diff --git a/front/src/main/java/app/module/front/usecase/info/GetInfoUIController.java b/front/src/main/java/app/module/front/usecase/info/GetInfoUIController.java new file mode 100644 index 00000000..105e945a --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/GetInfoUIController.java @@ -0,0 +1,30 @@ +package app.module.front.usecase.info; + +import app.module.core.config.application.util.CommonUtil; +import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; +import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +@RequiredArgsConstructor +class GetInfoUIController { + + private final GetHouseholdPortIn getHouseholdPortIn; + + @GetMapping(path = "/info") + String operate(Model model) { + + //TODO 일계부를 등록하지 않은 날짜 처리 필요 + boolean isUnregisteredDate = false; + + //TODO 최근등록일 취득 해야함 + String latestRegisteredDate = "2025년 5월 16~17일"; + + model.addAttribute("userInfo",getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow()); + model.addAttribute("isUnregisteredDate",isUnregisteredDate); + return "info/main"; + } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanksUI/adapters/web/GetBanksUIController.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanksUI/adapters/web/GetBanksUIController.java new file mode 100644 index 00000000..21d53a88 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanksUI/adapters/web/GetBanksUIController.java @@ -0,0 +1,25 @@ +package app.module.front.usecase.info.bank.getBanksUI.adapters.web; + +import app.module.core.config.application.util.CommonUtil; +import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; +import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +@RequiredArgsConstructor +class GetBanksUIController { + + private final GetHouseholdPortIn getHouseholdPortIn; + + @GetMapping(path = "/info/bank") + String operate(Model model) { + + model.addAttribute("userInfo", + getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow()); + + return "info/bank/banks"; + } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/monthly/getMonthlysUI/adapters/web/GetMontylysUIController.java b/front/src/main/java/app/module/front/usecase/info/monthly/getMonthlysUI/adapters/web/GetMontylysUIController.java new file mode 100644 index 00000000..98ec695c --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/monthly/getMonthlysUI/adapters/web/GetMontylysUIController.java @@ -0,0 +1,25 @@ +package app.module.front.usecase.info.monthly.getMonthlysUI.adapters.web; + +import app.module.core.config.application.util.CommonUtil; +import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; +import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +@RequiredArgsConstructor +class GetMontylysUIController { + + private final GetHouseholdPortIn getHouseholdPortIn; + + @GetMapping(path = "/info/monthly") + String operate(Model model) { + + model.addAttribute("userInfo", + getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow()); + + return "info/monthly/monthlys"; + } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/notice/getNoticesUI/adapters/web/GetNoticesUIController.java b/front/src/main/java/app/module/front/usecase/info/notice/getNoticesUI/adapters/web/GetNoticesUIController.java new file mode 100644 index 00000000..bea012b4 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/notice/getNoticesUI/adapters/web/GetNoticesUIController.java @@ -0,0 +1,25 @@ +package app.module.front.usecase.info.notice.getNoticesUI.adapters.web; + +import app.module.core.config.application.util.CommonUtil; +import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; +import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +@RequiredArgsConstructor +class GetNoticesUIController { + + private final GetHouseholdPortIn getHouseholdPortIn; + + @GetMapping(path = "/info/notice") + String operate(Model model) { + + model.addAttribute("userInfo", + getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow()); + + return "info/notice/notices"; + } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/user/getUserUI/adapters/web/GetUserUIController.java b/front/src/main/java/app/module/front/usecase/info/user/getUserUI/adapters/web/GetUserUIController.java new file mode 100644 index 00000000..4387924e --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/user/getUserUI/adapters/web/GetUserUIController.java @@ -0,0 +1,25 @@ +package app.module.front.usecase.info.user.getUserUI.adapters.web; + +import app.module.core.config.application.util.CommonUtil; +import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; +import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +@RequiredArgsConstructor +class GetUserUIController { + + private final GetHouseholdPortIn getHouseholdPortIn; + + @GetMapping(path = "/info/user") + String operate(Model model) { + + model.addAttribute("userInfo", + getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow()); + + return "info/user/user"; + } +} \ No newline at end of file diff --git a/front/src/main/resources/messages/uri.properties b/front/src/main/resources/messages/uri.properties index b6f5db92..95ecbb7c 100644 --- a/front/src/main/resources/messages/uri.properties +++ b/front/src/main/resources/messages/uri.properties @@ -1,14 +1,24 @@ uri=\uD648 \uD654\uBA74 uri.front=\uC784\uAC00\uACBD\uC81C\uC870\uC0AC -#uri.front.board.exampleBoard=\uC608\uC81C \uAC8C\uC2DC\uD310 -uri.front.board.articles=\uC608\uC81C \uAC8C\uC2DC\uD310 -uri.front.board.exampleBoard.{{pathVar}}=\uC608\uC81C \uAC8C\uC2DC\uD310 \uC0C1\uC138\uBCF4\uAE30 + uri.front.login=\uB85C\uADF8\uC778 -uri.front.user.register=\uD68C\uC6D0\uAC00\uC785 -uri.front.user.info=\uC815\uBCF4\uC218\uC815 -uri.front.board.article.create=\uC608\uC81C \uAC8C\uC2DC\uD310 \uB4F1\uB85D -uri.front.board.article.{{pathVar}}=\uC608\uC81C \uAC8C\uC2DC\uD310 \uC0C1\uC138\uBCF4\uAE30 -uri.front.board.article.update.{{pathVar}}=\uC608\uC81C \uAC8C\uC2DC\uD310 \uC218\uC815 + +# \uC785\uB825\uD604\uD669 +uri.front.status=\uC785\uB825\uD604\uD669 + +# \uD1B5\uACC4 +uri.front.statistics=\uD1B5\uACC4 + + +# \uB0B4\uC815\uBCF4 +uri.front.info=\uB0B4\uC815\uBCF4 +uri.front.info.path=/info +uri.front.info.user=\uAC1C\uC778\uC815\uBCF4 +uri.front.info.notice=\uACF5\uC9C0\uC0AC\uD56D +uri.front.info.monthly=\uC6D4\uBCC4 \uC784\uC0B0\uBB3C \uD604\uD669 +uri.front.info.bank=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED + + # \uC77C\uACC4\uBD80 uri.front.record.calendar=\uC784\uAC00\uACBD\uC81C\uC870\uC0AC \uC77C\uACC4\uBD80 diff --git a/front/src/main/resources/static/ui/commonUtil.js b/front/src/main/resources/static/ui/commonUtil.js index 28d30871..d3cf16d9 100644 --- a/front/src/main/resources/static/ui/commonUtil.js +++ b/front/src/main/resources/static/ui/commonUtil.js @@ -13,7 +13,7 @@ kri.menu.daily = function() { location.href = '/record/calendar'; } kri.menu.my = function() { - location.href = '/user/info'; + location.href = '/info'; } diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html index e4e9fd25..91643c78 100644 --- a/front/src/main/resources/templates/common/components.html +++ b/front/src/main/resources/templates/common/components.html @@ -77,32 +77,32 @@ -

- Current Device : [[${currentDevice}]] -

- + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/front/src/main/resources/templates/info/bank/banks.html b/front/src/main/resources/templates/info/bank/banks.html new file mode 100644 index 00000000..59e58ddd --- /dev/null +++ b/front/src/main/resources/templates/info/bank/banks.html @@ -0,0 +1,130 @@ + + + +
+
+ + + +
+
+ + + +
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+ + + + + + + + + + +
+ + +
+
+
+ +
+
+
+ +
+ + +
+ + \ No newline at end of file diff --git a/front/src/main/resources/templates/info/main.html b/front/src/main/resources/templates/info/main.html new file mode 100644 index 00000000..4162d3e9 --- /dev/null +++ b/front/src/main/resources/templates/info/main.html @@ -0,0 +1,92 @@ + + + + +
+
+ +
+

홍길동님,

+ + 일계부를 등록하지 않은 날짜가 있습니다.
+ 정확한 조사를 위해 꾸준히 입력해 주세요. +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ + + \ No newline at end of file diff --git a/front/src/main/resources/templates/info/monthly/monthlys.html b/front/src/main/resources/templates/info/monthly/monthlys.html new file mode 100644 index 00000000..59e58ddd --- /dev/null +++ b/front/src/main/resources/templates/info/monthly/monthlys.html @@ -0,0 +1,130 @@ + + + +
+
+ + + +
+
+ + + +
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+ + + + + + + + + + +
+ + +
+
+
+ +
+
+
+ +
+ + +
+ + \ No newline at end of file diff --git a/front/src/main/resources/templates/info/notice/notices.html b/front/src/main/resources/templates/info/notice/notices.html new file mode 100644 index 00000000..59e58ddd --- /dev/null +++ b/front/src/main/resources/templates/info/notice/notices.html @@ -0,0 +1,130 @@ + + + +
+
+ + + +
+
+ + + +
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+ + + + + + + + + + +
+ + +
+
+
+ +
+
+
+ +
+ + +
+ + \ No newline at end of file diff --git a/front/src/main/resources/templates/info/user/user.html b/front/src/main/resources/templates/info/user/user.html new file mode 100644 index 00000000..59e58ddd --- /dev/null +++ b/front/src/main/resources/templates/info/user/user.html @@ -0,0 +1,130 @@ + + + +
+
+ + + +
+
+ + + +
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+ + + + + + + + + + +
+ + +
+
+
+ +
+
+
+ +
+ + +
+ + \ No newline at end of file