diff --git a/app/citizen-frontend/public/logo.jpg b/app/citizen-frontend/public/logo.jpg new file mode 100644 index 0000000..232ebbd Binary files /dev/null and b/app/citizen-frontend/public/logo.jpg differ diff --git a/app/citizen-frontend/src/assets/introduction/expo_park_open/open_00.jpg b/app/citizen-frontend/src/assets/introduction/expo_park_open/open_00.jpg new file mode 100644 index 0000000..7aab7a0 Binary files /dev/null and b/app/citizen-frontend/src/assets/introduction/expo_park_open/open_00.jpg differ diff --git a/app/citizen-frontend/src/assets/introduction/expo_park_open/open_01.jpg b/app/citizen-frontend/src/assets/introduction/expo_park_open/open_01.jpg new file mode 100644 index 0000000..4a18277 Binary files /dev/null and b/app/citizen-frontend/src/assets/introduction/expo_park_open/open_01.jpg differ diff --git a/app/citizen-frontend/src/assets/introduction/expo_park_open/open_02.jpg b/app/citizen-frontend/src/assets/introduction/expo_park_open/open_02.jpg new file mode 100644 index 0000000..55d1f9a Binary files /dev/null and b/app/citizen-frontend/src/assets/introduction/expo_park_open/open_02.jpg differ diff --git a/app/citizen-frontend/src/assets/introduction/expo_park_open/open_03.jpg b/app/citizen-frontend/src/assets/introduction/expo_park_open/open_03.jpg new file mode 100644 index 0000000..aa0ea3e Binary files /dev/null and b/app/citizen-frontend/src/assets/introduction/expo_park_open/open_03.jpg differ diff --git a/app/citizen-frontend/src/components/BrandAvatar.vue b/app/citizen-frontend/src/components/BrandAvatar.vue index 6e5a1ca..79edc5d 100644 --- a/app/citizen-frontend/src/components/BrandAvatar.vue +++ b/app/citizen-frontend/src/components/BrandAvatar.vue @@ -2,33 +2,29 @@ withDefaults( defineProps<{ size?: number | string; - iconSize?: number | string; }>(), { - size: 80, - iconSize: 48, + size: 64, }, ); diff --git a/app/citizen-frontend/src/components/layout/DefaultLayout.vue b/app/citizen-frontend/src/components/layout/DefaultLayout.vue index a6b360d..08aa01b 100644 --- a/app/citizen-frontend/src/components/layout/DefaultLayout.vue +++ b/app/citizen-frontend/src/components/layout/DefaultLayout.vue @@ -191,8 +191,11 @@ - - + + diff --git a/app/citizen-frontend/src/config/features.ts b/app/citizen-frontend/src/config/features.ts index 386eb69..984c7f5 100644 --- a/app/citizen-frontend/src/config/features.ts +++ b/app/citizen-frontend/src/config/features.ts @@ -1,5 +1,6 @@ export const APPOINTMENT_ENABLED = false; export const BOTTOM_NAVIGATION_ENABLED = false; export const CHECKIN_ENABLED = false; +export const EXERCISE_DURATION_RECOMMENDATION_ENABLED = true; export const RADAR_ENABLED = false; export const SELF_ASSESSMENT_ENABLED = false; diff --git a/app/citizen-frontend/src/pages/course.vue b/app/citizen-frontend/src/pages/course.vue index 51f20e9..a031ff3 100644 --- a/app/citizen-frontend/src/pages/course.vue +++ b/app/citizen-frontend/src/pages/course.vue @@ -211,7 +211,10 @@ - +
- +
+ +
@@ -681,4 +683,11 @@ function updateTodayTimeString() { transform: translateY(-2px); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.06); } + +.brand-avatar-backdrop { + display: inline-flex; + padding: 4px; + border-radius: 50%; + background-color: rgba(var(--v-theme-primary), 0.14); +} diff --git a/app/citizen-frontend/src/pages/introduction.vue b/app/citizen-frontend/src/pages/introduction.vue index 0f3ea9d..616f1b0 100644 --- a/app/citizen-frontend/src/pages/introduction.vue +++ b/app/citizen-frontend/src/pages/introduction.vue @@ -1,8 +1,8 @@