From: Andrew Gundersen Date: Thu, 2 Dec 2021 01:33:25 +0000 (-0600) Subject: html rendering, bug fixes X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=0c6a58ea24e6ebb8b4181dc160cf0bc25a0402a8;p=mime-chat html rendering, bug fixes --- diff --git a/src/account.js b/src/account.js index 4a0ffe8..d75d649 100644 --- 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 e903e6c..28b60bd 100644 --- 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 index 0000000..f187eef --- /dev/null +++ b/src/render/assets/messageAvatar.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/render/components/bubble.js b/src/render/components/bubble.js index 7ceaadc..bdd64be 100644 --- a/src/render/components/bubble.js +++ b/src/render/components/bubble.js @@ -16,14 +16,8 @@ const Bubble = }, template: ` -
- {{ text }} +
` }; export default Bubble; - - -//
- - diff --git a/src/render/components/messenger.js b/src/render/components/messenger.js index aa07e29..dcf009d 100644 --- 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 4c625ee..1525819 100644 --- 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;