Skip to content

Dev #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dishantttt merged 3 commits into from
Aug 26, 2025
Merged

Dev #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a416658
added route protection in new entries page
laladwesh Aug 26, 2025
cd5ec18
made changes in routing in adding and entry page
laladwesh Aug 26, 2025
34a05d0
Merge pull request #24 from swciitg/admin-panel
dishantttt Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions routers/khokhaEntryRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,15 @@ khokhaEntryRouter.get("/history",
asyncErrorHandler(khokhaHistoryController.userHistory)
);

khokhaEntryRouter.get("/entries", (req, res) => {
res.render("index", {
user: req.session.user,
BASE_URL: req.app.locals.BASE_URL
});
});
// khokhaEntryRouter.get("/entries", (req, res) => {
// if (!req.session.user) {
// return res.redirect(process.env.BASE_URL +'/new/admin/login');
// }
// res.render("index", {
// user: req.session.user,
// BASE_URL: req.app.locals.BASE_URL
// });
// });

khokhaEntryRouter.post("/entries/table", async (req, res) => {
try {
Expand Down Expand Up @@ -240,7 +243,10 @@ khokhaEntryRouter.get("/entries/api", async (req, res) => {
}
});

khokhaEntryRouter.get("/entries/new", (req, res) => {
khokhaEntryRouter.get("/new/entries", (req, res) => {
if (!req.session.user) {
return res.redirect(process.env.BASE_URL +'/new/admin/login');
}
res.render("add-entry", { BASE_URL: req.app.locals.BASE_URL });
});

Expand Down
2 changes: 1 addition & 1 deletion views/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<h1>All Khokha Entries</h1>

<div class="d-flex flex-wrap justify-content-end mb-3 gap-2">
<a class="btn btn-primary" href="<%= BASE_URL %>/entries/new">+ Add New Entry</a>
<a class="btn btn-primary" href="<%= BASE_URL %>/new/entries">+ Add New Entry</a>

<!-- Close by roll -->
<div class="input-group" style="max-width: 360px;">
Expand Down