A-J-K-M · lexibor · Mar 20, 2023 · Mar 20, 2023 · Mar 20, 2023
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
+            <version>4.0.1</version>
         </dependency>
         <dependency>
             <groupId>jstl</groupId>

diff --git a/src/main/java/com/codeup/adlister/controllers/CounterServlet.java b/src/main/java/com/codeup/adlister/controllers/CounterServlet.java
diff --git a/src/main/java/com/codeup/adlister/controllers/EditProfileServlet.java b/src/main/java/com/codeup/adlister/controllers/EditProfileServlet.java
@@ -0,0 +1,21 @@
+package com.codeup.adlister.controllers;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "controllers.EditProfileServlet", urlPatterns = "/edit-profile")
+public class EditProfileServlet extends HttpServlet {
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        if (request.getSession().getAttribute("user") == null) {
+            response.sendRedirect("/login");
+            return;
+        }
+        request.getRequestDispatcher("/WEB-INF/editProfile.jsp")
+                .forward(request, response);
+    }
+}
diff --git a/src/main/java/com/codeup/adlister/controllers/HelloWorldServlet.java b/src/main/java/com/codeup/adlister/controllers/HelloWorldServlet.java
diff --git a/src/main/webapp/WEB-INF/editProfile.jsp b/src/main/webapp/WEB-INF/editProfile.jsp
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+  <jsp:include page="/WEB-INF/partials/head.jsp">
+    <jsp:param name="title" value="Your Profile" />
+  </jsp:include>
+</head>
+<body>
+<jsp:include page="/WEB-INF/partials/userNavbar.jsp" />
+
+<div class="container">
+  <h1>Edit your profile below ${sessionScope.user.username}!</h1>
+</div>
+
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/partials/head.jsp b/src/main/webapp/WEB-INF/partials/head.jsp
@@ -1,2 +1,2 @@
 <title>${param.title}</title>
-<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous">
diff --git a/src/main/webapp/WEB-INF/partials/navbar.jsp b/src/main/webapp/WEB-INF/partials/navbar.jsp
@@ -6,7 +6,6 @@
         </div>
         <ul class="nav navbar-nav navbar-right">
             <li><a href="/login">Login</a></li>
-            <li><a href="/logout">Logout</a></li>
         </ul>
     </div><!-- /.navbar-collapse -->
     </div><!-- /.container-fluid -->

diff --git a/src/main/webapp/WEB-INF/partials/userNavbar.jsp b/src/main/webapp/WEB-INF/partials/userNavbar.jsp
@@ -0,0 +1,12 @@
+<nav class="navbar navbar-default">
+    <div class="container-fluid">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <a class="navbar-brand" href="/ads">Adlister</a>
+        </div>
+        <ul class="nav navbar-nav navbar-right">
+            <li><a href="/ads/create">Create New Ad!</a></li>
+            <li><a href="/logout">Logout</a></li>
+        </ul>
+    </div><!-- /.navbar-collapse -->
+</nav>
diff --git a/src/main/webapp/WEB-INF/profile.jsp b/src/main/webapp/WEB-INF/profile.jsp
@@ -6,11 +6,34 @@
     </jsp:include>
 </head>
 <body>
-    <jsp:include page="/WEB-INF/partials/navbar.jsp" />
+    <jsp:include page="/WEB-INF/partials/userNavbar.jsp" />
 
-    <div class="container">
-        <h1>Welcome, ${sessionScope.user.username}!</h1>
+    <div class="card" style="width: 18rem;">
+        <img src="https://cdn.vectorstock.com/i/1000x1000/15/40/blank-profile-picture-image-holder-with-a-crown-vector-42411540.webp" class="card-img-top" alt="...">
+        <div class="card-body">
+            <h5 class="card-title"><h2>Welcome, ${sessionScope.user.username}!</h2></h5>
+        </div>
+        <ul class="list-group list-group-flush">
+            <li class="list-group-item"><h4>${sessionScope.user.email}!</h4></li>
+        </ul>
+        <div class="card-body">
+            <a href="/edit-profile" class="card-link">Edit Profile</a>
+            <a href="/ads">Your Ads!</a>
+        </div>
     </div>
 
+<%--    <div class="container">--%>
+<%--        <h1>Welcome, ${sessionScope.user.username}!</h1>--%>
+<%--    </div>--%>
+
 </body>
 </html>
+
+
+<%--//TODO The profile page should display the username and email of the logged-in user and a list of links to all the ads a user has created in the AdLister.&ndash;%&gt;--%>
+
+<%--//TODO When a user logs in the user should be redirected to their profile page.--%>
+<%--done--%>
+
+<%--//TODO The profile view should only be accessible to users that are logged in.--%>
+<%--done--%>