From 62856938b7247f5882f0a5562a50fb87c64d015f Mon Sep 17 00:00:00 2001 From: sarthakpranesh Date: Sun, 24 Mar 2024 10:44:17 +0530 Subject: [PATCH 1/5] chore: minor changes to express static --- index.ts | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.ts b/index.ts index 08fe64b..4c12c7b 100644 --- a/index.ts +++ b/index.ts @@ -122,6 +122,6 @@ app.put('/api/:tokenRead/:tokenWrite', async (request, response) => { return response.status(201).json({ readToken: tokenRead, writeToken: tokenWrite }); }); -app.use("/*", express.static(path.join(__dirname, './ui/dist'))) +app.use('/*', express.static(path.join(__dirname, './ui/dist'), {})) -app.listen(serverPort, () => console.log(`Listening on http://127.0.0.1:${serverPort}`)); \ No newline at end of file +app.listen(Number(serverPort), '0.0.0.0', () => console.log(`Listening on http://127.0.0.1:${serverPort}`)); \ No newline at end of file diff --git a/package.json b/package.json index 6e1e380..fbd98fb 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "description": "", "scripts": { - "dev": "nodemon index.ts", + "dev": "nodemon -e ts,js,html index.ts", "build": "tsc", "test": "echo \"Error: no test specified\" && exit 1" }, From ca506a12506b43ab7491f47c080aebd3f33edb5d Mon Sep 17 00:00:00 2001 From: Sarthak Pranesh Date: Sun, 24 Mar 2024 14:49:15 +0530 Subject: [PATCH 2/5] chore: serving base file separately --- index.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/index.ts b/index.ts index 4c12c7b..1bf08d7 100644 --- a/index.ts +++ b/index.ts @@ -122,6 +122,9 @@ app.put('/api/:tokenRead/:tokenWrite', async (request, response) => { return response.status(201).json({ readToken: tokenRead, writeToken: tokenWrite }); }); -app.use('/*', express.static(path.join(__dirname, './ui/dist'), {})) +app.use(express.static(path.join(__dirname, './ui/dist'), {})) +app.get('/', function(req, res) { + res.sendFile(path.join(__dirname, './ui/dist/index.html')); +}); -app.listen(Number(serverPort), '0.0.0.0', () => console.log(`Listening on http://127.0.0.1:${serverPort}`)); \ No newline at end of file +app.listen(Number(serverPort), () => console.log(`Listening on http://127.0.0.1:${serverPort}`)); \ No newline at end of file From e82945624d1007eedf92f8ae2cf087a274a71783 Mon Sep 17 00:00:00 2001 From: Sarthak Pranesh Date: Sun, 24 Mar 2024 14:51:08 +0530 Subject: [PATCH 3/5] chore: cleanup --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fbd98fb..6e1e380 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "description": "", "scripts": { - "dev": "nodemon -e ts,js,html index.ts", + "dev": "nodemon index.ts", "build": "tsc", "test": "echo \"Error: no test specified\" && exit 1" }, From 5ec96b1dcaa8585c1ee4ffb4f73e4b7d0aa01305 Mon Sep 17 00:00:00 2001 From: Sarthak Pranesh Date: Sun, 24 Mar 2024 15:03:13 +0530 Subject: [PATCH 4/5] chore: handling saved paths --- index.ts | 2 +- ui | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 160000 ui diff --git a/index.ts b/index.ts index 1bf08d7..4c992c1 100644 --- a/index.ts +++ b/index.ts @@ -123,7 +123,7 @@ app.put('/api/:tokenRead/:tokenWrite', async (request, response) => { }); app.use(express.static(path.join(__dirname, './ui/dist'), {})) -app.get('/', function(req, res) { +app.get('/*', function(req, res) { res.sendFile(path.join(__dirname, './ui/dist/index.html')); }); diff --git a/ui b/ui new file mode 160000 index 0000000..d569303 --- /dev/null +++ b/ui @@ -0,0 +1 @@ +Subproject commit d5693035048302b1d4fc65c94853f2aec361e9ec From d49a1b5bc455a7ca1a3248506e203969e88765c3 Mon Sep 17 00:00:00 2001 From: Sarthak Pranesh Date: Sun, 24 Mar 2024 15:04:30 +0530 Subject: [PATCH 5/5] chore: cleanup --- ui | 1 - 1 file changed, 1 deletion(-) delete mode 160000 ui diff --git a/ui b/ui deleted file mode 160000 index d569303..0000000 --- a/ui +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d5693035048302b1d4fc65c94853f2aec361e9ec