Skip to content

Commit bb075d4

Browse files
taylorotwelltaylorotwell
committed
Merge branch 'main' into workos
2 parents d36e15c + 4c7d0e3 commit bb075d4

File tree

11 files changed

+70
-34
lines changed

11 files changed

+70
-34
lines changed

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
],
5656
"dev": [
5757
"Composer\\Config::disableProcessTimeout",
58-
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite"
58+
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite --kill-others"
5959
],
6060
"dev:ssr": [
6161
"npm run build:ssr",
6262
"Composer\\Config::disableProcessTimeout",
63-
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"php artisan inertia:start-ssr\" --names=server,queue,logs,ssr"
63+
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"php artisan inertia:start-ssr\" --names=server,queue,logs,ssr --kill-others"
6464
],
6565
"test": [
6666
"@php artisan config:clear --ansi",

‎config/inertia.php‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?php
2+
3+
return [
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| Server Side Rendering
8+
|--------------------------------------------------------------------------
9+
|
10+
| These options configure if and how Inertia uses Server Side Rendering
11+
| to pre-render every initial visit made to your application's pages
12+
| automatically. A separate rendering service should be available.
13+
|
14+
| See: https://inertiajs.com/server-side-rendering
15+
|
16+
*/
17+
18+
'ssr' => [
19+
'enabled' => true,
20+
'url' => 'http://127.0.0.1:13714',
21+
// 'bundle' => base_path('bootstrap/ssr/ssr.mjs'),
22+
],
23+
24+
/*
25+
|--------------------------------------------------------------------------
26+
| Testing
27+
|--------------------------------------------------------------------------
28+
|
29+
| The values described here are used to locate Inertia components on the
30+
| filesystem. For instance, when using `assertInertia`, the assertion
31+
| attempts to locate the component as a file relative to the paths.
32+
|
33+
*/
34+
35+
'testing' => [
36+
'ensure_pages_exist' => true,
37+
38+
'page_paths' => [
39+
resource_path('js/pages'),
40+
],
41+
42+
'page_extensions' => [
43+
'js',
44+
'jsx',
45+
'svelte',
46+
'ts',
47+
'tsx',
48+
'vue',
49+
],
50+
],
51+
52+
];

‎resources/css/app.css‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -163,20 +163,6 @@
163163
hsl(240 5.9% 10%);
164164
}
165165

166-
@layer base {
167-
* {
168-
@apply border-border;
169-
}
170-
171-
body {
172-
@apply bg-background text-foreground;
173-
}
174-
}
175-
176-
/*
177-
---break---
178-
*/
179-
180166
@layer base {
181167
* {
182168
@apply border-border outline-ring/50;

‎resources/js/app.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ declare module 'vite/client' {
2323
const appName = import.meta.env.VITE_APP_NAME || 'Laravel';
2424

2525
createInertiaApp({
26-
title: (title) => `${title} - ${appName}`,
26+
title: (title) => title ? `${title} - ${appName}` : appName,
2727
resolve: (name) => resolvePageComponent(`./pages/${name}.vue`, import.meta.glob<DefineComponent>('./pages/**/*.vue')),
2828
setup({ el, App, props, plugin }) {
2929
createApp({ render: () => h(App, props) })

‎resources/js/components/AppHeader.vue‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from '@/compon
88
import {
99
NavigationMenu,
1010
NavigationMenuItem,
11-
NavigationMenuLink,
1211
NavigationMenuList,
1312
navigationMenuTriggerStyle,
1413
} from '@/components/ui/navigation-menu';
@@ -117,13 +116,12 @@ const rightNavItems: NavItem[] = [
117116
<NavigationMenu class="ml-10 flex h-full items-stretch">
118117
<NavigationMenuList class="flex h-full items-stretch space-x-2">
119118
<NavigationMenuItem v-for="(item, index) in mainNavItems" :key="index" class="relative flex h-full items-center">
120-
<Link :href="item.href">
121-
<NavigationMenuLink
122-
:class="[navigationMenuTriggerStyle(), activeItemStyles(item.href), 'h-9 cursor-pointer px-3']"
123-
>
124-
<component v-if="item.icon" :is="item.icon" class="mr-2 h-4 w-4" />
125-
{{ item.title }}
126-
</NavigationMenuLink>
119+
<Link
120+
:class="[navigationMenuTriggerStyle(), activeItemStyles(item.href), 'h-9 cursor-pointer px-3']"
121+
:href="item.href"
122+
>
123+
<component v-if="item.icon" :is="item.icon" class="mr-2 h-4 w-4" />
124+
{{ item.title }}
127125
</Link>
128126
<div
129127
v-if="isCurrentRoute(item.href)"

‎resources/js/components/AppLogo.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ import AppLogoIcon from '@/components/AppLogoIcon.vue';
77
<AppLogoIcon class="size-5 fill-current text-white dark:text-black" />
88
</div>
99
<div class="ml-1 grid flex-1 text-left text-sm">
10-
<span class="mb-0.5 truncate font-semibold leading-none">Laravel Starter Kit</span>
10+
<span class="mb-0.5 truncate font-semibold leading-tight">Laravel Starter Kit</span>
1111
</div>
1212
</template>

‎resources/js/components/Breadcrumbs.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
import { Breadcrumb, BreadcrumbItem, BreadcrumbLink, BreadcrumbList, BreadcrumbPage, BreadcrumbSeparator } from '@/components/ui/breadcrumb';
33
import { Link } from '@inertiajs/vue3';
44
5-
interface BreadcrumbItem {
5+
interface BreadcrumbItemType {
66
title: string;
77
href?: string;
88
}
99
1010
defineProps<{
11-
breadcrumbs: BreadcrumbItem[];
11+
breadcrumbs: BreadcrumbItemType[];
1212
}>();
1313
</script>
1414

‎resources/js/components/DeleteUser.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ const closeModal = () => {
5959
<Button variant="secondary" @click="closeModal"> Cancel </Button>
6060
</DialogClose>
6161

62-
<Button variant="destructive" :disabled="form.processing">
63-
<button type="submit">Delete account</button>
62+
<Button type="submit" variant="destructive" :disabled="form.processing">
63+
Delete account
6464
</Button>
6565
</DialogFooter>
6666
</form>

‎resources/js/components/ui/sidebar/SidebarInset.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const props = defineProps<{
1212
data-slot="sidebar-inset"
1313
:class="cn(
1414
'bg-background relative flex w-full flex-1 flex-col',
15-
'md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-2',
15+
'md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-0',
1616
props.class,
1717
)"
1818
>

‎resources/js/composables/useAppearance.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ export function initializeTheme() {
6262
mediaQuery()?.addEventListener('change', handleSystemThemeChange);
6363
}
6464

65-
export function useAppearance() {
66-
const appearance = ref<Appearance>('system');
65+
const appearance = ref<Appearance>('system');
6766

67+
export function useAppearance() {
6868
onMounted(() => {
6969
const savedAppearance = localStorage.getItem('appearance') as Appearance | null;
7070

0 commit comments

Comments
 (0)