gitea/amati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull Request branch dev-clone to main #1

Merged
gitea merged 429 commits from dev-clone into main 2024-12-23 09:31:34 +00:00
Conversation 0 Commits 429 Files Changed 142 +9 -7
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cda53a06eb - Show all commits

2
apps/frontend/src/components/PageTemplate.tsx
View File

@ -90,7 +90,7 @@ const createCreateButton = (
return (
<Button
className="gap-2"
variant={"outline"}
variant={isAssessmentRequestPage ? "request" : "outline"}
onClick={addQuery}
>
{isAssessmentRequestPage ? "Ajukan Permohonan" : "Tambah Data"}

12
apps/frontend/src/shadcn/components/ui/badge.tsx
View File

@ -17,12 +17,12 @@ const badgeVariants = cva(
outline: "text-foreground",
// Custom variants for status
inprogress: "border-yellow-500 border-2 bg-yellow-300 px-6 py-1.5 text-[12px]",
waiting: "border-yellow-400 border-2 bg-yellow-200 px-3 py-1.5 text-[12px]",
accepted: "border-green-500 border-2 bg-green-200 px-12 py-1.5 text-[12px]",
rejected: "border-red-500 border-2 bg-red-200 px-14 py-1.5 text-[12px]",
unverified: "border-orange-400 border-2 bg-orange-200 px-6 py-1.5 text-[12px]",
completed: "border-blue-500 border-2 bg-blue-200 px-14 py-1.5 text-[12px]",
inprogress: "border-yellow-500 border-[1.5px] bg-yellow-300 px-3 py-1.5 text-[12px]",
waiting: "border-yellow-400 border-[1.5px] bg-yellow-200 px-3 py-1.5 text-[12px]",
accepted: "border-green-500 border-[1.5px] bg-green-200 px-3 py-1.5 text-[12px]",
rejected: "border-red-500 border-[1.5px] bg-red-200 px-3 py-1.5 text-[12px]",
unverified: "border-orange-400 border-[1.5px] bg-orange-200 px-3 py-1.5 text-[12px]",
completed: "border-blue-500 border-[1.5px] bg-blue-200 px-3 py-1.5 text-[12px]",
},
},
defaultVariants: {

2
apps/frontend/src/shadcn/components/ui/button.tsx
View File

@ -19,6 +19,8 @@ const buttonVariants = cva(
"bg-secondary text-secondary-foreground hover:bg-secondary/80",
ghost: "hover:bg-accent hover:text-accent-foreground",
link: "text-primary underline-offset-4 hover:underline",
request:
"border-[2px] border-black bg-background hover:bg-accent hover:text-accent-foreground",
},
size: {
default: "h-10 px-4 py-2",