diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php index c39bc7c..e76a753 100644 --- a/app/Http/Middleware/HandleInertiaRequests.php +++ b/app/Http/Middleware/HandleInertiaRequests.php @@ -12,6 +12,15 @@ class HandleInertiaRequests extends Middleware public function share(Request $request): array { return array_merge(parent::share($request), [ + "auth" => fn() => [ + "user" => [ + "name" => 'Chelsea Hagon', + "email" => 'chelseahagon@example.com', + "role" => 'Human Resources Manager', + "imageUrl" => + 'https://images.unsplash.com/photo-1550525811-e5869dd03032?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80', + ], + ], "flash" => fn() => [ "success" => $request->session()->get("success"), "error" => $request->session()->get("error"), diff --git a/public/img/logo.png b/public/img/logo.png new file mode 100644 index 0000000..c6124b4 Binary files /dev/null and b/public/img/logo.png differ diff --git a/public/img/logo.svg b/public/img/logo.svg new file mode 100644 index 0000000..c6b321d --- /dev/null +++ b/public/img/logo.svg @@ -0,0 +1,109 @@ + + + +image/svg+xml diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue index b080cdb..f84cb24 100644 --- a/resources/js/Pages/Dashboard.vue +++ b/resources/js/Pages/Dashboard.vue @@ -1,681 +1,370 @@ diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue new file mode 100644 index 0000000..97e7175 --- /dev/null +++ b/resources/js/Shared/MainMenu.vue @@ -0,0 +1,285 @@ + + + + diff --git a/resources/js/app.js b/resources/js/app.js index 1ef93aa..9cab07a 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1,14 +1,24 @@ import {createApp, h} from 'vue'; -import {createInertiaApp} from '@inertiajs/inertia-vue3'; +import {createInertiaApp, Head, Link} from '@inertiajs/inertia-vue3'; import {InertiaProgress} from '@inertiajs/progress'; +import Layout from '@/Shared/Layout'; createInertiaApp({ - resolve: name => require(`./Pages/${name}`), + resolve: name => { + const page = require(`./Pages/${name}`).default; + + page.layout = page.layout || Layout; + + return page; + }, setup({el, App, props, plugin}) { createApp({render: () => h(App, props)}) .use(plugin) + .component('InertiaLink', Link) + .component('InertiaHead', Head) .mount(el); }, + title: title => `${title} - Toby`, }); InertiaProgress.init(); diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php index 90d965c..2d9199a 100644 --- a/resources/views/app.blade.php +++ b/resources/views/app.blade.php @@ -3,6 +3,7 @@ + diff --git a/tailwind.config.js b/tailwind.config.js index 40210da..cda7b7e 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -9,6 +9,20 @@ module.exports = { fontFamily: { sans: ['Inter var', ...defaultTheme.fontFamily.sans], }, + colors: { + 'blumilk': { + '50': '#D5DFEE', + '100': '#C7D4E9', + '200': '#AABDDD', + '300': '#8CA7D1', + '400': '#6F90C6', + '500': '#527ABA', + '600': '#3C5F97', + '700': '#2C466F', + '800': '#1C2D47', + '900': '#0C141F' + }, + } }, }, plugins: [