diff --git a/composer.json b/composer.json index 7345ec6..5e0d864 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,12 @@ } ], "require": { - "php": ">=7.1.0", - "laravel/nova": "^4.0" + "php": "^8.1", + "illuminate/support": "^10.0|^11.0|^12.0" + }, + "require-dev": { + "laravel/nova": "^5.0", + "laravel/nova-devtool": "^1.7" }, "autoload": { "psr-4": { @@ -37,11 +41,5 @@ "sort-packages": true }, "minimum-stability": "dev", - "prefer-stable": true, - "repositories": [ - { - "type": "composer", - "url": "https://nova.laravel.com" - } - ] + "prefer-stable": true } diff --git a/package.json b/package.json index 23609a0..dbefb9d 100644 --- a/package.json +++ b/package.json @@ -5,19 +5,17 @@ "watch": "mix watch", "watch-poll": "mix watch -- --watch-options-poll=1000", "hot": "mix watch --hot", - "prod": "mix --production" + "prod": "mix --production", + "nova:install": "npm --prefix='../../vendor/laravel/nova' ci" }, "devDependencies": { - "laravel-mix": "^6.0.43", - "vue-loader": "^16.8.3", - "vue-template-compiler": "^2.6.14" + "laravel-mix": "^6.0.43" }, "dependencies": { "chart.js": "^3.7.0", "chartjs-plugin-datalabels": "^2.0.0", "serialize-javascript": "^4.0.0", "sweetalert2": "^9.17.1", - "vue": "^3.2.31", "vue-chartjs": "^4.0.0" } } diff --git a/resources/js/chart-js-integration.js b/resources/js/chart-js-integration.js index 85b8d69..eb386d2 100644 --- a/resources/js/chart-js-integration.js +++ b/resources/js/chart-js-integration.js @@ -9,7 +9,7 @@ import PieChart from './components/PieChart' import PolarAreaChart from './components/PolarAreaChart' import ScatterChart from './components/ScatterChart' -Nova.booting((Vue) => { +Nova.booting((app, store) => { const textColor = getComputedStyle(document.documentElement) .getPropertyValue('--colors-gray-400'); @@ -17,12 +17,11 @@ Nova.booting((Vue) => { Chart.register(...registerables); Chart.defaults.color = `rgba(${textColor}, 1)`; - Vue.component('stacked-chart', StackedChart); - Vue.component('bar-chart', BarChart); - Vue.component('stripe-chart', LineChart); - Vue.component('doughnut-chart', DoughnutChart); - Vue.component('pie-chart', PieChart); - Vue.component('polar-area-chart', PolarAreaChart); - Vue.component('scatter-chart', ScatterChart); + app.component('stacked-chart', StackedChart); + app.component('bar-chart', BarChart); + app.component('stripe-chart', LineChart); + app.component('doughnut-chart', DoughnutChart); + app.component('pie-chart', PieChart); + app.component('polar-area-chart', PolarAreaChart); + app.component('scatter-chart', ScatterChart); }) - diff --git a/resources/js/components/BarChart.vue b/resources/js/components/BarChart.vue index 13ea1aa..af87402 100644 --- a/resources/js/components/BarChart.vue +++ b/resources/js/components/BarChart.vue @@ -3,15 +3,15 @@

{{ checkTitle }}

- + + + - +