Compare commits

...
Sign in to create a new pull request.
Author SHA1 Message Date
Andrew Gundersen
58232bba20 Sublime project 2022-06-06 12:13:45 -05:00
Andrew Gundersen
678942d144 Updated port 2022-06-06 12:01:21 -05:00
Andrew Gundersen
df191b657b Added PROD env variable 2022-05-18 10:15:18 -05:00
Andrew Gundersen
7b4eac06df Removed cursor hover pointer for simplicity, added set account via ENV 2022-05-18 10:07:13 -05:00
Andrew Gundersen
334ff3018c Patched rounded window on Linux 2022-05-18 10:00:46 -05:00
Andrew Gundersen
667220f8e7 Patched nav bar on Linux 2022-05-18 10:00:02 -05:00
6 changed files with 24 additions and 14 deletions

4
.gitignore vendored
View file

@ -1,3 +1,5 @@
.DS_Store .DS_Store
/node_modules /node_modules
/out /out
*.sublime-workspace

8
electron.sublime-project Normal file
View file

@ -0,0 +1,8 @@
{
"folders":
[
{
"path": "."
}
]
}

View file

@ -5,6 +5,8 @@ const store = require("./utils/store");
const { launchSession, endSession } = require("./session"); const { launchSession, endSession } = require("./session");
const { backgroundMitt, ipcEmit } = require("./utils/emitter"); const { backgroundMitt, ipcEmit } = require("./utils/emitter");
store.set("account", process.env.ACCOUNT);
async function auth(_e, creds) async function auth(_e, creds)
{ {
const { error, data } = await post("/auth", creds); const { error, data } = await post("/auth", creds);

View file

@ -2,10 +2,10 @@ const { app } = require("electron");
const DOMAIN = "crimata.com"; const DOMAIN = "crimata.com";
const prod = !process.defaultApp; /* If PROD env variable exists */
// const prod = true; const prod = process.env.PROD;
module.exports = { module.exports = {
PLATFORM: prod ? `https://app.${DOMAIN}` : `http://localhost:8760`, PLATFORM: prod ? `https://app.${DOMAIN}` : `http://localhost:5000`,
API: prod ? `https://${DOMAIN}/api` : `http://localhost:8761` API: prod ? `https://${DOMAIN}/api` : `http://localhost:5001`
} }

View file

@ -36,6 +36,7 @@ html, body {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
height: 100vh; /* 100% for website */ height: 100vh; /* 100% for website */
width: 100vw; /* 100% for website */ width: 100vw; /* 100% for website */
/* Does not work on Linux */
border-radius: 15px; border-radius: 15px;
} }
@ -92,6 +93,8 @@ html, body {
margin-left: 20px; margin-left: 20px;
margin-top: 20px; margin-top: 20px;
z-index: 2; z-index: 2;
/* Needed for Linux even with higher Z index */
-webkit-app-region: no-drag;
} }
.header-menu-button { .header-menu-button {
@ -227,7 +230,6 @@ html, body {
border-radius: 50%; border-radius: 50%;
/* Set opacity here to not affect child. */ /* Set opacity here to not affect child. */
background-color: rgba(235, 235, 235, 0.75); background-color: rgba(235, 235, 235, 0.75);
cursor: pointer;
box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.15); box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.15);
} }
@ -294,10 +296,8 @@ html, body {
margin-top: 19px; margin-top: 19px;
z-index: 2; z-index: 2;
background-color: Transparent; background-color: Transparent;
} /* Needed for Linux */
-webkit-app-region: no-drag;
.settings-icon:hover {
cursor: pointer;
} }
.settings-account { .settings-account {
@ -314,10 +314,6 @@ html, body {
font-size: 14px; font-size: 14px;
} }
.settings-logout-button:hover {
cursor: pointer;
}
.settings-version { .settings-version {
position: absolute; position: absolute;
left: 50%; left: 50%;

View file

@ -29,6 +29,8 @@ function handleMessageQueue()
// { // {
const update = messageQueue.shift(); const update = messageQueue.shift();
console.log(update);
if (update) if (update)
{ {
if (update.person) if (update.person)