diff --git a/pom.xml b/pom.xml index 22a2e9c039..1572a65b1e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ org.mindrot jbcrypt - 0.3m + 0.4 javax.servlet javax.servlet-api - 3.0.1 + 4.0.1 jstl @@ -42,7 +42,7 @@ mysql mysql-connector-java - 6.0.5 + 8.0.30 diff --git a/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java b/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java index 1763081228..92806865d5 100644 --- a/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java @@ -1,6 +1,8 @@ package com.codeup.adlister.controllers; import com.codeup.adlister.dao.DaoFactory; +import com.codeup.adlister.models.Ad; +import com.codeup.adlister.models.User; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; @@ -8,6 +10,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.List; @WebServlet(name = "controllers.AdsIndexServlet", urlPatterns = "/ads") public class AdsIndexServlet extends HttpServlet { @@ -15,4 +18,14 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t request.setAttribute("ads", DaoFactory.getAdsDao().all()); request.getRequestDispatcher("/WEB-INF/ads/index.jsp").forward(request, response); } -} + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + String searchQuery = req.getParameter("search"); + System.out.println(searchQuery); + + req.setAttribute("ads2", DaoFactory.getAdsDao().findByTitle(searchQuery)); + + req.getRequestDispatcher("/WEB-INF/ads/index.jsp").forward(req, resp); +// resp.sendRedirect("/ads"); + } +} \ No newline at end of file diff --git a/src/main/java/com/codeup/adlister/controllers/CreateAdServlet.java b/src/main/java/com/codeup/adlister/controllers/CreateAdServlet.java index 38775bc6f7..add19d8d56 100644 --- a/src/main/java/com/codeup/adlister/controllers/CreateAdServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/CreateAdServlet.java @@ -22,14 +22,26 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t .forward(request, response); } - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException { + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, IllegalStateException { User user = (User) request.getSession().getAttribute("user"); Ad ad = new Ad( user.getId(), request.getParameter("title"), request.getParameter("description") ); + + String title = request.getParameter("title"); + String description = request.getParameter("description"); + + boolean inputHasErrors = title.isEmpty() || description.isEmpty(); + + if (inputHasErrors) { + response.sendRedirect("/ads/create"); + return; + } DaoFactory.getAdsDao().insert(ad); response.sendRedirect("/ads"); } } + + diff --git a/src/main/java/com/codeup/adlister/controllers/DeleteServlet.java b/src/main/java/com/codeup/adlister/controllers/DeleteServlet.java new file mode 100644 index 0000000000..8b21b087c3 --- /dev/null +++ b/src/main/java/com/codeup/adlister/controllers/DeleteServlet.java @@ -0,0 +1,26 @@ +package com.codeup.adlister.controllers; + +import com.codeup.adlister.dao.DaoFactory; +import com.codeup.adlister.models.Ad; + +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(urlPatterns = "/profile/delete") +public class DeleteServlet extends HttpServlet { + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, SecurityException, ServletException { + Long id = Long.parseLong(request.getParameter("id")); + + DaoFactory.getAdsDao().deleteAd(id); + response.sendRedirect("/profile"); + + } + + + +} diff --git a/src/main/java/com/codeup/adlister/controllers/HelloWorldServlet.java b/src/main/java/com/codeup/adlister/controllers/HelloWorldServlet.java deleted file mode 100644 index 4ab9b9da70..0000000000 --- a/src/main/java/com/codeup/adlister/controllers/HelloWorldServlet.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.codeup.adlister.controllers; - -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.HelloWorldServlet", urlPatterns = "/") -public class HelloWorldServlet extends HttpServlet { - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { - response.getWriter().println("

Hello, World!

"); - } -} diff --git a/src/main/java/com/codeup/adlister/controllers/LoginServlet.java b/src/main/java/com/codeup/adlister/controllers/LoginServlet.java index e5c52723a2..1636e4bda2 100644 --- a/src/main/java/com/codeup/adlister/controllers/LoginServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/LoginServlet.java @@ -32,8 +32,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) } boolean validAttempt = Password.check(password, user.getPassword()); + boolean validUser = user.getUsername().equals(username); - if (validAttempt) { + if (validAttempt && validUser) { request.getSession().setAttribute("user", user); response.sendRedirect("/profile"); } else { diff --git a/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java b/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java index e1e997c17a..4948c23435 100644 --- a/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java @@ -33,9 +33,28 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) return; } + + // create and save a new user User user = new User(username, email, password); - DaoFactory.getUsersDao().insert(user); - response.sendRedirect("/login"); + try { + + User user1 = DaoFactory.getUsersDao().findByUsername(user.getUsername()); + +// System.out.println(DaoFactory.getUsersDao().findByUsername()); +// System.out.println(user1.getUsername()); + + if (user1.getUsername().equals(user.getUsername())){ + response.sendRedirect("/register"); + + } + + } + catch(NullPointerException e) + { + DaoFactory.getUsersDao().insert(user); + response.sendRedirect("/login"); + } + } } diff --git a/src/main/java/com/codeup/adlister/controllers/SingleAdServlet.java b/src/main/java/com/codeup/adlister/controllers/SingleAdServlet.java new file mode 100644 index 0000000000..eafa401057 --- /dev/null +++ b/src/main/java/com/codeup/adlister/controllers/SingleAdServlet.java @@ -0,0 +1,26 @@ +package com.codeup.adlister.controllers; + +import com.codeup.adlister.dao.DaoFactory; +import com.codeup.adlister.models.Ad; + +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.IndividualAdServlet", urlPatterns = "/ads/singles") +public class SingleAdServlet extends HttpServlet +{ + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + { + long ad_id = Long.parseLong(req.getParameter("ad_id")); + Ad ad = (Ad) DaoFactory.getAdsDao().findByID(ad_id); + System.out.println(ad_id); + System.out.println(ad); + req.setAttribute("singleAd", ad); + req.getRequestDispatcher("/WEB-INF/ads/single-ad.jsp").forward(req, resp); + } +} diff --git a/src/main/java/com/codeup/adlister/controllers/UpdateProfileServlet.java b/src/main/java/com/codeup/adlister/controllers/UpdateProfileServlet.java new file mode 100644 index 0000000000..98a6922bfd --- /dev/null +++ b/src/main/java/com/codeup/adlister/controllers/UpdateProfileServlet.java @@ -0,0 +1,35 @@ +package com.codeup.adlister.controllers; + +import com.codeup.adlister.dao.DaoFactory; +import com.codeup.adlister.models.Ad; + +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(urlPatterns = "/profile/update") +public class UpdateProfileServlet extends HttpServlet +{ + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, SecurityException, ServletException { + Long id = Long.parseLong(request.getParameter("id")); + + Ad newAd = DaoFactory.getAdsDao().findByID(id); + + request.setAttribute("adToEdit", newAd); + + request.getRequestDispatcher("/WEB-INF/update.jsp").forward(request, response); + } + + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, SecurityException, ServletException { + Long id = Long.valueOf(request.getParameter("id")); + String title = request.getParameter("title"); + String description = request.getParameter("description"); + + DaoFactory.getAdsDao().updateAd(id, title, description); + + response.sendRedirect("/profile"); + } +} diff --git a/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java b/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java index e1b8941067..5c6c7f9a9b 100644 --- a/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java @@ -1,5 +1,10 @@ package com.codeup.adlister.controllers; +import com.codeup.adlister.dao.DaoFactory; +import com.codeup.adlister.models.Ad; +import com.codeup.adlister.models.User; +import com.codeup.adlister.util.Password; + import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -14,6 +19,18 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t response.sendRedirect("/login"); return; } + + User user = (User) request.getSession().getAttribute("user"); + + long id = user.getId(); + + System.out.println(user.getId()); +// + request.setAttribute("ads", DaoFactory.getAdsDao().findByUserID(id)); + request.getRequestDispatcher("/WEB-INF/profile.jsp").forward(request, response); + } + + } diff --git a/src/main/java/com/codeup/adlister/dao/Ads.java b/src/main/java/com/codeup/adlister/dao/Ads.java index 79dc59f484..f65fc3db67 100644 --- a/src/main/java/com/codeup/adlister/dao/Ads.java +++ b/src/main/java/com/codeup/adlister/dao/Ads.java @@ -1,6 +1,7 @@ package com.codeup.adlister.dao; import com.codeup.adlister.models.Ad; +import com.codeup.adlister.models.User; import java.util.List; @@ -9,4 +10,12 @@ public interface Ads { List all(); // insert a new ad and return the new ad's id Long insert(Ad ad); + List findByUserID(long userID); + List findByTitle(String search); + + Ad findByID(Long user_id); +// List findByTitle(String search); + void updateAd(Long ad_id, String title, String description); + + void deleteAd(long ad_id); } diff --git a/src/main/java/com/codeup/adlister/dao/ListAdsDao.java b/src/main/java/com/codeup/adlister/dao/ListAdsDao.java deleted file mode 100644 index 8d3baaa369..0000000000 --- a/src/main/java/com/codeup/adlister/dao/ListAdsDao.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.codeup.adlister.dao; - -import com.codeup.adlister.models.Ad; - -import java.util.ArrayList; -import java.util.List; - -public class ListAdsDao implements Ads { - private List ads; - - public List all() { - if (ads == null) { - ads = generateAds(); - } - return ads; - } - - public Long insert(Ad ad) { - // make sure we have ads - if (ads == null) { - ads = generateAds(); - } - // we'll assign an "id" here based on the size of the ads list - // really the dao would handle this - ad.setId((long) ads.size()); - ads.add(ad); - return ad.getId(); - } - - private List generateAds() { - List ads = new ArrayList<>(); - ads.add(new Ad( - 1, - 1, - "playstation for sale", - "This is a slightly used playstation" - )); - ads.add(new Ad( - 2, - 1, - "Super Nintendo", - "Get your game on with this old-school classic!" - )); - ads.add(new Ad( - 3, - 2, - "Junior Java Developer Position", - "Minimum 7 years of experience required. You will be working in the scripting language for Java, JavaScript" - )); - ads.add(new Ad( - 4, - 2, - "JavaScript Developer needed", - "Must have strong Java skills" - )); - return ads; - } -} diff --git a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java index d58c45f985..f1bf2d7324 100644 --- a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java +++ b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java @@ -55,20 +55,99 @@ public Long insert(Ad ad) { } } - private Ad extractAd(ResultSet rs) throws SQLException { - return new Ad( - rs.getLong("id"), - rs.getLong("user_id"), - rs.getString("title"), - rs.getString("description") - ); + public List findByUserID(long user_id) + { + PreparedStatement stmt = null; + try { + stmt = connection.prepareStatement("SELECT * FROM ads WHERE user_id = ?"); + stmt.setLong(1, user_id); + return createAdsFromResults(stmt.executeQuery()); + } catch (SQLException e) { + throw new RuntimeException("Error finding ads by user_id", e); + } + } + @Override + public List findByTitle(String search) + { + String query = "SELECT * FROM ads WHERE title = ?"; + try { + PreparedStatement stmt = connection.prepareStatement(query); + stmt.setString(1, search); + ResultSet rs = stmt.executeQuery(); + rs.next(); + System.out.println("Below is our search results"); + + return createAdsFromResults(stmt.executeQuery()); + } catch (SQLException e) { + throw new RuntimeException(e.toString()); + } + } + + @Override + public Ad findByID(Long ad_id) { + String query = "SELECT * FROM ads WHERE id = ?"; + try { + PreparedStatement stmt = connection.prepareStatement(query); + stmt.setLong(1, ad_id); + ResultSet rs = stmt.executeQuery(); + rs.next(); + return extractAd(rs); + } catch (SQLException e) { + throw new RuntimeException(e.toString()); + } + } + + @Override + public void updateAd(Long ad_id, String title, String description) + { + try + { + String query = "UPDATE ads SET title = ?, description = ? WHERE id = ?"; + PreparedStatement stmt = connection.prepareStatement(query); + stmt.setString(1, title); + stmt.setString(2, description); + stmt.setLong(3, ad_id); + stmt.executeUpdate(); + } + catch (SQLException e) + { + throw new RuntimeException("Unable to update ad", e); + } } private List createAdsFromResults(ResultSet rs) throws SQLException { List ads = new ArrayList<>(); while (rs.next()) { + System.out.println("next result set"); ads.add(extractAd(rs)); } return ads; } + + private Ad extractAd(ResultSet rs) throws SQLException { + + System.out.println("Current result set " + rs); + System.out.println("result set id: " + rs.getLong("id")); + System.out.println("result set title: " + rs.getString("title")); + return new Ad( + rs.getLong("id"), + rs.getLong("user_id"), + rs.getString("title"), + rs.getString("description") + ); + } + + public void deleteAd(long ad_id) { + try + { + String query = "DELETE FROM ads WHERE id = ?"; + PreparedStatement stmt = connection.prepareStatement(query); + stmt.setLong(1, ad_id); + stmt.executeUpdate(); + } + catch (SQLException e) + { + throw new RuntimeException("Unable to update ad", e); + } + } } diff --git a/src/main/java/com/codeup/adlister/models/Ad.java b/src/main/java/com/codeup/adlister/models/Ad.java index 9e9e02d87e..8f744148b8 100644 --- a/src/main/java/com/codeup/adlister/models/Ad.java +++ b/src/main/java/com/codeup/adlister/models/Ad.java @@ -6,6 +6,8 @@ public class Ad { private String title; private String description; + public Ad(){}; + public Ad(long id, long userId, String title, String description) { this.id = id; this.userId = userId; @@ -50,4 +52,5 @@ public String getDescription() { public void setDescription(String description) { this.description = description; } + } diff --git a/src/main/webapp/WEB-INF/ads/create.jsp b/src/main/webapp/WEB-INF/ads/create.jsp index f6332692f7..3cf292a93e 100644 --- a/src/main/webapp/WEB-INF/ads/create.jsp +++ b/src/main/webapp/WEB-INF/ads/create.jsp @@ -6,8 +6,10 @@ -
-

Create a new Ad

+ + +
+

Create Ad

diff --git a/src/main/webapp/WEB-INF/ads/index.jsp b/src/main/webapp/WEB-INF/ads/index.jsp index 6f4371f0bb..4f8f930b77 100644 --- a/src/main/webapp/WEB-INF/ads/index.jsp +++ b/src/main/webapp/WEB-INF/ads/index.jsp @@ -7,17 +7,36 @@ - + -
-

Here Are all the ads!

+
+

All Ads

- -
-

${ad.title}

-

${ad.description}

+
+
+ + +
+ + + + +
+ +
+
+ +
+
+ + +
+

${ad2.description}

+
+ +
diff --git a/src/main/webapp/WEB-INF/ads/single-ad.jsp b/src/main/webapp/WEB-INF/ads/single-ad.jsp new file mode 100644 index 0000000000..3c42375001 --- /dev/null +++ b/src/main/webapp/WEB-INF/ads/single-ad.jsp @@ -0,0 +1,16 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + ad + + + + +
+

${singleAd.title}

+

${singleAd.description}

+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/login.jsp b/src/main/webapp/WEB-INF/login.jsp index 83ce2d0a1f..230c54e1b1 100644 --- a/src/main/webapp/WEB-INF/login.jsp +++ b/src/main/webapp/WEB-INF/login.jsp @@ -4,22 +4,32 @@ + - -
-

Please Log In

+ + +
-
+

Please sign in

+ +
+ -
-
+
+ -
- + +
+ +
+ +

© 2017–2021

-
+
diff --git a/src/main/webapp/WEB-INF/partials/head.jsp b/src/main/webapp/WEB-INF/partials/head.jsp index a33443d65c..17e1adf12a 100644 --- a/src/main/webapp/WEB-INF/partials/head.jsp +++ b/src/main/webapp/WEB-INF/partials/head.jsp @@ -1,2 +1,2 @@ ${param.title} - + diff --git a/src/main/webapp/WEB-INF/partials/index.html b/src/main/webapp/WEB-INF/partials/index.html new file mode 100644 index 0000000000..c5a7bfe9dc --- /dev/null +++ b/src/main/webapp/WEB-INF/partials/index.html @@ -0,0 +1,67 @@ + + + + + + + + + Signin Template · Bootstrap v5.1 + + + + + + + + + + + + + + + + +
+
+ +

Please sign in

+ +
+ + +
+
+ + +
+ +
+ +
+ +

© 2017–2021

+
+
+ + + + + diff --git a/src/main/webapp/WEB-INF/partials/integrating.sql b/src/main/webapp/WEB-INF/partials/integrating.sql new file mode 100644 index 0000000000..75c58143e9 --- /dev/null +++ b/src/main/webapp/WEB-INF/partials/integrating.sql @@ -0,0 +1,30 @@ +# USE adlister_db; +# +# DROP TABLE IF EXISTS ads; +# DROP TABLE IF EXISTS users; +# +# CREATE TABLE users ( +# id INT UNSIGNED NOT NULL AUTO_INCREMENT, +# username VARCHAR(240) NOT NULL, +# email VARCHAR(240) NOT NULL, +# password VARCHAR(255) NOT NULL, +# PRIMARY KEY (id), +# UNIQUE(username) +# ); +# +# CREATE TABLE ads ( +# id INT UNSIGNED NOT NULL AUTO_INCREMENT, +# user_id INT UNSIGNED NOT NULL, +# title VARCHAR(240) NOT NULL, +# description TEXT NOT NULL, +# PRIMARY KEY (id), +# FOREIGN KEY (user_id) REFERENCES users(id) +# +# ); + + + + + + + diff --git a/src/main/webapp/WEB-INF/partials/login-css.jsp b/src/main/webapp/WEB-INF/partials/login-css.jsp new file mode 100644 index 0000000000..0997fbd3cf --- /dev/null +++ b/src/main/webapp/WEB-INF/partials/login-css.jsp @@ -0,0 +1 @@ + diff --git a/src/main/webapp/WEB-INF/partials/navbar-ads.jsp b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp new file mode 100644 index 0000000000..ff724d7f59 --- /dev/null +++ b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp @@ -0,0 +1,22 @@ +
+ + diff --git a/src/main/webapp/WEB-INF/partials/navbar-create.jsp b/src/main/webapp/WEB-INF/partials/navbar-create.jsp new file mode 100644 index 0000000000..94619d4eae --- /dev/null +++ b/src/main/webapp/WEB-INF/partials/navbar-create.jsp @@ -0,0 +1,11 @@ +
+ + diff --git a/src/main/webapp/WEB-INF/partials/navbar-login.jsp b/src/main/webapp/WEB-INF/partials/navbar-login.jsp new file mode 100644 index 0000000000..28432a7447 --- /dev/null +++ b/src/main/webapp/WEB-INF/partials/navbar-login.jsp @@ -0,0 +1,13 @@ +
+ + diff --git a/src/main/webapp/WEB-INF/partials/navbar-profile.jsp b/src/main/webapp/WEB-INF/partials/navbar-profile.jsp new file mode 100644 index 0000000000..366dd19af2 --- /dev/null +++ b/src/main/webapp/WEB-INF/partials/navbar-profile.jsp @@ -0,0 +1,13 @@ +
+ diff --git a/src/main/webapp/WEB-INF/partials/navbar-register.jsp b/src/main/webapp/WEB-INF/partials/navbar-register.jsp new file mode 100644 index 0000000000..4f46491083 --- /dev/null +++ b/src/main/webapp/WEB-INF/partials/navbar-register.jsp @@ -0,0 +1,10 @@ +
+ + diff --git a/src/main/webapp/WEB-INF/partials/navbar.jsp b/src/main/webapp/WEB-INF/partials/navbar.jsp index 8e1f98f662..994213738a 100644 --- a/src/main/webapp/WEB-INF/partials/navbar.jsp +++ b/src/main/webapp/WEB-INF/partials/navbar.jsp @@ -1,12 +1,12 @@ -
diff --git a/src/main/webapp/WEB-INF/partials/signin.css b/src/main/webapp/WEB-INF/partials/signin.css new file mode 100644 index 0000000000..6cc45400ac --- /dev/null +++ b/src/main/webapp/WEB-INF/partials/signin.css @@ -0,0 +1,39 @@ +html, +body { + height: 100%; +} + +body { + display: flex; + align-items: center; + padding-top: 40px; + padding-bottom: 40px; + background-color: #f5f5f5; +} + +.form-signin { + width: 100%; + max-width: 330px; + padding: 15px; + margin: auto; +} + +.form-signin .checkbox { + font-weight: 400; +} + +.form-signin .form-floating:focus-within { + z-index: 2; +} + +.form-signin input[type="username"] { + margin-bottom: -1px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.form-signin input[type="password"] { + margin-bottom: 10px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} diff --git a/src/main/webapp/WEB-INF/profile.jsp b/src/main/webapp/WEB-INF/profile.jsp index 05e3fa7a91..f3d90c6066 100644 --- a/src/main/webapp/WEB-INF/profile.jsp +++ b/src/main/webapp/WEB-INF/profile.jsp @@ -1,3 +1,4 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> @@ -6,11 +7,30 @@ - + -
+

Welcome, ${sessionScope.user.username}!

+ +
+

${ad.title}

+

${ad.description}

+
+ + + + +
+ +
+ + +
+ +
+ + diff --git a/src/main/webapp/WEB-INF/register.jsp b/src/main/webapp/WEB-INF/register.jsp index 4b64e10a43..a05f6d6f93 100644 --- a/src/main/webapp/WEB-INF/register.jsp +++ b/src/main/webapp/WEB-INF/register.jsp @@ -6,7 +6,7 @@ - +

Please fill in your information.

diff --git a/src/main/webapp/WEB-INF/update.jsp b/src/main/webapp/WEB-INF/update.jsp new file mode 100644 index 0000000000..d31bbdad21 --- /dev/null +++ b/src/main/webapp/WEB-INF/update.jsp @@ -0,0 +1,23 @@ +<%-- + Created by IntelliJ IDEA. + User: juliangutierrez + Date: 11/16/22 + Time: 2:17 PM + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + Profile Update + + + + + + + + + +
+ + diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 68cf346ec9..7e690cb9ad 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -8,7 +8,7 @@ -
+

Welcome to the Adlister!