diff --git a/src/.env.development b/src/.env.development new file mode 100644 index 0000000..3452b5c --- /dev/null +++ b/src/.env.development @@ -0,0 +1 @@ +VITE_API_URL= \ No newline at end of file diff --git a/src/.env.production b/src/.env.production new file mode 100644 index 0000000..9206f33 --- /dev/null +++ b/src/.env.production @@ -0,0 +1 @@ +VITE_API_URL=https://frm.so \ No newline at end of file diff --git a/src/Home.js b/src/Home/Home.js similarity index 86% rename from src/Home.js rename to src/Home/Home.js index 21baeba..be16584 100644 --- a/src/Home.js +++ b/src/Home/Home.js @@ -1,7 +1,6 @@ -import "./components/Sidebar.js" -import "./components/AppMenu.js" -import "./components/AppWindow.js" -import util from "./util.js" +import "../components/Sidebar.js" +import "../components/AppMenu.js" +import "../components/AppWindow.js" class Home extends Shadow { diff --git a/src/Home/Login.js b/src/Home/Login.js index 5c65b80..4885966 100644 --- a/src/Home/Login.js +++ b/src/Home/Login.js @@ -1,3 +1,5 @@ +const env = import.meta.env + class Login extends Shadow { inputStyles(el) { return el @@ -47,7 +49,7 @@ class Login extends Shadow { .color("var(--text)") .border("1px solid var(--accent)") }) - .attr({action: "/login", method: "POST"}) + .attr({action: `${env.VITE_API_URL}/login`, method: "POST"}) .x(50, vw).y(50, vh) .center() }) diff --git a/src/_/icons/eventslight.svg b/src/_/icons/eventslight.svg deleted file mode 100644 index 61be66a..0000000 --- a/src/_/icons/eventslight.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/_/icons/eventslightselected.svg b/src/_/icons/eventslightselected.svg deleted file mode 100644 index 616ea25..0000000 --- a/src/_/icons/eventslightselected.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/_/icons/jobs.svg b/src/_/icons/jobs.svg deleted file mode 100644 index f4a811f..0000000 --- a/src/_/icons/jobs.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/_/icons/jobslight.svg b/src/_/icons/jobslight.svg deleted file mode 100644 index 16c87ed..0000000 --- a/src/_/icons/jobslight.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/_/icons/jobslightselected.svg b/src/_/icons/jobslightselected.svg deleted file mode 100644 index 14887f7..0000000 --- a/src/_/icons/jobslightselected.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/components/AppMenu.js b/src/components/AppMenu.js index 025750b..3336836 100644 --- a/src/components/AppMenu.js +++ b/src/components/AppMenu.js @@ -25,11 +25,24 @@ class AppMenu extends Shadow { } render() { + // let apps = global.currentNetwork.apps + let apps = [ + "Dashboard", "Jobs", "Events", "People" + ] + + let appCount = apps.filter(a => a !== "Settings").length + let horizontalMargin = { + 1: 50, + 2: 10, + 3: 2, + 4: 1.5, + 5: 0.5 + }[appCount] ?? 4 + HStack(() => { - let currentNetwork = global.currentNetwork - for(let i = 0; i < currentNetwork.apps.length; i++) { - let app = currentNetwork.apps[i] + for(let i = 0; i < apps.length; i++) { + let app = apps[i] if (app === "Settings") continue; img(util.cssVariable(global.currentApp() === app ? this.images[app].src[1] : this.images[app].src[0]), "1.3em") .attr({app: app}) @@ -37,6 +50,7 @@ class AppMenu extends Shadow { .borderBottom(global.currentApp() === app ? "1px solid var(--text)" : "1px solid transparent") .onTouch(async (done, e) => { if(done) { + console.log(e) e.target.style.borderBottom = "1px solid var(--text)" global.openApp(app) this.onNewSelection() @@ -45,16 +59,16 @@ class AppMenu extends Shadow { }) } }) - .borderTop("1px solid var(--darkgrey)") + .display("grid") + .gridTemplateColumns(`repeat(${apps.filter(a => a !== "Settings").length}, 1fr)`) + .placeItems("center") + .borderTop("0.5px solid #783131") .height("auto") .zIndex(1) - .justifyContent("space-between") - .paddingHorizontal(4, em) .paddingTop(0.5, em) .paddingBottom(2, em) .width(100, vw) .boxSizing("border-box") - .flex("0 0 auto") } } diff --git a/src/index.js b/src/index.js index 859dc4f..dffa6a7 100644 --- a/src/index.js +++ b/src/index.js @@ -1,7 +1,8 @@ import Socket from "/_/code/ws/Socket.js" -import "./Home.js" +import "./Home/Home.js" import "./Home/Login.js" import "./Home/ConnectionError.js" +const env = import.meta.env let Global = class { Socket = new Socket() @@ -31,7 +32,7 @@ let Global = class { async fetchAppData() { let personalSpace = this.currentNetwork === this.profile if (personalSpace) { return {} } - let appData = await fetch(`/api/${personalSpace ? "my" : "org"}data/` + this.currentNetwork.id, {method: "GET"}) + let appData = await fetch(`${env.VITE_API_URL}/api/${personalSpace ? "my" : "org"}data/` + this.currentNetwork.id, {method: "GET"}) let json = await appData.json() return json } @@ -116,8 +117,9 @@ let Global = class { } async getProfile() { + console.log(env) try { - const res = await fetch("/profile", { + const res = await fetch(`${env.VITE_API_URL}/profile`, { method: "GET", credentials: "include", headers: { diff --git a/src/_/icons/column2.svg b/src/public/_/icons/column2.svg similarity index 100% rename from src/_/icons/column2.svg rename to src/public/_/icons/column2.svg diff --git a/src/_/icons/columnwhite.png b/src/public/_/icons/columnwhite.png similarity index 100% rename from src/_/icons/columnwhite.png rename to src/public/_/icons/columnwhite.png diff --git a/src/_/icons/columnwhite.svg b/src/public/_/icons/columnwhite.svg similarity index 100% rename from src/_/icons/columnwhite.svg rename to src/public/_/icons/columnwhite.svg diff --git a/src/_/icons/events.svg b/src/public/_/icons/events.svg similarity index 100% rename from src/_/icons/events.svg rename to src/public/_/icons/events.svg diff --git a/src/public/_/icons/eventslight.svg b/src/public/_/icons/eventslight.svg new file mode 100644 index 0000000..970a6c7 --- /dev/null +++ b/src/public/_/icons/eventslight.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/public/_/icons/eventslightselected.svg b/src/public/_/icons/eventslightselected.svg new file mode 100644 index 0000000..122d5c0 --- /dev/null +++ b/src/public/_/icons/eventslightselected.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/_/icons/extra/settings.svg b/src/public/_/icons/extra/settings.svg similarity index 100% rename from src/_/icons/extra/settings.svg rename to src/public/_/icons/extra/settings.svg diff --git a/src/_/icons/extra/settingsdark.svg b/src/public/_/icons/extra/settingsdark.svg similarity index 100% rename from src/_/icons/extra/settingsdark.svg rename to src/public/_/icons/extra/settingsdark.svg diff --git a/src/_/icons/extra/settingslight.svg b/src/public/_/icons/extra/settingslight.svg similarity index 100% rename from src/_/icons/extra/settingslight.svg rename to src/public/_/icons/extra/settingslight.svg diff --git a/src/_/icons/favicon.ico b/src/public/_/icons/favicon.ico similarity index 100% rename from src/_/icons/favicon.ico rename to src/public/_/icons/favicon.ico diff --git a/src/_/icons/forum.png b/src/public/_/icons/forum.png similarity index 100% rename from src/_/icons/forum.png rename to src/public/_/icons/forum.png diff --git a/src/_/icons/hamburger.svg b/src/public/_/icons/hamburger.svg similarity index 100% rename from src/_/icons/hamburger.svg rename to src/public/_/icons/hamburger.svg diff --git a/src/_/icons/home.svg b/src/public/_/icons/home.svg similarity index 100% rename from src/_/icons/home.svg rename to src/public/_/icons/home.svg diff --git a/src/_/icons/homelight.svg b/src/public/_/icons/homelight.svg similarity index 100% rename from src/_/icons/homelight.svg rename to src/public/_/icons/homelight.svg diff --git a/src/_/icons/homelightselected.svg b/src/public/_/icons/homelightselected.svg similarity index 100% rename from src/_/icons/homelightselected.svg rename to src/public/_/icons/homelightselected.svg diff --git a/src/public/_/icons/jobs.svg b/src/public/_/icons/jobs.svg new file mode 100644 index 0000000..5eccad1 --- /dev/null +++ b/src/public/_/icons/jobs.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/public/_/icons/jobslight.svg b/src/public/_/icons/jobslight.svg new file mode 100644 index 0000000..5fce2c9 --- /dev/null +++ b/src/public/_/icons/jobslight.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/public/_/icons/jobslightselected.svg b/src/public/_/icons/jobslightselected.svg new file mode 100644 index 0000000..0002ad1 --- /dev/null +++ b/src/public/_/icons/jobslightselected.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/_/icons/letter.svg b/src/public/_/icons/letter.svg similarity index 100% rename from src/_/icons/letter.svg rename to src/public/_/icons/letter.svg diff --git a/src/_/icons/logo.svg b/src/public/_/icons/logo.svg similarity index 100% rename from src/_/icons/logo.svg rename to src/public/_/icons/logo.svg diff --git a/src/_/icons/logowhite.svg b/src/public/_/icons/logowhite.svg similarity index 100% rename from src/_/icons/logowhite.svg rename to src/public/_/icons/logowhite.svg diff --git a/src/public/_/icons/noun-job-5995378.svg b/src/public/_/icons/noun-job-5995378.svg new file mode 100644 index 0000000..e86b81a --- /dev/null +++ b/src/public/_/icons/noun-job-5995378.svg @@ -0,0 +1 @@ +Created by nasrilfrom the Noun Project \ No newline at end of file diff --git a/src/_/icons/people.svg b/src/public/_/icons/people.svg similarity index 100% rename from src/_/icons/people.svg rename to src/public/_/icons/people.svg diff --git a/src/_/icons/peoplelight.svg b/src/public/_/icons/peoplelight.svg similarity index 100% rename from src/_/icons/peoplelight.svg rename to src/public/_/icons/peoplelight.svg diff --git a/src/_/icons/peoplelightselected.svg b/src/public/_/icons/peoplelightselected.svg similarity index 100% rename from src/_/icons/peoplelightselected.svg rename to src/public/_/icons/peoplelightselected.svg diff --git a/src/_/icons/pin.svg b/src/public/_/icons/pin.svg similarity index 100% rename from src/_/icons/pin.svg rename to src/public/_/icons/pin.svg diff --git a/src/_/icons/pinlight.svg b/src/public/_/icons/pinlight.svg similarity index 100% rename from src/_/icons/pinlight.svg rename to src/public/_/icons/pinlight.svg diff --git a/src/_/icons/play.svg b/src/public/_/icons/play.svg similarity index 100% rename from src/_/icons/play.svg rename to src/public/_/icons/play.svg diff --git a/src/_/icons/runner.svg b/src/public/_/icons/runner.svg similarity index 100% rename from src/_/icons/runner.svg rename to src/public/_/icons/runner.svg diff --git a/src/_/icons/settings.svg b/src/public/_/icons/settings.svg similarity index 100% rename from src/_/icons/settings.svg rename to src/public/_/icons/settings.svg diff --git a/src/_/icons/settingslight.svg b/src/public/_/icons/settingslight.svg similarity index 100% rename from src/_/icons/settingslight.svg rename to src/public/_/icons/settingslight.svg diff --git a/src/_/icons/settingslightselected.svg b/src/public/_/icons/settingslightselected.svg similarity index 100% rename from src/_/icons/settingslightselected.svg rename to src/public/_/icons/settingslightselected.svg diff --git a/src/_/icons/stop.svg b/src/public/_/icons/stop.svg similarity index 100% rename from src/_/icons/stop.svg rename to src/public/_/icons/stop.svg diff --git a/src/_/icons/time.svg b/src/public/_/icons/time.svg similarity index 100% rename from src/_/icons/time.svg rename to src/public/_/icons/time.svg diff --git a/src/_/icons/timelight.svg b/src/public/_/icons/timelight.svg similarity index 100% rename from src/_/icons/timelight.svg rename to src/public/_/icons/timelight.svg diff --git a/src/_/icons/trash.svg b/src/public/_/icons/trash.svg similarity index 100% rename from src/_/icons/trash.svg rename to src/public/_/icons/trash.svg diff --git a/vite.config.ts b/vite.config.ts index 9840001..4fe0899 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -30,5 +30,8 @@ export default defineConfig({ }, host: true, allowedHosts: ['sam.local'], + }, + esbuild: { + keepNames: true } });