diff --git a/package-lock.json b/package-lock.json index 274525f..14da6d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,8 +14,7 @@ "@fortawesome/free-brands-svg-icons": "^6.6.0", "@fortawesome/free-solid-svg-icons": "^6.6.0", "@fortawesome/vue-fontawesome": "^3.0.8", - "@inertiajs/inertia": "^0.11.1", - "@inertiajs/inertia-vue3": "^0.6.0", + "@inertiajs/vue3": "^1.2.0", "@vitejs/plugin-vue": "^5.1.4", "@vueuse/core": "^11.1.0", "nprogress": "^0.2.0", @@ -506,37 +505,30 @@ "vue": ">= 3.0.0 < 4" } }, - "node_modules/@inertiajs/inertia": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/@inertiajs/inertia/-/inertia-0.11.1.tgz", - "integrity": "sha512-btmV53c54oW4Z9XF0YyTdIUnM7ue0ONy3/KJOz6J1C5CYIwimiKfDMpz8ZbGJuxS+SPdOlNsqj2ZhlHslpJRZg==", + "node_modules/@inertiajs/core": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@inertiajs/core/-/core-1.2.0.tgz", + "integrity": "sha512-6U0gqCPbGGGMcLoDm+ckKipc5gptZMmfVFfPGdO7vlO7yipWf1RD+TKkcZGJklFvfgFMKwK2VPw8GAv1OctuQA==", "dependencies": { - "axios": "^0.21.1", + "axios": "^1.6.0", "deepmerge": "^4.0.0", + "nprogress": "^0.2.0", "qs": "^6.9.0" } }, - "node_modules/@inertiajs/inertia-vue3": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@inertiajs/inertia-vue3/-/inertia-vue3-0.6.0.tgz", - "integrity": "sha512-qhPBtd/G0VS7vVVbYw1rrqKB6JqRusxqt+5ec2GLmK6t7fTlBBnZ3KsakmGZLSM1m1OGkNcfn4ifmCk3zfA8RQ==", + "node_modules/@inertiajs/vue3": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@inertiajs/vue3/-/vue3-1.2.0.tgz", + "integrity": "sha512-Y6AsvwIK/E1pQKAMp8B7i99CbNApcTYb7j8R+TXM/AFQG6yBlQ1Qb9oFMItb6VimXSnDyfO4+FWe/JPLk9OIVA==", "dependencies": { + "@inertiajs/core": "1.2.0", "lodash.clonedeep": "^4.5.0", "lodash.isequal": "^4.5.0" }, "peerDependencies": { - "@inertiajs/inertia": "^0.11.0", "vue": "^3.0.0" } }, - "node_modules/@inertiajs/inertia/node_modules/axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "dependencies": { - "follow-redirects": "^1.14.0" - } - }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", diff --git a/package.json b/package.json index 1e338bf..96baa8d 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,7 @@ "@fortawesome/free-brands-svg-icons": "^6.6.0", "@fortawesome/free-solid-svg-icons": "^6.6.0", "@fortawesome/vue-fontawesome": "^3.0.8", - "@inertiajs/inertia": "^0.11.1", - "@inertiajs/inertia-vue3": "^0.6.0", + "@inertiajs/vue3": "^1.2.0", "@vitejs/plugin-vue": "^5.1.4", "@vueuse/core": "^11.1.0", "nprogress": "^0.2.0", diff --git a/resources/js/Pages/App/Index.vue b/resources/js/Pages/App/Index.vue index e12fb0e..a427726 100644 --- a/resources/js/Pages/App/Index.vue +++ b/resources/js/Pages/App/Index.vue @@ -1,94 +1,149 @@ - \ No newline at end of file + diff --git a/resources/js/Pages/Person/Show.vue b/resources/js/Pages/Person/Show.vue index d04ba53..7e9fae0 100644 --- a/resources/js/Pages/Person/Show.vue +++ b/resources/js/Pages/Person/Show.vue @@ -1,161 +1,226 @@ - + diff --git a/resources/js/app.js b/resources/js/app.js index 9281b65..4a7ce81 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1,7 +1,7 @@ import { createApp, h } from "vue"; import { resolvePageComponent } from "laravel-vite-plugin/inertia-helpers"; -import { createInertiaApp } from "@inertiajs/inertia-vue3"; +import { createInertiaApp } from "@inertiajs/vue3"; import { library } from "@fortawesome/fontawesome-svg-core"; import { faArrowLeft, @@ -26,7 +26,7 @@ import VueQrcode from "@chenfengyuan/vue-qrcode"; import axios from "axios"; import VueAxios from "vue-axios"; //import { InertiaProgress } from '@inertiajs/progress' -import { Inertia } from "@inertiajs/inertia"; +import { router } from "@inertiajs/vue3"; import NProgress from "nprogress"; // fontawesome @@ -49,8 +49,8 @@ library.add( faGlassWater ); -Inertia.on("start", () => NProgress.start()); -Inertia.on("finish", () => NProgress.done()); +router.on("start", () => NProgress.start()); +router.on("finish", () => NProgress.done()); createInertiaApp({ resolve: (name) =>