From 3eb50a1e147c28acd448e50c97e269e3a7a842e9 Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Mon, 14 Nov 2022 09:45:32 -0600 Subject: [PATCH 01/17] pom.xml --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From 7901d27ba346ed58777fe30558dfd0199f062342 Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Mon, 14 Nov 2022 11:28:57 -0600 Subject: [PATCH 02/17] registration redirect --- .../adlister/controllers/RegisterServlet.java | 17 +++++++++++++++-- .../webapp/WEB-INF/partials/navbar-profile.jsp | 13 +++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 src/main/webapp/WEB-INF/partials/navbar-profile.jsp diff --git a/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java b/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java index e1e997c17a..5e1d9441f5 100644 --- a/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java @@ -33,9 +33,22 @@ 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"); + + User user1 = DaoFactory.getUsersDao().findByUsername(user.getUsername()); + + if(user1.getUsername().equals(user.getUsername())) + { + response.sendRedirect("/register"); + } + else + { + DaoFactory.getUsersDao().insert(user); + response.sendRedirect("/login"); + } + } } 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..5864ec9051 --- /dev/null +++ b/src/main/webapp/WEB-INF/partials/navbar-profile.jsp @@ -0,0 +1,13 @@ + From 5e7d36edd0a073f98e368eaf6621f186733a3d9c Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Mon, 14 Nov 2022 12:01:47 -0600 Subject: [PATCH 03/17] profile ad displays --- .../codeup/adlister/controllers/RegisterServlet.java | 1 + src/main/java/com/codeup/adlister/dao/Ads.java | 2 ++ .../java/com/codeup/adlister/dao/MySQLAdsDao.java | 12 ++++++++++++ src/main/java/com/codeup/adlister/models/Ad.java | 1 + src/main/webapp/WEB-INF/partials/navbar.jsp | 1 + src/main/webapp/WEB-INF/profile.jsp | 2 +- 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java b/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java index 5e1d9441f5..c587f07906 100644 --- a/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java @@ -43,6 +43,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) if(user1.getUsername().equals(user.getUsername())) { response.sendRedirect("/register"); + } else { diff --git a/src/main/java/com/codeup/adlister/dao/Ads.java b/src/main/java/com/codeup/adlister/dao/Ads.java index 79dc59f484..6e8391b02e 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,5 @@ public interface Ads { List all(); // insert a new ad and return the new ad's id Long insert(Ad ad); + Ads findByUserID(long userID); } diff --git a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java index d58c45f985..de0fe42c5c 100644 --- a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java +++ b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java @@ -71,4 +71,16 @@ private List createAdsFromResults(ResultSet rs) throws SQLException { } return ads; } + + public Ads findByUserID(long user_id) + { + String query = "SELECT * FROM ads WHERE user_id = ? LIMIT 1"; + try { + PreparedStatement stmt = connection.prepareStatement(query); + stmt.setLong(1, user_id); + return (Ads) extractAd(stmt.executeQuery()); + } catch (SQLException e) { + throw new RuntimeException("Error finding ads by user_id", 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..39f75b1dbd 100644 --- a/src/main/java/com/codeup/adlister/models/Ad.java +++ b/src/main/java/com/codeup/adlister/models/Ad.java @@ -50,4 +50,5 @@ public String getDescription() { public void setDescription(String description) { this.description = description; } + } diff --git a/src/main/webapp/WEB-INF/partials/navbar.jsp b/src/main/webapp/WEB-INF/partials/navbar.jsp index 8e1f98f662..0c6b5b762d 100644 --- a/src/main/webapp/WEB-INF/partials/navbar.jsp +++ b/src/main/webapp/WEB-INF/partials/navbar.jsp @@ -5,6 +5,7 @@ Adlister diff --git a/src/main/webapp/WEB-INF/profile.jsp b/src/main/webapp/WEB-INF/profile.jsp index 05e3fa7a91..b624069a7d 100644 --- a/src/main/webapp/WEB-INF/profile.jsp +++ b/src/main/webapp/WEB-INF/profile.jsp @@ -6,7 +6,7 @@ - +

Welcome, ${sessionScope.user.username}!

From ff9c38ce933c4896c54b3b837396d25ff23d38db Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Mon, 14 Nov 2022 12:29:16 -0600 Subject: [PATCH 04/17] user ads --- .../controllers/ViewProfileServlet.java | 10 ++++++++++ .../com/codeup/adlister/dao/ListAdsDao.java | 17 +++++++++++++++++ src/main/webapp/WEB-INF/profile.jsp | 7 +++++++ 3 files changed, 34 insertions(+) diff --git a/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java b/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java index e1b8941067..5b9efc0148 100644 --- a/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java @@ -1,5 +1,8 @@ package com.codeup.adlister.controllers; +import com.codeup.adlister.dao.DaoFactory; +import com.codeup.adlister.models.User; + import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -14,6 +17,13 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t response.sendRedirect("/login"); return; } + + User user = (User) request.getSession().getAttributeNames(); + + request.setAttribute("ads", DaoFactory.getAdsDao().findByUserID(user.getId())); + request.getRequestDispatcher("/WEB-INF/profile.jsp").forward(request, response); + + } } diff --git a/src/main/java/com/codeup/adlister/dao/ListAdsDao.java b/src/main/java/com/codeup/adlister/dao/ListAdsDao.java index 8d3baaa369..f5666b77c8 100644 --- a/src/main/java/com/codeup/adlister/dao/ListAdsDao.java +++ b/src/main/java/com/codeup/adlister/dao/ListAdsDao.java @@ -27,6 +27,23 @@ public Long insert(Ad ad) { return ad.getId(); } + public Ads findByUserID(long userID){ + List newAds = new ArrayList<>(); + newAds.add((Ad) DaoFactory.getAdsDao().all()); + + List returnAds = new ArrayList<>(); + + for(Ad ad : newAds) + { + if(userID == ad.getUserId()) + { + returnAds.add(ad); + } + } + + return (Ads) returnAds; + } + private List generateAds() { List ads = new ArrayList<>(); ads.add(new Ad( diff --git a/src/main/webapp/WEB-INF/profile.jsp b/src/main/webapp/WEB-INF/profile.jsp index b624069a7d..ebe4afc3e0 100644 --- a/src/main/webapp/WEB-INF/profile.jsp +++ b/src/main/webapp/WEB-INF/profile.jsp @@ -12,5 +12,12 @@

Welcome, ${sessionScope.user.username}!

+ +
+

${ad.title}

+

${ad.description}

+
+ + From f501b315b2b3dca013ee370705ca0553f7bfa75e Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Mon, 14 Nov 2022 14:32:59 -0600 Subject: [PATCH 05/17] unique usernames --- .../adlister/controllers/RegisterServlet.java | 15 ++++++++++----- .../adlister/controllers/ViewProfileServlet.java | 6 +++--- src/main/webapp/WEB-INF/partials/navbar-ads.jsp | 15 +++++++++++++++ 3 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 src/main/webapp/WEB-INF/partials/navbar-ads.jsp diff --git a/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java b/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java index c587f07906..4948c23435 100644 --- a/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/RegisterServlet.java @@ -37,15 +37,20 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) // create and save a new user User user = new User(username, email, password); + try { - User user1 = DaoFactory.getUsersDao().findByUsername(user.getUsername()); + User user1 = DaoFactory.getUsersDao().findByUsername(user.getUsername()); - if(user1.getUsername().equals(user.getUsername())) - { - response.sendRedirect("/register"); +// System.out.println(DaoFactory.getUsersDao().findByUsername()); +// System.out.println(user1.getUsername()); + + if (user1.getUsername().equals(user.getUsername())){ + response.sendRedirect("/register"); + + } } - else + catch(NullPointerException e) { DaoFactory.getUsersDao().insert(user); response.sendRedirect("/login"); diff --git a/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java b/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java index 5b9efc0148..a97e9c4345 100644 --- a/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java @@ -18,9 +18,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t return; } - User user = (User) request.getSession().getAttributeNames(); - - request.setAttribute("ads", DaoFactory.getAdsDao().findByUserID(user.getId())); +// User user = (User) request.getSession().getAttributeNames(); +// +// request.setAttribute("ads", DaoFactory.getAdsDao().findByUserID(user.getId())); request.getRequestDispatcher("/WEB-INF/profile.jsp").forward(request, response); 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..eec2fede63 --- /dev/null +++ b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp @@ -0,0 +1,15 @@ + From d5a21118af4b12632ff503a108075ab9346287b7 Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Mon, 14 Nov 2022 14:49:12 -0600 Subject: [PATCH 06/17] navbars --- src/main/webapp/WEB-INF/ads/index.jsp | 2 +- src/main/webapp/WEB-INF/partials/navbar-ads.jsp | 5 +---- src/main/webapp/WEB-INF/partials/navbar-profile.jsp | 2 +- src/main/webapp/WEB-INF/partials/navbar-register.jsp | 10 ++++++++++ src/main/webapp/WEB-INF/register.jsp | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 src/main/webapp/WEB-INF/partials/navbar-register.jsp diff --git a/src/main/webapp/WEB-INF/ads/index.jsp b/src/main/webapp/WEB-INF/ads/index.jsp index 6f4371f0bb..02da0b6760 100644 --- a/src/main/webapp/WEB-INF/ads/index.jsp +++ b/src/main/webapp/WEB-INF/ads/index.jsp @@ -7,7 +7,7 @@ - +

Here Are all the ads!

diff --git a/src/main/webapp/WEB-INF/partials/navbar-ads.jsp b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp index eec2fede63..8741374801 100644 --- a/src/main/webapp/WEB-INF/partials/navbar-ads.jsp +++ b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp @@ -5,10 +5,7 @@ Adlister
diff --git a/src/main/webapp/WEB-INF/partials/navbar-profile.jsp b/src/main/webapp/WEB-INF/partials/navbar-profile.jsp index 5864ec9051..68c0a489e2 100644 --- a/src/main/webapp/WEB-INF/partials/navbar-profile.jsp +++ b/src/main/webapp/WEB-INF/partials/navbar-profile.jsp @@ -5,7 +5,7 @@ Adlister 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..400be1bcc1 --- /dev/null +++ b/src/main/webapp/WEB-INF/partials/navbar-register.jsp @@ -0,0 +1,10 @@ + + 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.

From 66592fd55b1df060a8b95df9c3f4d05ccde5685d Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Mon, 14 Nov 2022 16:23:50 -0600 Subject: [PATCH 07/17] navbars --- src/main/webapp/WEB-INF/ads/create.jsp | 2 ++ src/main/webapp/WEB-INF/partials/navbar-ads.jsp | 1 + src/main/webapp/WEB-INF/partials/navbar-create.jsp | 10 ++++++++++ src/main/webapp/WEB-INF/partials/navbar-register.jsp | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/main/webapp/WEB-INF/partials/navbar-create.jsp diff --git a/src/main/webapp/WEB-INF/ads/create.jsp b/src/main/webapp/WEB-INF/ads/create.jsp index f6332692f7..467c1f0f17 100644 --- a/src/main/webapp/WEB-INF/ads/create.jsp +++ b/src/main/webapp/WEB-INF/ads/create.jsp @@ -6,6 +6,8 @@ + +

Create a new Ad

diff --git a/src/main/webapp/WEB-INF/partials/navbar-ads.jsp b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp index 8741374801..6f1e43abe2 100644 --- a/src/main/webapp/WEB-INF/partials/navbar-ads.jsp +++ b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp @@ -6,6 +6,7 @@
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..3ff6d2514a --- /dev/null +++ b/src/main/webapp/WEB-INF/partials/navbar-create.jsp @@ -0,0 +1,10 @@ + + diff --git a/src/main/webapp/WEB-INF/partials/navbar-register.jsp b/src/main/webapp/WEB-INF/partials/navbar-register.jsp index 400be1bcc1..b1373677e1 100644 --- a/src/main/webapp/WEB-INF/partials/navbar-register.jsp +++ b/src/main/webapp/WEB-INF/partials/navbar-register.jsp @@ -2,7 +2,7 @@
- Home + AdLister
From db52fdd8c0c162480b1a7a46b9df7e9ba11bd95b Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Tue, 15 Nov 2022 09:26:38 -0600 Subject: [PATCH 08/17] next pull --- .../adlister/controllers/CreateAdServlet.java | 14 +++++++++++++- .../codeup/adlister/controllers/LoginServlet.java | 3 ++- src/main/webapp/WEB-INF/login.jsp | 2 +- src/main/webapp/WEB-INF/partials/navbar-ads.jsp | 2 +- src/main/webapp/WEB-INF/partials/navbar-create.jsp | 1 + src/main/webapp/WEB-INF/partials/navbar-login.jsp | 13 +++++++++++++ src/main/webapp/WEB-INF/partials/navbar.jsp | 1 - 7 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 src/main/webapp/WEB-INF/partials/navbar-login.jsp 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/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/webapp/WEB-INF/login.jsp b/src/main/webapp/WEB-INF/login.jsp index 83ce2d0a1f..9ffb4bc069 100644 --- a/src/main/webapp/WEB-INF/login.jsp +++ b/src/main/webapp/WEB-INF/login.jsp @@ -6,7 +6,7 @@ - +

Please Log In

diff --git a/src/main/webapp/WEB-INF/partials/navbar-ads.jsp b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp index 6f1e43abe2..507645e46c 100644 --- a/src/main/webapp/WEB-INF/partials/navbar-ads.jsp +++ b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp @@ -6,7 +6,7 @@
diff --git a/src/main/webapp/WEB-INF/partials/navbar-create.jsp b/src/main/webapp/WEB-INF/partials/navbar-create.jsp index 3ff6d2514a..40adda593b 100644 --- a/src/main/webapp/WEB-INF/partials/navbar-create.jsp +++ b/src/main/webapp/WEB-INF/partials/navbar-create.jsp @@ -4,6 +4,7 @@
Adlister
+ 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..77dfc55d4d --- /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.jsp b/src/main/webapp/WEB-INF/partials/navbar.jsp index 0c6b5b762d..f668a02045 100644 --- a/src/main/webapp/WEB-INF/partials/navbar.jsp +++ b/src/main/webapp/WEB-INF/partials/navbar.jsp @@ -7,7 +7,6 @@ From 6ecaa6c14c4eeb0ce427c9ad92191f905497c7a1 Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Tue, 15 Nov 2022 12:42:24 -0600 Subject: [PATCH 09/17] finally fixed --- .../adlister/controllers/AdsIndexServlet.java | 10 +++ .../controllers/AdsSearchServlet.java | 24 +++++++ .../java/com/codeup/adlister/dao/Ads.java | 3 +- .../com/codeup/adlister/dao/ListAdsDao.java | 31 ++++++++- .../com/codeup/adlister/dao/MySQLAdsDao.java | 63 +++++++++++++------ .../java/com/codeup/adlister/models/Ad.java | 2 + .../webapp/WEB-INF/partials/navbar-ads.jsp | 5 ++ 7 files changed, 117 insertions(+), 21 deletions(-) create mode 100644 src/main/java/com/codeup/adlister/controllers/AdsSearchServlet.java diff --git a/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java b/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java index 1763081228..afe8e02eda 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,11 @@ 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); + Ad search = (Ad) DaoFactory.getAdsDao().findByTitle(searchQuery); + resp.sendRedirect("/"); + } } diff --git a/src/main/java/com/codeup/adlister/controllers/AdsSearchServlet.java b/src/main/java/com/codeup/adlister/controllers/AdsSearchServlet.java new file mode 100644 index 0000000000..922a5d7752 --- /dev/null +++ b/src/main/java/com/codeup/adlister/controllers/AdsSearchServlet.java @@ -0,0 +1,24 @@ +//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; +//import javax.servlet.http.HttpServlet; +//import javax.servlet.http.HttpServletRequest; +//import javax.servlet.http.HttpServletResponse; +//import java.io.IOException; +// +//@WebServlet(name = "controllers.AdsIndexServlet", urlPatterns = "/ads") +//public class AdsSearchServlet extends HttpServlet { +// protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { +// request.setAttribute("ads", DaoFactory.getAdsDao().all()); +// request.getRequestDispatcher("/WEB-INF/ads/index.jsp").forward(request, response); +// +// String searchQuery = request.getParameter("search"); +// System.out.println(searchQuery); +// Ad search = (Ad) DaoFactory.getAdsDao().findByTitle(searchQuery); +// } +//} diff --git a/src/main/java/com/codeup/adlister/dao/Ads.java b/src/main/java/com/codeup/adlister/dao/Ads.java index 6e8391b02e..04e24d8136 100644 --- a/src/main/java/com/codeup/adlister/dao/Ads.java +++ b/src/main/java/com/codeup/adlister/dao/Ads.java @@ -10,5 +10,6 @@ public interface Ads { List all(); // insert a new ad and return the new ad's id Long insert(Ad ad); - Ads findByUserID(long userID); + Ad findByUserID(long userID); + Ad findByTitle(String search); } diff --git a/src/main/java/com/codeup/adlister/dao/ListAdsDao.java b/src/main/java/com/codeup/adlister/dao/ListAdsDao.java index f5666b77c8..079a12bb0b 100644 --- a/src/main/java/com/codeup/adlister/dao/ListAdsDao.java +++ b/src/main/java/com/codeup/adlister/dao/ListAdsDao.java @@ -2,11 +2,16 @@ import com.codeup.adlister.models.Ad; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.ArrayList; import java.util.List; public class ListAdsDao implements Ads { private List ads; + private Connection connection = null; public List all() { if (ads == null) { @@ -27,7 +32,7 @@ public Long insert(Ad ad) { return ad.getId(); } - public Ads findByUserID(long userID){ + public Ad findByUserID(long userID){ List newAds = new ArrayList<>(); newAds.add((Ad) DaoFactory.getAdsDao().all()); @@ -41,7 +46,7 @@ public Ads findByUserID(long userID){ } } - return (Ads) returnAds; + return (Ad) returnAds; } private List generateAds() { @@ -72,4 +77,26 @@ private List generateAds() { )); return ads; } + + private Ad extractAd(ResultSet rs) throws SQLException { + return new Ad( + rs.getLong("id"), + rs.getLong("user_id"), + rs.getString("title"), + rs.getString("description") + ); + } + @Override + public Ad findByTitle(String search) + { + String query = "SELECT * FROM ads WHERE title LIKE ? "; + try { + PreparedStatement stmt = connection.prepareStatement(query); + stmt.setString(1, search); + return (Ad) extractAd(stmt.executeQuery()); + } catch (SQLException e) { + throw new RuntimeException("Error finding ads by search", e); + } + } + } diff --git a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java index de0fe42c5c..e98a5c8e57 100644 --- a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java +++ b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java @@ -55,32 +55,59 @@ 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 Ad findByUserID(long user_id) + { + PreparedStatement stmt = null; + try { + stmt = connection.prepareStatement("SELECT * FROM ads WHERE user_id = ? LIMIT 1"); + stmt.setLong(1, user_id); + return (Ad) extractAd(stmt.executeQuery()); + } catch (SQLException e) { + throw new RuntimeException("Error finding ads by user_id", e); + } + } + @Override + public Ad findByTitle(String search) + { + String query = "SELECT * FROM ads WHERE title = ? LIMIT 1"; + 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 new Ad( + rs.getLong("id"), + rs.getLong("user_id"), + rs.getString("title"), + rs.getString("description") + ); + } catch (SQLException e) { + throw new RuntimeException("Error finding ads by search", 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; } - - public Ads findByUserID(long user_id) - { - String query = "SELECT * FROM ads WHERE user_id = ? LIMIT 1"; - try { - PreparedStatement stmt = connection.prepareStatement(query); - stmt.setLong(1, user_id); - return (Ads) extractAd(stmt.executeQuery()); - } catch (SQLException e) { - throw new RuntimeException("Error finding ads by user_id", e); - } + private Ad extractAd(ResultSet rs) throws SQLException { +// if (! rs.next()) { +// return null; +// } + 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") + ); +// } } } diff --git a/src/main/java/com/codeup/adlister/models/Ad.java b/src/main/java/com/codeup/adlister/models/Ad.java index 39f75b1dbd..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; diff --git a/src/main/webapp/WEB-INF/partials/navbar-ads.jsp b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp index 507645e46c..1796bb3a10 100644 --- a/src/main/webapp/WEB-INF/partials/navbar-ads.jsp +++ b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp @@ -4,6 +4,11 @@
Adlister
+ +
+ +
+
  • Create Ad
  • Profile
    • From e8dc4cdc5214e1a8f162be84af3f2f2866a9b6ab Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Tue, 15 Nov 2022 14:50:32 -0600 Subject: [PATCH 10/17] next --- .../adlister/controllers/AdsIndexServlet.java | 7 ++-- .../java/com/codeup/adlister/dao/Ads.java | 5 ++- .../com/codeup/adlister/dao/ListAdsDao.java | 25 +++++++++++-- .../com/codeup/adlister/dao/MySQLAdsDao.java | 36 ++++++++++++++----- src/main/webapp/WEB-INF/ads/index.jsp | 12 +++++++ 5 files changed, 71 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java b/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java index afe8e02eda..8758055655 100644 --- a/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java @@ -22,7 +22,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { String searchQuery = req.getParameter("search"); System.out.println(searchQuery); - Ad search = (Ad) DaoFactory.getAdsDao().findByTitle(searchQuery); - resp.sendRedirect("/"); + + req.setAttribute("ads2", DaoFactory.getAdsDao().findByTitle(searchQuery)); + + req.getRequestDispatcher("/WEB-INF/ads/index.jsp").forward(req, resp); +// resp.sendRedirect("/ads"); } } diff --git a/src/main/java/com/codeup/adlister/dao/Ads.java b/src/main/java/com/codeup/adlister/dao/Ads.java index 04e24d8136..e940e4f6fc 100644 --- a/src/main/java/com/codeup/adlister/dao/Ads.java +++ b/src/main/java/com/codeup/adlister/dao/Ads.java @@ -11,5 +11,8 @@ public interface Ads { // insert a new ad and return the new ad's id Long insert(Ad ad); Ad findByUserID(long userID); - Ad findByTitle(String search); + List findByTitle(String search); + + List findByID(Long user_id); +// List findByTitle(String search); } diff --git a/src/main/java/com/codeup/adlister/dao/ListAdsDao.java b/src/main/java/com/codeup/adlister/dao/ListAdsDao.java index 079a12bb0b..9a693520af 100644 --- a/src/main/java/com/codeup/adlister/dao/ListAdsDao.java +++ b/src/main/java/com/codeup/adlister/dao/ListAdsDao.java @@ -86,14 +86,35 @@ private Ad extractAd(ResultSet rs) throws SQLException { rs.getString("description") ); } + + 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; + } @Override - public Ad findByTitle(String search) + public List findByTitle(String search) { String query = "SELECT * FROM ads WHERE title LIKE ? "; try { PreparedStatement stmt = connection.prepareStatement(query); stmt.setString(1, search); - return (Ad) extractAd(stmt.executeQuery()); + return createAdsFromResults(stmt.executeQuery()); + } catch (SQLException e) { + throw new RuntimeException("Error finding ads by search", e); + } + } + + public List findByID(Long user_id) + { + String query = "SELECT * FROM ads WHERE user_id = ? "; + try { + PreparedStatement stmt = connection.prepareStatement(query); + stmt.setLong(1, user_id); + return createAdsFromResults(stmt.executeQuery()); } catch (SQLException e) { throw new RuntimeException("Error finding ads by search", e); } diff --git a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java index e98a5c8e57..e6df8fad85 100644 --- a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java +++ b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java @@ -67,23 +67,40 @@ public Ad findByUserID(long user_id) } } @Override - public Ad findByTitle(String search) + public List findByTitle(String search) { - String query = "SELECT * FROM ads WHERE title = ? LIMIT 1"; + 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 new Ad( - rs.getLong("id"), - rs.getLong("user_id"), - rs.getString("title"), - rs.getString("description") - ); +// return new Ad( +// rs.getLong("id"), +// rs.getLong("user_id"), +// rs.getString("title"), +// rs.getString("description") +// ); + return createAdsFromResults(stmt.executeQuery()); } catch (SQLException e) { - throw new RuntimeException("Error finding ads by search", e); +// throw new RuntimeException("Error finding ads by search", e); + throw new RuntimeException(e.toString()); + } + } + + @Override + public List findByID(Long user_id) { + String query = "SELECT * FROM ads WHERE user_id = ?"; + try { + PreparedStatement stmt = connection.prepareStatement(query); + stmt.setLong(1, user_id); + ResultSet rs = stmt.executeQuery(); + rs.next(); + return createAdsFromResults(stmt.executeQuery()); + } catch (SQLException e) { +// throw new RuntimeException("Error finding ads by search", e); + throw new RuntimeException(e.toString()); } } @@ -95,6 +112,7 @@ private List createAdsFromResults(ResultSet rs) throws SQLException { } return ads; } + private Ad extractAd(ResultSet rs) throws SQLException { // if (! rs.next()) { // return null; diff --git a/src/main/webapp/WEB-INF/ads/index.jsp b/src/main/webapp/WEB-INF/ads/index.jsp index 02da0b6760..900135fd30 100644 --- a/src/main/webapp/WEB-INF/ads/index.jsp +++ b/src/main/webapp/WEB-INF/ads/index.jsp @@ -18,6 +18,18 @@

    ${ad.description}

    + + +
    +

    ${ad2.title}

    +

    ${ad2.description}

    +
    +     + +<%--
    --%> +<%--

    ${ads2.title}

    --%> +<%--

    ${ads2.description}

    --%> +<%--
    --%> From 375906a13e8dcf50178f1cce4ecc1111d0553b3b Mon Sep 17 00:00:00 2001 From: CleoBreaux Date: Tue, 15 Nov 2022 15:13:10 -0600 Subject: [PATCH 11/17] added functionality to profile page to show ads --- .../controllers/ViewProfileServlet.java | 13 ++++++-- .../webapp/WEB-INF/partials/integrating.sql | 30 +++++++++++++++++++ src/main/webapp/WEB-INF/profile.jsp | 1 + 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 src/main/webapp/WEB-INF/partials/integrating.sql diff --git a/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java b/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java index a97e9c4345..86482c9e58 100644 --- a/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java @@ -1,7 +1,9 @@ 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; @@ -18,12 +20,17 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t return; } -// User user = (User) request.getSession().getAttributeNames(); + User user = (User) request.getSession().getAttribute("user"); + + long id = user.getId(); + + System.out.println(user.getId()); // -// request.setAttribute("ads", DaoFactory.getAdsDao().findByUserID(user.getId())); + request.setAttribute("ads", DaoFactory.getAdsDao().findByID(id)); request.getRequestDispatcher("/WEB-INF/profile.jsp").forward(request, response); - } + + } 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/profile.jsp b/src/main/webapp/WEB-INF/profile.jsp index ebe4afc3e0..4e41a0e07f 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" %> From e4fd8da5982c59d197790258edc2a275e7b9d40d Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Wed, 16 Nov 2022 12:08:17 -0600 Subject: [PATCH 12/17] single ad page --- .../adlister/controllers/AdsIndexServlet.java | 2 +- .../controllers/AdsSearchServlet.java | 24 ----------------- .../adlister/controllers/SingleAdServlet.java | 26 +++++++++++++++++++ .../com/codeup/adlister/dao/MySQLAdsDao.java | 6 +---- src/main/webapp/WEB-INF/ads/index.jsp | 4 +-- src/main/webapp/WEB-INF/ads/single-ad.jsp | 16 ++++++++++++ .../webapp/WEB-INF/partials/navbar-ads.jsp | 6 ++--- 7 files changed, 49 insertions(+), 35 deletions(-) delete mode 100644 src/main/java/com/codeup/adlister/controllers/AdsSearchServlet.java create mode 100644 src/main/java/com/codeup/adlister/controllers/SingleAdServlet.java create mode 100644 src/main/webapp/WEB-INF/ads/single-ad.jsp diff --git a/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java b/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java index 8758055655..92806865d5 100644 --- a/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java @@ -28,4 +28,4 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S 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/AdsSearchServlet.java b/src/main/java/com/codeup/adlister/controllers/AdsSearchServlet.java deleted file mode 100644 index 922a5d7752..0000000000 --- a/src/main/java/com/codeup/adlister/controllers/AdsSearchServlet.java +++ /dev/null @@ -1,24 +0,0 @@ -//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; -//import javax.servlet.http.HttpServlet; -//import javax.servlet.http.HttpServletRequest; -//import javax.servlet.http.HttpServletResponse; -//import java.io.IOException; -// -//@WebServlet(name = "controllers.AdsIndexServlet", urlPatterns = "/ads") -//public class AdsSearchServlet extends HttpServlet { -// protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { -// request.setAttribute("ads", DaoFactory.getAdsDao().all()); -// request.getRequestDispatcher("/WEB-INF/ads/index.jsp").forward(request, response); -// -// String searchQuery = request.getParameter("search"); -// System.out.println(searchQuery); -// Ad search = (Ad) DaoFactory.getAdsDao().findByTitle(searchQuery); -// } -//} 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..cbda733521 --- /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 = "/ad?id=${ad.id}") +public class SingleAdServlet extends HttpServlet +{ + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + { + long id = Long.parseLong(req.getParameter("id")); + Ad ad = (Ad) DaoFactory.getAdsDao().findByID(id); + System.out.println(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/dao/MySQLAdsDao.java b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java index e6df8fad85..2e894a2c73 100644 --- a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java +++ b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java @@ -99,7 +99,6 @@ public List findByID(Long user_id) { rs.next(); return createAdsFromResults(stmt.executeQuery()); } catch (SQLException e) { -// throw new RuntimeException("Error finding ads by search", e); throw new RuntimeException(e.toString()); } } @@ -114,9 +113,7 @@ private List createAdsFromResults(ResultSet rs) throws SQLException { } private Ad extractAd(ResultSet rs) throws SQLException { -// if (! rs.next()) { -// return null; -// } + 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")); @@ -126,6 +123,5 @@ private Ad extractAd(ResultSet rs) throws SQLException { rs.getString("title"), rs.getString("description") ); -// } } } diff --git a/src/main/webapp/WEB-INF/ads/index.jsp b/src/main/webapp/WEB-INF/ads/index.jsp index 900135fd30..3aa45b7bb5 100644 --- a/src/main/webapp/WEB-INF/ads/index.jsp +++ b/src/main/webapp/WEB-INF/ads/index.jsp @@ -14,14 +14,14 @@
    -

    ${ad.title}

    +

    ${ad.title}

    ${ad.description}
    -

    ${ad2.title}

    +

    ${ad2.title}

    ${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/partials/navbar-ads.jsp b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp index 1796bb3a10..b353f77c7e 100644 --- a/src/main/webapp/WEB-INF/partials/navbar-ads.jsp +++ b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp @@ -4,9 +4,9 @@
    Adlister
    -
    -
    - + +
    +
      From 6d3a40eec8d42f2b3e0d8fadaeda1bee55320a48 Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Wed, 16 Nov 2022 13:11:04 -0600 Subject: [PATCH 13/17] single ad page --- .../controllers/HelloWorldServlet.java | 14 -- .../adlister/controllers/SingleAdServlet.java | 10 +- .../java/com/codeup/adlister/dao/Ads.java | 2 +- .../com/codeup/adlister/dao/ListAdsDao.java | 123 ------------------ .../com/codeup/adlister/dao/MySQLAdsDao.java | 8 +- src/main/webapp/WEB-INF/ads/index.jsp | 18 ++- 6 files changed, 24 insertions(+), 151 deletions(-) delete mode 100644 src/main/java/com/codeup/adlister/controllers/HelloWorldServlet.java delete mode 100644 src/main/java/com/codeup/adlister/dao/ListAdsDao.java 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/SingleAdServlet.java b/src/main/java/com/codeup/adlister/controllers/SingleAdServlet.java index cbda733521..eafa401057 100644 --- a/src/main/java/com/codeup/adlister/controllers/SingleAdServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/SingleAdServlet.java @@ -10,15 +10,15 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet(name = "controllers.IndividualAdServlet", urlPatterns = "/ad?id=${ad.id}") +@WebServlet(name = "controllers.IndividualAdServlet", urlPatterns = "/ads/singles") public class SingleAdServlet extends HttpServlet { @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - long id = Long.parseLong(req.getParameter("id")); - Ad ad = (Ad) DaoFactory.getAdsDao().findByID(id); - System.out.println(id); + 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/dao/Ads.java b/src/main/java/com/codeup/adlister/dao/Ads.java index e940e4f6fc..531c49b9eb 100644 --- a/src/main/java/com/codeup/adlister/dao/Ads.java +++ b/src/main/java/com/codeup/adlister/dao/Ads.java @@ -13,6 +13,6 @@ public interface Ads { Ad findByUserID(long userID); List findByTitle(String search); - List findByID(Long user_id); + Ad findByID(Long user_id); // List findByTitle(String search); } 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 9a693520af..0000000000 --- a/src/main/java/com/codeup/adlister/dao/ListAdsDao.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.codeup.adlister.dao; - -import com.codeup.adlister.models.Ad; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; - -public class ListAdsDao implements Ads { - private List ads; - private Connection connection = null; - - 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(); - } - - public Ad findByUserID(long userID){ - List newAds = new ArrayList<>(); - newAds.add((Ad) DaoFactory.getAdsDao().all()); - - List returnAds = new ArrayList<>(); - - for(Ad ad : newAds) - { - if(userID == ad.getUserId()) - { - returnAds.add(ad); - } - } - - return (Ad) returnAds; - } - - 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; - } - - private Ad extractAd(ResultSet rs) throws SQLException { - return new Ad( - rs.getLong("id"), - rs.getLong("user_id"), - rs.getString("title"), - rs.getString("description") - ); - } - - 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; - } - @Override - public List findByTitle(String search) - { - String query = "SELECT * FROM ads WHERE title LIKE ? "; - try { - PreparedStatement stmt = connection.prepareStatement(query); - stmt.setString(1, search); - return createAdsFromResults(stmt.executeQuery()); - } catch (SQLException e) { - throw new RuntimeException("Error finding ads by search", e); - } - } - - public List findByID(Long user_id) - { - String query = "SELECT * FROM ads WHERE user_id = ? "; - try { - PreparedStatement stmt = connection.prepareStatement(query); - stmt.setLong(1, user_id); - return createAdsFromResults(stmt.executeQuery()); - } catch (SQLException e) { - throw new RuntimeException("Error finding ads by search", e); - } - } - -} diff --git a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java index 2e894a2c73..5d4b5b5411 100644 --- a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java +++ b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java @@ -90,14 +90,14 @@ public List findByTitle(String search) } @Override - public List findByID(Long user_id) { - String query = "SELECT * FROM ads WHERE user_id = ?"; + public Ad findByID(Long ad_id) { + String query = "SELECT * FROM ads WHERE id = ?"; try { PreparedStatement stmt = connection.prepareStatement(query); - stmt.setLong(1, user_id); + stmt.setLong(1, ad_id); ResultSet rs = stmt.executeQuery(); rs.next(); - return createAdsFromResults(stmt.executeQuery()); + return extractAd(rs); } catch (SQLException e) { throw new RuntimeException(e.toString()); } diff --git a/src/main/webapp/WEB-INF/ads/index.jsp b/src/main/webapp/WEB-INF/ads/index.jsp index 3aa45b7bb5..1b0e939b9a 100644 --- a/src/main/webapp/WEB-INF/ads/index.jsp +++ b/src/main/webapp/WEB-INF/ads/index.jsp @@ -11,17 +11,27 @@

      Here Are all the ads!

      - +<%--
      + + + + +
      --%> -
      -

      ${ad.title}

       + +
      +
      + + +

      ${ad.description}

      +
      -

      ${ad2.title}

       +

      ${ad2.title}

      ${ad2.description}

       From eacb8b20b83625b29b781047ccdda06dbe6d5311 Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Wed, 16 Nov 2022 13:16:54 -0600 Subject: [PATCH 14/17] run it back --- src/main/webapp/WEB-INF/ads/index.jsp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/WEB-INF/ads/index.jsp b/src/main/webapp/WEB-INF/ads/index.jsp index 1b0e939b9a..0c56174f69 100644 --- a/src/main/webapp/WEB-INF/ads/index.jsp +++ b/src/main/webapp/WEB-INF/ads/index.jsp @@ -11,12 +11,7 @@

      Here Are all the ads!

      -<%--
      - - - - -
      --%> +
      @@ -30,16 +25,15 @@ -
      -

      ${ad2.title}

       +
      +
      + + +

      ${ad2.description}

      -<%--
      --%> -<%--

      ${ads2.title}

      --%> -<%--

      ${ads2.description}

      --%> -<%--
      --%>
      From ea579a58ed02cab9afa2d7f7c3f72eef85a2b4b5 Mon Sep 17 00:00:00 2001 From: Julian Gutierrez Date: Wed, 16 Nov 2022 16:10:32 -0600 Subject: [PATCH 15/17] added update function to the ads section in the user profile page --- .../controllers/UpdateProfileServlet.java | 35 +++++++++++++++++++ .../controllers/ViewProfileServlet.java | 2 +- .../java/com/codeup/adlister/dao/Ads.java | 3 +- .../com/codeup/adlister/dao/MySQLAdsDao.java | 24 +++++++++++-- src/main/webapp/WEB-INF/profile.jsp | 6 ++++ src/main/webapp/WEB-INF/update.jsp | 23 ++++++++++++ 6 files changed, 88 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/codeup/adlister/controllers/UpdateProfileServlet.java create mode 100644 src/main/webapp/WEB-INF/update.jsp 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 86482c9e58..5c6c7f9a9b 100644 --- a/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java +++ b/src/main/java/com/codeup/adlister/controllers/ViewProfileServlet.java @@ -26,7 +26,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t System.out.println(user.getId()); // - request.setAttribute("ads", DaoFactory.getAdsDao().findByID(id)); + 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 531c49b9eb..ed26df3f84 100644 --- a/src/main/java/com/codeup/adlister/dao/Ads.java +++ b/src/main/java/com/codeup/adlister/dao/Ads.java @@ -10,9 +10,10 @@ public interface Ads { List all(); // insert a new ad and return the new ad's id Long insert(Ad ad); - Ad findByUserID(long userID); + 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); } diff --git a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java index 5d4b5b5411..f17fb97a88 100644 --- a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java +++ b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java @@ -55,13 +55,13 @@ public Long insert(Ad ad) { } } - public Ad findByUserID(long user_id) + public List findByUserID(long user_id) { PreparedStatement stmt = null; try { - stmt = connection.prepareStatement("SELECT * FROM ads WHERE user_id = ? LIMIT 1"); + stmt = connection.prepareStatement("SELECT * FROM ads WHERE user_id = ?"); stmt.setLong(1, user_id); - return (Ad) extractAd(stmt.executeQuery()); + return createAdsFromResults(stmt.executeQuery()); } catch (SQLException e) { throw new RuntimeException("Error finding ads by user_id", e); } @@ -103,6 +103,24 @@ public Ad findByID(Long ad_id) { } } + @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()) { diff --git a/src/main/webapp/WEB-INF/profile.jsp b/src/main/webapp/WEB-INF/profile.jsp index 4e41a0e07f..eab8fd83f8 100644 --- a/src/main/webapp/WEB-INF/profile.jsp +++ b/src/main/webapp/WEB-INF/profile.jsp @@ -17,6 +17,12 @@

      ${ad.title}

      ${ad.description}

      +
      + + + + +
      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 + + +
      + + + + + + +
      + + From ba42df1ea931452bcc0951ba6979a119cad91ee0 Mon Sep 17 00:00:00 2001 From: CleoBreaux Date: Wed, 16 Nov 2022 16:56:09 -0600 Subject: [PATCH 16/17] added delete function --- .../adlister/controllers/DeleteServlet.java | 26 +++++++++++++++++++ .../java/com/codeup/adlister/dao/Ads.java | 2 ++ .../com/codeup/adlister/dao/MySQLAdsDao.java | 14 ++++++++++ src/main/webapp/WEB-INF/profile.jsp | 6 +++++ 4 files changed, 48 insertions(+) create mode 100644 src/main/java/com/codeup/adlister/controllers/DeleteServlet.java 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/dao/Ads.java b/src/main/java/com/codeup/adlister/dao/Ads.java index ed26df3f84..f65fc3db67 100644 --- a/src/main/java/com/codeup/adlister/dao/Ads.java +++ b/src/main/java/com/codeup/adlister/dao/Ads.java @@ -16,4 +16,6 @@ public interface Ads { 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/MySQLAdsDao.java b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java index f17fb97a88..3d6dda84f2 100644 --- a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java +++ b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java @@ -142,4 +142,18 @@ private Ad extractAd(ResultSet rs) throws SQLException { 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/webapp/WEB-INF/profile.jsp b/src/main/webapp/WEB-INF/profile.jsp index eab8fd83f8..53b6d0cc1f 100644 --- a/src/main/webapp/WEB-INF/profile.jsp +++ b/src/main/webapp/WEB-INF/profile.jsp @@ -23,6 +23,12 @@ + +
      + + +
      +
      From 1269d3e507b0dab33417af945d37e9bdeaa74d0a Mon Sep 17 00:00:00 2001 From: Ramaj Johnson Date: Thu, 17 Nov 2022 11:17:34 -0600 Subject: [PATCH 17/17] done --- .../com/codeup/adlister/dao/MySQLAdsDao.java | 8 +-- src/main/webapp/WEB-INF/ads/create.jsp | 4 +- src/main/webapp/WEB-INF/ads/index.jsp | 17 +++-- src/main/webapp/WEB-INF/login.jsp | 26 ++++--- src/main/webapp/WEB-INF/partials/head.jsp | 2 +- src/main/webapp/WEB-INF/partials/index.html | 67 +++++++++++++++++++ .../webapp/WEB-INF/partials/login-css.jsp | 1 + .../webapp/WEB-INF/partials/navbar-ads.jsp | 18 +++-- .../webapp/WEB-INF/partials/navbar-create.jsp | 4 +- .../webapp/WEB-INF/partials/navbar-login.jsp | 6 +- .../WEB-INF/partials/navbar-profile.jsp | 10 +-- .../WEB-INF/partials/navbar-register.jsp | 4 +- src/main/webapp/WEB-INF/partials/navbar.jsp | 10 +-- src/main/webapp/WEB-INF/partials/signin.css | 39 +++++++++++ src/main/webapp/WEB-INF/profile.jsp | 2 +- src/main/webapp/index.jsp | 2 +- 16 files changed, 169 insertions(+), 51 deletions(-) create mode 100644 src/main/webapp/WEB-INF/partials/index.html create mode 100644 src/main/webapp/WEB-INF/partials/login-css.jsp create mode 100644 src/main/webapp/WEB-INF/partials/signin.css diff --git a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java index 3d6dda84f2..f1bf2d7324 100644 --- a/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java +++ b/src/main/java/com/codeup/adlister/dao/MySQLAdsDao.java @@ -76,15 +76,9 @@ public List findByTitle(String search) ResultSet rs = stmt.executeQuery(); rs.next(); System.out.println("Below is our search results"); -// return new Ad( -// rs.getLong("id"), -// rs.getLong("user_id"), -// rs.getString("title"), -// rs.getString("description") -// ); + return createAdsFromResults(stmt.executeQuery()); } catch (SQLException e) { -// throw new RuntimeException("Error finding ads by search", e); throw new RuntimeException(e.toString()); } } diff --git a/src/main/webapp/WEB-INF/ads/create.jsp b/src/main/webapp/WEB-INF/ads/create.jsp index 467c1f0f17..3cf292a93e 100644 --- a/src/main/webapp/WEB-INF/ads/create.jsp +++ b/src/main/webapp/WEB-INF/ads/create.jsp @@ -8,8 +8,8 @@ -
      -

      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 0c56174f69..4f8f930b77 100644 --- a/src/main/webapp/WEB-INF/ads/index.jsp +++ b/src/main/webapp/WEB-INF/ads/index.jsp @@ -9,21 +9,24 @@ -
      -

      Here Are all the ads!

      +
      +

      All Ads

      - +
      +
      -
      + +
      - + + -

      ${ad.description}

      -       +
      +
      diff --git a/src/main/webapp/WEB-INF/login.jsp b/src/main/webapp/WEB-INF/login.jsp index 9ffb4bc069..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/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 index b353f77c7e..ff724d7f59 100644 --- a/src/main/webapp/WEB-INF/partials/navbar-ads.jsp +++ b/src/main/webapp/WEB-INF/partials/navbar-ads.jsp @@ -1,18 +1,22 @@ -
      diff --git a/src/main/webapp/WEB-INF/partials/navbar-profile.jsp b/src/main/webapp/WEB-INF/partials/navbar-profile.jsp index 68c0a489e2..366dd19af2 100644 --- a/src/main/webapp/WEB-INF/partials/navbar-profile.jsp +++ b/src/main/webapp/WEB-INF/partials/navbar-profile.jsp @@ -1,12 +1,12 @@ -
      diff --git a/src/main/webapp/WEB-INF/partials/navbar.jsp b/src/main/webapp/WEB-INF/partials/navbar.jsp index f668a02045..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 53b6d0cc1f..f3d90c6066 100644 --- a/src/main/webapp/WEB-INF/profile.jsp +++ b/src/main/webapp/WEB-INF/profile.jsp @@ -9,7 +9,7 @@ -
      +

      Welcome, ${sessionScope.user.username}!

      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!