html rendering, bug fixes

diff --git a/src/account.js b/src/account.js
index 4a0ffe8b8c265d033435210f6e1f3d5607f5ad1d..d75d6497903c7e91331f64839e92f80562b947a6 100644 (file)
--- a/src/account.js
+++ b/src/account.js
@@ -5,8 +5,8 @@ const { postLogin } = require("./api");
 const { ipcEmit } = require("./utils/emitter");
 const { launchSession, endSession } = require("./session");
 
-// store.set("account", "smith12@gmail.com");
-store.set("account", "gundersena@crimata.com");
+store.set("account", "smith12@gmail.com");
+// store.set("account", "adgundersen@gmail.com");
 // store.delete("account");
 
 async function login(_e, email, password) 

diff --git a/src/main.js b/src/main.js
index e903e6cf0802a564d903170fdb99648daf0b1add..28b60bda75c6ba8acf23b1e5c5188d5bfd7035e0 100644 (file)
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,4 @@
-const { app, protocol, ipcMain } = require("electron");
+const { app, protocol, ipcMain, nativeTheme } = require("electron");
 
 const store = require("./utils/store");
 
@@ -8,6 +8,9 @@ const { createWin } = require("./window");
 const { initAccount } = require("./account"); 
 const { terminateAudio } = require("./audio");
 
+// Assert a light theme
+nativeTheme.themeSource = "light";
+
 app.on("ready", () =>
 {
     initTray();

diff --git a/src/render/assets/messageAvatar.svg b/src/render/assets/messageAvatar.svg
new file mode 100644 (file)
index 0000000..f187eef
--- /dev/null
+++ b/src/render/assets/messageAvatar.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13.691" viewBox="0 0 16 13.691">
+  <g id="Group_754" data-name="Group 754" transform="translate(-4671 -921)">
+    <ellipse id="Ellipse_114" data-name="Ellipse 114" cx="8" cy="6" rx="8" ry="6" transform="translate(4671 921)" fill="#58fd84"/>
+    <path id="Path_193" data-name="Path 193" d="M4693.211,699.285v3.906l3.449-2.126Z" transform="translate(-19.217 231)" fill="#58fd84" stroke="#58fd84" stroke-linejoin="round" stroke-width="1"/>
+  </g>
+</svg>

diff --git a/src/render/components/bubble.js b/src/render/components/bubble.js
index 7ceaadc5cdbc647c8ffd3101e99156eea0d39b69..bdd64bec928cc2f85b0e1fdcb99d331ef08f576c 100644 (file)
--- a/src/render/components/bubble.js
+++ b/src/render/components/bubble.js
@@ -16,14 +16,8 @@ const Bubble =
     },
 
     template: `
-        <div :class="'bubble ' + modifier + '-bubble ' + modifier +'-'+ child">
-            {{ text }}
+        <div :class="'bubble ' + modifier + '-bubble ' + modifier +'-'+ child" v-html="text">
         </div> `
 };
 
 export default Bubble;
-
-
-// <div v-show="!seen" class="bubble-notify"></div>
-
-

diff --git a/src/render/components/messenger.js b/src/render/components/messenger.js
index aa07e2909e2e083849e645173b6916990320f70c..dcf009d13ac95dca78960853a1bc842e14362daa 100644 (file)
--- a/src/render/components/messenger.js
+++ b/src/render/components/messenger.js
@@ -76,3 +76,14 @@ const Messenger = {
 }
 
 export default Messenger;
+
+// {
+//     modifier: "ai",
+//     content: [
+//         "This is test 2\r\n"
+//     ],
+//     context: "Email from adgundersen@gmail.com",
+//     avatar: "./assets/mailAvatar.svg",
+//     audio: null,
+//     id: 0
+// }
\ No newline at end of file

diff --git a/src/window.js b/src/window.js
index 4c625eeb0cb48ad998af776763194aa5f2d92ec7..15258192bad398fe6594a216b364da1206c4f38c 100644 (file)
--- a/src/window.js
+++ b/src/window.js
@@ -39,7 +39,7 @@ function createWin()
         x:               pos.x,
         y:               pos.y,
         resizable:       true,
-        backgroundColor: '#EBEBEB',
+        backgroundColor: "#EBEBEB",
         frame:           false,
         minWidth:        350,
         minHeight:       500,
@@ -76,5 +76,6 @@ function createWin()
 }
 
 ipcMain.on("nav-bar", onNavBar);
+ipcMain.on("create-win", createWin);
 
 exports.createWin = createWin;