Merge pull request #29 from selab-hs/develop

refac : 파일 이름 통일
selab-hs · Jul 17, 2024 · afcdff8 · afcdff8
2 parents b4ba133 + 1267327
commit afcdff8
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 82 deletions.
diff --git a/src/main/java/com/urlshortener/actionlog/controller/view/SystemActionLogViewController.java b/src/main/java/com/urlshortener/actionlog/controller/view/SystemActionLogViewController.java
@@ -13,7 +13,7 @@ public class SystemActionLogViewController {
 
     @GetMapping("/history/{shortCode}")
     public String getSystemActionLogViewHome() {
-        return "system_action_log_board";
+        return "system_action_log_board_page";
     }
 
     @GetMapping("/logs")

diff --git a/src/main/java/com/urlshortener/auth/controller/rest/AuthDevRestController.java b/src/main/java/com/urlshortener/auth/controller/rest/AuthDevRestController.java
diff --git a/src/main/java/com/urlshortener/member/controller/view/MemberController.java b/src/main/java/com/urlshortener/member/controller/view/MemberController.java
@@ -12,14 +12,14 @@ public class MemberController {
      */
     @GetMapping("/login")
     public String loginPage() {
-        return "login";
+        return "login_page";
     }
 
     /**
      * @return 회원가입 화면을 반환합니다.
      */
     @GetMapping("/sign-up")
     public String signUpPage() {
-        return "sign-up";
+        return "sign_up_page";
     }
 }
diff --git a/src/main/java/com/urlshortener/shortener/controller/rest/DevShortenerRestController.java b/src/main/java/com/urlshortener/shortener/controller/rest/DevShortenerRestController.java
diff --git a/src/main/java/com/urlshortener/shortener/controller/view/ShortenerViewController.java b/src/main/java/com/urlshortener/shortener/controller/view/ShortenerViewController.java
@@ -12,15 +12,15 @@ public class ShortenerViewController {
      */
     @GetMapping("/main")
     public String page() {
-        return "main";
+        return "main_page";
     }
 
     /**
      * @return 메인 화면을 반환합니다.
      */
     @GetMapping("/")
     public String homePage() {
-        return "main";
+        return "main_page";
     }
 
     /**

diff --git a/...sources/static/css/member/member-edit.css → ...sources/static/css/member/member_edit.css b/...sources/static/css/member/member-edit.css → ...sources/static/css/member/member_edit.css
diff --git a/...n/resources/static/css/member/sign-up.css → ...n/resources/static/css/member/sign_up.css b/...n/resources/static/css/member/sign-up.css → ...n/resources/static/css/member/sign_up.css
diff --git a/...c/css/shortener/access_shortcode_page.css → ...static/css/shortener/access_shortcode.css b/...c/css/shortener/access_shortcode_page.css → ...static/css/shortener/access_shortcode.css
diff --git a/...ain/resources/static/js/member/sign-up.js → ...ain/resources/static/js/member/sign_up.js b/...ain/resources/static/js/member/sign-up.js → ...ain/resources/static/js/member/sign_up.js
diff --git a/...tic/js/shortener/access_shortcode_page.js → ...s/static/js/shortener/access_shortcode.js b/...tic/js/shortener/access_shortcode_page.js → ...s/static/js/shortener/access_shortcode.js
diff --git a/src/main/resources/templates/access_shortcode_page.html b/src/main/resources/templates/access_shortcode_page.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <title>Shortcode Dashboard</title>
     <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet">
-    <link rel="stylesheet" href="/css/shortener/access_shortcode_page.css" type="text/css"/>
+    <link rel="stylesheet" href="/css/shortener/access_shortcode.css" type="text/css"/>
     <link rel="stylesheet" href="/css/layout/layout.css" type="text/css"/>
     <script src="/js/layout/layout.js"></script>
 </head>
@@ -34,6 +34,6 @@ <h1 class="text-center mb-4">Shortcode Dashboard</h1>
     </table>
 </div>
 <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
-<script src="/js/shortener/access_shortcode_page.js"></script>
+<script src="/js/shortener/access_shortcode.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/login.html → src/main/resources/templates/login_page.html b/src/main/resources/templates/login.html → src/main/resources/templates/login_page.html
diff --git a/src/main/resources/templates/main.html → src/main/resources/templates/main_page.html b/src/main/resources/templates/main.html → src/main/resources/templates/main_page.html
diff --git a/src/main/resources/templates/sign-up.html → ...ain/resources/templates/sign_up_page.html b/src/main/resources/templates/sign-up.html → ...ain/resources/templates/sign_up_page.html
@@ -4,9 +4,9 @@
     <title>URL SHORTENER SIGN-UP</title>
     <meta charset="utf-8">
     <link href="https://fonts.googleapis.com/earlyaccess/notosanskr.css" rel="stylesheet">
-    <link rel="stylesheet" href="/css/member/sign-up.css" type="text/css"/>
+    <link rel="stylesheet" href="/css/member/sign_up.css" type="text/css"/>
     <link rel="stylesheet" href="/css/font.css" type="text/css"/>
-    <script src="/js/member/sign-up.js"></script>
+    <script src="/js/member/sign_up.js"></script>
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 </head>
 <body>

diff --git a/...es/templates/system_action_log_board.html → ...mplates/system_action_log_board_page.html b/...es/templates/system_action_log_board.html → ...mplates/system_action_log_board_page.html
diff --git a/src/main/resources/url-shortener-security b/src/main/resources/url-shortener-security