From ed936fffd175445312bdd87bb13d846c0ccc74e1 Mon Sep 17 00:00:00 2001 From: Atiwit Pattanapukdee <65160394@go.buu.ac.th> Date: Wed, 19 Mar 2025 15:27:13 +0700 Subject: [PATCH] Project Round 7 --- public/css/styles.css | 10 +--------- views/index.ejs | 32 +++++++++++++------------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/public/css/styles.css b/public/css/styles.css index 5653bc1..7103434 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -42,17 +42,9 @@ nav a:hover { background: rgba(255, 255, 255, 0.5); } -.header { - display: flex; - justify-content: space-between; - align-items: center; - padding: 20px; - background-color: #4c4cd9; - color: white; -} - .login-btn { display: flex; + justify-content: space-between; align-items: center; gap: 8px; background-color: transparent; diff --git a/views/index.ejs b/views/index.ejs index b3204e7..4c00214 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -12,25 +12,19 @@ <header> <h1>Welcome to JourneyHub</h1> <nav> - <div class="header"> - <% if (session.userId) { %> - <a href="/create" class="btn-create">Create Tour</a> - <% } %> - - <form action="/search" method="GET" class="search-container"> - <input type="text" name="query" placeholder="Search for tours..." required> - <button type="submit">Search</button> - </form> - - <div class="navbar"> - <% if (session && session.userId) { %> - <a><%= session.userName %></a> - <a href="/logout">Logout</a> - <% } else { %> - <a href="/login" class="login-btn">Login</a> - <% } %> - </div> - </div> + <% if (session.userId) { %> + <a href="/create" class="btn-create">Create Tour</a> + <% } %> + <form action="/search" method="GET" class="search-container"> + <input type="text" name="query" placeholder="Search for tours..." required> + <button type="submit">Search</button> + </form> + <% if (session && session.userId) { %> <!-- ตรวจสอบว่า userId อยู่ใน session หรือไม่ --> + <a><%= session.userName %></a> <!-- แสดงชื่อผู้ใช้ --> + <a href="/logout">Logout</a> + <% } else { %> + <a href="/login" class="login-btn">Login</a> <!-- ถ้ายังไม่ได้ login --> + <% } %> </nav> </header> -- GitLab