From: Andrew Gundersen <gundersena@xavier.edu>
Date: Mon, 22 Feb 2021 02:42:02 +0000 (-0600)
Subject: frontend ui enhacements
X-Git-Tag: v0.9~81^2
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=af47f884d1e17804eeae1e1f82b55e1efdcf3c74;p=mime-chat

frontend ui enhacements
---

diff --git a/src/App.vue b/src/App.vue
index 8f6d51d..99315a2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,11 +25,11 @@
   }
 
   #app {
+    font-family: "SF Pro Text";
+
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
 
-    color: #2c3e50;
-
     height: 100vh;
     width: 100vw;
 
@@ -43,15 +43,15 @@
     width: 100vw;
     height: 54px;
 
-    -webkit-user-select: none;
-    -webkit-app-region: drag;
+    opacity: 0.75;
 
-    background-color: red;
+    background-color: #EBEBEB;
 
-    opacity: 0.0;
+    -webkit-user-select: none;
+    -webkit-app-region: drag;
 
     border: none;
-    outline:none;
+    outline: none;
 
   }
 
diff --git a/src/components/messageView/index.vue b/src/components/messageView/index.vue
index d75ef73..58d19e8 100644
--- a/src/components/messageView/index.vue
+++ b/src/components/messageView/index.vue
@@ -23,21 +23,21 @@
 
 <script lang="ts">
 
-
-// mock messages
-import Messages from "./mockMessages";
-
-
 import TextBubble from "@/components/textBubble/index.vue";
+
 import { Message } from "@/types/message/index";
+import { useIpc } from "@/modules/ipc";
+import { Queue } from '@/modules/queue';
+
 import useTransitions from "./viewDetails/transitions";
 import useScrollView from "@/modules/scrollView";
+
 import useMitt from "@/modules/mitt";
-import { useIpc } from "@/modules/ipc";
-import { Queue } from '@/modules/queue';
+
 import { defineComponent, reactive, onMounted, onUnmounted, watch, ref } from "vue";
 
 export default defineComponent({
+  
   name: "MessageView",
   components: { TextBubble },
   
@@ -47,24 +47,13 @@ export default defineComponent({
     const renderQ = new Queue();
 
     const { invoke } = useIpc("message");
+
+    // Each method will be called on their respective lifecycle event.
     const { beforeEnter, enter, afterEnter, rendering } = useTransitions();
     const { scrollView } = useScrollView({
       targetId: "messageView",
     });
 
-
-    const messages = Messages;
-    const count = ref(0);
-
-    function emittMessage() {
-      console.log("emitting mock message")
-      if (count.value < messages.length) {
-        emitter.emit("render-message", messages[count.value]);
-        count.value++;
-        return;
-      }
-    }
-
     const render = (m: Message) => {
       if (rendering.value) {
         renderQ.enqueue(m);
@@ -81,6 +70,8 @@ export default defineComponent({
     })
 
     onMounted(() => {
+
+      // Call render function on event "render-message."
       window.ipcRenderer.on("render-message", (event, payload) => {
         const m = payload.message;
         if (m.content) render(m);
@@ -107,8 +98,17 @@ export default defineComponent({
       enter,
       afterEnter,
       scrollView,
-      emittMessage,
     };
   },
 });
 </script>
+
+<style lang="scss" scoped>
+
+  #messageView {
+    width: 1000px;
+    height: 100vh;
+    color: red;
+  }
+
+</style>
diff --git a/src/components/messageView/mockMessages.ts b/src/components/messageView/mockMessages.ts
deleted file mode 100644
index 6284c82..0000000
--- a/src/components/messageView/mockMessages.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import { Message } from "@/types/message/index";
-
-const Messages: Message[] = [
-    {
-        content: "Welcome",
-        context: "ai",
-        subContext: "",
-        modifier: "ai",
-        id: "2",
-        time: ""
-    },
-    {
-        content:
-            "add friend",
-        context: "launch",
-        subContext: "",
-        modifier: "sf",
-        id: "1",
-        time: ""
-    },
-    {
-        content: "Did you mean to addcontact?",
-        context: "addcontact",
-        subContext: "",
-        modifier: "ai",
-        id: "5",
-        time: ""
-    },
-    {
-        content: "yes",
-        context: "fulfill",
-        subContext: "",
-        modifier: "sf",
-        id: "6",
-        time: ""
-    },
-
-    {
-        content: "Hey Anna, did you get the paper done?",
-        context: "Mesage from Tommy McConville",
-        subContext: "New Conversation",
-        modifier: "ai",
-        id: "3",
-        time: ""
-    },
-    {
-        content: "Hey do you know Enrique Hernandez?",
-        context: "Message from Crimata",
-        subContext: "",
-        modifier: "ai",
-        id: "7",
-        time: ""
-    },
-
-    {
-        content: "Yes posting it online soon.",
-        context: "You to Tommy McConville",
-        subContext: "",
-        modifier: "sf",
-        id: "4",
-        time: ""
-    },
-    {
-        content: "Hey do you know Enrique Hernandez?",
-        context: "Message from Crimata",
-        subContext: "",
-        modifier: "ai",
-        id: "8",
-        time: ""
-    },
-    {
-        content: "Hey Anna, did you get the paper done?",
-        context: "Message from Tommy McConville",
-        subContext: "",
-        modifier: "ai",
-        id: "9",
-        time: ""
-    },
-    {
-        content: "Hey Anna, did you get the paper done?",
-        context: "Message from Tommy McConville",
-        subContext: "",
-        modifier: "ai",
-        id: "10",
-        time: ""
-    },
-    {
-        content: "Yes posting it online soon.",
-        context: "Message from Tommy McConville",
-        subContext: "",
-        modifier: "sf",
-        id: "11",
-        time: ""
-    },
-    {
-        content:
-            "I can be there at 5 pm tomorrow to greet you at a Chick file with my almond and chive salad.",
-        context: "You to Tommy McConville",
-        subContext: "",
-        modifier: "sf",
-        id: "12",
-        time: ""
-    },
-    {
-        content: "Hey Anna, did you get the paper done?",
-        context: "Message from Tommy McConville",
-        subContext: "",
-        modifier: "ai",
-        id: "13",
-        time: ""
-    },
-    {
-        content: "Hey Anna, did you get the paper done?",
-        context: "Message from Tommy McConville",
-        subContext: "",
-        modifier: "ai",
-        id: "14",
-        time: ""
-    },
-    {
-        content: "Yes posting it online soon.",
-        context: "You to Tommy McConville",
-        subContext: "",
-        modifier: "sf",
-        id: "15",
-        time: ""
-    },
-    {
-        content: "Sweet, thanks!",
-        context: "Message from Tommy McConville",
-        subContext: "",
-        modifier: "ai",
-        id: "16",
-        time: ""
-    },
-    {
-        content: "Hey do you know Enrique Hernandez?",
-        context: "Message from Crimata AI",
-        subContext: "",
-        modifier: "ai",
-        id: "17",
-        time: ""
-    },
-    {
-        content: "Yes posting it online soon.",
-        context: "You to Tommy McConville",
-        subContext: "",
-        modifier: "sf",
-        id: "18",
-        time: ""
-    },
-    {
-        content: "Sweet, thanks!",
-        context: "Message from Tommy McConville",
-        subContext: "",
-        modifier: "ai",
-        id: "19",
-        time: ""
-    },
-];
-export default Messages;
\ No newline at end of file
diff --git a/src/components/messageView/viewDetails/offsetCalculator.ts b/src/components/messageView/viewDetails/offsetCalculator.ts
index a04e5ab..01be800 100644
--- a/src/components/messageView/viewDetails/offsetCalculator.ts
+++ b/src/components/messageView/viewDetails/offsetCalculator.ts
@@ -5,7 +5,7 @@ import { ref } from "vue";
 export default function useOffsetCalculator() {
     const xOffset = ref(0);
     const yOffset = ref(0);
-    const firstChildMarginTop = 0;
+    const firstChildMarginTop = 45;
     let previousMessageHeight = 0;
     const messagePadding = 15;
 
diff --git a/src/components/messageView/viewDetails/transitions.ts b/src/components/messageView/viewDetails/transitions.ts
index 8d85701..493725e 100644
--- a/src/components/messageView/viewDetails/transitions.ts
+++ b/src/components/messageView/viewDetails/transitions.ts
@@ -33,9 +33,12 @@ export default function useTransitions() {
 
     const animateMessage = async (el: SVGGElement) => {
 
+        // Where the message gets translated to.
         const elTransform = `translate(${messageOffset.x} ${messageOffset.y})`;
+
         const viewTransform = `translate(0 ${-vB})`;
 
+        // Shift of view height > window height.
         if (shift) {
             await shiftAnimate(el, elTransform, messageView, viewTransform);
         } else {
@@ -44,6 +47,7 @@ export default function useTransitions() {
         rendering.value = false;
     }
 
+    // Get height of messageView.
     const beforeEnter: VueTransitionCallback = () => {
         rendering.value = true;
         // query DOM for messageView element
diff --git a/src/components/taInput/index.vue b/src/components/taInput/index.vue
index 91fb570..b0f3a28 100644
--- a/src/components/taInput/index.vue
+++ b/src/components/taInput/index.vue
@@ -1,17 +1,33 @@
 <template>
-  <audio-stream v-if="visualizeStream" :bubbleWidth="audioBubbleWidth" :paths="paths" />
-  <text-input v-else :input="input" :textXoffset="textInputXoffset" />
+
+  <!-- render audio or text input-->
+  <AudioStream 
+    v-if="visualizeStream" 
+    :bubbleWidth="audioBubbleWidth" 
+    :paths="paths" 
+  />
+
+  <TextInput 
+    v-else 
+    :input="input" 
+    :textXoffset="textInputXoffset"
+    :textYoffset="textInputYoffset"
+  />
+
 </template>
 
 <script lang="ts">
-// input child components
+
+// import child components
 import TextInput from "./textDetails/text.vue";
 import AudioStream from "./audioDetails/audio.vue";
 
 import useInputController from "./inputController";
 
 import { defineComponent } from "vue";
+
 export default defineComponent({
+  
   name: "TextAudioInput",
   components: { TextInput, AudioStream },
   setup() {
@@ -24,14 +40,20 @@ export default defineComponent({
     const {
       input,
       visualizeStream,
+
       textInputXoffset,
+      textInputYoffset,
+
       audioBubbleWidth,
       paths,
     } = useInputController();
 
     return {
       input,
+      
       textInputXoffset,
+      textInputYoffset,
+
       visualizeStream,
       audioBubbleWidth,
       paths,
diff --git a/src/components/taInput/inputController.ts b/src/components/taInput/inputController.ts
index e7eda4c..20bf438 100644
--- a/src/components/taInput/inputController.ts
+++ b/src/components/taInput/inputController.ts
@@ -32,9 +32,18 @@ export default function useInputController() {
         emitter.emit("user-message", message);
     }
 
-    const { visualizeStreamAsPaths, expandBubble } = useAudioVisualizer(visualizeStream);
+    const { 
+        visualizeStreamAsPaths, 
+        expandBubble 
+    } = useAudioVisualizer(visualizeStream);
+
     const { keyDownHandler, input } = useKeyDownHandler(enterCallback);
-    const { textInputXoffset, renderTextInput } = useTextVisualizer(input);
+
+    const { 
+        textInputXoffset, 
+        textInputYoffset,
+        renderTextInput 
+    } = useTextVisualizer(input);
 
     // stops stream recording on space key up
     function keyupHandler(e: any) {
@@ -83,6 +92,7 @@ export default function useInputController() {
         input,
         visualizeStream,
         textInputXoffset,
+        textInputYoffset,
         audioBubbleWidth,
         paths
     }
diff --git a/src/components/taInput/textDetails/text.vue b/src/components/taInput/textDetails/text.vue
index 886633e..eb16b77 100644
--- a/src/components/taInput/textDetails/text.vue
+++ b/src/components/taInput/textDetails/text.vue
@@ -1,38 +1,52 @@
 <template>
-  <foreignObject class="inputContainer" :x="textXoffset" y="450" width="55%" height="50%">
+
+  <foreignObject 
+    class="inputContainer" 
+    :x="textXoffset" 
+    :y="textYoffset" 
+    width="55%" 
+    height="50%"
+  >
     <div xmlns="http://www.w3.org/1999/xhtml">
-      <div class="inputBubble" contenteditable v-show="input.length > 0" font-family="SF Pro">
+      <div class="inputBubble" v-show="input.length > 0">
         <p>{{ input }}</p>
       </div>
     </div>
+
   </foreignObject>
+
 </template>
 
 <script lang="ts">
+
 import { defineComponent } from "vue";
+
 export default defineComponent({
+
   name: "TextInput",
   props: {
     input: String,
     textXoffset: String,
+    textYoffset: String,
   },
 });
+
 </script>
 
 <style lang="scss" scoped>
-div[contenteditable] {
-  width: auto;
+.inputBubble {
+
   max-width: 180px;
-  height: auto;
-  min-height: 36px;
+  min-height: 32px;
+
   display: table;
   justify-items: center;
-  border: 0;
+
   border-radius: 10px;
-  color: #000;
-  background-color: #b9b9b9;
-  font-size: 14;
-  text-align: left;
+  background-color: #B9B9B9;
+
+  font-size: 14px;
+
   p {
     max-width: 150px;
     overflow-wrap: break-word;
diff --git a/src/components/taInput/textDetails/textVisualizer.ts b/src/components/taInput/textDetails/textVisualizer.ts
index 4b3c89c..e41da04 100644
--- a/src/components/taInput/textDetails/textVisualizer.ts
+++ b/src/components/taInput/textDetails/textVisualizer.ts
@@ -50,8 +50,13 @@ export default function useTextVisualizer(input: Ref<string>) {
         return `calc(50% - ${inputWidth.value / 2})`;
     });
 
+    const textInputYoffset = computed(() => {
+        return `calc(97% - ${inputHeight.value})`;
+    });
+
     return {
         textInputXoffset,
+        textInputYoffset,
         renderTextInput
     }
 }
diff --git a/src/components/textBubble/bubbleDetails/computed.ts b/src/components/textBubble/bubbleDetails/computed.ts
index c3b4769..a2e9fa2 100644
--- a/src/components/textBubble/bubbleDetails/computed.ts
+++ b/src/components/textBubble/bubbleDetails/computed.ts
@@ -6,6 +6,7 @@ import { computed, onMounted, ref } from "vue";
 export default function useComputedBubble(m: string, id: string) {
     const x = ref(0)
     const paddingLeft = 30;
+
     const winW = 350;
     const messageWidth = ref(0);
     const messageMarginTop = 75;
@@ -39,7 +40,7 @@ export default function useComputedBubble(m: string, id: string) {
     const calculateXoffset = async () => {
         switch (m) {
             case "sf":
-                x.value = winW - messageWidth.value - selfMessageMarginRight;
+                x.value = 800 - messageWidth.value - selfMessageMarginRight;
                 break;
             default:
                 x.value = paddingLeft;
diff --git a/src/components/textBubble/index.vue b/src/components/textBubble/index.vue
index a19ac84..5ac976f 100644
--- a/src/components/textBubble/index.vue
+++ b/src/components/textBubble/index.vue
@@ -1,7 +1,7 @@
 <template>
   <g :id="item.id" :class="item.modifier" :transform="startingOffset">
     <rect ref="messageRect" x="30" y="10" width="196" height="63" rx="10" :fill="bubbleFill" />
-    <text font-size="14" font-family="SF Pro" ref="messageText" :fill="textFill">
+    <text font-size="14" font-family="SF Pro Text" ref="messageText" :fill="textFill">
       <tspan dy="16" x="0" v-for="(item, index) in textArr" :key="index">{{ item }}</tspan>
     </text>
     <g :transform="signatureTranslate">
diff --git a/src/modules/scrollView.ts b/src/modules/scrollView.ts
index 3032667..7184f72 100644
--- a/src/modules/scrollView.ts
+++ b/src/modules/scrollView.ts
@@ -12,30 +12,44 @@ export default function useScrollView({ targetId }: { targetId: string }) {
   let topBound: number;
   const scrollStartHeight = 445;
 
-  const clampedScroll = computed(() => {
-    if (targetHeight.value === 0) { return 0; }
-    topBound = -targetHeight.value + 450;
-    return Math.max(topBound, Math.min(scroll.value, 0)) as number;
-  })
-
   const scrollView = computed(() => {
+
     if (clampedScroll.value === 0) {
       scroll.value = 0;
     } else if (clampedScroll.value === topBound) {
       scroll.value = topBound;
     }
+
+    // x, y, width, height
+    // width and height should be dynamic
     return `0 ${clampedScroll.value} 350 500`;
   });
 
+  const clampedScroll = computed(() => {
+    if (targetHeight.value === 0) { return 0; }
+    topBound = -targetHeight.value + 450;
+    return Math.max(topBound, Math.min(scroll.value, 0)) as number;
+  })
+
   const getHeight = () => {
     if (scrollTarget) {
       return scrollTarget.getBoundingClientRect().height as number;
     }
   }
 
+  const getWidth = () => {
+    if (scrollTarget) {
+      return scrollTarget.getBoundingClientRect().width as number;
+    }
+  }
+
   const updateView = (verticalScroll: number) => {
+
     if (scrollTarget) {
+
       const heightResult = getHeight();
+      const widthResult = getWidth();
+
       if (heightResult) {
         // only scroll if renderer scrollStart
         if (heightResult > scrollStartHeight) {
diff --git a/src/views/home.vue b/src/views/home.vue
index 341a81a..401b35a 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -13,14 +13,17 @@
 
 <script lang="ts">
 
+// Home consists on MessageView and Text/Audio imput component.
 import MessageView from "@/components/messageView/index.vue";
 import TextAudioInput from "@/components/taInput/index.vue";
+
 import { defineComponent } from "vue";
 
 export default defineComponent({
   name: "Messenger",
   components: { MessageView, TextAudioInput },
 });
+
 </script>
 
 <style lang="scss" scoped>