Add new files and update existing files

SDE-ADNAN · Jan 5, 2024 · 60aee77 · 60aee77
1 parent 8f8d436
commit 60aee77
Show file tree

Hide file tree

Showing 25 changed files with 12 additions and 11 deletions.
diff --git a/server/app.ts b/server/app.ts
@@ -50,7 +50,7 @@ app.use('/jarvis/admin', adminRoutes);
 
 // for serving clientside react pages ( which are built using "npm run build" or "vite build")
 app.use(express.static("public"));
-app.use("/*", (req, res) => {
+app.use("*", (req, res) => {
   res.sendFile(path.join(__dirname, "/public/index.html"))
 })
 

diff --git a/server/dist/app.js b/server/dist/app.js
@@ -42,8 +42,9 @@ app.use('/jarvis/admin', admin_1.default);
 // app.use('/', (req, res, next) => {
 //   res.send("<h1>Welcome to todo backend </h1>")
 // })
+// for serving clientside react pages ( which are built using "npm run build" or "vite build")
 app.use(express_1.default.static("public"));
-app.use("/*", (req, res) => {
+app.use("*", (req, res) => {
     res.sendFile(path_1.default.join(__dirname, "/public/index.html"));
 });
 mongoose_1.default

diff --git a/server/public/_redirects → server/dist/public/_redirects b/server/public/_redirects → server/dist/public/_redirects
diff --git a/server/public/asset-manifest.json → server/dist/public/asset-manifest.json b/server/public/asset-manifest.json → server/dist/public/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.013f3146.css",
-    "main.js": "/static/js/main.c0b23865.js",
+    "main.js": "/static/js/main.5bd47464.js",
     "static/media/bgfinaldark.jpg": "/static/media/bgfinaldark.b0e59fa0ba58246be184.jpg",
     "static/media/bgfinallight.jpg": "/static/media/bgfinallight.4f070915fbd0bf061862.jpg",
     "static/media/add.png": "/static/media/add.90b950d171bb0b3986d1.png",
@@ -14,10 +14,10 @@
     "static/media/subtask.svg": "/static/media/subtask.0aee0a3293406f3c959e65a1925a9502.svg",
     "static/media/rightarrow.svg": "/static/media/rightarrow.87f8be47de5397f44ad09947d6186828.svg",
     "main.013f3146.css.map": "/static/css/main.013f3146.css.map",
-    "main.c0b23865.js.map": "/static/js/main.c0b23865.js.map"
+    "main.5bd47464.js.map": "/static/js/main.5bd47464.js.map"
   },
   "entrypoints": [
     "static/css/main.013f3146.css",
-    "static/js/main.c0b23865.js"
+    "static/js/main.5bd47464.js"
   ]
 }
diff --git a/server/public/favicon.ico → server/dist/public/favicon.ico b/server/public/favicon.ico → server/dist/public/favicon.ico
diff --git a/server/public/index.html → server/dist/public/index.html b/server/public/index.html → server/dist/public/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="manifest" href="/manifest.json"/><title>Todo App</title><script defer="defer" src="/static/js/main.c0b23865.js"></script><link href="/static/css/main.013f3146.css" rel="stylesheet"></head><body><div id="root"></div><div id="modal-root"></div><div id="loader"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="manifest" href="/manifest.json"/><title>Todo App</title><script defer="defer" src="/static/js/main.5bd47464.js"></script><link href="/static/css/main.013f3146.css" rel="stylesheet"></head><body><div id="root"></div><div id="modal-root"></div><div id="loader"></div></body></html>
diff --git a/server/public/manifest.json → server/dist/public/manifest.json b/server/public/manifest.json → server/dist/public/manifest.json
diff --git a/server/public/robots.txt → server/dist/public/robots.txt b/server/public/robots.txt → server/dist/public/robots.txt
diff --git a/server/public/static/css/main.013f3146.css → .../dist/public/static/css/main.013f3146.css b/server/public/static/css/main.013f3146.css → .../dist/public/static/css/main.013f3146.css
diff --git a/...r/public/static/css/main.013f3146.css.map → ...t/public/static/css/main.013f3146.css.map b/...r/public/static/css/main.013f3146.css.map → ...t/public/static/css/main.013f3146.css.map
diff --git a/server/dist/public/static/js/main.5bd47464.js b/server/dist/public/static/js/main.5bd47464.js
diff --git a/...ic/static/js/main.c0b23865.js.LICENSE.txt → ...ic/static/js/main.5bd47464.js.LICENSE.txt b/...ic/static/js/main.c0b23865.js.LICENSE.txt → ...ic/static/js/main.5bd47464.js.LICENSE.txt
diff --git a/server/public/static/js/main.c0b23865.js.map → ...ist/public/static/js/main.5bd47464.js.map b/server/public/static/js/main.c0b23865.js.map → ...ist/public/static/js/main.5bd47464.js.map
diff --git a/...static/media/add.90b950d171bb0b3986d1.png → ...static/media/add.90b950d171bb0b3986d1.png b/...static/media/add.90b950d171bb0b3986d1.png → ...static/media/add.90b950d171bb0b3986d1.png
diff --git a/...edia/bgfinaldark.b0e59fa0ba58246be184.jpg → ...edia/bgfinaldark.b0e59fa0ba58246be184.jpg b/...edia/bgfinaldark.b0e59fa0ba58246be184.jpg → ...edia/bgfinaldark.b0e59fa0ba58246be184.jpg
diff --git a/...dia/bgfinallight.4f070915fbd0bf061862.jpg → ...dia/bgfinallight.4f070915fbd0bf061862.jpg b/...dia/bgfinallight.4f070915fbd0bf061862.jpg → ...dia/bgfinallight.4f070915fbd0bf061862.jpg
diff --git a/...tic/media/hidden.22c6a09acdf28a7b5e22.png → ...tic/media/hidden.22c6a09acdf28a7b5e22.png b/...tic/media/hidden.22c6a09acdf28a7b5e22.png → ...tic/media/hidden.22c6a09acdf28a7b5e22.png
diff --git a/...-512.2e57f723038d450219929250767e121d.svg → ...-512.2e57f723038d450219929250767e121d.svg b/...-512.2e57f723038d450219929250767e121d.svg → ...-512.2e57f723038d450219929250767e121d.svg
diff --git a/...tatic/media/logo.3c3caf3bbb73bd7d0eec.png → ...tatic/media/logo.3c3caf3bbb73bd7d0eec.png b/...tatic/media/logo.3c3caf3bbb73bd7d0eec.png → ...tatic/media/logo.3c3caf3bbb73bd7d0eec.png
diff --git a/...tic/media/remove.3c662b752278fc52f408.png → ...tic/media/remove.3c662b752278fc52f408.png b/...tic/media/remove.3c662b752278fc52f408.png → ...tic/media/remove.3c662b752278fc52f408.png
diff --git a/...rrow.87f8be47de5397f44ad09947d6186828.svg → ...rrow.87f8be47de5397f44ad09947d6186828.svg b/...rrow.87f8be47de5397f44ad09947d6186828.svg → ...rrow.87f8be47de5397f44ad09947d6186828.svg
diff --git a/...task.0aee0a3293406f3c959e65a1925a9502.svg → ...task.0aee0a3293406f3c959e65a1925a9502.svg b/...task.0aee0a3293406f3c959e65a1925a9502.svg → ...task.0aee0a3293406f3c959e65a1925a9502.svg
diff --git a/...tatic/media/view.0b5c67b9c9c6e2b4b7d1.png → ...tatic/media/view.0b5c67b9c9c6e2b4b7d1.png b/...tatic/media/view.0b5c67b9c9c6e2b4b7d1.png → ...tatic/media/view.0b5c67b9c9c6e2b4b7d1.png
diff --git a/server/package.json b/server/package.json
@@ -8,7 +8,7 @@
   "main": "./dist/app.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "cd ../admin-client && sudo rm -rf ../server/public && sudo mkdir -p ../server/public && cd ./build && sudo cp -r * ../../server/public && cd ../../server && node ./dist/app.js",
+    "start": "cd ../admin-client && sudo rm -rf ../server/dist/public && sudo mkdir -p ../server/dist/public && cd ./build && sudo cp -r * ../../server/dist/public && cd ../../server && node ./dist/app.js",
     "dev": "NODE_ENV=development nodemon ./dist/app.js"
   },
   "repository": {

diff --git a/server/public/static/js/main.c0b23865.js b/server/public/static/js/main.c0b23865.js