diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java index 14b8a83b..d005d0bb 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java @@ -18,7 +18,6 @@ import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDe import java.util.Optional; import org.springframework.beans.factory.annotation.Value; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Repository; @Repository diff --git a/front/src/main/resources/static/assets/styles/style.css b/front/src/main/resources/static/assets/styles/style.css index 7fb2ce4d..544abbf7 100644 --- a/front/src/main/resources/static/assets/styles/style.css +++ b/front/src/main/resources/static/assets/styles/style.css @@ -1598,6 +1598,17 @@ hr::before { border-radius: 3.2rem 0rem 0rem 0rem; } +.loading { + position: absolute; + left: 50%; + top: 50%; + -webkit-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + width: 4.8rem !important; + height: 4.8rem !important; + z-index: 3200; +} + /*약관 폰트 가이드 규칙*/ .term-wrap .modal-content-inner { margin-top: 3.2rem; diff --git a/front/src/main/resources/static/ui/ajaxUtil.js b/front/src/main/resources/static/ui/ajaxUtil.js index 65508942..7942dea3 100644 --- a/front/src/main/resources/static/ui/ajaxUtil.js +++ b/front/src/main/resources/static/ui/ajaxUtil.js @@ -323,10 +323,13 @@ var ajaxUtil = { if (ajaxUtil.loadingStatus) { ajaxUtil.loadingStatus = false; // TODO : 로딩바 숨김 + document.querySelector('#loadingBar').style.display = 'none'; } }, _showWaiting:function(){ ajaxUtil.loadingStatus = true; // TODO : 로딩바 활성화 + document.querySelector('#loadingBar').style.display = 'block'; + debugger }, }; \ 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 3baa4539..60e40f45 100644 --- a/front/src/main/resources/templates/layout/layout-none.html +++ b/front/src/main/resources/templates/layout/layout-none.html @@ -5,6 +5,7 @@
+
diff --git a/front/src/main/resources/templates/layout/layout-subar.html b/front/src/main/resources/templates/layout/layout-subar.html index 9de27790..6524768c 100644 --- a/front/src/main/resources/templates/layout/layout-subar.html +++ b/front/src/main/resources/templates/layout/layout-subar.html @@ -5,6 +5,7 @@
+
diff --git a/front/src/main/resources/templates/layout/layout.html b/front/src/main/resources/templates/layout/layout.html index 363ffe6d..441fd901 100644 --- a/front/src/main/resources/templates/layout/layout.html +++ b/front/src/main/resources/templates/layout/layout.html @@ -5,6 +5,7 @@
+
diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index 144b3418..d19e5737 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -303,6 +303,7 @@ let formData = new FormData(); formData.append('file', file); + ajaxUtil._showWaiting(); $.ajax({ method: 'POST',