From 20a409954959081dca4749ed893b72bff4e83827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A4=EC=A0=95?= <70215620+yunjeongiya@users.noreply.github.com> Date: Fri, 5 Apr 2024 21:22:24 +0900 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=EC=9A=94=EA=B5=AC=EC=82=AC?= =?UTF-8?q?=ED=95=AD=201:=20HomeController?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jwp/controller/HomeController.java | 22 +++++++++++++++++++ webapp/{index.html => index.jsp} | 4 ++++ webapp/qna/show.html | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 src/main/java/jwp/controller/HomeController.java rename webapp/{index.html => index.jsp} (97%) diff --git a/src/main/java/jwp/controller/HomeController.java b/src/main/java/jwp/controller/HomeController.java new file mode 100644 index 0000000..6d097e0 --- /dev/null +++ b/src/main/java/jwp/controller/HomeController.java @@ -0,0 +1,22 @@ +package jwp.controller; + +import core.db.MemoryUserRepository; +import jwp.model.User; +import org.apache.coyote.Request; + +import javax.servlet.RequestDispatcher; +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("/") +public class HomeController extends HttpServlet { + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + RequestDispatcher rd = request.getRequestDispatcher("home.jsp"); + rd.forward(request, response); + } +} diff --git a/webapp/index.html b/webapp/index.jsp similarity index 97% rename from webapp/index.html rename to webapp/index.jsp index 74f10ab..60cfc3b 100644 --- a/webapp/index.html +++ b/webapp/index.jsp @@ -1,3 +1,7 @@ +// jsp +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +// jstl +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> diff --git a/webapp/qna/show.html b/webapp/qna/show.html index 740acd1..72fa33d 100644 --- a/webapp/qna/show.html +++ b/webapp/qna/show.html @@ -91,7 +91,7 @@

객체지향에서 가장 중요하다고 생각하는 것
  • - 목록 + 목록
    • From dacbd0f2db951ae579e9f43e5056732ba14cd7c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A4=EC=A0=95?= <70215620+yunjeongiya@users.noreply.github.com> Date: Fri, 5 Apr 2024 21:34:57 +0900 Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=EC=9A=94=EA=B5=AC=EC=82=AC?= =?UTF-8?q?=ED=95=AD=202:=20=EC=A4=91=EB=B3=B5=EB=90=9C=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/include/header.jspf | 7 +++ webapp/include/navigation.jspf | 42 +++++++++++++++ webapp/index.jsp | 59 ++------------------- webapp/qna/form.html | 80 ---------------------------- webapp/qna/form.jsp | 34 ++++++++++++ webapp/qna/{show.html => show.jsp} | 56 ++------------------ webapp/user/form.html | 85 ------------------------------ webapp/user/form.jsp | 39 ++++++++++++++ webapp/user/list.jsp | 54 +------------------ webapp/user/login.html | 74 -------------------------- webapp/user/login.jsp | 29 ++++++++++ webapp/user/login_failed.html | 77 --------------------------- webapp/user/login_failed.jsp | 32 +++++++++++ 13 files changed, 195 insertions(+), 473 deletions(-) create mode 100644 webapp/include/header.jspf create mode 100644 webapp/include/navigation.jspf delete mode 100644 webapp/qna/form.html create mode 100644 webapp/qna/form.jsp rename webapp/qna/{show.html => show.jsp} (73%) delete mode 100644 webapp/user/form.html create mode 100644 webapp/user/form.jsp delete mode 100644 webapp/user/login.html create mode 100644 webapp/user/login.jsp delete mode 100644 webapp/user/login_failed.html create mode 100644 webapp/user/login_failed.jsp diff --git a/webapp/include/header.jspf b/webapp/include/header.jspf new file mode 100644 index 0000000..1854784 --- /dev/null +++ b/webapp/include/header.jspf @@ -0,0 +1,7 @@ + + + + KUIT + + + \ No newline at end of file diff --git a/webapp/include/navigation.jspf b/webapp/include/navigation.jspf new file mode 100644 index 0000000..fc80dd5 --- /dev/null +++ b/webapp/include/navigation.jspf @@ -0,0 +1,42 @@ + +
    +
    + + + + + + +
    + Login + Sign-up +
    +
    +
    \ No newline at end of file diff --git a/webapp/index.jsp b/webapp/index.jsp index 60cfc3b..74255b2 100644 --- a/webapp/index.jsp +++ b/webapp/index.jsp @@ -1,59 +1,10 @@ -// jsp <%@ page contentType="text/html;charset=UTF-8" language="java" %> -// jstl <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - - - - KUIT - - - +<%@ include file="include/navigation.jspf"%> - -
    -
    - - - - - - -
    - Login - Sign-up -
    -
    -
    +<%@ include file="include/navigation.jspf" %>

    Q&A

    @@ -62,7 +13,7 @@
    - 객체지향에서 가장 중요하다고 생각하는 것이 무엇인가요? + 객체지향에서 가장 중요하다고 생각하는 것이 무엇인가요?
    @@ -80,7 +31,7 @@
    - 동아리에 시간 얼마나 투자할 수 있는지? + 동아리에 시간 얼마나 투자할 수 있는지?
    @@ -113,7 +64,7 @@
    - 질문하기 + 질문하기
    diff --git a/webapp/qna/form.html b/webapp/qna/form.html deleted file mode 100644 index db01fcd..0000000 --- a/webapp/qna/form.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - KUIT - - - - - -
    -
    - - - - - - -
    - Login - Sign-up -
    -
    -
    - -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    - -
    - -
    -
    -
    - - - - - \ No newline at end of file diff --git a/webapp/qna/form.jsp b/webapp/qna/form.jsp new file mode 100644 index 0000000..eda0ed9 --- /dev/null +++ b/webapp/qna/form.jsp @@ -0,0 +1,34 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + + + <%@ include file="../include/navigation.jspf" %> + + <%@ include file="../include/header.jspf" %> +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    + +
    + +
    +
    +
    + + + + + \ No newline at end of file diff --git a/webapp/qna/show.html b/webapp/qna/show.jsp similarity index 73% rename from webapp/qna/show.html rename to webapp/qna/show.jsp index 72fa33d..df08459 100644 --- a/webapp/qna/show.html +++ b/webapp/qna/show.jsp @@ -1,56 +1,10 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - - - - KUIT - - - - - -
    -
    - - - - - - -
    - Login - Sign-up -
    -
    -
    - +<%@ include file="../include/navigation.jspf" %> + +<%@ include file="../include/header.jspf" %>

    객체지향에서 가장 중요하다고 생각하는 것이 무엇인가요?

    diff --git a/webapp/user/form.html b/webapp/user/form.html deleted file mode 100644 index 038f2ca..0000000 --- a/webapp/user/form.html +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - KUIT - - - - - -
    -
    - - - - - - -
    - Login - Sign-up -
    -
    -
    - -
    - -
    - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    - -
    -
    -
    - - - - - \ No newline at end of file diff --git a/webapp/user/form.jsp b/webapp/user/form.jsp new file mode 100644 index 0000000..00eff69 --- /dev/null +++ b/webapp/user/form.jsp @@ -0,0 +1,39 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + + +<%@ include file="../include/navigation.jspf" %> + +<%@ include file="../include/header.jspf" %> +
    + +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + +
    +
    +
    + + + + + \ No newline at end of file diff --git a/webapp/user/list.jsp b/webapp/user/list.jsp index 8b5ea68..0146405 100644 --- a/webapp/user/list.jsp +++ b/webapp/user/list.jsp @@ -1,60 +1,10 @@ <%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - - - - - KUIT - - - +<%@ include file="../include/navigation.jspf" %> - -
    -
    - - - - - - -
    - Login - Sign-up -
    -
    - +<%@ include file="../include/header.jspf" %>
    diff --git a/webapp/user/login.html b/webapp/user/login.html deleted file mode 100644 index b54d6ed..0000000 --- a/webapp/user/login.html +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - KUIT - - - - - -
    -
    - - - - - - -
    - Login - Sign-up -
    -
    -
    -
    -
    -
    -

    Please sign in

    - -
    - - -
    -
    - - -
    - - - -
    -
    - - - - \ No newline at end of file diff --git a/webapp/user/login.jsp b/webapp/user/login.jsp new file mode 100644 index 0000000..f3befb5 --- /dev/null +++ b/webapp/user/login.jsp @@ -0,0 +1,29 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + + +<%@ include file="../include/navigation.jspf" %> + +<%@ include file="../include/header.jspf" %> +
    +
    +
    +

    Please sign in

    + +
    + + +
    +
    + + +
    + + + +
    +
    + + + + \ No newline at end of file diff --git a/webapp/user/login_failed.html b/webapp/user/login_failed.html deleted file mode 100644 index 3f6bd3f..0000000 --- a/webapp/user/login_failed.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - KUIT - - - - - -
    -
    - - - - - - -
    - Login - Sign-up -
    -
    -
    -
    -
    -
    - ID와 비밀번호가 틀렸습니다. -
    -
    -

    Please sign in

    - -
    - - -
    -
    - - -
    - - - -
    -
    - - - - \ No newline at end of file diff --git a/webapp/user/login_failed.jsp b/webapp/user/login_failed.jsp new file mode 100644 index 0000000..4c5b8f2 --- /dev/null +++ b/webapp/user/login_failed.jsp @@ -0,0 +1,32 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + + +<%@ include file="../include/navigation.jspf" %> + +<%@ include file="../include/header.jspf" %> +
    +
    +
    + ID와 비밀번호가 틀렸습니다. +
    +
    +

    Please sign in

    + +
    + + +
    +
    + + +
    + + + +
    +
    + + + + \ No newline at end of file From 5662070efd46467dd6c57f5a162a267205cc32d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A4=EC=A0=95?= <70215620+yunjeongiya@users.noreply.github.com> Date: Fri, 5 Apr 2024 21:48:01 +0900 Subject: [PATCH 3/8] fix: typo in .jsp --- webapp/{index.jsp => home.jsp} | 8 ++++---- webapp/include/navigation.jspf | 2 +- webapp/qna/form.jsp | 6 +++--- webapp/qna/show.jsp | 6 +++--- webapp/user/form.jsp | 4 ++-- webapp/user/list.jsp | 4 ++-- webapp/user/login.jsp | 4 ++-- webapp/user/login_failed.jsp | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) rename webapp/{index.jsp => home.jsp} (96%) diff --git a/webapp/index.jsp b/webapp/home.jsp similarity index 96% rename from webapp/index.jsp rename to webapp/home.jsp index 74255b2..1d07cd8 100644 --- a/webapp/index.jsp +++ b/webapp/home.jsp @@ -2,8 +2,8 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ include file="include/navigation.jspf"%> - +<%@ include file="include/header.jspf"%> + <%@ include file="include/navigation.jspf" %>

    Q&A

    @@ -48,7 +48,7 @@
    -
    +
    - + diff --git a/webapp/include/navigation.jspf b/webapp/include/navigation.jspf index fc80dd5..6a7ad16 100644 --- a/webapp/include/navigation.jspf +++ b/webapp/include/navigation.jspf @@ -28,7 +28,7 @@
      -
    • Q&A
      • +
    • Q&A
    • FAQs
    • User List
    • About
      • diff --git a/webapp/qna/form.jsp b/webapp/qna/form.jsp index eda0ed9..fb9a45e 100644 --- a/webapp/qna/form.jsp +++ b/webapp/qna/form.jsp @@ -2,9 +2,9 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - <%@ include file="../include/navigation.jspf" %> - - <%@ include file="../include/header.jspf" %> +<%@ include file="../include/header.jspf" %> + +<%@ include file="../include/navigation.jspf" %>
      diff --git a/webapp/qna/show.jsp b/webapp/qna/show.jsp index df08459..0098045 100644 --- a/webapp/qna/show.jsp +++ b/webapp/qna/show.jsp @@ -2,9 +2,9 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ include file="../include/navigation.jspf" %> - <%@ include file="../include/header.jspf" %> + +<%@ include file="../include/navigation.jspf" %>

      객체지향에서 가장 중요하다고 생각하는 것이 무엇인가요?

      @@ -45,7 +45,7 @@
    • - 목록 + 목록
    diff --git a/webapp/user/form.jsp b/webapp/user/form.jsp index 00eff69..5c3ea82 100644 --- a/webapp/user/form.jsp +++ b/webapp/user/form.jsp @@ -2,9 +2,9 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ include file="../include/navigation.jspf" %> - <%@ include file="../include/header.jspf" %> + +<%@ include file="../include/navigation.jspf" %>
    diff --git a/webapp/user/list.jsp b/webapp/user/list.jsp index 0146405..c3e40d9 100644 --- a/webapp/user/list.jsp +++ b/webapp/user/list.jsp @@ -2,9 +2,9 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ include file="../include/navigation.jspf" %> - <%@ include file="../include/header.jspf" %> + +<%@ include file="../include/navigation.jspf" %>
    diff --git a/webapp/user/login.jsp b/webapp/user/login.jsp index f3befb5..4ea9797 100644 --- a/webapp/user/login.jsp +++ b/webapp/user/login.jsp @@ -2,9 +2,9 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ include file="../include/navigation.jspf" %> - <%@ include file="../include/header.jspf" %> + +<%@ include file="../include/navigation.jspf" %>
    diff --git a/webapp/user/login_failed.jsp b/webapp/user/login_failed.jsp index 4c5b8f2..a016df0 100644 --- a/webapp/user/login_failed.jsp +++ b/webapp/user/login_failed.jsp @@ -2,9 +2,9 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ include file="../include/navigation.jspf" %> - <%@ include file="../include/header.jspf" %> + +<%@ include file="../include/navigation.jspf" %>
    From 4e9c2b93bcea710006cf6891b44d0728802c1329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A4=EC=A0=95?= <70215620+yunjeongiya@users.noreply.github.com> Date: Fri, 5 Apr 2024 22:05:15 +0900 Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=EC=9A=94=EA=B5=AC=EC=82=AC?= =?UTF-8?q?=ED=95=AD=203:=20=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=8B=A4=EC=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jwp/controller/UpdateUserController.java | 20 ++++++++++ .../controller/UpdateUserFormController.java | 29 ++++++++++++++ webapp/user/updateForm.jsp | 39 +++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 src/main/java/jwp/controller/UpdateUserController.java create mode 100644 src/main/java/jwp/controller/UpdateUserFormController.java create mode 100644 webapp/user/updateForm.jsp diff --git a/src/main/java/jwp/controller/UpdateUserController.java b/src/main/java/jwp/controller/UpdateUserController.java new file mode 100644 index 0000000..3e768f7 --- /dev/null +++ b/src/main/java/jwp/controller/UpdateUserController.java @@ -0,0 +1,20 @@ +package jwp.controller; + +import core.db.MemoryUserRepository; +import jwp.model.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("/user/update") +public class UpdateUserController extends HttpServlet { + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + User user = new User(req.getParameter("userId"), req.getParameter("password"), req.getParameter("name"), req.getParameter("email")); + MemoryUserRepository.getInstance().changeUserInfo(user); + resp.sendRedirect("/user/userList"); + } +} diff --git a/src/main/java/jwp/controller/UpdateUserFormController.java b/src/main/java/jwp/controller/UpdateUserFormController.java new file mode 100644 index 0000000..35ba9a2 --- /dev/null +++ b/src/main/java/jwp/controller/UpdateUserFormController.java @@ -0,0 +1,29 @@ +package jwp.controller; + +import core.db.MemoryUserRepository; + +import jwp.model.User; + +import javax.servlet.RequestDispatcher; +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("/user/updateForm") +public class UpdateUserFormController extends HttpServlet { + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + String userId = req.getParameter("userId"); + User user = MemoryUserRepository.getInstance().findUserById(userId); + if (user != null) { + req.setAttribute("user", user); + RequestDispatcher rd = req.getRequestDispatcher("/user/updateForm.jsp"); + rd.forward(req, resp); + return; + } + resp.sendRedirect("/"); + } +} diff --git a/webapp/user/updateForm.jsp b/webapp/user/updateForm.jsp new file mode 100644 index 0000000..87b874f --- /dev/null +++ b/webapp/user/updateForm.jsp @@ -0,0 +1,39 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + + +<%@ include file="../include/header.jspf" %> + +<%@ include file="../include/navigation.jspf" %> +
    + +
    + + +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + + +
    +
    + + + + + \ No newline at end of file From bfdb450b470dec13b0e8da09fff4ae25d5b022e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A4=EC=A0=95?= <70215620+yunjeongiya@users.noreply.github.com> Date: Fri, 5 Apr 2024 22:46:07 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=EC=9A=94=EA=B5=AC=EC=82=AC=ED=95=AD=204:?= =?UTF-8?q?=20=EB=A1=9C=EA=B7=B8=EC=9D=B8/=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jwp/controller/LoginController.java | 29 +++++++++++++++++++ .../java/jwp/controller/LogoutController.java | 19 ++++++++++++ webapp/include/navigation.jspf | 12 ++++++-- 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 src/main/java/jwp/controller/LoginController.java create mode 100644 src/main/java/jwp/controller/LogoutController.java diff --git a/src/main/java/jwp/controller/LoginController.java b/src/main/java/jwp/controller/LoginController.java new file mode 100644 index 0000000..ac8eacd --- /dev/null +++ b/src/main/java/jwp/controller/LoginController.java @@ -0,0 +1,29 @@ +package jwp.controller; + +import core.db.MemoryUserRepository; +import jwp.model.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 javax.servlet.http.HttpSession; +import java.io.IOException; + +@WebServlet("/user/login") +public class LoginController extends HttpServlet { + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + HttpSession session = req.getSession(); + String userId = req.getParameter("userId"); + String password = req.getParameter("password"); + User user = MemoryUserRepository.getInstance().findUserById(userId); + if (user != null && user.matchPassword(password)) { + session.setAttribute("user", user); + resp.sendRedirect("/"); + return; + } + resp.sendRedirect("/user/login_failed.jsp"); + } +} diff --git a/src/main/java/jwp/controller/LogoutController.java b/src/main/java/jwp/controller/LogoutController.java new file mode 100644 index 0000000..aa10eb8 --- /dev/null +++ b/src/main/java/jwp/controller/LogoutController.java @@ -0,0 +1,19 @@ +package jwp.controller; + +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 javax.servlet.http.HttpSession; +import java.io.IOException; + +@WebServlet("/user/logout") +public class LogoutController extends HttpServlet { + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + HttpSession session = req.getSession(); + session.removeAttribute("user"); + resp.sendRedirect("/"); + } +} diff --git a/webapp/include/navigation.jspf b/webapp/include/navigation.jspf index 6a7ad16..09739bf 100644 --- a/webapp/include/navigation.jspf +++ b/webapp/include/navigation.jspf @@ -35,8 +35,16 @@
    - Login - Sign-up + + + Log-Out + Info Update + + + Log-In + Sign-up + +
    \ No newline at end of file From d08eedcbd3893e20d6d1252c2b38e8ce084c5ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A4=EC=A0=95?= <70215620+yunjeongiya@users.noreply.github.com> Date: Fri, 5 Apr 2024 22:53:27 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=EC=9A=94=EA=B5=AC=EC=82=AC=ED=95=AD=205:?= =?UTF-8?q?=20=ED=9A=8C=EC=9B=90=20=EB=AA=A9=EB=A1=9D=20=EB=B0=8F=20?= =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B3=B4=EC=95=88=20=EA=B0=95=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jwp/controller/ListUserController.java | 11 ++++++++--- src/main/java/jwp/util/UserSessionUtils.java | 18 ++++++++++++++++++ webapp/user/list.jsp | 11 ++++++++++- 3 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 src/main/java/jwp/util/UserSessionUtils.java diff --git a/src/main/java/jwp/controller/ListUserController.java b/src/main/java/jwp/controller/ListUserController.java index 83367f4..ae0edf9 100644 --- a/src/main/java/jwp/controller/ListUserController.java +++ b/src/main/java/jwp/controller/ListUserController.java @@ -1,6 +1,7 @@ package jwp.controller; import core.db.MemoryUserRepository; +import jwp.util.UserSessionUtils; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; @@ -14,8 +15,12 @@ public class ListUserController extends HttpServlet { @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - req.setAttribute("users", MemoryUserRepository.getInstance().findAll()); - RequestDispatcher rd = req.getRequestDispatcher("/user/list.jsp"); - rd.forward(req,resp); + if(UserSessionUtils.isLogined(req.getSession())){ + req.setAttribute("users", MemoryUserRepository.getInstance().findAll()); + RequestDispatcher rd = req.getRequestDispatcher("/user/list.jsp"); + rd.forward(req,resp); + return; + } + resp.sendRedirect("/user/login.jsp"); } } diff --git a/src/main/java/jwp/util/UserSessionUtils.java b/src/main/java/jwp/util/UserSessionUtils.java new file mode 100644 index 0000000..67eb713 --- /dev/null +++ b/src/main/java/jwp/util/UserSessionUtils.java @@ -0,0 +1,18 @@ +package jwp.util; + +import jwp.model.User; + +import javax.servlet.http.HttpSession; + +public class UserSessionUtils { + public static final String USER_SESSION_KEY = "user"; + public static User getUserFromSession(HttpSession session) { + Object user = session.getAttribute(USER_SESSION_KEY); + if (user == null) return null; + return (User) user; + } + + public static boolean isLogined(HttpSession session) { + return getUserFromSession(session) != null; + } +} diff --git a/webapp/user/list.jsp b/webapp/user/list.jsp index c3e40d9..1dc34e5 100644 --- a/webapp/user/list.jsp +++ b/webapp/user/list.jsp @@ -25,7 +25,16 @@
    - + From 45fcae4491142f371f4472afee590dbc84565ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A4=EC=A0=95?= <70215620+yunjeongiya@users.noreply.github.com> Date: Fri, 5 Apr 2024 22:57:48 +0900 Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?= =?UTF-8?q?=20=EC=8B=9C=20=EC=9E=90=EB=8F=99=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=20=EC=B2=98=EB=A6=AC=20=ED=9B=84=20userList=EA=B0=80=20?= =?UTF-8?q?=EC=95=84=EB=8B=8C=20home=EC=9C=BC=EB=A1=9C=20=EB=A6=AC?= =?UTF-8?q?=EB=8B=A4=EC=9D=B4=EB=A0=89=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/jwp/controller/CreateUserController.java | 8 ++++++-- src/main/java/jwp/controller/LoginController.java | 3 ++- src/main/java/jwp/util/UserSessionUtils.java | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/jwp/controller/CreateUserController.java b/src/main/java/jwp/controller/CreateUserController.java index 94fcb2a..dfda06e 100644 --- a/src/main/java/jwp/controller/CreateUserController.java +++ b/src/main/java/jwp/controller/CreateUserController.java @@ -3,11 +3,14 @@ import core.db.MemoryUserRepository; import jwp.model.User; +import jwp.util.UserSessionUtils; + 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 javax.servlet.http.HttpSession; import java.io.IOException; @WebServlet("/user/signup") @@ -20,7 +23,8 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S req.getParameter("email")); MemoryUserRepository.getInstance().addUser(user); - - resp.sendRedirect("/user/userList"); + HttpSession session = req.getSession(); + UserSessionUtils.login(session, user); + resp.sendRedirect("/"); } } diff --git a/src/main/java/jwp/controller/LoginController.java b/src/main/java/jwp/controller/LoginController.java index ac8eacd..548f382 100644 --- a/src/main/java/jwp/controller/LoginController.java +++ b/src/main/java/jwp/controller/LoginController.java @@ -2,6 +2,7 @@ import core.db.MemoryUserRepository; import jwp.model.User; +import jwp.util.UserSessionUtils; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; @@ -20,7 +21,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S String password = req.getParameter("password"); User user = MemoryUserRepository.getInstance().findUserById(userId); if (user != null && user.matchPassword(password)) { - session.setAttribute("user", user); + UserSessionUtils.login(session, user); resp.sendRedirect("/"); return; } diff --git a/src/main/java/jwp/util/UserSessionUtils.java b/src/main/java/jwp/util/UserSessionUtils.java index 67eb713..3d8f199 100644 --- a/src/main/java/jwp/util/UserSessionUtils.java +++ b/src/main/java/jwp/util/UserSessionUtils.java @@ -15,4 +15,8 @@ public static User getUserFromSession(HttpSession session) { public static boolean isLogined(HttpSession session) { return getUserFromSession(session) != null; } + + public static void login(HttpSession session, User user) { + session.setAttribute("user", user); + } } From e00ac7ce2ed691ccf6ddd8612aed64c5ea37c7fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A4=EC=A0=95?= <70215620+yunjeongiya@users.noreply.github.com> Date: Fri, 5 Apr 2024 23:55:24 +0900 Subject: [PATCH 8/8] =?UTF-8?q?feat:=20=EC=84=9C=EB=B8=94=EB=A6=BF=20MVC?= =?UTF-8?q?=20=EB=8B=A8=EA=B3=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/core/mvc/Controller.java | 9 ++++ src/main/java/core/mvc/DispatcherServlet.java | 42 +++++++++++++++++++ src/main/java/core/mvc/ForwardController.java | 19 +++++++++ src/main/java/core/mvc/RequestMapper.java | 40 ++++++++++++++++++ .../jwp/controller/CreateUserController.java | 8 ++-- .../java/jwp/controller/HomeController.java | 18 ++------ .../jwp/controller/ListUserController.java | 12 +++--- .../java/jwp/controller/LoginController.java | 11 +++-- .../java/jwp/controller/LogoutController.java | 9 ++-- .../jwp/controller/UpdateUserController.java | 8 ++-- .../controller/UpdateUserFormController.java | 13 +++--- webapp/home.jsp | 6 +-- webapp/include/navigation.jspf | 6 +-- webapp/qna/show.jsp | 2 +- 14 files changed, 150 insertions(+), 53 deletions(-) create mode 100644 src/main/java/core/mvc/Controller.java create mode 100644 src/main/java/core/mvc/DispatcherServlet.java create mode 100644 src/main/java/core/mvc/ForwardController.java create mode 100644 src/main/java/core/mvc/RequestMapper.java diff --git a/src/main/java/core/mvc/Controller.java b/src/main/java/core/mvc/Controller.java new file mode 100644 index 0000000..9ddf7f4 --- /dev/null +++ b/src/main/java/core/mvc/Controller.java @@ -0,0 +1,9 @@ +package core.mvc; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public interface Controller { + static final String REDIRECT = "redirect:"; + String execute(HttpServletRequest req, HttpServletResponse resp); +} diff --git a/src/main/java/core/mvc/DispatcherServlet.java b/src/main/java/core/mvc/DispatcherServlet.java new file mode 100644 index 0000000..893356b --- /dev/null +++ b/src/main/java/core/mvc/DispatcherServlet.java @@ -0,0 +1,42 @@ +package core.mvc; + +import javax.servlet.RequestDispatcher; +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 static core.mvc.Controller.REDIRECT; + +@WebServlet(name="dispatcher", urlPatterns="/", loadOnStartup=1) +public class DispatcherServlet extends HttpServlet { + private RequestMapper requestMapper; + + @Override + public void init() throws ServletException { + this.requestMapper = new RequestMapper(); + } + + @Override + protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + Controller controller = requestMapper.getController(req); + try { + String viewName = controller.execute(req, resp); + move(viewName, req, resp); + } catch (Throwable e) { + throw new ServletException(e.getMessage()); + } + } + + private void move(String viewName, HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + if (viewName.startsWith(REDIRECT)) { + resp.sendRedirect(viewName.substring(REDIRECT.length())); + return; + } + + RequestDispatcher rd = req.getRequestDispatcher(viewName); + rd.forward(req, resp); + } +} diff --git a/src/main/java/core/mvc/ForwardController.java b/src/main/java/core/mvc/ForwardController.java new file mode 100644 index 0000000..72bae59 --- /dev/null +++ b/src/main/java/core/mvc/ForwardController.java @@ -0,0 +1,19 @@ +package core.mvc; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class ForwardController implements Controller { + private String forwardUrl; + + public ForwardController(String forwardUrl) { + this.forwardUrl = forwardUrl; + if (forwardUrl == null) { + throw new NullPointerException("forwardUrl is null. 이동할 URL을 입력하세요."); + } + } + @Override + public String execute(HttpServletRequest req, HttpServletResponse resp){ + return forwardUrl; + } +} \ No newline at end of file diff --git a/src/main/java/core/mvc/RequestMapper.java b/src/main/java/core/mvc/RequestMapper.java new file mode 100644 index 0000000..43d87f9 --- /dev/null +++ b/src/main/java/core/mvc/RequestMapper.java @@ -0,0 +1,40 @@ +package core.mvc; + +import jwp.controller.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; + +public class RequestMapper { + private Map controllers = new HashMap<>(); + + public RequestMapper() { + initControllers(); + } + + private void initControllers() { + controllers.put("/", new HomeController()); + + controllers.put("/user/form", new ForwardController("/user/form.jsp")); + controllers.put("/user/loginForm", new ForwardController("/user/login.jsp")); + controllers.put("/user/loginFailed", new ForwardController("/user/login_failed.jsp")); + controllers.put("/qna/form", new ForwardController("/qna/form.jsp")); + controllers.put("/qna/show", new ForwardController("/qna/show.jsp")); + + + controllers.put("/user/userList", new ListUserController()); + + controllers.put("/user/login", new LoginController()); + controllers.put("/user/logout", new LogoutController()); + + controllers.put("/user/signup", new CreateUserController()); + + controllers.put("/user/updateForm", new UpdateUserFormController()); + controllers.put("/user/update", new UpdateUserController()); + } + + public Controller getController(HttpServletRequest request) { + return controllers.get(request.getRequestURI()); + } +} \ No newline at end of file diff --git a/src/main/java/jwp/controller/CreateUserController.java b/src/main/java/jwp/controller/CreateUserController.java index dfda06e..b318b66 100644 --- a/src/main/java/jwp/controller/CreateUserController.java +++ b/src/main/java/jwp/controller/CreateUserController.java @@ -2,6 +2,7 @@ import core.db.MemoryUserRepository; +import core.mvc.Controller; import jwp.model.User; import jwp.util.UserSessionUtils; @@ -13,10 +14,9 @@ import javax.servlet.http.HttpSession; import java.io.IOException; -@WebServlet("/user/signup") -public class CreateUserController extends HttpServlet { +public class CreateUserController implements Controller { @Override - protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + public String execute(HttpServletRequest req, HttpServletResponse resp) { User user = new User(req.getParameter("userId"), req.getParameter("password"), req.getParameter("name"), @@ -25,6 +25,6 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S MemoryUserRepository.getInstance().addUser(user); HttpSession session = req.getSession(); UserSessionUtils.login(session, user); - resp.sendRedirect("/"); + return REDIRECT+"/"; } } diff --git a/src/main/java/jwp/controller/HomeController.java b/src/main/java/jwp/controller/HomeController.java index 6d097e0..9820a84 100644 --- a/src/main/java/jwp/controller/HomeController.java +++ b/src/main/java/jwp/controller/HomeController.java @@ -1,22 +1,12 @@ package jwp.controller; -import core.db.MemoryUserRepository; -import jwp.model.User; -import org.apache.coyote.Request; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; +import core.mvc.Controller; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -@WebServlet("/") -public class HomeController extends HttpServlet { +public class HomeController implements Controller { @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - RequestDispatcher rd = request.getRequestDispatcher("home.jsp"); - rd.forward(request, response); + public String execute(HttpServletRequest req, HttpServletResponse resp) { + return "/home.jsp"; } } diff --git a/src/main/java/jwp/controller/ListUserController.java b/src/main/java/jwp/controller/ListUserController.java index ae0edf9..3d62709 100644 --- a/src/main/java/jwp/controller/ListUserController.java +++ b/src/main/java/jwp/controller/ListUserController.java @@ -1,6 +1,7 @@ package jwp.controller; import core.db.MemoryUserRepository; +import core.mvc.Controller; import jwp.util.UserSessionUtils; import javax.servlet.RequestDispatcher; @@ -11,16 +12,13 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet("/user/userList") -public class ListUserController extends HttpServlet { +public class ListUserController implements Controller { @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + public String execute(HttpServletRequest req, HttpServletResponse resp) { if(UserSessionUtils.isLogined(req.getSession())){ req.setAttribute("users", MemoryUserRepository.getInstance().findAll()); - RequestDispatcher rd = req.getRequestDispatcher("/user/list.jsp"); - rd.forward(req,resp); - return; + return "/user/list.jsp"; } - resp.sendRedirect("/user/login.jsp"); + return REDIRECT + "/user/login"; } } diff --git a/src/main/java/jwp/controller/LoginController.java b/src/main/java/jwp/controller/LoginController.java index 548f382..3cd7a51 100644 --- a/src/main/java/jwp/controller/LoginController.java +++ b/src/main/java/jwp/controller/LoginController.java @@ -1,6 +1,7 @@ package jwp.controller; import core.db.MemoryUserRepository; +import core.mvc.Controller; import jwp.model.User; import jwp.util.UserSessionUtils; @@ -12,19 +13,17 @@ import javax.servlet.http.HttpSession; import java.io.IOException; -@WebServlet("/user/login") -public class LoginController extends HttpServlet { +public class LoginController implements Controller { @Override - protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + public String execute(HttpServletRequest req, HttpServletResponse resp) { HttpSession session = req.getSession(); String userId = req.getParameter("userId"); String password = req.getParameter("password"); User user = MemoryUserRepository.getInstance().findUserById(userId); if (user != null && user.matchPassword(password)) { UserSessionUtils.login(session, user); - resp.sendRedirect("/"); - return; + return REDIRECT + "/"; } - resp.sendRedirect("/user/login_failed.jsp"); + return REDIRECT + "/user/loginFailed"; } } diff --git a/src/main/java/jwp/controller/LogoutController.java b/src/main/java/jwp/controller/LogoutController.java index aa10eb8..5ac5d32 100644 --- a/src/main/java/jwp/controller/LogoutController.java +++ b/src/main/java/jwp/controller/LogoutController.java @@ -1,5 +1,7 @@ package jwp.controller; +import core.mvc.Controller; + import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -8,12 +10,11 @@ import javax.servlet.http.HttpSession; import java.io.IOException; -@WebServlet("/user/logout") -public class LogoutController extends HttpServlet { +public class LogoutController implements Controller { @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + public String execute(HttpServletRequest req, HttpServletResponse resp) { HttpSession session = req.getSession(); session.removeAttribute("user"); - resp.sendRedirect("/"); + return REDIRECT + "/"; } } diff --git a/src/main/java/jwp/controller/UpdateUserController.java b/src/main/java/jwp/controller/UpdateUserController.java index 3e768f7..299014e 100644 --- a/src/main/java/jwp/controller/UpdateUserController.java +++ b/src/main/java/jwp/controller/UpdateUserController.java @@ -1,6 +1,7 @@ package jwp.controller; import core.db.MemoryUserRepository; +import core.mvc.Controller; import jwp.model.User; import javax.servlet.ServletException; @@ -9,12 +10,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet("/user/update") -public class UpdateUserController extends HttpServlet { +public class UpdateUserController implements Controller { @Override - protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + public String execute(HttpServletRequest req, HttpServletResponse resp) { User user = new User(req.getParameter("userId"), req.getParameter("password"), req.getParameter("name"), req.getParameter("email")); MemoryUserRepository.getInstance().changeUserInfo(user); - resp.sendRedirect("/user/userList"); + return REDIRECT + "/user/userList"; } } diff --git a/src/main/java/jwp/controller/UpdateUserFormController.java b/src/main/java/jwp/controller/UpdateUserFormController.java index 35ba9a2..1e10cd4 100644 --- a/src/main/java/jwp/controller/UpdateUserFormController.java +++ b/src/main/java/jwp/controller/UpdateUserFormController.java @@ -2,6 +2,7 @@ import core.db.MemoryUserRepository; +import core.mvc.Controller; import jwp.model.User; import javax.servlet.RequestDispatcher; @@ -12,18 +13,16 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet("/user/updateForm") -public class UpdateUserFormController extends HttpServlet { +public class UpdateUserFormController implements Controller { @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + public String execute(HttpServletRequest req, HttpServletResponse resp) { String userId = req.getParameter("userId"); User user = MemoryUserRepository.getInstance().findUserById(userId); if (user != null) { req.setAttribute("user", user); - RequestDispatcher rd = req.getRequestDispatcher("/user/updateForm.jsp"); - rd.forward(req, resp); - return; + return "/user/updateForm.jsp"; } - resp.sendRedirect("/"); + return REDIRECT + "/"; } + } diff --git a/webapp/home.jsp b/webapp/home.jsp index 1d07cd8..34d16c5 100644 --- a/webapp/home.jsp +++ b/webapp/home.jsp @@ -13,7 +13,7 @@
    - 객체지향에서 가장 중요하다고 생각하는 것이 무엇인가요? + 객체지향에서 가장 중요하다고 생각하는 것이 무엇인가요?
    @@ -31,7 +31,7 @@
    - 동아리에 시간 얼마나 투자할 수 있는지? + 동아리에 시간 얼마나 투자할 수 있는지?
    @@ -64,7 +64,7 @@
    - 질문하기 + 질문하기
    diff --git a/webapp/include/navigation.jspf b/webapp/include/navigation.jspf index 09739bf..688aec0 100644 --- a/webapp/include/navigation.jspf +++ b/webapp/include/navigation.jspf @@ -28,7 +28,7 @@
    diff --git a/webapp/qna/show.jsp b/webapp/qna/show.jsp index 0098045..c343a09 100644 --- a/webapp/qna/show.jsp +++ b/webapp/qna/show.jsp @@ -45,7 +45,7 @@
  • - 목록 + 목록
    • ${user.email} 수정 + + + 수정 + + + - + + +