-
- poll
-
+
+
+
diff --git a/src/components/Profile.vue b/src/components/Profile.vue
index 031e01e..daa30cf 100644
--- a/src/components/Profile.vue
+++ b/src/components/Profile.vue
@@ -53,9 +53,14 @@
- {{
- $t("menu.logout")
- }}
+
+ {{ $t("menu.logout") }}
+
+
{{ answer.percentage }}%
- more_vert {{ answer.percentage }}%
-
- {{ $t("poll_create.title") }} -
-{{ $t("poll_create.intro") }}
-
+
+
-
+
+
+
+
-
-
-
-
-
-
- {{ $t("poll_create.add_answer") }}
+
+
+ delete
+
+
+
+
+
+
+
-
-
- {{ $t("menu.cancel") }}
-
-
+
+
+
{{ $t("poll_create.create") }}
+
+
+
+
-
+
diff --git a/src/components/InputControl.vue b/src/components/InputControl.vue
new file mode 100644
index 0000000..a0a077c
--- /dev/null
+++ b/src/components/InputControl.vue
@@ -0,0 +1,163 @@
+
+
+
+
+ close
+
+
+
+
+ {{ $t("poll_create.title") }}
+
+ 
+
+
+
{{ status }}
-
+ {{ $t("poll_create.tip_title") }}{{ $t("poll_create.tip_text") }}
+
+
+
+
+
+
+
+
+
diff --git a/src/components/LogoutRoomDialog.vue b/src/components/LogoutRoomDialog.vue
new file mode 100644
index 0000000..e869e1b
--- /dev/null
+++ b/src/components/LogoutRoomDialog.vue
@@ -0,0 +1,54 @@
+
+
+
+
+ {{ label }}
+
+
+
+
+
+
+
+
+
+ {{ $t("menu.cancel") }}
+
+
+ {{ $t("menu.logout") }}
+
+
+
+
+ + {{ $t("logout.confirm_text")}} +
+ +
@@ -89,12 +94,14 @@
diff --git a/src/components/RoomExport.vue b/src/components/RoomExport.vue
index 8ed0640..0010efb 100644
--- a/src/components/RoomExport.vue
+++ b/src/components/RoomExport.vue
@@ -33,7 +33,6 @@
:room="room"
:event="event"
:nextEvent="events[index + 1]"
- :reactions="timelineSet.getRelationsForEvent(event.getId(), 'm.annotation', 'm.reaction')"
:timelineSet="timelineSet"
ref="exportedEvent"
/>
diff --git a/src/components/RoomInfo.vue b/src/components/RoomInfo.vue
index ab1c4d6..c59f700 100644
--- a/src/components/RoomInfo.vue
+++ b/src/components/RoomInfo.vue
@@ -24,12 +24,7 @@
-
-
+
diff --git a/src/components/messages/MessageIncomingPoll.vue b/src/components/messages/MessageIncomingPoll.vue
index 2b956a3..8bb5166 100644
--- a/src/components/messages/MessageIncomingPoll.vue
+++ b/src/components/messages/MessageIncomingPoll.vue
@@ -21,6 +21,7 @@
/>
+
{{ roomName }}
{{ roomTopic }}
@@ -190,7 +185,7 @@
>{{ $t("room_info.purge") }}
-
+
{{ $t("room_info.version_info", { version: buildVersion }) }}
@@ -218,6 +213,7 @@ import LeaveRoomDialog from "../components/LeaveRoomDialog";
import PurgeRoomDialog from "../components/PurgeRoomDialog";
import DeviceList from "../components/DeviceList";
import RoomExport from "../components/RoomExport";
+import RoomAvatarPicker from "../components/RoomAvatarPicker";
import QRCode from "qrcode";
import roomInfoMixin from "./roomInfoMixin";
import QRCodePopup from './QRCodePopup.vue';
@@ -232,6 +228,7 @@ export default {
DeviceList,
RoomExport,
QRCodePopup,
+ RoomAvatarPicker
},
data() {
return {
diff --git a/src/components/RoomInfoBottomSheet.vue b/src/components/RoomInfoBottomSheet.vue
index 086749e..bd09691 100644
--- a/src/components/RoomInfoBottomSheet.vue
+++ b/src/components/RoomInfoBottomSheet.vue
@@ -1,34 +1,12 @@
-
-
-
- {{ loadValue }}
-
+
diff --git a/src/components/messages/ContactLeave.vue b/src/components/messages/ContactLeave.vue
index b592c7f..0b77831 100644
--- a/src/components/messages/ContactLeave.vue
+++ b/src/components/messages/ContactLeave.vue
@@ -10,6 +10,11 @@ import messageMixin from "./messageMixin";
export default {
mixins: [messageMixin],
+ mounted() {
+ if(this.room.getJoinedMemberCount() === 0) {
+ this.$navigation.push({ name: "Home", params: { roomId: null } }, -1);
+ }
+ }
};
diff --git a/src/components/messages/MessageIncoming.vue b/src/components/messages/MessageIncoming.vue
index 3f11f2b..a345132 100644
--- a/src/components/messages/MessageIncoming.vue
+++ b/src/components/messages/MessageIncoming.vue
@@ -20,7 +20,7 @@
>more_vert
- {{$t('room_info_sheet.this_room')}}
{{ roomName }}
{{ pollQuestion }}
+
-
-
+
+
+
+
{{ $t("poll_create.num_answered", { count: pollNumAnswers }) }}
-
- {{ $t("poll_create.close_poll") }}
-
-
-
-
- {{ $t("poll_create.poll_submit") }}
-
+
+
diff --git a/src/components/messages/MessageOutgoing.vue b/src/components/messages/MessageOutgoing.vue
index c14d2c9..11b4000 100644
--- a/src/components/messages/MessageOutgoing.vue
+++ b/src/components/messages/MessageOutgoing.vue
@@ -8,7 +8,7 @@
-
+ {{ $t("poll_create.poll_submit") }}
+
+
+ {{ $t("poll_create.view_results") }}
+
+
+
+
+
+
+ {{ $t("poll_create.close_poll") }}
+
+
+ 
+ {{ $t("poll_create.poll_status_closed") }}
+
+ {{ $t("poll_create.poll_status_closed") }}
+ {{ event.status }}
+
-
-
+
+
+
+
{{ $t("poll_create.num_answered", { count: pollNumAnswers }) }}
-
- {{ $t("poll_create.close_poll") }}
-
-
-
-
- {{ $t("poll_create.poll_submit") }}
-
+
+
diff --git a/src/components/messages/QuickReactions.vue b/src/components/messages/QuickReactions.vue
index 0e7c7b6..deb608b 100644
--- a/src/components/messages/QuickReactions.vue
+++ b/src/components/messages/QuickReactions.vue
@@ -15,24 +15,33 @@ export default {
return {}
}
},
- reactions: {
+ timelineSet: {
type: Object,
default: function () {
return null
}
- }
+ },
},
data() {
return {
- reactionMap: {}
+ reactionMap: {},
+ reactions: null
}
},
+ mounted() {
+ this.reactions = this.timelineSet.getRelationsForEvent(this.event.getId(), 'm.annotation', 'm.reaction');
+ this.event.on("Event.relationsCreated", this.onRelationsCreated);
+ },
beforeDestroy() {
+ this.event.off("Event.relationsCreated", this.onRelationsCreated);
if (this.reactions) {
this.reactions.off('Relations.add', this.onAddRelation);
}
},
methods: {
+ onRelationsCreated() {
+ this.reactions = this.timelineSet.getRelationsForEvent(this.event.getId(), 'm.annotation', 'm.reaction');
+ },
onClickEmoji(emoji) {
this.$bubble('send-quick-reaction', {reaction:emoji, event:this.event});
},
diff --git a/src/components/messages/messageMixin.js b/src/components/messages/messageMixin.js
index 4255022..e51e53c 100644
--- a/src/components/messages/messageMixin.js
+++ b/src/components/messages/messageMixin.js
@@ -27,12 +27,6 @@ export default {
return null
}
},
- reactions: {
- type: Object,
- default: function () {
- return null
- }
- },
timelineSet: {
type: Object,
default: function () {
diff --git a/src/components/messages/pollMixin.js b/src/components/messages/pollMixin.js
index 7544764..6bb073f 100644
--- a/src/components/messages/pollMixin.js
+++ b/src/components/messages/pollMixin.js
@@ -11,6 +11,7 @@ export default {
pollEndTs: null,
pollIsDisclosed: true,
pollTentativeAnswer: null,
+ pollViewResults: false,
};
},
mounted() {
@@ -145,8 +146,13 @@ export default {
this.pollTotalVotes = totalVotes;
},
pollAnswer(id) {
- if (!this.userHasVoted) {
- this.pollTentativeAnswer = id;
+ // Only if not voted and not currently viewing poll results.
+ if (!this.userHasVoted && !this.pollViewResults) {
+ if (id == this.pollTentativeAnswer) {
+ this.pollTentativeAnswer = null;
+ } else {
+ this.pollTentativeAnswer = id;
+ }
}
},
pollAnswerSubmit() {
@@ -163,7 +169,9 @@ export default {
});
},
pollClose() {
- util.closePoll(this.$matrix.matrixClient, this.room.roomId, this.event).catch((err) => {
+ util.closePoll(this.$matrix.matrixClient, this.room.roomId, this.event).then(() => {
+ this.$emit("poll-closed", this);
+ }).catch((err) => {
console.log("Failed to send:", err);
});
},
diff --git a/src/main.js b/src/main.js
index 2019b78..07853c9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,7 +7,7 @@ import router from './router'
import matrix from './services/matrix.service'
import navigation from './services/navigation.service'
import config from './services/config.service'
-import cleaninsights from './services/cleaninsights.service'
+import analytics from './services/analytics.service'
import 'roboto-fontface/css/roboto/roboto-fontface.css'
import 'material-design-icons-iconfont/dist/material-design-icons.css'
import VEmojiPicker from 'v-emoji-picker';
@@ -27,7 +27,7 @@ Vue.use(VueResize);
Vue.use(VEmojiPicker);
Vue.use(matrix, { store: store, i18n: i18n });
Vue.use(config); // Use this before cleaninsights below, it depends on config!
-Vue.use(cleaninsights);
+Vue.use(analytics);
Vue.use(VueClipboard);
// Add bubble functionality to custom events.
@@ -159,6 +159,6 @@ new Vue({
router,
matrix,
config,
- cleaninsights,
+ analytics,
render: h => h(App)
}).$mount('#app');
\ No newline at end of file
diff --git a/src/plugins/utils.js b/src/plugins/utils.js
index cb9b67f..1122cb8 100644
--- a/src/plugins/utils.js
+++ b/src/plugins/utils.js
@@ -389,8 +389,12 @@ class Util {
}
/** Generate a random user name */
- randomUser() {
- return this.randomString(
+ randomUser(prefix) {
+ var pfx = prefix ? prefix.replace(/[^0-9a-zA-Z\-_]/gi, '') : null;
+ if (!pfx || pfx.length == 0) {
+ pfx = "weblite-";
+ }
+ return pfx + this.randomString(
12,
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
);
diff --git a/src/services/analytics.service.js b/src/services/analytics.service.js
new file mode 100644
index 0000000..ce7e58f
--- /dev/null
+++ b/src/services/analytics.service.js
@@ -0,0 +1,65 @@
+import cleaninsights from './cleaninsights.service'
+import matomo from './matomo.service'
+
+export default {
+ install(Vue) {
+ const analyticsService = new Vue({
+ data() {
+ return {
+ engines: [],
+ cachedEvents: [],
+ initialized: false
+ }
+ },
+ created() {
+ this.$config.promise.then((config) => {
+ var analytics = config.analytics || {};
+ if (!Array.isArray(analytics)) {
+ analytics = [analytics];
+ }
+ for (const engineConfig of analytics) {
+ if (engineConfig.enabled) {
+ let type = engineConfig.type || "ci";
+ switch (type) {
+ case "ci":
+ {
+ let engine = cleaninsights.install(Vue, engineConfig.config);
+ this.engines.push(engine);
+ }
+ break;
+ case "matomo":
+ {
+ let engine = matomo.install(Vue, engineConfig.config);
+ this.engines.push(engine);
+ }
+ break;
+ }
+ }
+ }
+
+ this.initialized = true;
+
+ // Handle cached events
+ this.cachedEvents.forEach(([category, action]) => {
+ this.event(category, action);
+ })
+ this.cachedEvents = [];
+ });
+ },
+ methods: {
+ event(category, action) {
+ if (!this.initialized) {
+ this.cachedEvents.push([category, action]);
+ return
+ }
+
+ // Send the event to each configured analytics engine.
+ this.engines.forEach((engine) => {
+ engine.event(category, action);
+ });
+ }
+ }
+ });
+ Vue.prototype.$analytics = analyticsService;
+ }
+}
diff --git a/src/services/cleaninsights.service.js b/src/services/cleaninsights.service.js
index accfb7b..ba0fe60 100644
--- a/src/services/cleaninsights.service.js
+++ b/src/services/cleaninsights.service.js
@@ -1,7 +1,7 @@
import { CleanInsights, ConsentRequestUi } from 'clean-insights-sdk';
export default {
- install(Vue) {
+ install(Vue, config) {
class RequestUi extends ConsentRequestUi {
showForCampaign(campaignId, campaign, complete) {
@@ -18,6 +18,7 @@ export default {
}
const cleanInsightsService = new Vue({
+ config: config,
data() {
return {
ci: null,
@@ -26,17 +27,14 @@ export default {
}
},
created() {
- const self = this;
- this.$config.promise.then(function (config) {
- const analytics = config.analytics || {};
- if (analytics.enabled && analytics.config) {
- self.ci = new CleanInsights(analytics.config);
+ if (this.$options.config) {
+ const config = this.$options.config;
+ this.ci = new CleanInsights(config);
- // Get name of first campaign in the config.
- self.campaignId = Object.keys(analytics.config.campaigns || { invalid: {} })[0];
- }
+ // Get name of first campaign in the config.
+ this.campaignId = Object.keys(config.campaigns || { invalid: {} })[0];
- });
+ }
},
methods: {
event(category, action) {
@@ -55,6 +53,6 @@ export default {
}
}
});
- Vue.prototype.$ci = cleanInsightsService;
+ return cleanInsightsService;
}
}
diff --git a/src/services/matomo.service.js b/src/services/matomo.service.js
new file mode 100644
index 0000000..70ded8b
--- /dev/null
+++ b/src/services/matomo.service.js
@@ -0,0 +1,51 @@
+
+export default {
+ install(Vue, config) {
+
+ const matomoService = new Vue({
+ config: config,
+ data() {
+ return {
+ initialized: false
+ }
+ },
+ created() {
+ if (this.$options.config) {
+ const config = this.$options.config;
+ let server = config.server;
+ let siteId = config.siteId;
+ if (server && siteId) {
+ if (!server.endsWith("/")) {
+ server = server + "/";
+ }
+ let script = `
+ var _paq = window._paq = window._paq || [];
+ /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+ _paq.push(['trackPageView']);
+ _paq.push(['enableLinkTracking']);
+ (function() {
+ var u="${server}";
+ _paq.push(['setTrackerUrl', u+'matomo.php']);
+ _paq.push(['setSiteId', '${siteId}']);
+ var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+ g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+ })();
+ `;
+ var s = document.createElement('script');
+ s.innerHTML = script;
+ document.body.appendChild(s);
+ this.initialized = true;
+ }
+ }
+ },
+ methods: {
+ event(category, action) {
+ if (this.initialized) {
+ window._paq.push(['trackEvent', category, action]);
+ }
+ }
+ }
+ });
+ return matomoService;
+ }
+}
diff --git a/src/services/matrix.service.js b/src/services/matrix.service.js
index 1265a0c..ce0ac87 100644
--- a/src/services/matrix.service.js
+++ b/src/services/matrix.service.js
@@ -115,7 +115,7 @@ export default {
// can not use avatars and 3. They can not seamlessly be upgraded to real accounts.
//
// Instead, we use an ILAG approach, Improved Landing as Guest.
- const user = util.randomUser();
+ const user = util.randomUser(this.$config.userIdPrefix);
const pass = util.randomPass();
promiseLogin = tempMatrixClient
.register(user, pass, null, {
@@ -854,7 +854,7 @@ export default {
if (tempUser) {
clientPromise = Promise.resolve(tempUser);
} else {
- const user = util.randomUser();
+ const user = util.randomUser(this.$config.userIdPrefix);
const pass = util.randomPass();
clientPromise = tempMatrixClient
.register(user, pass, null, {
+ {{ $t("poll_create.poll_submit") }}
+
+
+ {{ $t("poll_create.view_results") }}
+
+
+
+
+
+
+ {{ $t("poll_create.close_poll") }}
+
+
+
+ {{ $t("poll_create.poll_status_closed") }}
+
+ {{ $t("poll_create.poll_status_closed") }}
+