fix conflict and add seeder vilages

composer.json

@@ -3,7 +3,10 @@
     "name": "laravel/laravel",
     "type": "project",
     "description": "The skeleton application for the Laravel framework.",
-    "keywords": ["laravel", "framework"],
+    "keywords": [
+        "laravel",
+        "framework"
+    ],
     "license": "MIT",
     "require": {
         "php": "^8.2",
@@ -72,11 +75,5 @@
         }
     },
     "minimum-stability": "stable",
-    "prefer-stable": true,
+    "prefer-stable": true
-    "repositories": {
-        "grocery-crud": {
-            "type": "composer",
-            "url": "https://composer.grocerycrud.com/"
-        }
-    }
 }

database/seeders/UsersRoleMenuSeeder.php

@@ -143,6 +143,13 @@ class UsersRoleMenuSeeder extends Seeder
                 "parent_id" => $data->id,
                 "sort_order" => 1,
             ],
+            [
+                "name" => "Reklame",
+                "url" => "advertisements.index",
+                "icon" => null,
+                "parent_id" => $data->id,
+                "sort_order" => 1,
+            ],
         ];
 
         foreach ($children_menus as $child_menu) {
@@ -157,6 +164,7 @@ class UsersRoleMenuSeeder extends Seeder
         $setting_role = Menu::where('name', 'Role')->first();
         $setting_dashboard = Menu::where('name', 'Setting Dashboard')->first();
         $setting_pbg = Menu::where('name', 'PBG')->first();
+        $reklame = Menu::where('name', 'Reklame')->first();
 
         // Superadmin gets all menus
         $superadmin->menus()->sync([
@@ -175,6 +183,7 @@ class UsersRoleMenuSeeder extends Seeder
             $setting_role->id => ["allow_show" => true, "allow_create" => true, "allow_update" => true, "allow_destroy" => true],
             $setting_dashboard->id => ["allow_show" => true, "allow_create" => true, "allow_update" => true, "allow_destroy" => true],
             $setting_pbg->id => ["allow_show" => true, "allow_create" => true, "allow_update" => true, "allow_destroy" => true],
+            $reklame->id => ["allow_show" => true, "allow_create" => true, "allow_update" => true, "allow_destroy" => true],
         ]);
 
         // Admin gets limited menus

public/build/.vite/manifest.json

@@ -94,7 +94,7 @@
     "isEntry": true
   },
   "resources/js/dashboards/bigdata.js": {
-    "file": "assets/bigdata-DCJUcfXz.js",
+    "file": "assets/bigdata-DBp18hcY.js",
     "name": "bigdata",
     "src": "resources/js/dashboards/bigdata.js",
     "isEntry": true,
@@ -128,6 +128,26 @@
     "src": "resources/js/data-settings/update.js",
     "isEntry": true
   },
+  "resources/js/data/advertisements/data-advertisements.js": {
+    "file": "assets/data-advertisements-C_ZfB4RA.js",
+    "name": "data-advertisements",
+    "src": "resources/js/data/advertisements/data-advertisements.js",
+    "isEntry": true,
+    "imports": [
+      "_gridjs.umd-BiCNXlqL.js",
+      "_global-config-9uDKFQ8j.js",
+      "__commonjsHelpers-C4iS2aBk.js"
+    ]
+  },
+  "resources/js/data/advertisements/form-create-update.js": {
+    "file": "assets/form-create-update-CyN97GsU.js",
+    "name": "form-create-update",
+    "src": "resources/js/data/advertisements/form-create-update.js",
+    "isEntry": true,
+    "imports": [
+      "_global-config-9uDKFQ8j.js"
+    ]
+  },
   "resources/js/master/users/create.js": {
     "file": "assets/create-RO4xgm-f.js",
     "name": "create",
@@ -356,7 +376,7 @@
     "isEntry": true
   },
   "resources/scss/style.scss": {
-    "file": "assets/style-B3TufzIa.css",
+    "file": "assets/style-DF7fxh2D.css",
     "src": "resources/scss/style.scss",
     "isEntry": true
   }

vite.config.js

@@ -44,7 +44,7 @@ export default defineConfig({
                 "resources/js/pages/maps-iraq.js",
                 "resources/js/pages/maps-canada.js",
                 "resources/js/data/advertisements/data-advertisements.js",
-                "resources/js/form-create-update.js",
+                "resources/js/data/advertisements/form-create-update.js",
 
                 //js-additional
                 "resources/js/dashboards/bigdata.js",