diff --git a/app/Http/Controllers/OrganisationController.php b/app/Http/Controllers/OrganisationController.php index f0cebc6..cd08ecb 100644 --- a/app/Http/Controllers/OrganisationController.php +++ b/app/Http/Controllers/OrganisationController.php @@ -2,10 +2,16 @@ namespace App\Http\Controllers; +use App\Models\Provider; +use Illuminate\Http\Request; +use Inertia\Inertia; + class OrganisationController extends Controller { - public function show() + public function show(Request $request) { - return inertia('organisations/Show'); + return inertia('organisations/Show', [ + 'providers' => Inertia::lazy(fn () => Provider::whereOrganisationId($request->route('organisation'))->get()), + ]); } } diff --git a/package-lock.json b/package-lock.json index 81ae410..d80aa2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "lucide": "^0.468.0", "lucide-vue-next": "^0.468.0", "radix-vue": "^1.9.11", + "reka-ui": "^2.2.0", "tailwind-merge": "^2.6.0", "tailwindcss": "^3.4.1", "tailwindcss-animate": "^1.0.7", @@ -3658,6 +3659,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/ohash": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz", + "integrity": "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==", + "license": "MIT" + }, "node_modules/optionator": { "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", @@ -4276,6 +4283,27 @@ "node": ">=8.10.0" } }, + "node_modules/reka-ui": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.2.0.tgz", + "integrity": "sha512-eeRrLI4LwJ6dkdwks6KFNKGs0+beqZlHO3JMHen7THDTh+yJ5Z0KNwONmOhhV/0hZC2uJCEExgG60QPzGstkQg==", + "license": "MIT", + "dependencies": { + "@floating-ui/dom": "^1.6.13", + "@floating-ui/vue": "^1.1.6", + "@internationalized/date": "^3.5.0", + "@internationalized/number": "^3.5.0", + "@tanstack/vue-virtual": "^3.12.0", + "@vueuse/core": "^12.5.0", + "@vueuse/shared": "^12.5.0", + "aria-hidden": "^1.2.4", + "defu": "^6.1.4", + "ohash": "^2.0.11" + }, + "peerDependencies": { + "vue": ">= 3.2.0" + } + }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", diff --git a/package.json b/package.json index 9e6c852..cac7c92 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "lucide": "^0.468.0", "lucide-vue-next": "^0.468.0", "radix-vue": "^1.9.11", + "reka-ui": "^2.2.0", "tailwind-merge": "^2.6.0", "tailwindcss": "^3.4.1", "tailwindcss-animate": "^1.0.7", diff --git a/resources/js/components/AppLogo.vue b/resources/js/components/AppLogo.vue index 3ee328b..08bc5b5 100644 --- a/resources/js/components/AppLogo.vue +++ b/resources/js/components/AppLogo.vue @@ -7,6 +7,6 @@ import AppLogoIcon from '@/components/AppLogoIcon.vue';
- Laravel Starter Kit + Keystone
diff --git a/resources/js/components/ui/tabs/Tabs.vue b/resources/js/components/ui/tabs/Tabs.vue new file mode 100644 index 0000000..15aeca8 --- /dev/null +++ b/resources/js/components/ui/tabs/Tabs.vue @@ -0,0 +1,15 @@ + + + diff --git a/resources/js/components/ui/tabs/TabsContent.vue b/resources/js/components/ui/tabs/TabsContent.vue new file mode 100644 index 0000000..662638d --- /dev/null +++ b/resources/js/components/ui/tabs/TabsContent.vue @@ -0,0 +1,22 @@ + + + diff --git a/resources/js/components/ui/tabs/TabsList.vue b/resources/js/components/ui/tabs/TabsList.vue new file mode 100644 index 0000000..4f78732 --- /dev/null +++ b/resources/js/components/ui/tabs/TabsList.vue @@ -0,0 +1,25 @@ + + + diff --git a/resources/js/components/ui/tabs/TabsTrigger.vue b/resources/js/components/ui/tabs/TabsTrigger.vue new file mode 100644 index 0000000..7e4182e --- /dev/null +++ b/resources/js/components/ui/tabs/TabsTrigger.vue @@ -0,0 +1,29 @@ + + + diff --git a/resources/js/components/ui/tabs/index.ts b/resources/js/components/ui/tabs/index.ts new file mode 100644 index 0000000..a5e58dc --- /dev/null +++ b/resources/js/components/ui/tabs/index.ts @@ -0,0 +1,4 @@ +export { default as Tabs } from './Tabs.vue' +export { default as TabsContent } from './TabsContent.vue' +export { default as TabsList } from './TabsList.vue' +export { default as TabsTrigger } from './TabsTrigger.vue' diff --git a/resources/js/pages/organisations/Show.vue b/resources/js/pages/organisations/Show.vue index 0c29c4b..af87ec5 100644 --- a/resources/js/pages/organisations/Show.vue +++ b/resources/js/pages/organisations/Show.vue @@ -1,14 +1,17 @@ @@ -17,7 +20,24 @@ const props = defineProps({
- {{ organisation }} +

{{ organisation.name }}

+ + + Dashboard + Settings + + Overview on organisation. + + + +

Server Providers

+

Manage your server providers.

+ +
+
+