Boryana dimova

.gitignore

@@ -1,4 +1,4 @@
 *.iml
 target/
 .idea/
-Config.java
+src/main/java/Config.java

pom.xml

@@ -24,11 +24,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.mindrot</groupId>
-            <artifactId>jbcrypt</artifactId>
-            <version>0.3m</version>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -42,7 +37,13 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>6.0.5</version>
+            <version>8.0.23</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.mindrot/jbcrypt -->
+        <dependency>
+            <groupId>org.mindrot</groupId>
+            <artifactId>jbcrypt</artifactId>
+            <version>0.4</version>
         </dependency>
     </dependencies>
 

src/main/java/com/codeup/adlister/models/Ad.java → src/main/java/Ad.java

@@ -1,11 +1,8 @@
-package com.codeup.adlister.models;
-
 public class Ad {
     private long id;
     private long userId;
     private String title;
     private String description;
-
     public Ad(long id, long userId, String title, String description) {
         this.id = id;
         this.userId = userId;

src/main/java/Ads.java

@@ -0,0 +1,6 @@
+import java.util.List;
+
+public interface Ads {
+    List<Ad> all();
+    Long insert(Ad ad);
+}

src/main/java/com/codeup/adlister/controllers/AdsIndexServlet.java → src/main/java/AdsIndexServlet.java

@@ -1,18 +1,20 @@
-package com.codeup.adlister.controllers;
-
-import com.codeup.adlister.dao.DaoFactory;
-
 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;
+import java.io.Serializable;
+import java.util.List;
 
-@WebServlet(name = "controllers.AdsIndexServlet", urlPatterns = "/ads")
+@WebServlet(name = "AdsIndexServlet", urlPatterns = "/ads")
 public class AdsIndexServlet 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);
+
+        Ads adsDao = DaoFactory.getAdsDao();
+
+        List<Ad> currentAds = adsDao.all();
+        request.setAttribute("allAds", currentAds);
+        request.getRequestDispatcher("/ads/index.jsp").forward(request, response);
     }
 }

src/main/java/com/codeup/adlister/controllers/CounterServlet.java → src/main/java/CounterServlet.java

@@ -1,12 +1,10 @@
-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.CounterServlet", urlPatterns = "/count")
+@WebServlet(name = "CounterServlet", urlPatterns = "/count")
 public class CounterServlet extends HttpServlet {
     private int counter = 0;
 

src/main/java/com/codeup/adlister/controllers/CreateAdServlet.java → src/main/java/CreateAdServlet.java

@@ -1,9 +1,3 @@
-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;
@@ -19,15 +13,15 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
             return;
         }
         request.getRequestDispatcher("/WEB-INF/ads/create.jsp")
-            .forward(request, response);
+                .forward(request, response);
     }
 
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
         User user = (User) request.getSession().getAttribute("user");
         Ad ad = new Ad(
-            user.getId(),
-            request.getParameter("title"),
-            request.getParameter("description")
+                user.getId(),
+                request.getParameter("title"),
+                request.getParameter("description")
         );
         DaoFactory.getAdsDao().insert(ad);
         response.sendRedirect("/ads");

src/main/java/DaoFactory.java

@@ -0,0 +1,10 @@
+public class DaoFactory {
+    public static Ads adsDao;
+
+    public static Ads getAdsDao() {
+        if(adsDao == null) {
+            adsDao = new ListAdsDao();
+        }
+        return adsDao;
+    }
+}

src/main/java/HelloWorldServlet1.java

@@ -0,0 +1,14 @@
+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 = "HelloWorldServlet", urlPatterns = "/")
+public class HelloWorldServlet1 extends HttpServlet {
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+//         response.getWriter().println("<h1>Hello, World!</h1>");
+        request.getRequestDispatcher("/index.jsp").forward(request, response);
+    }
+}

src/main/java/ListAdsDao.java

@@ -0,0 +1,58 @@
+import java.util.ArrayList;
+import java.util.List;
+
+public class ListAdsDao implements Ads {
+    private List<Ad> ads;
+
+    public List<Ad> all() {
+        if (ads == null) {
+            ads = generateAds();
+        }
+        return ads;
+    }
+
+    @Override
+    public Long insert(Ad ad) {
+        return null;
+    }
+
+    //    public Long insert(Ad ad) {
+//        if (ads == null) {
+//            ads = generateAds();
+//        }
+//
+//        ad.setId((long) ads.size());
+//        ads.add(ad);
+//        return ad.getId();
+//    }
+//
+    private List<Ad> generateAds() {
+        List<Ad> 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;
+    }
+}
+

src/main/java/LoginServlet.java

@@ -0,0 +1,38 @@
+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 = "LoginServlet", urlPatterns = "/login")
+public class LoginServlet extends HttpServlet {
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+//        request.getRequestDispatcher("/login.jsp").forward(request, response);
+        if (request.getSession().getAttribute("user") != null) {
+            response.sendRedirect("/profile");
+            return;
+        }
+        request.getRequestDispatcher("/login.jsp").forward(request, response);
+    }
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        String userName = request.getParameter("userName");
+        String pass = request.getParameter("password");
+//        if (userName.equals("admin") && pass.equals("password")) {
+//            response.sendRedirect("/profile");
+//        } else {
+//            response.sendRedirect("/login");
+//        }
+        boolean validAttempt = true;
+        if (validAttempt) {
+            // TODO: store the logged in user object in the session, instead of just the username
+            request.getSession().setAttribute("user", userName);
+            response.sendRedirect("/profile");
+        } else {
+            response.sendRedirect("/login");
+        }
+    }
+}
+

src/main/java/com/codeup/adlister/controllers/LogoutServlet.java → src/main/java/LogoutServlet.java

@@ -1,5 +1,3 @@
-package com.codeup.adlister.controllers;
-
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -13,4 +11,4 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         request.getSession().invalidate();
         response.sendRedirect("/login");
     }
-}
+}

src/main/java/PickColorServlet.java

@@ -0,0 +1,19 @@
+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("/pick-color")
+public class PickColorServlet extends HttpServlet {
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        request.getRequestDispatcher("/pick-color.jsp").forward(request, response);
+    }
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        String color = request.getParameter("color");
+        response.sendRedirect("/view-color?viewcolor=" + color); //query string
+    }
+ }

src/main/java/PizzaOrder.java

@@ -0,0 +1,29 @@
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+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 = "PizzaOrder", urlPatterns = "/pizza-order")
+public class PizzaOrder extends HttpServlet{
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        request.getRequestDispatcher("/pizza-order.jsp").forward(request, response);
+    }
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        System.out.println(request.getParameter("crust-type"));
+        System.out.println(request.getParameter("sauce-type"));
+        String[] toppings = request.getParameterValues("toppings");
+        for(String topping : toppings){
+            System.out.println(topping);
+            System.out.println(" ");
+        }
+        System.out.println(" ");
+        System.out.println(request.getParameter("address"));
+        response.sendRedirect("/");
+    }
+}

src/main/java/com/codeup/adlister/models/User.java → src/main/java/User.java

@@ -1,19 +1,13 @@
-package com.codeup.adlister.models;
-
-import com.codeup.adlister.util.Password;
+import sun.security.util.Password;
 
 public class User {
     private long id;
     private String username;
     private String email;
     private String password;
 
-    public User() {}
+    public User() {
 
-    public User(String username, String email, String password) {
-        this.username = username;
-        this.email = email;
-        setPassword(password);
     }
 
     public User(long id, String username, String email, String password) {
@@ -23,6 +17,14 @@ public User(long id, String username, String email, String password) {
         this.password = password;
     }
 
+    public User(String username, String email, String password) {
+        this.username = username;
+        this.email = email;
+        this.password = password;
+    }
+
+
+
     public long getId() {
         return id;
     }
@@ -52,6 +54,6 @@ public String getPassword() {
     }
 
     public void setPassword(String password) {
-        this.password = Password.hash(password);
+        this.password = password;
     }
 }