From 0504712559c7570f4de48c22c6bb648445779894 Mon Sep 17 00:00:00 2001 From: Andsky Date: Sat, 25 Oct 2025 16:21:39 +0700 Subject: [PATCH 1/3] Feat/encounter status 107 (#136) From 3e7e735ae426807ef20f0fb372a89d28214dc377 Mon Sep 17 00:00:00 2001 From: Munawwirul Jamal Date: Tue, 28 Oct 2025 15:40:41 +0700 Subject: [PATCH 2/3] dev: hotfix, nav-footer, button, dialog --- app/assets/css/main.css | 4 +- .../pub/my-ui/nav-footer/ba-de-dr-su.vue | 50 +++++++++++++++++ .../pub/my-ui/nav-footer/ba-de-ed-pri.vue | 50 +++++++++++++++++ .../pub/my-ui/nav-footer/ba-de-su.vue | 44 +++++++++++++++ .../pub/my-ui/nav-footer/ba-dr-su-pr.vue | 54 ++++++++++++------ .../pub/my-ui/nav-footer/ba-dr-su.vue | 44 ++++++++++----- .../pub/my-ui/nav-footer/ba-ed-de-pri.vue | 32 ----------- .../pub/my-ui/nav-footer/ba-ed-de.vue | 44 ++++++++++----- .../pub/my-ui/nav-footer/ba-ed-pri.vue | 44 ++++++++++----- app/components/pub/my-ui/nav-footer/ba-ed.vue | 49 ++++++++--------- app/components/pub/my-ui/nav-footer/ba-su.vue | 46 ++++++++-------- .../pub/my-ui/nav-footer/ca-ed-su.vue | 55 +++++++++++++++++++ app/components/pub/my-ui/nav-footer/ca-sa.vue | 38 +++++++++++++ app/components/pub/my-ui/nav-footer/cl-sa.vue | 38 +++++++++++++ app/components/pub/ui/button/index.ts | 2 +- .../pub/ui/dialog/DialogContent.vue | 2 +- .../pub/ui/dialog/DialogDescription.vue | 2 +- app/composables/useQueryParam.ts | 32 +++++++++++ app/lib/constants.ts | 7 +++ 19 files changed, 493 insertions(+), 144 deletions(-) create mode 100644 app/components/pub/my-ui/nav-footer/ba-de-dr-su.vue create mode 100644 app/components/pub/my-ui/nav-footer/ba-de-ed-pri.vue create mode 100644 app/components/pub/my-ui/nav-footer/ba-de-su.vue delete mode 100644 app/components/pub/my-ui/nav-footer/ba-ed-de-pri.vue create mode 100644 app/components/pub/my-ui/nav-footer/ca-ed-su.vue create mode 100644 app/components/pub/my-ui/nav-footer/ca-sa.vue create mode 100644 app/components/pub/my-ui/nav-footer/cl-sa.vue create mode 100644 app/composables/useQueryParam.ts diff --git a/app/assets/css/main.css b/app/assets/css/main.css index 17502027..a25bddcb 100644 --- a/app/assets/css/main.css +++ b/app/assets/css/main.css @@ -16,8 +16,8 @@ --primary-hover: 26, 92%, 65%; /* Secondary - Clean Blue */ - --secondary: 210 50% 96%; - --secondary-foreground: 210 20% 20%; + --secondary: 40 70% 60%; + --secondary-foreground: 210 20% 100%; --muted: 210 25% 95%; --muted-foreground: 210 15% 50%; diff --git a/app/components/pub/my-ui/nav-footer/ba-de-dr-su.vue b/app/components/pub/my-ui/nav-footer/ba-de-dr-su.vue new file mode 100644 index 00000000..a4df2da3 --- /dev/null +++ b/app/components/pub/my-ui/nav-footer/ba-de-dr-su.vue @@ -0,0 +1,50 @@ + + + diff --git a/app/components/pub/my-ui/nav-footer/ba-de-ed-pri.vue b/app/components/pub/my-ui/nav-footer/ba-de-ed-pri.vue new file mode 100644 index 00000000..0d8fcfb2 --- /dev/null +++ b/app/components/pub/my-ui/nav-footer/ba-de-ed-pri.vue @@ -0,0 +1,50 @@ + + + diff --git a/app/components/pub/my-ui/nav-footer/ba-de-su.vue b/app/components/pub/my-ui/nav-footer/ba-de-su.vue new file mode 100644 index 00000000..47246c4c --- /dev/null +++ b/app/components/pub/my-ui/nav-footer/ba-de-su.vue @@ -0,0 +1,44 @@ + + + diff --git a/app/components/pub/my-ui/nav-footer/ba-dr-su-pr.vue b/app/components/pub/my-ui/nav-footer/ba-dr-su-pr.vue index 78034463..67d5aec5 100644 --- a/app/components/pub/my-ui/nav-footer/ba-dr-su-pr.vue +++ b/app/components/pub/my-ui/nav-footer/ba-dr-su-pr.vue @@ -1,5 +1,15 @@ diff --git a/app/components/pub/my-ui/nav-footer/ba-dr-su.vue b/app/components/pub/my-ui/nav-footer/ba-dr-su.vue index 17dbd6dc..4598817b 100644 --- a/app/components/pub/my-ui/nav-footer/ba-dr-su.vue +++ b/app/components/pub/my-ui/nav-footer/ba-dr-su.vue @@ -1,5 +1,15 @@ diff --git a/app/components/pub/my-ui/nav-footer/ba-ed-de-pri.vue b/app/components/pub/my-ui/nav-footer/ba-ed-de-pri.vue deleted file mode 100644 index 4a9d5268..00000000 --- a/app/components/pub/my-ui/nav-footer/ba-ed-de-pri.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - diff --git a/app/components/pub/my-ui/nav-footer/ba-ed-de.vue b/app/components/pub/my-ui/nav-footer/ba-ed-de.vue index fabaa425..cc607ac0 100644 --- a/app/components/pub/my-ui/nav-footer/ba-ed-de.vue +++ b/app/components/pub/my-ui/nav-footer/ba-ed-de.vue @@ -1,5 +1,15 @@ diff --git a/app/components/pub/my-ui/nav-footer/ba-ed-pri.vue b/app/components/pub/my-ui/nav-footer/ba-ed-pri.vue index 97bf62de..331c30af 100644 --- a/app/components/pub/my-ui/nav-footer/ba-ed-pri.vue +++ b/app/components/pub/my-ui/nav-footer/ba-ed-pri.vue @@ -1,5 +1,15 @@ diff --git a/app/components/pub/my-ui/nav-footer/ba-ed.vue b/app/components/pub/my-ui/nav-footer/ba-ed.vue index ae455a81..aebd4296 100644 --- a/app/components/pub/my-ui/nav-footer/ba-ed.vue +++ b/app/components/pub/my-ui/nav-footer/ba-ed.vue @@ -1,5 +1,15 @@ diff --git a/app/components/pub/my-ui/nav-footer/ba-su.vue b/app/components/pub/my-ui/nav-footer/ba-su.vue index 9db66bb4..613cac85 100644 --- a/app/components/pub/my-ui/nav-footer/ba-su.vue +++ b/app/components/pub/my-ui/nav-footer/ba-su.vue @@ -1,5 +1,15 @@ diff --git a/app/components/pub/my-ui/nav-footer/ca-ed-su.vue b/app/components/pub/my-ui/nav-footer/ca-ed-su.vue new file mode 100644 index 00000000..1f0f5915 --- /dev/null +++ b/app/components/pub/my-ui/nav-footer/ca-ed-su.vue @@ -0,0 +1,55 @@ + + + diff --git a/app/components/pub/my-ui/nav-footer/ca-sa.vue b/app/components/pub/my-ui/nav-footer/ca-sa.vue new file mode 100644 index 00000000..cbd5ef7f --- /dev/null +++ b/app/components/pub/my-ui/nav-footer/ca-sa.vue @@ -0,0 +1,38 @@ + + + diff --git a/app/components/pub/my-ui/nav-footer/cl-sa.vue b/app/components/pub/my-ui/nav-footer/cl-sa.vue new file mode 100644 index 00000000..fea6fc56 --- /dev/null +++ b/app/components/pub/my-ui/nav-footer/cl-sa.vue @@ -0,0 +1,38 @@ + + + diff --git a/app/components/pub/ui/button/index.ts b/app/components/pub/ui/button/index.ts index c1aa89a8..c4063089 100644 --- a/app/components/pub/ui/button/index.ts +++ b/app/components/pub/ui/button/index.ts @@ -12,7 +12,7 @@ export const buttonVariants = cva( destructive: 'bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90', outline: - 'border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground', + 'border border-slate-300 dark:border-slate-600 bg-background shadow-sm hover:bg-accent hover:text-accent-foreground', secondary: 'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80', ghost: 'hover:bg-accent hover:text-accent-foreground', diff --git a/app/components/pub/ui/dialog/DialogContent.vue b/app/components/pub/ui/dialog/DialogContent.vue index 5e9e8538..0c0fbf6b 100644 --- a/app/components/pub/ui/dialog/DialogContent.vue +++ b/app/components/pub/ui/dialog/DialogContent.vue @@ -34,7 +34,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits) v-bind="forwarded" :class=" cn( - 'fixed left-1/2 top-1/2 z-50 grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 gap-4 border bg-background p-5 2xl:p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg', + 'fixed left-1/2 top-1/2 z-50 grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 gap-2 2x:gap-3 border bg-background p-5 2xl:p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg', props.class, )" > diff --git a/app/components/pub/ui/dialog/DialogDescription.vue b/app/components/pub/ui/dialog/DialogDescription.vue index 3444c492..c7ac62d1 100644 --- a/app/components/pub/ui/dialog/DialogDescription.vue +++ b/app/components/pub/ui/dialog/DialogDescription.vue @@ -19,7 +19,7 @@ const forwardedProps = useForwardProps(delegatedProps)