diff --git a/.gitignore b/.gitignore index 106c7df..92f732b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ .DS_Store /node_modules -/out - -*.sublime-workspace +/out \ No newline at end of file diff --git a/electron.sublime-project b/electron.sublime-project deleted file mode 100644 index 24db303..0000000 --- a/electron.sublime-project +++ /dev/null @@ -1,8 +0,0 @@ -{ - "folders": - [ - { - "path": "." - } - ] -} diff --git a/src/account.js b/src/account.js index f6ad73e..e339db2 100644 --- a/src/account.js +++ b/src/account.js @@ -5,8 +5,6 @@ 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/config.js b/src/config.js index 3211b79..bc47fb5 100644 --- a/src/config.js +++ b/src/config.js @@ -2,10 +2,10 @@ const { app } = require("electron"); const DOMAIN = "crimata.com"; -/* If PROD env variable exists */ -const prod = process.env.PROD; +const prod = !process.defaultApp; +// const prod = true; module.exports = { - PLATFORM: prod ? `https://app.${DOMAIN}` : `http://localhost:5000`, - API: prod ? `https://${DOMAIN}/api` : `http://localhost:5001` + PLATFORM: prod ? `https://app.${DOMAIN}` : `http://localhost:8760`, + API: prod ? `https://${DOMAIN}/api` : `http://localhost:8761` } diff --git a/src/render/main.css b/src/render/main.css index 2118c63..cd26154 100644 --- a/src/render/main.css +++ b/src/render/main.css @@ -36,7 +36,6 @@ html, body { -webkit-font-smoothing: antialiased; height: 100vh; /* 100% for website */ width: 100vw; /* 100% for website */ - /* Does not work on Linux */ border-radius: 15px; } @@ -93,8 +92,6 @@ 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 { @@ -230,6 +227,7 @@ 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); } @@ -296,8 +294,10 @@ html, body { margin-top: 19px; z-index: 2; background-color: Transparent; - /* Needed for Linux */ - -webkit-app-region: no-drag; +} + +.settings-icon:hover { + cursor: pointer; } .settings-account { @@ -314,6 +314,10 @@ html, body { font-size: 14px; } +.settings-logout-button:hover { + cursor: pointer; +} + .settings-version { position: absolute; left: 50%; diff --git a/src/session.js b/src/session.js index f5aa0e1..883be16 100644 --- a/src/session.js +++ b/src/session.js @@ -29,8 +29,6 @@ function handleMessageQueue() // { const update = messageQueue.shift(); - console.log(update); - if (update) { if (update.person)