html rendering, bug fixes
This commit is contained in:
parent
d5fd8b39e7
commit
0c6a58ea24
6 changed files with 26 additions and 11 deletions
|
|
@ -5,8 +5,8 @@ const { postLogin } = require("./api");
|
||||||
const { ipcEmit } = require("./utils/emitter");
|
const { ipcEmit } = require("./utils/emitter");
|
||||||
const { launchSession, endSession } = require("./session");
|
const { launchSession, endSession } = require("./session");
|
||||||
|
|
||||||
// store.set("account", "smith12@gmail.com");
|
store.set("account", "smith12@gmail.com");
|
||||||
store.set("account", "gundersena@crimata.com");
|
// store.set("account", "adgundersen@gmail.com");
|
||||||
// store.delete("account");
|
// store.delete("account");
|
||||||
|
|
||||||
async function login(_e, email, password)
|
async function login(_e, email, password)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
const { app, protocol, ipcMain } = require("electron");
|
const { app, protocol, ipcMain, nativeTheme } = require("electron");
|
||||||
|
|
||||||
const store = require("./utils/store");
|
const store = require("./utils/store");
|
||||||
|
|
||||||
|
|
@ -8,6 +8,9 @@ const { createWin } = require("./window");
|
||||||
const { initAccount } = require("./account");
|
const { initAccount } = require("./account");
|
||||||
const { terminateAudio } = require("./audio");
|
const { terminateAudio } = require("./audio");
|
||||||
|
|
||||||
|
// Assert a light theme
|
||||||
|
nativeTheme.themeSource = "light";
|
||||||
|
|
||||||
app.on("ready", () =>
|
app.on("ready", () =>
|
||||||
{
|
{
|
||||||
initTray();
|
initTray();
|
||||||
|
|
|
||||||
6
src/render/assets/messageAvatar.svg
Normal file
6
src/render/assets/messageAvatar.svg
Normal file
|
|
@ -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>
|
||||||
|
After Width: | Height: | Size: 510 B |
|
|
@ -16,14 +16,8 @@ const Bubble =
|
||||||
},
|
},
|
||||||
|
|
||||||
template: `
|
template: `
|
||||||
<div :class="'bubble ' + modifier + '-bubble ' + modifier +'-'+ child">
|
<div :class="'bubble ' + modifier + '-bubble ' + modifier +'-'+ child" v-html="text">
|
||||||
{{ text }}
|
|
||||||
</div> `
|
</div> `
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Bubble;
|
export default Bubble;
|
||||||
|
|
||||||
|
|
||||||
// <div v-show="!seen" class="bubble-notify"></div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -76,3 +76,14 @@ const Messenger = {
|
||||||
}
|
}
|
||||||
|
|
||||||
export default 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
|
||||||
|
// }
|
||||||
|
|
@ -39,7 +39,7 @@ function createWin()
|
||||||
x: pos.x,
|
x: pos.x,
|
||||||
y: pos.y,
|
y: pos.y,
|
||||||
resizable: true,
|
resizable: true,
|
||||||
backgroundColor: '#EBEBEB',
|
backgroundColor: "#EBEBEB",
|
||||||
frame: false,
|
frame: false,
|
||||||
minWidth: 350,
|
minWidth: 350,
|
||||||
minHeight: 500,
|
minHeight: 500,
|
||||||
|
|
@ -76,5 +76,6 @@ function createWin()
|
||||||
}
|
}
|
||||||
|
|
||||||
ipcMain.on("nav-bar", onNavBar);
|
ipcMain.on("nav-bar", onNavBar);
|
||||||
|
ipcMain.on("create-win", createWin);
|
||||||
|
|
||||||
exports.createWin = createWin;
|
exports.createWin = createWin;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue