diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php index c39bc7c..f24215c 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/composer.lock b/composer.lock index 7d273d9..cea7dcd 100644 --- a/composer.lock +++ b/composer.lock @@ -290,32 +290,28 @@ }, { "name": "doctrine/lexer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" + "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", + "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11.8", - "phpunit/phpunit": "^8.2" + "doctrine/coding-standard": "^9.0", + "phpstan/phpstan": "1.3", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.11" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" @@ -350,7 +346,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.1" + "source": "https://github.com/doctrine/lexer/tree/1.2.2" }, "funding": [ { @@ -366,7 +362,7 @@ "type": "tidelift" } ], - "time": "2020-05-25T17:44:05+00:00" + "time": "2022-01-12T08:27:12+00:00" }, { "name": "dragonmantank/cron-expression", @@ -6854,16 +6850,16 @@ }, { "name": "nunomaduro/collision", - "version": "v5.10.0", + "version": "v5.11.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "3004cfa49c022183395eabc6d0e5207dfe498d00" + "reference": "8b610eef8582ccdc05d8f2ab23305e2d37049461" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/3004cfa49c022183395eabc6d0e5207dfe498d00", - "reference": "3004cfa49c022183395eabc6d0e5207dfe498d00", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/8b610eef8582ccdc05d8f2ab23305e2d37049461", + "reference": "8b610eef8582ccdc05d8f2ab23305e2d37049461", "shasum": "" }, "require": { @@ -6925,7 +6921,7 @@ }, "funding": [ { - "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L", + "url": "https://www.paypal.com/paypalme/enunomaduro", "type": "custom" }, { @@ -6937,7 +6933,7 @@ "type": "patreon" } ], - "time": "2021-09-20T15:06:32+00:00" + "time": "2022-01-10T16:22:52+00:00" }, { "name": "nunomaduro/larastan", diff --git a/package-lock.json b/package-lock.json index a58928e..35166cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8451,9 +8451,9 @@ } }, "node_modules/tailwindcss": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.12.tgz", - "integrity": "sha512-VqhF86z2c34sJyS5ZS8Q2nYuN0KzqZw1GGsuQQO9kJ3mY1oG7Fsag0vICkxUVXk6P+1sUkTkjMjKWCjEF0hNHw==", + "version": "3.0.13", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.13.tgz", + "integrity": "sha512-raRPGFwQSGXn/3h0ttHND9jyPYfqk/ur2NXtlQuK25+ZnrCjlH1s1j4/oPswHGMoZzGNykUVycZ/LcROanUE0A==", "dependencies": { "arg": "^5.0.1", "chalk": "^4.1.2", @@ -8474,7 +8474,7 @@ "postcss-selector-parser": "^6.0.8", "postcss-value-parser": "^4.2.0", "quick-lru": "^5.1.1", - "resolve": "^1.20.0" + "resolve": "^1.21.0" }, "bin": { "tailwind": "lib/cli.js", @@ -15646,9 +15646,9 @@ } }, "tailwindcss": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.12.tgz", - "integrity": "sha512-VqhF86z2c34sJyS5ZS8Q2nYuN0KzqZw1GGsuQQO9kJ3mY1oG7Fsag0vICkxUVXk6P+1sUkTkjMjKWCjEF0hNHw==", + "version": "3.0.13", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.13.tgz", + "integrity": "sha512-raRPGFwQSGXn/3h0ttHND9jyPYfqk/ur2NXtlQuK25+ZnrCjlH1s1j4/oPswHGMoZzGNykUVycZ/LcROanUE0A==", "requires": { "arg": "^5.0.1", "chalk": "^4.1.2", @@ -15669,7 +15669,7 @@ "postcss-selector-parser": "^6.0.8", "postcss-value-parser": "^4.2.0", "quick-lru": "^5.1.1", - "resolve": "^1.20.0" + "resolve": "^1.21.0" }, "dependencies": { "glob-parent": { diff --git a/public/img/icon.png b/public/img/icon.png new file mode 100644 index 0000000..c6124b4 Binary files /dev/null and b/public/img/icon.png differ diff --git a/public/img/logo.png b/public/img/logo.png new file mode 100644 index 0000000..853f4e3 Binary files /dev/null and b/public/img/logo.png differ 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..f23d97d --- /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..0c09d2c 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: [