Merge pull request #93 from LikeKNU/Hotfix/CafeteriaSequence

식당 순서 변경

build.gradle

@@ -27,9 +27,12 @@ jar {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
     compileOnly 'org.projectlombok:lombok'
     testCompileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.h2database:h2'

src/main/java/ac/knu/likeknu/config/SecurityConfiguration.java

@@ -0,0 +1,51 @@
+package ac.knu.likeknu.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfiguration {
+
+    @Value("${admin.username}")
+    private String username;
+    @Value("${admin.password}")
+    private String password;
+
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        return http.authorizeHttpRequests(registry -> registry.requestMatchers("/api/**").permitAll()
+                        .anyRequest().authenticated())
+                .formLogin(security -> security.loginPage("/admin/login")
+                        .defaultSuccessUrl("/admin/messages")
+                        .permitAll()).csrf(AbstractHttpConfigurer::disable)
+                .build();
+    }
+
+    @Bean
+    public UserDetailsService userDetailsService() {
+        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+        UserDetails admin = User.withUsername(username)
+                .password(password)
+                .passwordEncoder(encoder::encode)
+                .roles("USER", "ADMIN")
+                .build();
+        return new InMemoryUserDetailsManager(admin);
+    }
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+}

src/main/java/ac/knu/likeknu/controller/AdminController.java

@@ -0,0 +1,21 @@
+package ac.knu.likeknu.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/admin")
+@Controller
+public class AdminController {
+
+    @GetMapping("/login")
+    public String loginForm() {
+        return "login";
+    }
+
+    @GetMapping("/messages")
+    public String registerMessageForm(Model model) {
+        return "registerMessage";
+    }
+}

src/main/java/ac/knu/likeknu/domain/value/CafeteriaName.java

@@ -5,13 +5,13 @@
 @Getter
 public enum CafeteriaName {
 
-    STUDENT_CAFETERIA("학생식당", 1),
-    DORMITORY("생활관식당", 2),
+    STUDENT_CAFETERIA("학생식당", 10),
+    DORMITORY("생활관식당", 20),
     EMPLOYEE_CAFETERIA("직원식당", 3),
-    SODAM("소담", 4),
-    NEULSOM("늘솜", 5),
-    EUNHAENGSA_VISION("은행사/비전", 6),
-    DREAM("드림", 7);
+    SODAM("소담", 40),
+    NEULSOM("늘솜", 50),
+    EUNHAENGSA_VISION("은행사/비전", 1),
+    DREAM("드림", 2);
 
     private final String cafeteriaName;
     private final int sequence;

src/main/resources/application.properties

@@ -1,5 +1 @@
-spring.datasource.url=jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_SCHEMA}?characterEncoding=UTF-8&serverTimezone=UTC
-spring.datasource.username=${DB_USERNAME}
-spring.datasource.password=${DB_PASSWORD}
-
-spring.jpa.hibernate.ddl-auto=validate
+spring.profiles.active=dev

src/main/resources/templates/login.html

@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>로그인</title>
+  <link href="https://getbootstrap.com/docs/5.3/dist/css/bootstrap.min.css" rel="stylesheet">
+  <style>
+    html,
+    body {
+      height: 100%;
+    }
+
+    .form-signin {
+      max-width: 330px;
+      padding: 1rem;
+    }
+
+    .form-signin .form-floating:focus-within {
+      z-index: 2;
+    }
+
+    .form-signin input[type="text"] {
+      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;
+    }
+  </style>
+</head>
+<body class="d-flex align-items-center py-4 bg-body-tertiary">
+<main class="form-signin w-100 m-auto">
+  <form action="/admin/login" method="POST">
+    <img class="mb-4"
+         src="https://avatars.githubusercontent.com/u/144087727?s=400&u=0234d20a40888b3d67e1576444a2511e7f351c91&v=4"
+         alt="" width="72" height="72">
+    <h1 class="h3 mb-3 fw-normal">공주대처럼 관리자 로그인</h1>
+    <div class="form-floating">
+      <input type="text" class="form-control" id="floatingInput" placeholder="Username" name="username">
+      <label for="floatingInput">관리자 아이디</label>
+    </div>
+    <div class="form-floating mb-5">
+      <input type="password" class="form-control" id="floatingPassword" placeholder="Password" name="password">
+      <label for="floatingPassword">관리자 비밀번호</label>
+    </div>
+    <button class="btn btn-primary w-100 py-2" type="submit">관리자 로그인</button>
+    <p class="mt-5 mb-3 text-body-secondary">© 공주대처럼</p>
+  </form>
+</main>
+<script>
+  (() => {
+    'use strict'
+
+    const getStoredTheme = () => localStorage.getItem('theme')
+    const setStoredTheme = theme => localStorage.setItem('theme', theme)
+
+    const getPreferredTheme = () => {
+      const storedTheme = getStoredTheme()
+      if (storedTheme) {
+        return storedTheme
+      }
+
+      return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
+    }
+
+    const setTheme = theme => {
+      if (theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches) {
+        document.documentElement.setAttribute('data-bs-theme', 'dark')
+      } else {
+        document.documentElement.setAttribute('data-bs-theme', theme)
+      }
+    }
+
+    setTheme(getPreferredTheme())
+
+    const showActiveTheme = (theme, focus = false) => {
+      const themeSwitcher = document.querySelector('#bd-theme')
+
+      if (!themeSwitcher) {
+        return
+      }
+
+      const themeSwitcherText = document.querySelector('#bd-theme-text')
+      const activeThemeIcon = document.querySelector('.theme-icon-active use')
+      const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`)
+      const svgOfActiveBtn = btnToActive.querySelector('svg use').getAttribute('href')
+
+      document.querySelectorAll('[data-bs-theme-value]').forEach(element => {
+        element.classList.remove('active')
+        element.setAttribute('aria-pressed', 'false')
+      })
+
+      btnToActive.classList.add('active')
+      btnToActive.setAttribute('aria-pressed', 'true')
+      activeThemeIcon.setAttribute('href', svgOfActiveBtn)
+      const themeSwitcherLabel = `${themeSwitcherText.textContent} (${btnToActive.dataset.bsThemeValue})`
+      themeSwitcher.setAttribute('aria-label', themeSwitcherLabel)
+
+      if (focus) {
+        themeSwitcher.focus()
+      }
+    }
+
+    window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
+      const storedTheme = getStoredTheme()
+      if (storedTheme !== 'light' && storedTheme !== 'dark') {
+        setTheme(getPreferredTheme())
+      }
+    })
+
+    window.addEventListener('DOMContentLoaded', () => {
+      showActiveTheme(getPreferredTheme())
+
+      document.querySelectorAll('[data-bs-theme-value]')
+        .forEach(toggle => {
+          toggle.addEventListener('click', () => {
+            const theme = toggle.getAttribute('data-bs-theme-value')
+            setStoredTheme(theme)
+            setTheme(theme)
+            showActiveTheme(theme, true)
+          })
+        })
+    })
+  })()
+</script>
+</body>
+</html>

src/main/resources/templates/registerMessage.html

@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>공주대처럼 관리자</title>
+  <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
+        integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+</head>
+<body>
+<div class="container p-5">
+  <form class="row g-3 needs-validation" method="POST" action="/admin/messages">
+    <div class="col-md-4">
+      <label for="notificationSummary" class="form-label"><strong>알림 요약</strong></label>
+      <input type="text" class="form-control" id="notificationSummary" placeholder="지하철 4호선 지연"
+             name="notificationSummary" required>
+    </div>
+    <div class="col-md-4">
+      <label for="notificationContents" class="form-label"><strong>알림 내용</strong></label>
+      <input type="text" class="form-control" id="notificationContents" placeholder="현재 지하철 4호선이 지연되고 있습니다."
+             name="notificationContents" required>
+    </div>
+    <div class="form-outline datetimepicker" data-mdb-inline="true">
+      <label for="notificationDateTime" class="form-label"><strong>알림 시간</strong></label>
+      <input type="datetime-local" class="form-control" id="notificationDateTime" name="notificationDate">
+    </div>
+    <div class="col-12">
+      <button class="btn btn-primary" type="submit">알림 등록</button>
+    </div>
+  </form>
+</div>
+<br><br>
+<div>
+  <table class="table table-striped">
+    <thead>
+    <tr>
+      <th>ID</th>
+      <th>알림 요약</th>
+      <th>알림 내용</th>
+      <th>알림 시간</th>
+      <th></th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr th:each="notification : ${notifications}">
+      <td th:text="${notification.id}" id="notificationId"></td>
+      <td th:text="${notification.summary}"></td>
+      <td th:text="${notification.content}"></td>
+      <td th:text="${notification.dateTime}"></td>
+      <td>
+        <a id="removeButton" href="#" class="btn btn-danger" role="button">삭제</a>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+</div>
+</body>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
+        integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+        crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
+        integrity="sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r"
+        crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
+        integrity="sha384-BBtl+eGJRgqQAUMxJ7pMwbEyER4l1g+O15P+16Ep7Q9Q+zqX6gSbd85u4mG4QzX+"
+        crossorigin="anonymous"></script>
+<script>
+  const removeButton = document.getElementById('removeButton');
+  const notificationId = document.getElementById('notificationId').textContent;
+
+  if (removeButton) {
+    removeButton.addEventListener('click', event => {
+      const confirmation = confirm('정말 삭제하시겠습니까?');
+      if (confirmation) {
+        fetch(`/admin/notifications/${notificationId}`, {
+          method: 'DELETE'
+        })
+          .then(() => {
+            alert('삭제 완료');
+            location.replace(`/admin/notifications`);
+          });
+      } else {
+      }
+    });
+  }
+</script>
+</html>