From 3f67bf4ba8f99ef9672efd7ff25cdb92c767cb7d Mon Sep 17 00:00:00 2001 From: Aastha Rai Date: Tue, 13 Jun 2023 13:44:54 +0530 Subject: [PATCH 1/3] #48 bug issue resolved --- app.js | 5 +---- controller/index.js | 2 +- public/index.html | 13 ------------- 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 public/index.html diff --git a/app.js b/app.js index 6ede9cd..33becb2 100644 --- a/app.js +++ b/app.js @@ -1,16 +1,13 @@ import express from "express"; -import path, { dirname } from "path"; import morgan from "morgan"; import cookieParser from "cookie-parser"; import cors from "cors"; -import { fileURLToPath } from "url"; import { logger } from "#util"; import indexRouter from "#routes/index"; import usersRouter from "#routes/users"; import authRouter from "#routes/auth"; const app = express(); -const currDirName = dirname(fileURLToPath(import.meta.url)); app.use(morgan( ":remote-addr - :remote-user \":method :url HTTP/:http-version\" :status \":referrer\" \":user-agent\"", @@ -21,9 +18,9 @@ app.use(cors()); app.use(express.json()); app.use(express.urlencoded({ extended: false })); app.use(cookieParser()); -app.use(express.static(path.join(currDirName, "public"))); app.use("/", indexRouter); + app.use("/users", usersRouter); app.use("/auth", authRouter); diff --git a/controller/index.js b/controller/index.js index 50aaa32..864f247 100644 --- a/controller/index.js +++ b/controller/index.js @@ -1,5 +1,5 @@ function home(req, res) { - res.render("index", { title: "Express" }); + res.render("public/index.html", { title: "Express" }); } export default { home }; diff --git a/public/index.html b/public/index.html deleted file mode 100644 index ab1ad8a..0000000 --- a/public/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Express - - - - -

Express

-

Welcome to Express

- - - From 6761c55a135657e65ae1b7a6cbf6ec96e09c1a64 Mon Sep 17 00:00:00 2001 From: Aastha Rai Date: Tue, 13 Jun 2023 13:49:22 +0530 Subject: [PATCH 2/3] #48 restored index.js --- controller/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller/index.js b/controller/index.js index 864f247..50aaa32 100644 --- a/controller/index.js +++ b/controller/index.js @@ -1,5 +1,5 @@ function home(req, res) { - res.render("public/index.html", { title: "Express" }); + res.render("index", { title: "Express" }); } export default { home }; From dd94b2ef3e60f49488b02e52d18f3d89d1885d75 Mon Sep 17 00:00:00 2001 From: Aastha Rai Date: Thu, 15 Jun 2023 15:25:11 +0530 Subject: [PATCH 3/3] #48 changes done as mentioned in PR --- app.js | 5 ++++- controller/index.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index 33becb2..6ede9cd 100644 --- a/app.js +++ b/app.js @@ -1,13 +1,16 @@ import express from "express"; +import path, { dirname } from "path"; import morgan from "morgan"; import cookieParser from "cookie-parser"; import cors from "cors"; +import { fileURLToPath } from "url"; import { logger } from "#util"; import indexRouter from "#routes/index"; import usersRouter from "#routes/users"; import authRouter from "#routes/auth"; const app = express(); +const currDirName = dirname(fileURLToPath(import.meta.url)); app.use(morgan( ":remote-addr - :remote-user \":method :url HTTP/:http-version\" :status \":referrer\" \":user-agent\"", @@ -18,9 +21,9 @@ app.use(cors()); app.use(express.json()); app.use(express.urlencoded({ extended: false })); app.use(cookieParser()); +app.use(express.static(path.join(currDirName, "public"))); app.use("/", indexRouter); - app.use("/users", usersRouter); app.use("/auth", authRouter); diff --git a/controller/index.js b/controller/index.js index 50aaa32..8dab0fb 100644 --- a/controller/index.js +++ b/controller/index.js @@ -1,5 +1,5 @@ function home(req, res) { - res.render("index", { title: "Express" }); + res.json({ res: "Server Working" }); } export default { home };