From: Enrique Hernandez <hernandeze2@xavier.edu>
Date: Mon, 8 Mar 2021 00:42:56 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/main'
X-Git-Tag: v0.9~50
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=2fa76a89124805215d46148c4465dfffe4844512;p=mime-chat

Merge remote-tracking branch 'origin/main'
---

2fa76a89124805215d46148c4465dfffe4844512
diff --cc src/views/messenger.vue
index 16e16fe,d0631e4..b1e965f
--- a/src/views/messenger.vue
+++ b/src/views/messenger.vue
@@@ -25,16 -31,23 +25,21 @@@ export default defineComponent(
      // List of messages in the view.
      // Oldest message first.
      const messages: Message[] = reactive([]);
+     const messages_ref: any = {}
  
      // Render a message.
+     // Called on "enter" instead of on "recv message"
      const render = (message: Message) => {
        messages.push(message);
-       console.log(
-         `Pushing: ${message.modifier}: ${message.content.text} ${message.context}`
-       );
-     };
+       messages_ref[message.id] = message;
+     }
+ 
+     // Annotate/update an existing message.
+     const annotate = (message: Message) => {
+       1+1
+     }
  
      onMounted(() => {
 -
        // Listen for new messages to render.
        window.ipcRenderer.on("render-message", (event, payload) => {
          if (payload.message.content) render(payload.message);
@@@ -53,18 -69,21 +58,29 @@@
  </script>
  
  <style lang="scss" scoped>
 +#messenger {
 +  position: fixed;
  
++<<<<<<< HEAD
 +  width: 100vw;
 +  min-height: 100vh;
++=======
+   #messenger {
+     position: fixed;
+ 
+     width: 100vw;
+ 
+     overflow-y: scroll;
+ 
+     bottom: 0;
++>>>>>>> origin/main
  
 -  }
 +  overflow-y: scroll;
  
 -  #messenger::-webkit-scrollbar {
 -    display: none;
 -  }
 +  bottom: 0;
 +}
  
 +#messenger::-webkit-scrollbar {
 +  display: none;
 +}
  </style>