Skip to content

Commit 2216867

Browse files
taylorotwelltaylorotwell
committed
fix conflicts
2 parents 8c15254 + 56b3d93 commit 2216867

File tree

76 files changed

+158
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+158
-311
lines changed

‎app/Http/Middleware/HandleInertiaRequests.php

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public function share(Request $request): array
5050
...(new Ziggy)->toArray(),
5151
'location' => $request->url(),
5252
],
53+
'sidebarOpen' => ! $request->hasCookie('sidebar_state') || $request->cookie('sidebar_state') === 'true',
5354
];
5455
}
5556
}

‎bootstrap/app.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
health: '/up',
1515
)
1616
->withMiddleware(function (Middleware $middleware) {
17-
$middleware->encryptCookies(except: ['appearance']);
17+
$middleware->encryptCookies(except: ['appearance', 'sidebar_state']);
1818

1919
$middleware->web(append: [
2020
HandleAppearance::class,

‎components.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
2-
"$schema": "https://shadcn-vue.com/schema.json",
3-
"style": "default",
4-
"typescript": true,
5-
"tailwind": {
6-
"config": "tailwind.config.js",
7-
"css": "resources/css/app.css",
8-
"baseColor": "neutral",
9-
"cssVariables": true,
10-
"prefix": ""
11-
},
12-
"aliases": {
13-
"components": "@/components",
14-
"composables": "@/composables",
15-
"utils": "@/lib/utils",
16-
"ui": "@/components/ui",
17-
"lib": "@/lib"
18-
},
19-
"iconLibrary": "lucide"
2+
"$schema": "https://shadcn-vue.com/schema.json",
3+
"style": "default",
4+
"typescript": true,
5+
"tailwind": {
6+
"config": "tailwind.config.js",
7+
"css": "resources/css/app.css",
8+
"baseColor": "neutral",
9+
"cssVariables": true,
10+
"prefix": ""
11+
},
12+
"aliases": {
13+
"components": "@/components",
14+
"composables": "@/composables",
15+
"utils": "@/lib/utils",
16+
"ui": "@/components/ui",
17+
"lib": "@/lib"
18+
},
19+
"iconLibrary": "lucide"
2020
}

‎package-lock.json

+29-129
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"laravel-vite-plugin": "^1.0",
3434
"lucide": "^0.468.0",
3535
"lucide-vue-next": "^0.468.0",
36-
"radix-vue": "^1.9.11",
36+
"reka-ui": "^2.0.0",
3737
"tailwind-merge": "^2.5.5",
3838
"tailwindcss": "^3.4.1",
3939
"tailwindcss-animate": "^1.0.7",

‎resources/js/components/AppShell.vue

+4-12
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,22 @@
11
<script setup lang="ts">
22
import { SidebarProvider } from '@/components/ui/sidebar';
3-
import { onMounted, ref } from 'vue';
3+
import { usePage } from '@inertiajs/vue3';
4+
import { SharedData } from '@/types';
45
56
interface Props {
67
variant?: 'header' | 'sidebar';
78
}
89
910
defineProps<Props>();
1011
11-
const isOpen = ref(true);
12-
13-
onMounted(() => {
14-
isOpen.value = localStorage.getItem('sidebar') !== 'false';
15-
});
16-
17-
const handleSidebarChange = (open: boolean) => {
18-
isOpen.value = open;
19-
localStorage.setItem('sidebar', String(open));
20-
};
12+
const isOpen = usePage<SharedData>().props.sidebarOpen;
2113
</script>
2214

2315
<template>
2416
<div v-if="variant === 'header'" class="flex min-h-screen w-full flex-col">
2517
<slot />
2618
</div>
27-
<SidebarProvider v-else :default-open="isOpen" :open="isOpen" @update:open="handleSidebarChange">
19+
<SidebarProvider v-else :default-open="isOpen">
2820
<slot />
2921
</SidebarProvider>
3022
</template>

‎resources/js/components/NavMain.vue

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ const page = usePage<SharedData>();
1515
<SidebarGroupLabel>Platform</SidebarGroupLabel>
1616
<SidebarMenu>
1717
<SidebarMenuItem v-for="item in items" :key="item.title">
18-
<SidebarMenuButton as-child :is-active="item.href === page.url">
18+
<SidebarMenuButton
19+
as-child :is-active="item.href === page.url"
20+
:tooltip="item.title"
21+
>
1922
<Link :href="item.href">
2023
<component :is="item.icon" />
2124
<span>{{ item.title }}</span>

‎resources/js/components/NavUser.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ const { isMobile, state } = useSidebar();
2222
<ChevronsUpDown class="ml-auto size-4" />
2323
</SidebarMenuButton>
2424
</DropdownMenuTrigger>
25-
<DropdownMenuContent
26-
class="w-[--radix-dropdown-menu-trigger-width] min-w-56 rounded-lg"
25+
<DropdownMenuContent
26+
class="w-[--reka-dropdown-menu-trigger-width] min-w-56 rounded-lg"
2727
:side="isMobile ? 'bottom' : state === 'collapsed' ? 'left' : 'bottom'"
2828
align="end"
2929
:side-offset="4"

‎resources/js/components/ui/avatar/Avatar.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup lang="ts">
22
import { cn } from '@/lib/utils';
3-
import { AvatarRoot } from 'radix-vue';
3+
import { AvatarRoot } from 'reka-ui';
44
import type { HTMLAttributes } from 'vue';
55
import { avatarVariant, type AvatarVariants } from '.';
66

‎resources/js/components/ui/avatar/AvatarFallback.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import { AvatarFallback, type AvatarFallbackProps } from 'radix-vue';
2+
import { AvatarFallback, type AvatarFallbackProps } from 'reka-ui';
33
44
const props = defineProps<AvatarFallbackProps>();
55
</script>

‎resources/js/components/ui/avatar/AvatarImage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import { AvatarImage, type AvatarImageProps } from 'radix-vue';
2+
import { AvatarImage, type AvatarImageProps } from 'reka-ui';
33
44
const props = defineProps<AvatarImageProps>();
55
</script>

‎resources/js/components/ui/breadcrumb/BreadcrumbLink.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script lang="ts" setup>
22
import { cn } from '@/lib/utils';
3-
import { Primitive, type PrimitiveProps } from 'radix-vue';
3+
import { Primitive, type PrimitiveProps } from 'reka-ui';
44
import type { HTMLAttributes } from 'vue';
55
66
const props = withDefaults(defineProps<PrimitiveProps & { class?: HTMLAttributes['class'] }>(), {

‎resources/js/components/ui/button/Button.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup lang="ts">
22
import { cn } from '@/lib/utils';
3-
import { Primitive, type PrimitiveProps } from 'radix-vue';
3+
import { Primitive, type PrimitiveProps } from 'reka-ui';
44
import type { HTMLAttributes } from 'vue';
55
import { buttonVariants, type ButtonVariants } from '.';
66

‎resources/js/components/ui/button/index.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ export const buttonVariants = cva(
77
{
88
variants: {
99
variant: {
10-
default: 'bg-primary text-primary-foreground shadow hover:bg-primary/90',
11-
destructive: 'bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90',
12-
outline: 'border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground',
13-
secondary: 'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80',
10+
default: 'bg-primary text-primary-foreground hover:bg-primary/90',
11+
destructive: 'bg-destructive text-destructive-foreground hover:bg-destructive/90',
12+
outline: 'border border-input bg-background hover:bg-accent hover:text-accent-foreground',
13+
secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80',
1414
ghost: 'hover:bg-accent hover:text-accent-foreground',
1515
link: 'text-primary underline-offset-4 hover:underline',
1616
},
1717
size: {
18-
default: 'h-9 px-4 py-2',
19-
sm: 'h-8 rounded-md px-3 text-xs',
20-
lg: 'h-10 rounded-md px-8',
21-
icon: 'h-9 w-9',
18+
default: 'h-10 px-4 py-2',
19+
sm: 'h-9 rounded-md px-3',
20+
lg: 'h-11 rounded-md px-8',
21+
icon: 'h-10 w-10',
2222
},
2323
},
2424
defaultVariants: {

‎resources/js/components/ui/checkbox/Checkbox.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<script setup lang="ts">
2-
import type { CheckboxRootEmits, CheckboxRootProps } from 'radix-vue'
2+
import type { CheckboxRootEmits, CheckboxRootProps } from 'reka-ui'
33
import { cn } from '@/lib/utils'
44
import { Check } from 'lucide-vue-next'
5-
import { CheckboxIndicator, CheckboxRoot, useForwardPropsEmits } from 'radix-vue'
5+
import { CheckboxIndicator, CheckboxRoot, useForwardPropsEmits } from 'reka-ui'
66
import { computed, type HTMLAttributes } from 'vue'
77
88
const props = defineProps<CheckboxRootProps & { class?: HTMLAttributes['class'] }>()

0 commit comments

Comments
 (0)