diff --git a/front/package-lock.json b/front/package-lock.json index 8dc461c..f70eecb 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -1,5 +1,5 @@ { - "name": "front", + "name": "Chattypub", "version": "0.1.0", "lockfileVersion": 1, "requires": true, @@ -10107,6 +10107,40 @@ "unpipe": "1.0.0" } }, + "raw-loader": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz", + "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==", + "dev": true, + "requires": { + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0" + }, + "dependencies": { + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "schema-utils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz", + "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.7", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + } + } + } + }, "read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", diff --git a/front/package.json b/front/package.json index f72a988..adb4026 100644 --- a/front/package.json +++ b/front/package.json @@ -51,4 +51,4 @@ "last 2 versions", "not dead" ] -} \ No newline at end of file +} diff --git a/front/src/App.vue b/front/src/App.vue index 5c8ed42..1c2c0ab 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -32,7 +32,7 @@ export default { }; }, computed: { - ...mapState(["isMobile", "pubStr", "currentStream"]), + ...mapState(["isMobile", "pubStr", "currentStream", "streams"]), }, created() { this.$store.commit("setMobile", this.checkIfMobile()); @@ -46,7 +46,7 @@ export default { this.$store.commit("setTopics", []); this.$store.commit("setRules", []); this.$store.commit("setCurStream", to.path.replace("/", "")); - if (this.currentStream != "") { + if (this.currentStream != "" && this.streams.includes(this.currentStream)) { this.setUpDoc(this.currentStream); } }); diff --git a/front/src/assets/logo.png b/front/src/assets/logo.png deleted file mode 100644 index f3d2503..0000000 Binary files a/front/src/assets/logo.png and /dev/null differ diff --git a/front/src/components/Content/Chapter.vue b/front/src/components/Content/Chapter.vue index 2f5d55c..45ecbfd 100644 --- a/front/src/components/Content/Chapter.vue +++ b/front/src/components/Content/Chapter.vue @@ -38,7 +38,8 @@ export default { return r; }, messagesToShow() { - return this.topic.messages.filter(m => !m.responseTo) + return this.topic.messages + .filter(m => !m.responseTo) } }, }; diff --git a/front/src/components/Content/Message.vue b/front/src/components/Content/Message.vue index aa34b02..186ded0 100644 --- a/front/src/components/Content/Message.vue +++ b/front/src/components/Content/Message.vue @@ -53,12 +53,14 @@ export default { m.responseTo.sender_id == this.message.sender_id && this.message.content.includes(m.responseTo.quote) ); + console.log(c, referrers) referrers.forEach((m) => { const classes = m.reactions.map((r) => "u" + r.emoji_code).join(" "); c = c.replace( m.responseTo.quote, `${m.responseTo.quote}` ); + console.log(c) }); return c; }, diff --git a/front/src/components/Content/index.vue b/front/src/components/Content/index.vue index 1d6695e..9f3621b 100644 --- a/front/src/components/Content/index.vue +++ b/front/src/components/Content/index.vue @@ -1,6 +1,6 @@