applying compatability changes from new-website to this

diff --git a/src/render/assets/fonts/SF-Compact-Display-Bold.otf b/src/render/assets/fonts/SF-Compact-Display-Bold.otf
new file mode 100755 (executable)
index 0000000..409e11a
Binary files /dev/null and b/src/render/assets/fonts/SF-Compact-Display-Bold.otf differ

diff --git a/src/render/assets/fonts/SF-Pro-Text-Regular.otf b/src/render/assets/fonts/SF-Pro-Text-Regular.otf
new file mode 100755 (executable)
index 0000000..06dbe85
Binary files /dev/null and b/src/render/assets/fonts/SF-Pro-Text-Regular.otf differ

diff --git a/src/render/components/app.js b/src/render/components/app.js
index cfd831bdcb1c3e6dd40f6df47442c8313e5813d9..32f09772145ccf270072f6e50f06447b276908cc 100644 (file)
--- a/src/render/components/app.js
+++ b/src/render/components/app.js
@@ -20,14 +20,14 @@ const App =
     },
 
     template: `
-        <main id="app" v-if="account !== null">
+        <div id="app" v-if="account !== null">
 
             <Header />
 
             <Messenger v-if="account"/>
             <Login v-else />
 
-        </main>
+        </div>
 
         <Splash v-else />`
 }

diff --git a/src/render/components/control/draggify.js b/src/render/components/control/draggify.js
index f85b9305e115dcf17239bccff1162110a09ee816..486f539dbcbef4fcca565ba4f5b58544987cc673 100644 (file)
--- a/src/render/components/control/draggify.js
+++ b/src/render/components/control/draggify.js
@@ -1,5 +1,5 @@
 const saveLocation = "input_item_position";
-const defaultPosition = { x: 15, y: window.innerHeight - 300 };
+const defaultPosition = { x: 15, y: 400 };
 
 //---Dragabble Helper Funcs--------------------------------------
 
@@ -33,9 +33,10 @@ function calcPosition (elementPosition, elementLength, percent, short, win) {
     return elementPosition
 }
 
-function draggify(elementId, margin) {
+function draggify(elementId, parentId, margin) {
 
     let element;
+    let parent;
 
     /* only compatible with elements having equal width and height */
     let elementLength;
@@ -52,14 +53,11 @@ function draggify(elementId, margin) {
     let xShort;
     let yShort;
 
-    // Keep track of window size;
-    let winW = window.innerWidth;
-    let winH = window.innerHeight;
-
     //---Reposition Anime-----------------------------------------------
 
     // Move element to target smoothly.
     const repositionAnime = (xChange, yChange) => {
+
         const xStep = xChange / 6000;
         const yStep = yChange / 6000;
 
@@ -79,9 +77,8 @@ function draggify(elementId, margin) {
     const onMouseMove = (e) => {
       e.preventDefault();
 
-      const inputItemRect = element.getBoundingClientRect();
-      elementX.value = inputItemRect.left + e.movementX;
-      elementY.value = inputItemRect.top + e.movementY;
+      elementX.value = element.offsetLeft + e.movementX;
+      elementY.value = element.offsetTop + e.movementY;
     }
 
     // Add an event listener for dragging.
@@ -102,6 +99,9 @@ function draggify(elementId, margin) {
       let x = 0; // vector change
       let y = 0;
 
+      const winW = parent.clientWidth;
+      const winH = parent.clientHeight;
+
       if (elementX.value < 0) {
         x = (elementX.value - margin)*-1
       }
@@ -138,12 +138,8 @@ function draggify(elementId, margin) {
     // Update position of targetEl on windowResize.
     const onWindowResize = (_e) => {
 
-      // Update window dimensions.
-      winW = window.innerWidth;
-      winH = window.innerHeight;
-
-      elementX.value = calcPosition(elementX.value, elementLength, percentX, xShort, winW);
-      elementY.value = calcPosition(elementY.value, elementLength, percentY, yShort, winH);
+      elementX.value = calcPosition(elementX.value, elementLength, percentX, xShort, parent.clientWidth);
+      elementY.value = calcPosition(elementY.value, elementLength, percentY, yShort, parent.clientHeight);
 
       savePosition();
     }
@@ -160,27 +156,28 @@ function draggify(elementId, margin) {
     Vue.onMounted(() => {
 
       element = document.getElementById(elementId);
+      parent = document.getElementById(parentId);
 
       elementLength = element.offsetWidth;
 
       // Initialize the positional references.
-      percentX = elementX.value / window.innerWidth;
-      percentY = elementY.value / window.innerHeight;
+      percentX = elementX.value / parent.clientWidth;
+      percentY = elementY.value / parent.clientHeight;
 
-      xShort = calcSideProximity(elementX.value, elementLength, window.innerWidth);
-      yShort = calcSideProximity(elementX.value, elementLength, window.innerHeight);
+      xShort = calcSideProximity(elementX.value, elementLength, parent.clientWidth);
+      yShort = calcSideProximity(elementX.value, elementLength, parent.clientHeight);
 
       // Then, we can listen for window resize (and mousedown).
       element.addEventListener("mousedown", onMouseDown);
-      window.addEventListener('resize', onWindowResize)
+      parent.addEventListener('resize', onWindowResize)
     });
 
     // remove event listeners on component dismount.
     Vue.onUnmounted(() => {
         element.removeEventListener('mousedown', onMouseDown);
-        window.removeEventListener('resize', onWindowResize)
-        window.removeEventListener('mouseup', onMouseUp)
-        window.removeEventListener('mousemove', onMouseMove);
+        parent.removeEventListener('resize', onWindowResize)
+        parent.removeEventListener('mouseup', onMouseUp)
+        parent.removeEventListener('mousemove', onMouseMove);
     });
 
     // Try loading initPosition, otherwise set default values

diff --git a/src/render/components/form.js b/src/render/components/form.js
new file mode 100644 (file)
index 0000000..3e0946f
--- /dev/null
+++ b/src/render/components/form.js
@@ -0,0 +1,78 @@
+const debounce = (fn, delay) => {
+
+    let timeoutId;
+
+    const wrapper = (...args) => {
+
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
+
+        timeoutId = setTimeout(() => {
+            fn(...args);
+        }, delay);
+
+    }
+
+    return wrapper;
+}
+
+
+
+const SmartForm =
+{
+    props: ["fields", "channel", "modifier"],
+
+    setup(props)
+    {
+        let logsEl;
+
+        const submit = debounce(async (data) => {
+
+            const err = await fetch(props.channel, data);
+
+            if (err) {
+                logsEl.style.color == "red";
+                logsEl.innerText = err;
+                return;
+            }
+
+            logsEl.style.color = "green";
+            logsEl.innerText = props.modifier;
+
+        }, 2000);
+
+        Vue.onMounted(() => {
+
+            const el = document.getElementById("smart-form");
+
+            logsEl = el.querySelector(".smart-form-logs");
+
+            logsEl.innerText = props.modifier;
+
+            el.addEventListener("input", () => { 
+                submit(new FormData(el)) 
+            });
+
+        });
+    },
+
+    template: `
+        <form id="smart-form" class="smart-form">
+
+            <div v-for="field in fields" style="display:flex">
+
+                <input type="text" class="text-field"
+                    :name="field.name"
+                    :value="field.value"
+                    :placeholder="field.placeholder"
+                />
+
+            </div>
+
+            <div class="smart-form-logs"></div>
+
+        </form>`
+}
+
+export default SmartForm;

diff --git a/src/render/components/input.js b/src/render/components/input.js
index 5bc8144281a9f27608dc113b62dac2d034b785f5..08c0e381bf0fea7b4ddb061f0ee32762dbec239f 100644 (file)
--- a/src/render/components/input.js
+++ b/src/render/components/input.js
@@ -11,7 +11,7 @@ const Input =
 
         const recording = Vue.ref(false);
 
-        const { elementX, elementY } =  draggify("input", 15);
+        const { elementX, elementY } =  draggify("input", "app", 15);
 
         const { leftSide, show } = useText("input-text", elementX);
 

diff --git a/src/render/components/login.js b/src/render/components/login.js
index da2e08056048f3e1b796659db2fedc9d6c343d61..83aa336ef85d1d5b98061c28104ed7782fa4f797 100644 (file)
--- a/src/render/components/login.js
+++ b/src/render/components/login.js
@@ -1,58 +1,40 @@
+import SmartForm from "./form.js";
+
 const Login =
 {
+    components: {
+        SmartForm
+    },
+
     setup()
     {
-        const usr = Vue.ref("");
-        const pwd = Vue.ref("");
-
-        const submitForm = async () => {
-            const success = await window.mainApi.invoke("login", usr.value, pwd.value);
-            if (!success) shake("login-form");
-        }
-
-        return { usr, pwd, submitForm };
+        return;
     },
 
     template: `
-        <form id="login" @submit.prevent="submitForm">
-
-            <!-- username and password forms -->
-            <div id="login-form">
-                <!-- username -->
-                <div class="login-input-box">
-                    <input class="login-input" type="text" v-model="usr" />
-                    <div class="login-input-modifier">Email</div>
-                </div>
-
-                <!-- password -->
-                <div class="login-input-box">
-                    <input class="login-input" type="password" v-model="pwd" />
-                    <div class="login-input-modifier">Password</div>
-                </div>
-            </div>
-
-            <!-- submit button; position: fixed -->
-            <button 
-                class="login-submit-button button" 
-                type="submit"
-            >
-                Login
-            </button>
-
-        </form> `
-}
-
-/** Shake a div to indicate incorrect credentials */
-const shake = (elementId) => 
-{
-    const el = document.getElementById(elementId);
-
-    if (el) 
-    el.classList.remove("shake");
-
-    setTimeout(() => {
-        if (el) el.classList.add("shake");
-    }, 250);
+        <div id="login">
+
+            <!-- <SmartForm 
+                :fields="[{
+                    name: 'email',
+                    value: null,
+                    placeholder: 'Email',
+                },
+                {
+                    name: 'password',
+                    value: null,
+                    placeholder: 'Password'
+                },
+                {
+                    name: 'repassword',
+                    value: null,
+                    placeholder: 'Re-Password'
+                }]"
+                :channel="'auth'"
+                :modifier="'Login or re-enter password to register.'"
+            /> -->
+
+        </div>`
 }
 
 export default Login;
\ No newline at end of file

diff --git a/src/render/components/message.js b/src/render/components/message.js
index afbfd0da079d601da42eed5e60f79aeee149ca76..ce7231b1df28c694128b1a3bb42ef6eb074e69ef 100644 (file)
--- a/src/render/components/message.js
+++ b/src/render/components/message.js
@@ -18,8 +18,9 @@ const Message =
     template: `
         <div :id="id" :class="'message ' + modifier + '-message'">
 
-            <Bubble
+            <Bubble 
                 v-for="(c, index) in content"
+                :id="'bubble-' + id + '-' + index"
                 :category="c.category"
                 :text="c.text"
                 :html="c.html"

diff --git a/src/render/components/messenger.js b/src/render/components/messenger.js
index 5b5b8adee5baa3b0f5f649adc2333b2fe07e28d4..37b399167a2a83c4c9513b2760037daea70fe020 100644 (file)
--- a/src/render/components/messenger.js
+++ b/src/render/components/messenger.js
@@ -71,14 +71,12 @@ const Messenger = {
             @dragover.prevent
             @dragenter.prevent
         >
-            <Message
-                v-for="message in messages"
-                :modifier="message.modifier"
-                :content="message.content"
-                :context="message.context"
-                :avatar="message.avatar"
-                :id="message.id"
+
+            <Message 
+                v-for="message in messages" 
+                v-bind="message" 
             />
+            
         </div> `
 }
 

diff --git a/src/render/components/settings.js b/src/render/components/settings.js
index 8e4a0fc066b52f35e98fefda9ce1115342979bcb..8bcb99478bffe3e3ab0dc65027f6265706ab3a03 100644 (file)
--- a/src/render/components/settings.js
+++ b/src/render/components/settings.js
@@ -20,7 +20,7 @@ const Settings =
             await window.mainApi.send("logout");
         }
 
-      return { showSettings, active, logout };
+        return { showSettings, active, logout, window };
     },
 
     template: `
@@ -33,7 +33,7 @@ const Settings =
         </div>
 
         <button v-else class="settings-icon" @click="showSettings">
-            <img src="./assets/settingsIcon.svg">
+            <img :src="window.path + 'assets/settingsIcon.svg'">
         </button>`
 }
 

diff --git a/src/render/components/ws.js b/src/render/components/ws.js
index 189b03dd6fa9d2c29a682f2f781df539b07629a5..2f60eabfb4cea66d1608810bee994228d244631c 100644 (file)
--- a/src/render/components/ws.js
+++ b/src/render/components/ws.js
@@ -13,13 +13,13 @@ const WS =
 
         }); 
 
-        return { status }
+        return { status, window }
     },
 
     template: `
         <div id="ws">
 
-            <img id="ws-logo" src="./assets/connectLogo.svg"
+            <img id="ws-logo" :src="window.path + 'assets/connectLogo.svg'"
                 :class="{ move: status }"
             >
 

diff --git a/src/render/index.js b/src/render/index.js
index 9757f5ab7668878d09d5377172fc6dab435ae788..d7df8b0e0342713c845189fbf1737bba6faa3352 100644 (file)
--- a/src/render/index.js
+++ b/src/render/index.js
@@ -1,2 +1,5 @@
 import App from "./components/app.js";
+
+window.path = "./";
+
 Vue.createApp(App).mount("#app");

diff --git a/src/render/main.css b/src/render/main.css
index 9c2f640bb4840a713e359a1841fd90833daf4882..e883efd6dfe6870ee204a3454a927fb26bbef544 100644 (file)
--- a/src/render/main.css
+++ b/src/render/main.css
@@ -1,3 +1,13 @@
+@font-face {
+  font-family: "Default";
+  src: url("assets/fonts/SF-Pro-Text-Regular.otf");
+}
+
+@font-face {
+  font-family: "Compact";
+  src: url("assets/fonts/SF-Compact-Display-Bold.otf");
+}
+
 html, body {
   margin: 0;
   padding: 0;
@@ -7,24 +17,25 @@ html, body {
 /* The first word of the class is the component that it modifys. */
 
 #splash {
-  width: 100vw;
-  height: 100vh;
+  width: 100%;
+  height: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
 #app {
-  font-family: "SF Pro Text";
+  position: relative; /* must explicitly be declared */
+  font-family: "Default";
   -webkit-font-smoothing: antialiased;
-  height: 100vh;
-  width: 100vw;
+  height: 100vh; /* 100% for website */
+  width: 100vw; /* 100% for website */
   border-radius: 15px;
 }
 
 #header-titlebar {
-  position: fixed;
-  width: 100vw;
+  position: absolute;
+  width: 100%;
   height: 54px;
   opacity: 0.75;
   background-color: #EBEBEB;
@@ -32,6 +43,8 @@ html, body {
   border: none;
   outline: none;
   z-index: 1;
+  border-top-left-radius: 15px;
+  border-top-right-radius: 15px;
 }
 
 .contacts {
@@ -61,7 +74,7 @@ html, body {
 }
 
 .contacts .email {
-  font-family: SF Compact Display;
+  font-family: "Compact";
   font-size: 12px;
   color: #898989;
   overflow: w;
@@ -69,7 +82,7 @@ html, body {
 }
 
 #header-menu {
-  position: fixed;
+  position: absolute;
   margin-left: 20px;
   margin-top: 20px;
   z-index: 2;
@@ -107,87 +120,9 @@ html, body {
   justify-content: center;
 }
 
-#login-form {
-  font-family: "SF Compact Display";
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding-bottom: 20px;
-}
-
-.login-input-box {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 10px;
-}
-
-.login-input {
-  background-color: #D3D3D3;
-  border: none;
-  outline: none;
-  padding: 16px;
-  text-decoration: none;
-  margin: 4px 2px;
-  cursor: pointer;
-  border-radius: 10px;
-}
-
-.login-input-modifier {
-  min-width: 181px;
-  font-size: 12px;
-  font-weight: bold;
-  text-align: left;
-  margin-left: 15px;
-}
-
-.login-submit-button {
-  font-family: "SF Compact Display";
-  position: fixed;
-  margin-top: 260px;
-  background-color: #58C4FD;
-  color: white;
-  padding: 10px 30px;
-  border-radius: 20px;
-  font-size: 14px;
-  font-weight: bold;
-}
-
-.login-submit-button:active {
-  background-color: #4296C3;
-}
-
-/* generic shaking functionality */
-.shake {
-  animation: shake 0.82s cubic-bezier(.36,.07,.19,.97) both;
-  transform: translate3d(0, 0, 0);
-  backface-visibility: hidden;
-  perspective: 1000px;
-}
-
-@keyframes shake {
-  10%, 90% {
-    transform: translate3d(-1px, 0, 0);
-  }
-  
-  20%, 80% {
-    transform: translate3d(2px, 0, 0);
-  }
-
-  30%, 50%, 70% {
-    transform: translate3d(-4px, 0, 0);
-  }
-
-  40%, 60% {
-    transform: translate3d(4px, 0, 0);
-  }
-}
-
 #messenger {
-  width: 100vw;
-  height: 100vh;
+  width: 100%;
+  height: 100%;
   overflow: auto;
 }
 
@@ -197,8 +132,8 @@ html, body {
 }
 
 #ws {
-  position: fixed;
-  width: 100vw;
+  position: absolute;
+  width: 100%;
   height: 54px;
   display: flex;
   align-items: center;
@@ -317,9 +252,9 @@ html, body {
 }
 
 #settings {
-  position: fixed;
-  width: 100vw;
-  height: 100vh;
+  position: absolute;
+  width: 100%;
+  height: 100%;
   background-color: rgba(235, 235, 235, 0.75);
   z-index: 4;
   display: flex;
@@ -328,6 +263,7 @@ html, body {
   align-items: center;
   animation-name: settings-appear;
   animation-duration: 0.5s;
+  border-radius: inherit;
 }
 
 @keyframes settings-appear {
@@ -340,7 +276,7 @@ html, body {
 }
 
 .settings-icon {
-  position: fixed;
+  position: absolute;
   right: 0;
   border: none;
   outline: none;
@@ -364,12 +300,11 @@ html, body {
 }
 
 .settings-logout-button {
-  font-family: "SF Compact Display";
+  font-family: "Compact";
   background-color: #B7B7B7;
-  padding: 10px 30px;
+  padding: 10px 20px;
   border-radius: 20px;
   font-size: 14px;
-  font-weight: bold;
 }
 
 .settings-logout-button:hover {
@@ -387,7 +322,7 @@ html, body {
 }
 
 .message {
-  width: 100vw;
+  width: inherit;
   display: flex;
   flex-direction: column;
   padding-top: 9px;
@@ -417,9 +352,8 @@ html, body {
   display: flex;
   justify-content: center;
   align-items: center;
-  font-family: "SF Compact Display";
+  font-family: "Compact";
   font-size: 12px;
-  font-weight: bold;
   color: #9B9B9B;
   margin-bottom: 18px;
 }
@@ -439,7 +373,6 @@ html, body {
 .bubble {
   position: relative;
   max-width: 66vw;
-  font-family: "SF Pro Text";
   font-size: 14px;
   border-radius: 18px;
   margin-bottom: 4px;
@@ -536,9 +469,8 @@ html, body {
   min-height: 14px;
   display: flex;
   align-items: center;
-  font-family: "SF Compact Display";
+  font-family: "Compact";
   font-size: 12px;
-  font-weight: bold;
   margin-top: 5px;
 }
 
@@ -568,6 +500,32 @@ html, body {
   cursor: pointer;
 }*/
 
+/* shake a div to signal error*/
+.shake {
+  animation: shake 0.82s cubic-bezier(.36,.07,.19,.97) both;
+  transform: translate3d(0, 0, 0);
+  backface-visibility: hidden;
+  perspective: 1000px;
+}
+
+@keyframes shake {
+  10%, 90% {
+    transform: translate3d(-1px, 0, 0);
+  }
+  
+  20%, 80% {
+    transform: translate3d(2px, 0, 0);
+  }
+
+  30%, 50%, 70% {
+    transform: translate3d(-4px, 0, 0);
+  }
+
+  40%, 60% {
+    transform: translate3d(4px, 0, 0);
+  }
+}
+
 .audio {
   animation-name: audio-anim;
   animation-duration: 2s;
@@ -589,3 +547,28 @@ html, body {
     box-shadow: 0 0 0 0.25em rgba(195, 195, 195, 0.25), 0 0 0 0.55em rgba(195, 195, 195, 0.45);
   }
 }
+
+.smart-form {
+  width: 225px;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+}
+
+.text-field {
+  width: 100%;
+  padding: 16px;
+  background: none;
+  border: none;
+  margin: 4px;
+  font-size: 14px;
+  border-radius: 10px;
+  background-color: #d1d1d1;
+}
+
+.smart-form-logs {
+  font-family: "Compact";
+  font-size: 12px;
+  text-align: left;
+  margin-left: 10px;
+}