diff --git a/apps/web/app/(dashboard)/home/[account]/_components/account-layout-sidebar.tsx b/apps/web/app/(dashboard)/home/[account]/_components/account-layout-sidebar.tsx index 0a14dfb15..b9b785dae 100644 --- a/apps/web/app/(dashboard)/home/[account]/_components/account-layout-sidebar.tsx +++ b/apps/web/app/(dashboard)/home/[account]/_components/account-layout-sidebar.tsx @@ -69,7 +69,7 @@ function SidebarContainer(props: { return ( <> - + - + diff --git a/apps/web/app/(dashboard)/home/[account]/page.tsx b/apps/web/app/(dashboard)/home/[account]/page.tsx index f68ddae11..22fbef8e6 100644 --- a/apps/web/app/(dashboard)/home/[account]/page.tsx +++ b/apps/web/app/(dashboard)/home/[account]/page.tsx @@ -1,6 +1,6 @@ import loadDynamic from 'next/dynamic'; -import { Plus } from 'lucide-react'; +import { PlusCircle } from 'lucide-react'; import { Button } from '@kit/ui/button'; import { PageBody } from '@kit/ui/page'; @@ -55,8 +55,8 @@ function TeamAccountHomePage({ description={} account={params.account} > - diff --git a/apps/web/app/(dashboard)/home/_components/home-sidebar.tsx b/apps/web/app/(dashboard)/home/_components/home-sidebar.tsx index 0b261a435..294635a0b 100644 --- a/apps/web/app/(dashboard)/home/_components/home-sidebar.tsx +++ b/apps/web/app/(dashboard)/home/_components/home-sidebar.tsx @@ -20,7 +20,7 @@ export function HomeSidebar() { return ( - + } @@ -32,7 +32,7 @@ export function HomeSidebar() { - + diff --git a/apps/web/package.json b/apps/web/package.json index 443ca9172..e345401ed 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -60,7 +60,7 @@ "i18next": "^23.11.2", "i18next-resources-to-backend": "^1.2.1", "lucide-react": "^0.368.0", - "next": "14.3.0-canary.7", + "next": "14.3.0-canary.9", "next-sitemap": "^4.2.3", "next-themes": "0.3.0", "react": "18.2.0", @@ -76,7 +76,7 @@ "@kit/prettier-config": "workspace:^", "@kit/tailwind-config": "workspace:^", "@kit/tsconfig": "workspace:^", - "@next/bundle-analyzer": "14.3.0-canary.7", + "@next/bundle-analyzer": "14.3.0-canary.9", "@types/mdx": "^2.0.13", "@types/node": "^20.12.7", "@types/react": "^18.2.79", @@ -85,7 +85,7 @@ "dotenv-cli": "^7.4.1", "eslint": "^8.57.0", "prettier": "^3.2.5", - "supabase": "^1.159.1", + "supabase": "^1.162.4", "tailwindcss": "3.4.3", "typescript": "^5.4.5" }, diff --git a/apps/web/styles/globals.css b/apps/web/styles/globals.css index eb9a01cdc..d401e411a 100644 --- a/apps/web/styles/globals.css +++ b/apps/web/styles/globals.css @@ -43,7 +43,7 @@ --muted: 223 47% 11%; --muted-foreground: 215.4 16.3% 56.9%; - --accent: 216 34% 17%; + --accent: 216 34% 10%; --accent-foreground: 210 40% 98%; --popover: 224 71% 4%; @@ -58,7 +58,7 @@ --primary: 210 40% 98%; --primary-foreground: 222.2 47.4% 1.2%; - --secondary: 222.2 47.4% 11.2%; + --secondary: 216 34% 10%; --secondary-foreground: 210 40% 98%; --destructive: 0 63% 31%; diff --git a/package.json b/package.json index 54a7974e8..8264e0f57 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ }, "pnpm": { "overrides": { - "next": "14.3.0-canary.7", + "next": "14.3.0-canary.9", "react": "18.2.0", "react-dom": "18.2.0" } diff --git a/packages/billing/gateway/package.json b/packages/billing/gateway/package.json index 444dfca05..f56dc103e 100644 --- a/packages/billing/gateway/package.json +++ b/packages/billing/gateway/package.json @@ -47,7 +47,7 @@ "@types/react": "^18.2.79", "date-fns": "^3.6.0", "lucide-react": "^0.368.0", - "next": "14.3.0-canary.7", + "next": "14.3.0-canary.9", "react": "18.2.0", "react-hook-form": "^7.51.3", "react-i18next": "^14.1.0", diff --git a/packages/billing/gateway/src/components/plan-picker.tsx b/packages/billing/gateway/src/components/plan-picker.tsx index 196340523..b39cef2d5 100644 --- a/packages/billing/gateway/src/components/plan-picker.tsx +++ b/packages/billing/gateway/src/components/plan-picker.tsx @@ -142,10 +142,10 @@ export function PlanPicker( htmlFor={interval} key={interval} className={cn( - 'hover:bg-muted flex items-center space-x-2 rounded-md border border-transparent px-4 py-2', + 'hover:bg-secondary flex items-center space-x-2 rounded-md border border-transparent px-4 py-2', { - ['border-primary']: selected, - ['hover:bg-muted']: !selected, + ['border-primary bg-secondary']: selected, + ['hover:bg-secondary']: !selected, }, )} > @@ -173,7 +173,6 @@ export function PlanPicker( diff --git a/packages/billing/stripe/package.json b/packages/billing/stripe/package.json index 93d4a1f84..8c90f88f6 100644 --- a/packages/billing/stripe/package.json +++ b/packages/billing/stripe/package.json @@ -26,7 +26,7 @@ "dependencies": { "@stripe/react-stripe-js": "^2.7.0", "@stripe/stripe-js": "^3.3.0", - "stripe": "^15.1.0" + "stripe": "^15.2.0" }, "devDependencies": { "@kit/billing": "workspace:^", diff --git a/packages/cms/core/src/create-cms-client.ts b/packages/cms/core/src/create-cms-client.ts index 6a07a348a..bee8f8ddc 100644 --- a/packages/cms/core/src/create-cms-client.ts +++ b/packages/cms/core/src/create-cms-client.ts @@ -50,7 +50,10 @@ async function getKeystaticClient() { function mockCMSClient() { return { getContentItems() { - return Promise.resolve([]); + return Promise.resolve({ + items: [], + total: 0, + }); }, getContentItemBySlug() { return Promise.resolve(undefined); diff --git a/packages/features/accounts/package.json b/packages/features/accounts/package.json index ca7355ddc..8c605d5eb 100644 --- a/packages/features/accounts/package.json +++ b/packages/features/accounts/package.json @@ -36,7 +36,7 @@ "@types/react": "^18.2.79", "@types/react-dom": "^18.2.25", "lucide-react": "^0.368.0", - "next": "14.3.0-canary.7", + "next": "14.3.0-canary.9", "next-themes": "0.3.0", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/packages/features/accounts/src/components/personal-account-dropdown.tsx b/packages/features/accounts/src/components/personal-account-dropdown.tsx index 2bcf4728e..212ea07bb 100644 --- a/packages/features/accounts/src/components/personal-account-dropdown.tsx +++ b/packages/features/accounts/src/components/personal-account-dropdown.tsx @@ -83,8 +83,8 @@ export function PersonalAccountDropdown({ 'animate-in fade-in group flex cursor-pointer items-center focus:outline-none', className ?? '', { - ['active:bg-muted/50 items-center space-x-2.5 rounded-md' + - ' hover:bg-muted p-2 transition-colors']: showProfileName, + ['active:bg-secondary/50 items-center space-x-2.5 rounded-md' + + ' hover:bg-secondary p-2 transition-colors']: showProfileName, }, )} > diff --git a/packages/features/admin/package.json b/packages/features/admin/package.json index b71e0806c..64bf232bb 100644 --- a/packages/features/admin/package.json +++ b/packages/features/admin/package.json @@ -40,7 +40,7 @@ "@tanstack/react-table": "^8.16.0", "@types/react": "^18.2.79", "lucide-react": "^0.368.0", - "next": "14.3.0-canary.7", + "next": "14.3.0-canary.9", "react": "18.2.0", "react-hook-form": "^7.51.3", "zod": "^3.22.4" diff --git a/packages/features/auth/package.json b/packages/features/auth/package.json index af6f301f1..352cba3c6 100644 --- a/packages/features/auth/package.json +++ b/packages/features/auth/package.json @@ -32,7 +32,7 @@ "@tanstack/react-query": "5.29.2", "@types/react": "^18.2.79", "lucide-react": "^0.368.0", - "next": "14.3.0-canary.7", + "next": "14.3.0-canary.9", "react-hook-form": "^7.51.3", "react-i18next": "^14.1.0", "sonner": "^1.4.41", diff --git a/packages/features/team-accounts/package.json b/packages/features/team-accounts/package.json index 02ce656de..d81bbc5b0 100644 --- a/packages/features/team-accounts/package.json +++ b/packages/features/team-accounts/package.json @@ -37,7 +37,7 @@ "class-variance-authority": "^0.7.0", "date-fns": "^3.6.0", "lucide-react": "^0.368.0", - "next": "14.3.0-canary.7", + "next": "14.3.0-canary.9", "react": "18.2.0", "react-dom": "18.2.0", "react-hook-form": "^7.51.3", diff --git a/packages/next/package.json b/packages/next/package.json index 4fc5287e4..6f796dae8 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -28,7 +28,7 @@ "@kit/tailwind-config": "workspace:*", "@kit/tsconfig": "workspace:*", "@supabase/supabase-js": "^2.42.4", - "next": "14.3.0-canary.7", + "next": "14.3.0-canary.9", "zod": "^3.22.4" }, "eslintConfig": { diff --git a/packages/supabase/package.json b/packages/supabase/package.json index cb77935b5..2ad7cf5cc 100644 --- a/packages/supabase/package.json +++ b/packages/supabase/package.json @@ -32,7 +32,7 @@ "@supabase/supabase-js": "^2.42.4", "@tanstack/react-query": "5.29.2", "@types/react": "^18.2.79", - "next": "14.3.0-canary.7", + "next": "14.3.0-canary.9", "react": "18.2.0", "zod": "^3.22.4" }, diff --git a/packages/ui/package.json b/packages/ui/package.json index 4757d1977..4a8ccff48 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -59,7 +59,7 @@ "date-fns": "^3.6.0", "eslint": "^8.57.0", "lucide-react": "^0.368.0", - "next": "14.3.0-canary.7", + "next": "14.3.0-canary.9", "next-themes": "0.3.0", "prettier": "^3.2.5", "react-day-picker": "^8.10.1", diff --git a/packages/ui/src/makerkit/page.tsx b/packages/ui/src/makerkit/page.tsx index 20b46c270..aa35f5318 100644 --- a/packages/ui/src/makerkit/page.tsx +++ b/packages/ui/src/makerkit/page.tsx @@ -14,7 +14,7 @@ export function Page(
{props.children} @@ -45,27 +45,29 @@ export function PageHeader({ }>) { return (
{mobileNavigation}
-

- - - {title} - - +

+ {title}

- + {description}

diff --git a/packages/ui/src/makerkit/sidebar.tsx b/packages/ui/src/makerkit/sidebar.tsx index ab3b8dd41..dc7b6ddd0 100644 --- a/packages/ui/src/makerkit/sidebar.tsx +++ b/packages/ui/src/makerkit/sidebar.tsx @@ -161,12 +161,12 @@ export function SidebarItem({ const currentPath = usePathname() ?? ''; const active = isRouteActive(path, currentPath, end ? 0 : 3); const variant = active ? 'secondary' : 'ghost'; - const size = collapsed ? 'icon' : 'default'; + const size = collapsed ? 'icon' : 'sm'; return (