diff --git a/apps/user-app/src/components/AppHeader.vue b/apps/user-app/src/components/AppHeader.vue deleted file mode 100644 index 3c9ca95..0000000 --- a/apps/user-app/src/components/AppHeader.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - diff --git a/apps/user-app/src/components/product/OrderCard.vue b/apps/user-app/src/components/product/OrderCard.vue index 880c1be..f378652 100644 --- a/apps/user-app/src/components/product/OrderCard.vue +++ b/apps/user-app/src/components/product/OrderCard.vue @@ -1,49 +1,165 @@ - + + + diff --git a/apps/user-app/src/components/product/OrderItemCard.vue b/apps/user-app/src/components/product/OrderItemCard.vue index e73c1bb..7058002 100644 --- a/apps/user-app/src/components/product/OrderItemCard.vue +++ b/apps/user-app/src/components/product/OrderItemCard.vue @@ -1,42 +1,57 @@ + + diff --git a/apps/user-app/src/components/ui/ScrollFetchSearch.vue b/apps/user-app/src/components/ui/ScrollFetchSearch.vue index 483ef2b..2a8a5d9 100644 --- a/apps/user-app/src/components/ui/ScrollFetchSearch.vue +++ b/apps/user-app/src/components/ui/ScrollFetchSearch.vue @@ -1,10 +1,12 @@ @@ -32,7 +33,6 @@ withDefaults( loading: boolean flag: boolean padding?: string - isFav?: boolean }>(), {}, ) diff --git a/apps/user-app/src/router/index.ts b/apps/user-app/src/router/index.ts index 1338545..db0c2bc 100644 --- a/apps/user-app/src/router/index.ts +++ b/apps/user-app/src/router/index.ts @@ -64,12 +64,18 @@ router.beforeEach((to) => { else nav.setPgaTransition(undefined); }); -// Ported from legacy router/index.ts:273-286. This hook is what actually -// drives two animations, and its absence was why neither ran: -// 1. cycling transitionFlag false->true replays AppHeader's "shutter" enter -// animation on every navigation; -// 2. setActiveLink moves the bottom-nav GSAP notch + bubble to the current -// tab (it is the ONLY caller of setActiveLink in the whole app). +// Ported from legacy router/index.ts:273-286. +// +// setActiveLink moves the bottom-nav GSAP notch + bubble to the current tab, +// and this hook is its ONLY caller in the whole app — that part is live. +// +// The transitionFlag cycling below used to replay AppHeader's "shutter" enter +// animation. AppHeader was deleted when every screen moved to the redesigned +// components/ui/PageBar.vue, and nothing reads transitionFlag any more, so +// that half is currently inert. It is left in place rather than ripped out +// because transitionStore is still the shared home for this kind of +// page-transition state; flagged here so the next reader doesn't assume it +// still drives a visible animation. router.afterEach((to) => { const nav = useNavStore(); const transition = useTransitionStore(); diff --git a/apps/user-app/src/views/user/DashboardView.vue b/apps/user-app/src/views/user/DashboardView.vue index 4433b19..1c3d4c7 100644 --- a/apps/user-app/src/views/user/DashboardView.vue +++ b/apps/user-app/src/views/user/DashboardView.vue @@ -1,110 +1,122 @@ + + diff --git a/apps/user-app/src/views/user/LoginView.vue b/apps/user-app/src/views/user/LoginView.vue index b15df48..1d359b9 100644 --- a/apps/user-app/src/views/user/LoginView.vue +++ b/apps/user-app/src/views/user/LoginView.vue @@ -1,94 +1,93 @@ - + + diff --git a/apps/user-app/src/views/user/OrdersView.vue b/apps/user-app/src/views/user/OrdersView.vue index 4e0ed20..e5fdb66 100644 --- a/apps/user-app/src/views/user/OrdersView.vue +++ b/apps/user-app/src/views/user/OrdersView.vue @@ -1,126 +1,166 @@ - diff --git a/apps/user-app/src/views/user/ProfileView.vue b/apps/user-app/src/views/user/ProfileView.vue index 31fd624..e9cb607 100644 --- a/apps/user-app/src/views/user/ProfileView.vue +++ b/apps/user-app/src/views/user/ProfileView.vue @@ -1,70 +1,74 @@ - diff --git a/apps/user-app/src/views/user/RegisterView.vue b/apps/user-app/src/views/user/RegisterView.vue index d0f0571..fb699ea 100644 --- a/apps/user-app/src/views/user/RegisterView.vue +++ b/apps/user-app/src/views/user/RegisterView.vue @@ -1,78 +1,84 @@