From 667220f8e711f530869d8e00dc4adac20bc6f923 Mon Sep 17 00:00:00 2001 From: Andrew Gundersen Date: Wed, 18 May 2022 10:00:02 -0500 Subject: [PATCH 1/6] Patched nav bar on Linux --- src/render/main.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/render/main.css b/src/render/main.css index cd26154..9fb373f 100644 --- a/src/render/main.css +++ b/src/render/main.css @@ -92,6 +92,8 @@ html, body { margin-left: 20px; margin-top: 20px; z-index: 2; + /* Needed for Linux even with higher Z index */ + -webkit-app-region: no-drag; } .header-menu-button { From 334ff3018ce0135628b10cc67c996d41373adaa0 Mon Sep 17 00:00:00 2001 From: Andrew Gundersen Date: Wed, 18 May 2022 10:00:46 -0500 Subject: [PATCH 2/6] Patched rounded window on Linux --- src/render/main.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/render/main.css b/src/render/main.css index 9fb373f..bf8e088 100644 --- a/src/render/main.css +++ b/src/render/main.css @@ -36,6 +36,7 @@ html, body { -webkit-font-smoothing: antialiased; height: 100vh; /* 100% for website */ width: 100vw; /* 100% for website */ + /* Does not work on Linux */ border-radius: 15px; } From 7b4eac06dfc44f2b88ee7af3947fd114201fe558 Mon Sep 17 00:00:00 2001 From: Andrew Gundersen Date: Wed, 18 May 2022 10:07:13 -0500 Subject: [PATCH 3/6] Removed cursor hover pointer for simplicity, added set account via ENV --- src/account.js | 2 ++ src/render/main.css | 11 ++--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/account.js b/src/account.js index e339db2..f6ad73e 100644 --- a/src/account.js +++ b/src/account.js @@ -5,6 +5,8 @@ const store = require("./utils/store"); const { launchSession, endSession } = require("./session"); const { backgroundMitt, ipcEmit } = require("./utils/emitter"); +store.set("account", process.env.ACCOUNT); + async function auth(_e, creds) { const { error, data } = await post("/auth", creds); diff --git a/src/render/main.css b/src/render/main.css index bf8e088..2118c63 100644 --- a/src/render/main.css +++ b/src/render/main.css @@ -230,7 +230,6 @@ html, body { border-radius: 50%; /* Set opacity here to not affect child. */ background-color: rgba(235, 235, 235, 0.75); - cursor: pointer; box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.15); } @@ -297,10 +296,8 @@ html, body { margin-top: 19px; z-index: 2; background-color: Transparent; -} - -.settings-icon:hover { - cursor: pointer; + /* Needed for Linux */ + -webkit-app-region: no-drag; } .settings-account { @@ -317,10 +314,6 @@ html, body { font-size: 14px; } -.settings-logout-button:hover { - cursor: pointer; -} - .settings-version { position: absolute; left: 50%; From df191b657b7fb97c082f38820fda22e62bb33257 Mon Sep 17 00:00:00 2001 From: Andrew Gundersen Date: Wed, 18 May 2022 10:15:18 -0500 Subject: [PATCH 4/6] Added PROD env variable --- src/config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.js b/src/config.js index bc47fb5..3537600 100644 --- a/src/config.js +++ b/src/config.js @@ -2,8 +2,8 @@ const { app } = require("electron"); const DOMAIN = "crimata.com"; -const prod = !process.defaultApp; -// const prod = true; +/* If PROD env variable exists */ +const prod = process.env.PROD; module.exports = { PLATFORM: prod ? `https://app.${DOMAIN}` : `http://localhost:8760`, From 678942d1449817c1f2c258fa1c28cd49fb0e5022 Mon Sep 17 00:00:00 2001 From: Andrew Gundersen Date: Mon, 6 Jun 2022 12:01:21 -0500 Subject: [PATCH 5/6] Updated port --- src/config.js | 4 ++-- src/session.js | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/config.js b/src/config.js index 3537600..3211b79 100644 --- a/src/config.js +++ b/src/config.js @@ -6,6 +6,6 @@ const DOMAIN = "crimata.com"; const prod = process.env.PROD; module.exports = { - PLATFORM: prod ? `https://app.${DOMAIN}` : `http://localhost:8760`, - API: prod ? `https://${DOMAIN}/api` : `http://localhost:8761` + PLATFORM: prod ? `https://app.${DOMAIN}` : `http://localhost:5000`, + API: prod ? `https://${DOMAIN}/api` : `http://localhost:5001` } diff --git a/src/session.js b/src/session.js index 883be16..f5aa0e1 100644 --- a/src/session.js +++ b/src/session.js @@ -29,6 +29,8 @@ function handleMessageQueue() // { const update = messageQueue.shift(); + console.log(update); + if (update) { if (update.person) From 58232bba20c5e664273a7311db8343fff058e9f2 Mon Sep 17 00:00:00 2001 From: Andrew Gundersen Date: Mon, 6 Jun 2022 12:13:45 -0500 Subject: [PATCH 6/6] Sublime project --- .gitignore | 4 +++- electron.sublime-project | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 electron.sublime-project diff --git a/.gitignore b/.gitignore index 92f732b..106c7df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ .DS_Store /node_modules -/out \ No newline at end of file +/out + +*.sublime-workspace diff --git a/electron.sublime-project b/electron.sublime-project new file mode 100644 index 0000000..24db303 --- /dev/null +++ b/electron.sublime-project @@ -0,0 +1,8 @@ +{ + "folders": + [ + { + "path": "." + } + ] +}