diff --git a/src/main/java/com/urlshortener/actionlog/controller/view/SystemActionLogViewController.java b/src/main/java/com/urlshortener/actionlog/controller/view/SystemActionLogViewController.java index edf22d2..ac862a3 100644 --- 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 deleted file mode 100644 index 5e70bd0..0000000 --- a/src/main/java/com/urlshortener/auth/controller/rest/AuthDevRestController.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.urlshortener.auth.controller.rest; - -import com.urlshortener.auth.model.AuthUser; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Nullable; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Tag(name = "인증인가 개발 및 테스트용") -@RestController -@RequiredArgsConstructor -@RequestMapping("api/v1/auth/dev") -public class AuthDevRestController { - /** - * AuthUser를 통해 인증된 사용자만을 넘긴다, 만약 인증이 되지 않은 경우에는 에러가 발생 - */ - @GetMapping("/test1") - public String test1(AuthUser user) { - return "OK"; - } - - /** - * AuthUser를 통해 인증된 사용자만을 넘긴다, 단, 토큰이 없이 요청된 사용자의 경우에는 인증이 없어도 사용 가능하다. - * - 토큰을 넘기는 경우, 인증인가 체크 - * - 토큰을 넘기지 않는 경우, 인증인가 체크를 진행하지 않는다. - */ - @GetMapping("/test2") - public String test2(@Nullable AuthUser user) { - return "OK"; - } -} \ No newline at end of file diff --git a/src/main/java/com/urlshortener/member/controller/view/MemberController.java b/src/main/java/com/urlshortener/member/controller/view/MemberController.java index 315c0c5..66e6a2f 100644 --- a/src/main/java/com/urlshortener/member/controller/view/MemberController.java +++ b/src/main/java/com/urlshortener/member/controller/view/MemberController.java @@ -12,7 +12,7 @@ public class MemberController { */ @GetMapping("/login") public String loginPage() { - return "login"; + return "login_page"; } /** @@ -20,6 +20,6 @@ public String loginPage() { */ @GetMapping("/sign-up") public String signUpPage() { - return "sign-up"; + return "sign_up_page"; } } \ No newline at end of file diff --git a/src/main/java/com/urlshortener/shortener/controller/rest/DevShortenerRestController.java b/src/main/java/com/urlshortener/shortener/controller/rest/DevShortenerRestController.java deleted file mode 100644 index ce36b46..0000000 --- a/src/main/java/com/urlshortener/shortener/controller/rest/DevShortenerRestController.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.urlshortener.shortener.controller.rest; - -import com.urlshortener.auth.model.AuthUser; -import com.urlshortener.common.response.ResponseDto; -import com.urlshortener.shortener.dto.request.OriginUrlRequest; -import com.urlshortener.shortener.service.DevShortenerService; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Nullable; -import jakarta.servlet.http.HttpServletRequest; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -@Tag(name = "[DEV] url 단축기") -@Slf4j -@RestController -@RequiredArgsConstructor -public class DevShortenerRestController { - private final DevShortenerService devShortenerService; - - @PostMapping("/api/dev/v1/short") - public ResponseEntity createShortUrl( - /** 인증되지 않은 사용자도 사용 가능해야 한다. */ - @Nullable AuthUser member, - @RequestBody OriginUrlRequest originUrlRequest, - HttpServletRequest request - ) { - var shortUrl = devShortenerService.createShortUrl( - member, - originUrlRequest, - request - ).getShortCode(); - - return ResponseDto.created(shortUrl); - } -} \ No newline at end of file diff --git a/src/main/java/com/urlshortener/shortener/controller/view/ShortenerViewController.java b/src/main/java/com/urlshortener/shortener/controller/view/ShortenerViewController.java index bb9aa4a..b46895c 100644 --- a/src/main/java/com/urlshortener/shortener/controller/view/ShortenerViewController.java +++ b/src/main/java/com/urlshortener/shortener/controller/view/ShortenerViewController.java @@ -12,7 +12,7 @@ public class ShortenerViewController { */ @GetMapping("/main") public String page() { - return "main"; + return "main_page"; } /** @@ -20,7 +20,7 @@ public String page() { */ @GetMapping("/") public String homePage() { - return "main"; + return "main_page"; } /** diff --git a/src/main/resources/static/css/member/member-edit.css b/src/main/resources/static/css/member/member_edit.css similarity index 100% rename from src/main/resources/static/css/member/member-edit.css rename to src/main/resources/static/css/member/member_edit.css diff --git a/src/main/resources/static/css/member/sign-up.css b/src/main/resources/static/css/member/sign_up.css similarity index 100% rename from src/main/resources/static/css/member/sign-up.css rename to src/main/resources/static/css/member/sign_up.css diff --git a/src/main/resources/static/css/shortener/access_shortcode_page.css b/src/main/resources/static/css/shortener/access_shortcode.css similarity index 100% rename from src/main/resources/static/css/shortener/access_shortcode_page.css rename to src/main/resources/static/css/shortener/access_shortcode.css diff --git a/src/main/resources/static/js/member/sign-up.js b/src/main/resources/static/js/member/sign_up.js similarity index 100% rename from src/main/resources/static/js/member/sign-up.js rename to src/main/resources/static/js/member/sign_up.js diff --git a/src/main/resources/static/js/shortener/access_shortcode_page.js b/src/main/resources/static/js/shortener/access_shortcode.js similarity index 100% rename from src/main/resources/static/js/shortener/access_shortcode_page.js rename to src/main/resources/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 index 8699066..c930ae3 100644 --- a/src/main/resources/templates/access_shortcode_page.html +++ b/src/main/resources/templates/access_shortcode_page.html @@ -4,7 +4,7 @@ Shortcode Dashboard - + @@ -34,6 +34,6 @@

Shortcode Dashboard

- + diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login_page.html similarity index 100% rename from src/main/resources/templates/login.html rename to src/main/resources/templates/login_page.html diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main_page.html similarity index 100% rename from src/main/resources/templates/main.html rename to src/main/resources/templates/main_page.html diff --git a/src/main/resources/templates/sign-up.html b/src/main/resources/templates/sign_up_page.html similarity index 95% rename from src/main/resources/templates/sign-up.html rename to src/main/resources/templates/sign_up_page.html index 0eeacbb..f0873b1 100644 --- a/src/main/resources/templates/sign-up.html +++ b/src/main/resources/templates/sign_up_page.html @@ -4,9 +4,9 @@ URL SHORTENER SIGN-UP - + - + diff --git a/src/main/resources/templates/system_action_log_board.html b/src/main/resources/templates/system_action_log_board_page.html similarity index 100% rename from src/main/resources/templates/system_action_log_board.html rename to src/main/resources/templates/system_action_log_board_page.html diff --git a/src/main/resources/url-shortener-security b/src/main/resources/url-shortener-security index 895c146..2a64eda 160000 --- a/src/main/resources/url-shortener-security +++ b/src/main/resources/url-shortener-security @@ -1 +1 @@ -Subproject commit 895c146852804bda7841489b48cbbd437320fac0 +Subproject commit 2a64edaaa411234bcf0e72794af76ed0bd8f97d8