Merge pull request #32 from Sharifur/dev

upgrade to latest laravel version and change webpack to vite
Sharifur · Jan 21, 2024 · 5cec5cf · 5cec5cf
2 parents ebd466c + 17449d7
commit 5cec5cf
Show file tree

Hide file tree

Showing 137 changed files with 7,869 additions and 19,392 deletions.
diff --git a/app/Http/Controllers/Admin/GeneralSettingsController.php b/app/Http/Controllers/Admin/GeneralSettingsController.php
@@ -38,7 +38,7 @@ public function syncData(){
         $zkHelper = ZktecoHelper::init();
         $getData = $zkHelper->getData();
         $getUsers =  $zkHelper->users();
-//        dd($getUsers);
+//        dd($getUsers,$getData);
         $allEmployee = Employee::where('status',1)->get();
         $buildDataForAttendanceLog = [];
         $filename = 'attendance-file/last-30days-attendance'.Str::uuid()->toString().'.csv';

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -16,7 +16,6 @@ class Kernel extends HttpKernel
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
         \App\Http\Middleware\TrustProxies::class,
-        \Fruitcake\Cors\HandleCors::class,
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,

diff --git a/composer.json b/composer.json
@@ -5,26 +5,29 @@
     "keywords": ["framework", "laravel"],
     "license": "MIT",
     "require": {
-        "php": "^8.0",
-        "fruitcake/laravel-cors": "^2.0",
-        "guzzlehttp/guzzle": "^7.0.1",
-        "inertiajs/inertia-laravel": "^0.4.3",
+        "php": "^8.1",
+        "doctrine/dbal": "^3.0",
+        "guzzlehttp/guzzle": "^7.2",
+        "inertiajs/inertia-laravel": "^0.6.11",
         "intervention/image": "^2.7",
-        "laravel/framework": "^8.54",
-        "laravel/sanctum": "^2.6",
+        "laravel/framework": "^10.10",
+        "laravel/sanctum": "^3.3",
         "laravel/tinker": "^2.5",
         "rats/zkteco": "^002.0",
-        "spatie/laravel-uptime-monitor": "^4.1.",
-        "tightenco/ziggy": "^1.0"
+        "spatie/laravel-uptime-monitor": "^4.2.",
+        "symfony/http-client": "^6.4",
+        "symfony/mailgun-mailer": "^6.4",
+        "symfony/postmark-mailer": "^6.4",
+        "tightenco/ziggy": "^1.8.1"
     },
     "require-dev": {
-        "facade/ignition": "^2.5",
         "fakerphp/faker": "^1.9.1",
-        "laravel/breeze": "^1.4",
-        "laravel/sail": "^1.0.1",
-        "mockery/mockery": "^1.4.2",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.3.3"
+        "laravel/pint": "^1.0",
+        "laravel/sail": "^1.18",
+        "mockery/mockery": "^1.4.4",
+        "nunomaduro/collision": "^7.0",
+        "phpunit/phpunit": "^10.1",
+        "spatie/laravel-ignition": "^2.0"
     },
     "autoload": {
         "psr-4": {