diff --git a/flame/index.html b/app.html similarity index 86% rename from flame/index.html rename to app.html index eb0c305..7384949 100644 --- a/flame/index.html +++ b/app.html @@ -25,6 +25,6 @@
- + diff --git a/app.js b/app.js index 40394bf..1e310e0 100644 --- a/app.js +++ b/app.js @@ -33,7 +33,7 @@ class App { win.setAlwaysOnTop(true, 'screen-saver', 1); // necessary so it doesn't bring you back out of full screen when spawned } - win.loadFile('flame/index.html'); + win.loadFile('app.html'); win.on("focus", () => { win.setVibrancy("appearance-based"); // full colors @@ -59,7 +59,7 @@ class App { } spawnFlame(spawnForms) { - new Server(spawnForms) + new Server(spawnForms, 10001) } async spawnForms() { diff --git a/cave/_/code/shared.css b/cave/_/code/shared.css index 86ae125..61b7784 100644 --- a/cave/_/code/shared.css +++ b/cave/_/code/shared.css @@ -1,5 +1,5 @@ :root { - --main: #BD410D; + --main: #FFBB7C; --accent: var(--tan); --accent2: var(--brown); @@ -8,7 +8,8 @@ --green: #0B5538; --red: #BC1C02; --brown: #c6a476; - --darkbrown: #60320c; + --rust: #BD410D; + --darkbrown: #6A2C1C; --darkred: #7f0b09; --darkorange: #b15900; --orange: #FE9201; @@ -18,7 +19,7 @@ @media (prefers-color-scheme: dark) { :root { - --main: #6A2C1C; + --main: var(--darkbrown); --accent: var(--tan); --accent2: var(--green); --accent3: #c74109 diff --git a/cave/components/Home.js b/cave/components/Home.js index b88af4b..07eb939 100644 --- a/cave/components/Home.js +++ b/cave/components/Home.js @@ -7,8 +7,6 @@ class Home extends Shadow { render() { ZStack(() => { - NavMenu() - switch(window.location.pathname) { case "/": HomePanel() diff --git a/flame/index.js b/flame/index.js index 429b508..cf571b1 100644 --- a/flame/index.js +++ b/flame/index.js @@ -82,7 +82,7 @@ export default class Server { }) } - constructor(spawnForms) { + constructor(spawnForms, port) { const app = express(); app.use(cors({ origin: '*' })); app.use(express.json()); @@ -100,11 +100,10 @@ export default class Server { const server = http.createServer(app); initWebSocket(server); - const PORT = 80; - server.listen(PORT, () => { + server.listen(port, () => { console.log("\n") console.log(chalk.yellow("**************Parchment****************")) - console.log(chalk.yellowBright(`Server is running on port ${PORT}: http://localhost`)); + console.log(chalk.yellowBright(`Server is running on port ${port}: http://localhost`)); console.log(chalk.yellow("***************************************")) console.log("\n") });