zaid.marzguioui/myeasycms-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update UI elements and refine billing schema

Browse Source 
Several changes were made to improve UI consistency across various components. Styling updates and enhancements were applied to elements including but not limited to, the SiteHeader, SiteNavigationItem, and ModeToggle components. Additionally, a refinement was made to the billing schema to enforce only having one per-seat and one flat line item per plan.
This commit is contained in:
giancarlo
2024-04-19 00:04:37 +08:00
parent 4914a56460
commit f58d2e364f
5 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/billing/core/src/create-billing-schema.ts
View File

@@ -80,7 +80,19 @@ export const PlanSchema = z
})
.min(1),
interval: BillingIntervalSchema.optional(),
lineItems: z.array(LineItemSchema),
lineItems: z.array(LineItemSchema).refine(
(schema) => {
const types = schema.map((item) => item.type);
const perSeat = types.filter((type) => type === 'per-seat').length;
const flat = types.filter((type) => type === 'flat').length;
return perSeat <= 1 && flat <= 1;
},
{
message: 'Plans can only have one per-seat and one flat line item',
path: ['lineItems'],
},
),
trialDays: z
.number({
description:

8
packages/ui/src/makerkit/mode-toggle.tsx
View File

@@ -20,7 +20,7 @@ import { Trans } from './trans';
const MODES = ['light', 'dark', 'system'];
export function ModeToggle() {
export function ModeToggle(props: { className?: string }) {
const { setTheme, theme } = useTheme();
const Items = useMemo(() => {
@@ -51,9 +51,9 @@ export function ModeToggle() {
return (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="ghost" size="icon" className="rounded-full">
<Sun className="h-[1rem] w-[1rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
<Moon className="absolute h-[1rem] w-[1rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
<Button variant="ghost" size="icon" className={props.className}>
<Sun className="h-[0.9rem] w-[0.9rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
<Moon className="absolute h-[0.9rem] w-[0.9rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
<span className="sr-only">Toggle theme</span>
</Button>
</DropdownMenuTrigger>