diff --git a/front/src/main/java/app/module/front/usecase/menu/adapters/web/MenuController.java b/front/src/main/java/app/module/front/usecase/menu/adapters/web/MenuController.java new file mode 100644 index 00000000..71306a3a --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/menu/adapters/web/MenuController.java @@ -0,0 +1,25 @@ +package app.module.front.usecase.menu.adapters.web; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.HashMap; + +@Controller +public class MenuController { + + /** + * FRONT 메인 페이지 + * @return + */ + @GetMapping(path = "/menu") + ResponseEntity allMenu() { + // TODO + HashMap resVO = new HashMap<>(); +// resVO.put("daily", "2025년 5월 16~17일"); + + return ResponseEntity.status(HttpStatus.OK).body(resVO); + } +} diff --git a/front/src/main/java/app/module/front/usecase/policy/work/adapters/web/PolicyUIController.java b/front/src/main/java/app/module/front/usecase/policy/adapters/web/PolicyUIController.java similarity index 90% rename from front/src/main/java/app/module/front/usecase/policy/work/adapters/web/PolicyUIController.java rename to front/src/main/java/app/module/front/usecase/policy/adapters/web/PolicyUIController.java index 357563cb..c01b6046 100644 --- a/front/src/main/java/app/module/front/usecase/policy/work/adapters/web/PolicyUIController.java +++ b/front/src/main/java/app/module/front/usecase/policy/adapters/web/PolicyUIController.java @@ -1,4 +1,4 @@ -package app.module.front.usecase.policy.work.adapters.web; +package app.module.front.usecase.policy.adapters.web; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/front/src/main/resources/messages/uri.properties b/front/src/main/resources/messages/uri.properties index 2fe5b33e..e70e1fdd 100644 --- a/front/src/main/resources/messages/uri.properties +++ b/front/src/main/resources/messages/uri.properties @@ -11,10 +11,10 @@ uri.front.statistics=\uD1B5\uACC4 # \uB0B4\uC815\uBCF4 -uri.front.info=\uB0B4\uC815\uBCF4 +uri.front.info=\uB0B4 \uC815\uBCF4 uri.front.info.path=/info -uri.front.info.user=\uAC1C\uC778\uC815\uBCF4 \uBCC0\uACBD +uri.front.info.user=\uAC1C\uC778\uC815\uBCF4 uri.front.info.user.path=/info/user uri.front.info.user.password=\uAC1C\uC778\uC815\uBCF4 \uBCC0\uACBD uri.front.info.notice=\uACF5\uC9C0\uC0AC\uD56D @@ -33,6 +33,7 @@ uri.front.info.bank.create.output.month.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC # \uC77C\uACC4\uBD80 uri.front.record.calendar=\uC784\uAC00\uACBD\uC81C\uC870\uC0AC \uC77C\uACC4\uBD80 +uri.front.record.calendar.path=/record/calendar uri.front.record.calendar.{{pathVar}}.{{pathVar}}=\uC77C\uACC4\uBD80 \uC6D4\uBCC4 \uD604\uD669 uri.front.record.daily=\uC77C\uACC4\uBD80 \uB4F1\uB85D uri.front.record.daily.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D diff --git a/front/src/main/resources/static/ui/commonUtil.js b/front/src/main/resources/static/ui/commonUtil.js index 1ff1d6be..9a361aa7 100644 --- a/front/src/main/resources/static/ui/commonUtil.js +++ b/front/src/main/resources/static/ui/commonUtil.js @@ -4,6 +4,7 @@ let kri = { kri.menu = new Object; kri.logger = new Object(); kri.form = new Object(); + /* kri.menu */ /** * 스크립트로 페이지 이동 @@ -11,13 +12,50 @@ kri.form = new Object(); kri.menu.main = function() { location.href = '/'; } -kri.menu.daily = function() { - location.href = '/record/calendar'; -} -kri.menu.my = function() { - location.href = '/info'; +kri.menu.logout = function() { + etUI.dialog.alert({ + title: '로그아웃 확인', + message: '로그아웃 하시겠어요?
서비스를 다시 이용하시려면 로그인이 필요합니다.', + type: 'confirm', + dialogType: 'confirm', + callback: function () { + location.href = '/logout'; + }, + }); } +/** + * 전체 메뉴 + */ +kri.menu.open = function() { + ajaxUtil._ajaxAsyncMethod( + '/menu', + {}, + function(rstData, status) { + if (rstData != null && rstData.daily !== undefined && rstData.daily !== null) { + $('.menuModal').find('.date').html('최근등록 : ' + rstData.daily + ''); + } else { + $('.menuModal').find('.date').html('등록된 일계부가 없습니다.'); + } + + $('.detail-menu').each(function (index, item) { + if ($(item).find('li').length == 0) { + $(item).hide(); + } + }); + + const menuModal = document.querySelector('.menuModal').ui; + menuModal.open(); + }, + function(code, rstData) { + kri.logger.error('Do nothing. code: '+ code, rstData); + $('.menuModal').find('.date').hide(); + }, + 'get', + 'json' + ); +}; + /** * 뒤로가기 */ diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html index 55be6321..b9ece0ff 100644 --- a/front/src/main/resources/templates/common/components.html +++ b/front/src/main/resources/templates/common/components.html @@ -110,8 +110,7 @@

[[${#messages.msg(currentURI.id)}]]

- - + @@ -192,8 +191,8 @@ diff --git a/front/src/main/resources/templates/common/menu-modal.html b/front/src/main/resources/templates/common/menu-modal.html new file mode 100644 index 00000000..4d53fa6d --- /dev/null +++ b/front/src/main/resources/templates/common/menu-modal.html @@ -0,0 +1,49 @@ +
+ +
\ No newline at end of file diff --git a/front/src/main/resources/templates/layout/layout-none.html b/front/src/main/resources/templates/layout/layout-none.html index 02042cb7..bb296782 100644 --- a/front/src/main/resources/templates/layout/layout-none.html +++ b/front/src/main/resources/templates/layout/layout-none.html @@ -12,6 +12,10 @@
+
+ + + + + + + + +