From b8fa676e1612929e6a709bd14af268131df51f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=83=D8=A7=D8=B1=D9=84=20=D9=85=D8=A8=D8=A7=D8=B1=D9=83?=
 <bonjour@mouabrak.eu>
Date: Fri, 2 Jul 2021 22:20:08 +0200
Subject: [PATCH] prepped for more streams, vue3 store not reactive when
 pushing to rules array, wonky fix

---
 front/src/App.vue                       | 64 +++++++++++----------
 front/src/components/Content/index.vue  | 14 ++++-
 front/src/components/Rules/Rule.vue     |  4 +-
 front/src/components/Rules/Styles.vue   | 35 +++++-------
 front/src/components/Rules/index.vue    | 12 ++++
 front/src/components/Streams/Stream.vue |  2 +
 front/src/components/Streams/index.vue  |  7 ++-
 front/src/store/index.js                | 75 ++++++++++++++++---------
 8 files changed, 131 insertions(+), 82 deletions(-)

diff --git a/front/src/App.vue b/front/src/App.vue
index f138ed3..7084050 100644
--- a/front/src/App.vue
+++ b/front/src/App.vue
@@ -2,7 +2,6 @@
   <div 
     id="app" 
     :class="[
-      stream,
       { mobile: isMobile }
     ]">
     <Styles />
@@ -34,7 +33,6 @@ export default {
     return {
       api: api,
       zulipClient: null,
-      stream: null,
     };
   },
   computed: {
@@ -49,13 +47,11 @@ export default {
     this.getStreams();
 
     this.$router.afterEach((to) => {
+      this.$store.commit("setContents", []);
+      this.$store.commit("setRules", []);
       this.$store.commit("setCurStream", to.path.replace("/", ""))
-      this.stream = to.path.replace("/", "")
-      if (this.stream != "") {
-        this.setUpDoc(this.stream);
-      } else {
-        this.$store.commit("setContents", []);
-        this.$store.commit("setRules", []);
+      if (this.currentStream != "") {
+        this.setUpDoc(this.currentStream);
       }
     });
   },
@@ -64,29 +60,29 @@ export default {
     checkIfMobile: () => window.innerWidth < 700,
 
     getStreams() {
-      api
-      .zulip
-      .init()
-      .then(client => {
+      api.zulip.init().then(client => {
         this.zulipClient = client
-        api
-        .zulip
-        .getStreams(client)
-        .then(result => {
-          this
-          .$store
-          .commit( 'setStreams', 
-            result
-            .streams
-            .filter(s => 
-              s.name.startsWith(this.pubStr)
-            )
+        api.zulip.getStreams(client).then(result => {
+          this.$store.commit( 'setStreams', 
+            result.streams
+            .filter(s => s.name.startsWith(this.pubStr))
           )
         })
+        api.zulip.listen(this.zulipClient, this.eventHandler)
       })
     },
 
     setUpDoc(stream) {
+    
+      api.zulip.getSubs(this.zulipClient).then(result => {
+        if (
+          !result.subscriptions
+          .map(s => s.name)
+          .includes(this.currentStream)
+        ) {
+          api.zulip.addSub(this.zulipClient, this.currentStream)
+        }
+      })
         
       api.zulip.getMsgs(this.zulipClient, stream, "content").then((result) => {
         for (let m = 0; m < result.messages.length; m++) {
@@ -99,8 +95,6 @@ export default {
         this.$store.commit("setRules", result.messages);
       });
 
-      api.zulip.listen(this.zulipClient, this.eventHandler)
-      
     },
 
     eventHandler(event) {
@@ -125,7 +119,7 @@ export default {
         case 'update_message':
           this.$store.commit('editMessage', {
             mid: event.message_id,
-            content: event.content
+            content: event.rendered_content
           })
           break
           
@@ -192,17 +186,27 @@ main {
 section {
   position: relative;
   box-sizing: border-box;
-  margin-left: 1em;
-  min-width: 500px;
+  /* margin-left: 1em; */
+  padding: 1em;
+  min-width: 800px;
   max-width: 800px;
   display: flex;
   flex-direction: column;
   overflow: scroll;
+  background: lightgray;
+}
+section p {
+  margin-bottom: 0;
+  margin-top: 0;
 }
-
 section .title {
+  display: none;
   font-weight: bold;
   position: sticky;
   top: 1em;
 }
+
+@media print {
+  .title { display: none; } 
+}
 </style>
diff --git a/front/src/components/Content/index.vue b/front/src/components/Content/index.vue
index 1e732e6..7c6c985 100644
--- a/front/src/components/Content/index.vue
+++ b/front/src/components/Content/index.vue
@@ -1,7 +1,10 @@
 <template>
   <section class="content">
     <p class="title">{{ $.type.name }}</p>
-    <div class="body">
+    <div 
+      class="body"
+      :class="currentStream"
+    >
       <span
         v-for="message in contents"
         :key="message.id"
@@ -27,7 +30,8 @@ export default {
   computed: {
     ...mapState([
       'contents',
-      'rules'
+      'rules',
+      'currentStream'
     ])
   },
   methods: {
@@ -36,7 +40,11 @@ export default {
 </script>
 
 <style scoped>
-section {
+.content {
   max-width: 700px;
+  background: unset;
+}
+@media print {
+  .title { display: none; } 
 }
 </style>
\ No newline at end of file
diff --git a/front/src/components/Rules/Rule.vue b/front/src/components/Rules/Rule.vue
index 544e1de..ebc605e 100644
--- a/front/src/components/Rules/Rule.vue
+++ b/front/src/components/Rules/Rule.vue
@@ -1,12 +1,12 @@
 <template>
-  <code 
+  <div 
     class="rule"
     :style="rule.rules"  
   >
     <p :title="toEmojiCode(rule.className)">{{ rule.className }} {</p>
     <p v-for="dec in rule.rules" :key="dec">&nbsp; {{ dec }}</p>
     <p>}</p>
-  </code>
+  </div>
 </template>
 
 <script>
diff --git a/front/src/components/Rules/Styles.vue b/front/src/components/Rules/Styles.vue
index 8d2c313..c3b7e5b 100644
--- a/front/src/components/Rules/Styles.vue
+++ b/front/src/components/Rules/Styles.vue
@@ -1,27 +1,20 @@
 <script>
+import { mapState } from 'vuex';
 import emoji from "../../mixins/emoji";
 
+
 export default {
   name: "Styles",
   mixins: [emoji],
   computed: {
-    rules() {
-      return this.$store.state.rules;
-    },
+    ...mapState([
+      'rules'
+    ]),
+    
   },
-  data: function () {
+  data() {
     return {
       el: null,
-      htmlTags: [
-        'section',
-        'p',
-        'a',
-        'span',
-        'code',
-        'ul',
-        'li',
-        'and so on' 
-      ]
     }
   },
   methods: {
@@ -38,22 +31,24 @@ export default {
         });
         styles += "}";
       });
-      console.log(styles)
       return styles;
     },
-    insertStyleElement() {
+    createStyleElement() {
       var style = document.createElement("style");
       style.innerText = this.generateStyleRules();
       return style;
     },
   },
-  mounted: function () {
-    this.el = document.head.appendChild(this.insertStyleElement());
+  mounted() {
+    this.el = this.createStyleElement() 
+    document.head.appendChild(this.el)
   },
   watch: {
     rules() {
-      let style = this.insertStyleElement();
-      this.el.parentNode.replaceChild(style, this.el);
+      console.log('rules!')
+      const newStyle = this.createStyleElement()
+      document.head.replaceChild(newStyle, this.el)
+      this.el = newStyle
     },
   },
 };
diff --git a/front/src/components/Rules/index.vue b/front/src/components/Rules/index.vue
index c8741e0..e059ef0 100644
--- a/front/src/components/Rules/index.vue
+++ b/front/src/components/Rules/index.vue
@@ -22,9 +22,21 @@ export default {
     ...mapState([
       'rules',
     ])
+  },
+  watch: {
+    rules() {
+      console.log('rules')
+    }
   }
 }
 </script>
 
 <style scoped>
+.rules {
+  max-width: unset;
+}
+
+@media print {
+  .rules { display: none; } 
+}
 </style>
\ No newline at end of file
diff --git a/front/src/components/Streams/Stream.vue b/front/src/components/Streams/Stream.vue
index 6ac72a1..31b5e37 100644
--- a/front/src/components/Streams/Stream.vue
+++ b/front/src/components/Streams/Stream.vue
@@ -21,6 +21,8 @@ export default {
 </script>
 
 <style scoped>
+div {
+}
 div p {
   margin: 0;
 }
diff --git a/front/src/components/Streams/index.vue b/front/src/components/Streams/index.vue
index 0641331..2a806a5 100644
--- a/front/src/components/Streams/index.vue
+++ b/front/src/components/Streams/index.vue
@@ -27,7 +27,10 @@ export default {
 </script>
 
 <style scoped>
-section {
-  min-width: 6em;
+.streams {
+  min-width: 10em;
+}
+@media print {
+  .streams { display: none; } 
 }
 </style>
\ No newline at end of file
diff --git a/front/src/store/index.js b/front/src/store/index.js
index 7e7293d..d4a3ebf 100644
--- a/front/src/store/index.js
+++ b/front/src/store/index.js
@@ -1,24 +1,28 @@
 /*eslint no-unused-vars: "off"*/
 /*eslint no-undef: "off"*/
 
+// import Vue from 'vue'
 import { createStore } from 'vuex'
-import emoji from "../mixins/emoji";
-import { stripHtml } from "string-strip-html";
+import emoji from "../mixins/emoji"
+import { stripHtml } from "string-strip-html"
 
 var EmojiConvertor = require('emoji-js');
 var emojiConv = new EmojiConvertor();
 
 let toCSS = (message, currentStream) => {
+  // console.log(message)
   let className = "",
     emoji_code = "",
     rules = [],
-    parentClassName = currentStream
+    parentClassName = currentStream,
+    id = message.id
 
   // let regex = /[/s]?(?<selector>.+)\s*\n?{\n?(?<prop>[\s\w.~:>-]+\s*:\s*.+;?\n?)*\n?}/gm
   let regex = /[/s]?(?<selector>.+)\s*\n?{\n?(?<props>(.*;\n?)+)}/gm
   let content = stripHtml(message.content).result;
   let results = content.matchAll(regex);
   results = Array.from(results);
+  // console.log(results)
   if (results.length > 0) {
     className = emojiConv.replace_colons(results[0]['groups']['selector']);
     if (emoji.methods.containsEmoji(className)) {
@@ -26,7 +30,8 @@ let toCSS = (message, currentStream) => {
     }
     rules = results[0]['groups']['props'].split("\n");
     rules = rules.filter((rule) => validateRule(rule))
-    return { className, emoji_code, rules, parentClassName };
+    // console.log(className, emoji_code, rules, parentClassName, id)
+    return { className, emoji_code, rules, parentClassName, id };
   }
   return null;
 }
@@ -84,25 +89,22 @@ export default createStore({
   },
 
   mutations: {
+  
     setMobile    : (state, mobile)    => state.isMobile  = mobile,
     setStreams   : (state, streams)   => state.streams = streams,
-    setCurStream : (state, stream)  => state.currentStream = stream,
-
+    setCurStream : (state, stream)    => state.currentStream = stream,
+    setContents: (state, contents) => state.contents = contents,
     addMessage: (state, message) => {
-      if (message.content.startsWith('@_**')) {
-        handleMDReply(message)
-      } else if (
-        message.content.includes('user-mention') && 
-        message.content.includes('blockquote')
-      ) {
-        handleHTMLReply(message)
-      }
-      state.contents.push(message)
-    },
-    editMessage: (state, { mid, content }) => {
-      const message = state.contents.find(m => m.id == mid)
-      if (message) {
-        message.content = content
+      if (message.display_recipient == state.currentStream) {
+        if (message.content.startsWith('@_**')) {
+          handleMDReply(message)
+        } else if (
+          message.content.includes('user-mention') && 
+          message.content.includes('blockquote')
+        ) {
+          handleHTMLReply(message)
+        }
+        state.contents.push(message)
       }
     },
     deleteMessage: (state, mid) => {
@@ -123,7 +125,6 @@ export default createStore({
         message.reactions.splice(message.reactions.indexOf(reaction), 1)
       }
     },
-    
     setRules: (state, rules) => {
       state.rules = rules.reduce((acc, cur) => {
         let rule = toCSS(cur, state.currentStream);
@@ -133,19 +134,43 @@ export default createStore({
         return acc
       }, [])
     },
-    
     addRule: (state, rule) => {
       if (toCSS(rule) !== null) {
-        state.rules.push(toCSS(rule))
+        state.rules.push(toCSS(rule, state.currentStream))
       }
-    } 
+    },
+    editMessage: (state, { mid, content }) => {
+      const message = state.contents.find(m => m.id == mid)
+      const rule = state.rules.find(r => r.id == mid)
+      if (message) {
+        message.content = content
+        if (message.content.startsWith('@_**')) {
+          handleMDReply(message)
+        } else if (
+          message.content.includes('user-mention') && 
+          message.content.includes('blockquote')
+        ) {
+          handleHTMLReply(message)
+        }
+      } else if (rule) {
+        const newRules = [...state.rules, ...[toCSS({
+          id: mid, content: content,
+        }, state.currentStream)]]
+        state.rules = newRules
+        
+        // state.rules[state.rules.indexOf(rule)] = toCSS({
+        //   id: mid, content: content,
+        // }, state.currentStream)
+      }
+    },
     
   },
 
   actions: {
   },
 
-  getters: {
+  getters: {  
+    rules: state => state.rules
   }
 
 })