From 417205326cbc9b2969f963a1c0d9baa71ab1d810 Mon Sep 17 00:00:00 2001
From: Atiwit Pattanapukdee <65160394@go.buu.ac.th>
Date: Sun, 16 Mar 2025 22:14:57 +0700
Subject: [PATCH] Project Round 2
---
routes/tourRoutes.js | 11 ++++++++++-
server.js | 2 ++
views/index.ejs | 6 +++---
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/routes/tourRoutes.js b/routes/tourRoutes.js
index 517bde7..0afd60d 100644
--- a/routes/tourRoutes.js
+++ b/routes/tourRoutes.js
@@ -2,8 +2,17 @@ const express = require('express');
const router = express.Router();
const tourController = require('../controllers/tourController');
+// Middleware สำหรับตรวจสอบ session
+function checkLogin(req, res, next) {
+ if (!req.session.userId) {
+ return res.redirect('/login'); // ถ้ายังไม่ได้ล็อกอินให้ไปหน้า login
+ }
+ next(); // ถ้า login แล้วให้ไปต่อ
+}
+
router.get('/', tourController.getTours);
-router.get('/tour/:id', tourController.getTourDetails);
+router.get('/profile', checkLogin, tourController.getProfile);
+router.get('/tour/:id', checkLogin, tourController.getTourDetails);
router.get('/login', tourController.getLogin);
router.get('/register', tourController.getRegister);
router.post('/login', tourController.postLogin);
diff --git a/server.js b/server.js
index ecf2353..2ea0bea 100644
--- a/server.js
+++ b/server.js
@@ -20,6 +20,8 @@ app.use(bodyParser.urlencoded({ extended: false }));
app.use(express.urlencoded({ extended: true }));
app.use(express.json());
+
+
app.use('/', tourRoutes);
app.use('/login', tourRoutes);
app.use('/register', tourRoutes);
diff --git a/views/index.ejs b/views/index.ejs
index 457dfe0..0f8dd2a 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -13,12 +13,12 @@
<a href="/">Home</a>
<a href="/about">About</a>
<a href="/contact">Contact</a>
-
- <% if (session.userName) { %> <!-- ตรวจสอบว่า userName อยู่ใน session หรือไม่ -->
+
+ <% if (session.userId) { %> <!-- ตรวจสอบว่า userId อยู่ใน session หรือไม่ -->
<a href="/profile"><%= session.userName %></a> <!-- แสดงชื่อผู้ใช้ -->
<a href="/logout">Logout</a>
<% } else { %>
- <a href="/login">Login</a>
+ <a href="/login">Login</a> <!-- ถ้ายังไม่ได้ login -->
<% } %>
</nav>
</header>
--
GitLab