Skip to content

[MVC 구현하기 - 3단계] 도기(김동호) 미션 제출합니다. #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Sep 26, 2023
Merged

[MVC 구현하기 - 3단계] 도기(김동호) 미션 제출합니다. #603

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4ab0a46
feat: JspView 구현
kdkdhoho Sep 25, 2023
b34e44a
feat: JsonView 구현
kdkdhoho Sep 25, 2023
e227baa
refactor: DispatcherServlet에서 View에게 render를 처리하도록 수행
kdkdhoho Sep 25, 2023
d2a6eba
remove: 테스트를 위한 클래스 제거
kdkdhoho Sep 25, 2023
1e11b50
fix: support에서 잘못된 연산으로 생긴 버그 수정
kdkdhoho Sep 25, 2023
f0b0664
refactor: 주입하는 basePackages 수정
kdkdhoho Sep 25, 2023
dd574b4
refactor: 로그인 및 회원가입 페이지 요청 URL 수정
kdkdhoho Sep 25, 2023
a624ef6
refactor: Legacy MVC 제거
kdkdhoho Sep 25, 2023
e0153b8
refactor: 주석 제거
kdkdhoho Sep 25, 2023
cd677a2
feat: HandlerExecution에 ViewAdapter를 두어 컨트롤러의 반환값에 상관없이 적절한 View를 반환하…
kdkdhoho Sep 25, 2023
dff941e
feat: asis 패키지에 있는 ForwardController를 디스패처 서블릿의 DefaultController로 승격…
kdkdhoho Sep 25, 2023
183864f
refactor: AnnotationHandlerMapping의 경로를 좀 더 광범위하게 적용
kdkdhoho Sep 26, 2023
d1e2914
refactor: 레거시 MVC 전체 제거
kdkdhoho Sep 26, 2023
4546c23
rename: 기본 위치로 요청이 들어오는 경우 Index 페이지로 응답하도록 하는 성격에 맞도록 네이밍 수정
kdkdhoho Sep 26, 2023
f30bb89
rename: 두둠이 공유해주신 문서에 맞도록 패키지 네이밍 변경
kdkdhoho Sep 26, 2023
6363168
refactor: 예외 종류 변경
kdkdhoho Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions app/src/main/java/com/techcourse/controller/AnnotatedControllerForTest.java
View file
Open in desktop

This file was deleted.

29 changes: 22 additions & 7 deletions app/src/main/java/com/techcourse/controller/LoginController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,42 @@
package com.techcourse.controller;

import static web.org.springframework.web.bind.annotation.RequestMethod.GET;
import static web.org.springframework.web.bind.annotation.RequestMethod.POST;

import com.techcourse.domain.User;
import com.techcourse.repository.InMemoryUserRepository;
import context.org.springframework.stereotype.Controller;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import webmvc.org.springframework.web.servlet.mvc.asis.Controller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import web.org.springframework.web.bind.annotation.RequestMapping;

public class LoginController implements Controller {
@Controller
public class LoginController {

private static final Logger log = LoggerFactory.getLogger(LoginController.class);

@Override
public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
if (UserSession.isLoggedIn(req.getSession())) {
@RequestMapping(value = "/login", method = GET)
public String getLoginPage(HttpServletRequest request, HttpServletResponse response) {
return UserSession.getUserFrom(request.getSession())
.map(user -> {
log.info("logged in {}", user.getAccount());
return "redirect:/index.jsp";
})
.orElse("/login.jsp");
}

@RequestMapping(value = "/login", method = POST)
public String login(HttpServletRequest request, HttpServletResponse response) {
if (UserSession.isLoggedIn(request.getSession())) {
return "redirect:/index.jsp";
}

return InMemoryUserRepository.findByAccount(req.getParameter("account"))
return InMemoryUserRepository.findByAccount(request.getParameter("account"))
.map(user -> {
log.info("User : {}", user);
return login(req, user);
return login(request, user);
})
.orElse("redirect:/401.jsp");
}
Expand Down
22 changes: 0 additions & 22 deletions app/src/main/java/com/techcourse/controller/LoginViewController.java
View file
Open in desktop

This file was deleted.

14 changes: 9 additions & 5 deletions app/src/main/java/com/techcourse/controller/LogoutController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
package com.techcourse.controller;

import static web.org.springframework.web.bind.annotation.RequestMethod.GET;

import context.org.springframework.stereotype.Controller;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import webmvc.org.springframework.web.servlet.mvc.asis.Controller;
import web.org.springframework.web.bind.annotation.RequestMapping;

public class LogoutController implements Controller {
@Controller
public class LogoutController {

@Override
public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
final var session = req.getSession();
@RequestMapping(value = "/logout", method = GET)
public String logout(HttpServletRequest request, HttpServletResponse response) {
final var session = request.getSession();
session.removeAttribute(UserSession.SESSION_KEY);
return "redirect:/";
}
Expand Down
27 changes: 18 additions & 9 deletions app/src/main/java/com/techcourse/controller/RegisterController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
package com.techcourse.controller;

import static web.org.springframework.web.bind.annotation.RequestMethod.GET;
import static web.org.springframework.web.bind.annotation.RequestMethod.POST;

import com.techcourse.domain.User;
import com.techcourse.repository.InMemoryUserRepository;
import context.org.springframework.stereotype.Controller;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import webmvc.org.springframework.web.servlet.mvc.asis.Controller;
import web.org.springframework.web.bind.annotation.RequestMapping;

public class RegisterController implements Controller {
@Controller
public class RegisterController {

@Override
public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
final var user = new User(2,
req.getParameter("account"),
req.getParameter("password"),
req.getParameter("email"));
InMemoryUserRepository.save(user);
@RequestMapping(value = "/register", method = GET)
public String getRegisterPage(HttpServletRequest request, HttpServletResponse response) {
return "/register.jsp";
}

@RequestMapping(value = "/register", method = POST)
public String register(HttpServletRequest request, HttpServletResponse response) {
User user = new User(2,
request.getParameter("account"),
request.getParameter("password"),
request.getParameter("email"));
InMemoryUserRepository.save(user);
return "redirect:/index.jsp";
}
}
13 changes: 0 additions & 13 deletions app/src/main/java/com/techcourse/controller/RegisterViewController.java
View file
Open in desktop

This file was deleted.

170 changes: 89 additions & 81 deletions app/src/main/webapp/index.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,97 +1,105 @@
<%@ page contentType="text/html;charset=UTF-8" %>
<!DOCTYPE html>
<html lang="en">
<head>
<%@ include file="include/header.jspf" %>
<title>대시보드</title>
</head>
<body class="sb-nav-fixed">
<nav class="sb-topnav navbar navbar-expand navbar-dark bg-dark">
<!-- Navbar Brand-->
<a class="navbar-brand ps-3" href="/index.jsp">대시보드</a>
<!-- Sidebar Toggle-->
<button class="btn btn-link btn-sm order-1 order-lg-0 me-4 me-lg-0" id="sidebarToggle" href="#!"><i class="fas fa-bars"></i></button>
<% if (session.getAttribute("user") != null) { %>
<div class="navbar-nav d-none d-md-inline-block ms-auto me-0 me-md-3 my-2 my-md-0">
<ul class="navbar-nav ms-auto ms-md-0 me-3 me-lg-4">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" id="navbarDropdown" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false"><i class="fas fa-user fa-fw"></i></a>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
<li><a class="dropdown-item" href="#!">내정보</a></li>
<li><hr class="dropdown-divider" /></li>
<li><a class="dropdown-item" href="/logout">로그아웃</a></li>
</ul>
<head>
<%@ include file="include/header.jspf" %>
<title>대시보드</title>
</head>
<body class="sb-nav-fixed">
<nav class="sb-topnav navbar navbar-expand navbar-dark bg-dark">
<!-- Navbar Brand-->
<a class="navbar-brand ps-3" href="/index.jsp">대시보드</a>
<!-- Sidebar Toggle-->
<button class="btn btn-link btn-sm order-1 order-lg-0 me-4 me-lg-0" id="sidebarToggle" href="#!"><i
class="fas fa-bars"></i></button>
<% if (session.getAttribute("user") != null) { %>
<div class="navbar-nav d-none d-md-inline-block ms-auto me-0 me-md-3 my-2 my-md-0">
<ul class="navbar-nav ms-auto ms-md-0 me-3 me-lg-4">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" id="navbarDropdown" href="#" role="button" data-bs-toggle="dropdown"
aria-expanded="false"><i class="fas fa-user fa-fw"></i></a>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
<li><a class="dropdown-item" href="#!">내정보</a></li>
<li>
<hr class="dropdown-divider"/>
</li>
<li><a class="dropdown-item" href="/logout">로그아웃</a></li>
</ul>
</li>
</ul>
</div>
<% } else { %>
<div class="navbar-nav d-none d-md-inline-block ms-auto me-0 me-md-3 my-2 my-md-0">
<a class="nav-link" href="/login" role="button"><i class="fas fa-user fa-fw"></i>&nbsp;로그인</a>
</div>
<% } %>
</nav>
<div id="layoutSidenav">
<div id="layoutSidenav_nav">
<nav class="sb-sidenav accordion sb-sidenav-dark" id="sidenavAccordion">
<div class="sb-sidenav-menu">
<div class="nav">
<div class="sb-sidenav-menu-heading">Core</div>
<a class="nav-link" href="/index.jsp">
<div class="sb-nav-link-icon"><i class="fas fa-tachometer-alt"></i></div>
대시보드
</a>
</div>
</div>
<% } else { %>
<div class="navbar-nav d-none d-md-inline-block ms-auto me-0 me-md-3 my-2 my-md-0">
<a class="nav-link" href="/login/view" role="button"><i class="fas fa-user fa-fw"></i>&nbsp;로그인</a>
</div>
<% } %>
</nav>
<div id="layoutSidenav">
<div id="layoutSidenav_nav">
<nav class="sb-sidenav accordion sb-sidenav-dark" id="sidenavAccordion">
<div class="sb-sidenav-menu">
<div class="nav">
<div class="sb-sidenav-menu-heading">Core</div>
<a class="nav-link" href="/index.jsp">
<div class="sb-nav-link-icon"><i class="fas fa-tachometer-alt"></i></div>
대시보드
</a>
</div>
</div>
</nav>
</div>
<div id="layoutSidenav_content">
<main>
<div class="container-fluid px-4">
<h1 class="mt-4">대시보드</h1>
<ol class="breadcrumb mb-4">
<li class="breadcrumb-item active">첫 페이지</li>
</ol>
<div class="row">
<div class="col-lg-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-bar me-1"></i>
Bar Chart
</div>
<div class="card-body"><canvas id="myBarChart" width="100%" height="50"></canvas></div>
</div>
</div>
<div id="layoutSidenav_content">
<main>
<div class="container-fluid px-4">
<h1 class="mt-4">대시보드</h1>
<ol class="breadcrumb mb-4">
<li class="breadcrumb-item active">첫 페이지</li>
</ol>
<div class="row">
<div class="col-lg-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-bar me-1"></i>
Bar Chart
</div>
<div class="col-lg-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-pie me-1"></i>
Pie Chart
</div>
<div class="card-body"><canvas id="myPieChart" width="100%" height="50"></canvas></div>
</div>
<div class="card-body">
<canvas id="myBarChart" width="100%" height="50"></canvas>
</div>
</div>
</div>
</main>
<footer class="py-4 bg-light mt-auto">
<div class="container-fluid px-4">
<div class="d-flex align-items-center justify-content-between small">
<div class="text-muted">Copyright &copy; Your Website 2021</div>
<div>
<a href="/index.jsp">Home</a>
&middot;
<a href="#">Privacy Policy</a>
&middot;
<a href="#">Terms &amp; Conditions</a>
<div class="col-lg-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-pie me-1"></i>
Pie Chart
</div>
<div class="card-body">
<canvas id="myPieChart" width="100%" height="50"></canvas>
</div>
</div>
</div>
</footer>
</div>
</div>
</main>
<footer class="py-4 bg-light mt-auto">
<div class="container-fluid px-4">
<div class="d-flex align-items-center justify-content-between small">
<div class="text-muted">Copyright &copy; Your Website 2021</div>
<div>
<a href="/index.jsp">Home</a>
&middot;
<a href="#">Privacy Policy</a>
&middot;
<a href="#">Terms &amp; Conditions</a>
</div>
</div>
</div>
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.8.0/Chart.min.js" crossorigin="anonymous"></script>
<script src="/assets/chart-bar.js"></script>
<script src="/assets/chart-pie.js"></script>
<%@ include file="include/footer.jspf" %>
</body>
</footer>
</div>
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.8.0/Chart.min.js" crossorigin="anonymous"></script>
<script src="/assets/chart-bar.js"></script>
<script src="/assets/chart-pie.js"></script>
<%@ include file="include/footer.jspf" %>
</body>
</html>
Loading