diff --git a/customer-vue/src/components/StoreNavigation.vue b/customer-vue/src/components/StoreNavigation.vue index f772ca6..b2d9804 100644 --- a/customer-vue/src/components/StoreNavigation.vue +++ b/customer-vue/src/components/StoreNavigation.vue @@ -7,7 +7,7 @@ hide-on-scroll absolute > - + mdi-arrow-left diff --git a/customer-vue/src/router/router.js b/customer-vue/src/router/router.js index 853733c..21be65f 100644 --- a/customer-vue/src/router/router.js +++ b/customer-vue/src/router/router.js @@ -38,49 +38,42 @@ const routes = [ path: "/home", beforeEnter: authCheck, name: 'home', - beforeEnter: authCheck, component: () => import('../views/HomeView') }, { path: "/search", beforeEnter: authCheck, name: 'search-store', - beforeEnter: authCheck, component: () => import('../views/SearchStore') }, { path: "/history", beforeEnter: authCheck, name: 'order-history', - beforeEnter: authCheck, component: () => import('../views/OrderHistory') }, { path: "/favorite", beforeEnter: authCheck, name: 'favorite-store', - beforeEnter: authCheck, component: () => import('../views/FavoriteStore') }, { path: "/notification", beforeEnter: authCheck, name: 'notification', - beforeEnter: authCheck, component: () => import('../views/NotificationView') }, { path: "/item/:itemId", beforeEnter: authCheck, name: 'itemDetail', - beforeEnter: authCheck, component: () => import('../views/ItemDetail') }, { path: "/order", beforeEnter: authCheck, name: 'orderPage', - beforeEnter: authCheck, component: () => import('../views/OrderPage') }, { diff --git a/customer-vue/src/views/ItemDetail.vue b/customer-vue/src/views/ItemDetail.vue index 1bd15b1..4e9f80d 100644 --- a/customer-vue/src/views/ItemDetail.vue +++ b/customer-vue/src/views/ItemDetail.vue @@ -167,6 +167,7 @@ export default { this.setItem.count =1 return false } + return true } diff --git a/customer-vue/src/views/OrderPage.vue b/customer-vue/src/views/OrderPage.vue index b756c9c..4b9a2d4 100644 --- a/customer-vue/src/views/OrderPage.vue +++ b/customer-vue/src/views/OrderPage.vue @@ -40,7 +40,7 @@ - 삭제하기 + 삭제하기 @@ -107,6 +107,9 @@ export default { console.log(error.response) }) }, + message: function(message){ + alert(message) + } } } diff --git a/owner-vue/src/views/Layout/DashboardLayout.vue b/owner-vue/src/views/Layout/DashboardLayout.vue index 66858ea..c35191e 100644 --- a/owner-vue/src/views/Layout/DashboardLayout.vue +++ b/owner-vue/src/views/Layout/DashboardLayout.vue @@ -30,7 +30,7 @@ export default { }, data: function() { return { - drawer: null, + drawer: true, notificationCounts: 0 } }, diff --git a/store-service/src/test/java/com/justpickup/storeservice/domain/category/web/CategoryOwnerApiControllerTest.java b/store-service/src/test/java/com/justpickup/storeservice/domain/category/web/CategoryOwnerApiControllerTest.java index 63bdf20..3988a8c 100644 --- a/store-service/src/test/java/com/justpickup/storeservice/domain/category/web/CategoryOwnerApiControllerTest.java +++ b/store-service/src/test/java/com/justpickup/storeservice/domain/category/web/CategoryOwnerApiControllerTest.java @@ -49,29 +49,27 @@ class CategoryOwnerApiControllerTest { @DisplayName("카테고리리스트_가져오기_성공") void getCategoryList_success() throws Exception { //given - Long storeId = 1L; List categoryDtoList = new ArrayList<>(); categoryDtoList.add(CategoryDto.builder() .id(10L) - .name("카테고리1") + .name("카페인") .items(List.of(new ItemDto(1L,"아메리카노",null,5000L) - ,new ItemDto(1L,"카페라테",null,5000L))) + ,new ItemDto(2L,"카페라테",null,5000L))) .order(1) .build()); categoryDtoList.add(CategoryDto.builder() .id(11L) - .name("카테고리2") - .items(List.of(new ItemDto(1L,"비스킷",null,5000L) - ,new ItemDto(1L,"와플",null,5000L))) + .name("디저트") + .items(List.of(new ItemDto(3L,"비스킷",null,5000L) + ,new ItemDto(4L,"와플",null,5000L))) .order(2) .build()); - given(categoryService.getCategoriesWithItem(any())).willReturn(categoryDtoList); + given(categoryService.getCategoriesWithItemByUserId(any())).willReturn(categoryDtoList); //when ResultActions actions = mockMvc.perform(MockMvcRequestBuilders.get("/api/owner/category") - .param("storeId",String.valueOf(storeId)) .header("user-id","2") );