diff --git a/src/main/java/com/madeuhome/common/ctrl/MenuController.java b/src/main/java/com/madeuhome/common/ctrl/MenuController.java index 78c2da8..581851a 100644 --- a/src/main/java/com/madeuhome/common/ctrl/MenuController.java +++ b/src/main/java/com/madeuhome/common/ctrl/MenuController.java @@ -1,6 +1,5 @@ package com.madeuhome.common.ctrl; -import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -24,12 +23,13 @@ public class MenuController { String requestURI = request.getRequestURI(); // 특정 URL 패턴에만 메뉴 추가 - if (requestURI.endsWith("Intro.do") || requestURI.startsWith("/index") ) { - return menuService.getMenuHierarchy("MAIN"); - } + /* + * if (requestURI.endsWith("Intro.do") || requestURI.startsWith("/index") ) { + * return menuService.getMenuHierarchy("MAIN"); } + */ - return new ArrayList<>(); + return menuService.getMenuHierarchy("MAIN"); } } diff --git a/src/main/java/com/madeuhome/controller/web/webhome/WebHomeController.java b/src/main/java/com/madeuhome/controller/web/webhome/WebHomeController.java index 02afc1f..78967c5 100644 --- a/src/main/java/com/madeuhome/controller/web/webhome/WebHomeController.java +++ b/src/main/java/com/madeuhome/controller/web/webhome/WebHomeController.java @@ -5,7 +5,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.GetMapping; @Slf4j @@ -19,17 +19,17 @@ public class WebHomeController extends ManagerDraftAction{ * @param response * @return */ - @RequestMapping(value="/") - public String homeIntro(HttpSession session,HttpServletRequest request) { + @GetMapping("/") + public String homeIntro(HttpSession session,HttpServletRequest request) { log.debug("WebHomeController homeIntro START"); log.debug("WebHomeController homeIntro END"); - return "/intro"; + return "/index"; } - @RequestMapping(value="/index") - public String homeIndex(HttpSession session,HttpServletRequest request) { + @GetMapping("/index") + public String homeIndex(HttpSession session,HttpServletRequest request) { log.debug("WebHomeController homeIndex START"); diff --git a/src/main/resources/static/css/web/makeReservation.css b/src/main/resources/static/css/web/makeReservation.css index b2ceb7b..b75de6a 100644 --- a/src/main/resources/static/css/web/makeReservation.css +++ b/src/main/resources/static/css/web/makeReservation.css @@ -385,6 +385,29 @@ body { cursor: not-allowed !important; } +.flatpickr-calendar { + max-width: 320px; + margin: 0 auto; + box-shadow: 0 4px 12px rgba(0,0,0,0.15); +} + +.flatpickr-day.disabled { + color: #ccc !important; + background: #f8f9fa; + cursor: not-allowed; +} + +.flatpickr-day.today { + background: #007bff; + color: white; +} + +.flatpickr-day.selected { + background: #28a745; + border-color: #28a745; +} + + /* Responsive Design */ @media (max-width: 1199.98px) { .reservation-container { diff --git a/src/main/resources/templates/web/layout/layoutHead.html b/src/main/resources/templates/web/layout/layoutHead.html index 8e17df2..e1d5beb 100644 --- a/src/main/resources/templates/web/layout/layoutHead.html +++ b/src/main/resources/templates/web/layout/layoutHead.html @@ -23,7 +23,7 @@ - +