Merge branch 'main' of https://github.com/inikoo/aiku into main

inikoo · Oct 3, 2024 · 8ffbd39 · 8ffbd39
2 parents 1bd397c + 78d8bac
commit 8ffbd39
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 67 deletions.
diff --git a/app/Actions/Procurement/OrgSupplierProducts/UI/ShowOrgSupplierProduct.php b/app/Actions/Procurement/OrgSupplierProducts/UI/ShowOrgSupplierProduct.php
@@ -153,40 +153,40 @@ public function getBreadcrumbs(string $routeName, array $routeParameters, string
         return match ($routeName) {
             'grp.org.procurement.org_supplier_products.show' =>
                 array_merge(
-                (new ShowProcurementDashboard())->getBreadcrumbs(Arr::only($routeParameters, 'organisation')),
-                $headCrumb(
-                    $orgSupplierProduct,
-                    [
-                        'index' => [
-                            'name'       => 'grp.org.procurement.org_supplier_products.index',
-                            'parameters' => $routeParameters
+                    (new ShowProcurementDashboard())->getBreadcrumbs(Arr::only($routeParameters, 'organisation')),
+                    $headCrumb(
+                        $orgSupplierProduct,
+                        [
+                            'index' => [
+                                'name'       => 'grp.org.procurement.org_supplier_products.index',
+                                'parameters' => $routeParameters
+                            ],
+                            'model' => [
+                                'name'       => 'grp.org.procurement.org_supplier_products.show',
+                                'parameters' => $routeParameters
+                            ]
                         ],
-                        'model' => [
-                            'name'       => 'grp.org.procurement.org_supplier_products.show',
-                            'parameters' => $routeParameters
-                        ]
-                    ],
-                    $suffix
-                )
-            ),
+                        $suffix
+                    )
+                ),
             'grp.org.procurement.org_suppliers.show.supplier_products.show' =>
                 array_merge(
-                (new ShowOrgSupplier())->getBreadcrumbs(Arr::only($routeParameters, ['organisation', 'orgSupplier'])),
-                $headCrumb(
-                    $orgSupplierProduct,
-                    [
-                        'index' => [
-                            'name'       => 'grp.org.procurement.org_suppliers.show',
-                            'parameters' => $routeParameters
+                    (new ShowOrgSupplier())->getBreadcrumbs(Arr::only($routeParameters, ['organisation', 'orgSupplier'])),
+                    $headCrumb(
+                        $orgSupplierProduct,
+                        [
+                            'index' => [
+                                'name'       => 'grp.org.procurement.org_suppliers.show',
+                                'parameters' => $routeParameters
+                            ],
+                            'model' => [
+                                'name'       => 'grp.org.procurement.org_suppliers.show.supplier_products.show',
+                                'parameters' => $routeParameters
+                            ]
                         ],
-                        'model' => [
-                            'name'       => 'grp.org.procurement.org_suppliers.show.supplier_products.show',
-                            'parameters' => $routeParameters
-                        ]
-                    ],
-                    $suffix
-                )
-            ),
+                        $suffix
+                    )
+                ),
             default => []
         };
     }

diff --git a/app/Actions/UI/Iris/ShowHome.php b/app/Actions/UI/Iris/ShowHome.php
@@ -8,7 +8,6 @@
 namespace App\Actions\UI\Iris;
 
 use App\Models\Web\Website;
-use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
 use Inertia\Response;
 use Lorisleiva\Actions\Concerns\AsController;

diff --git a/app/Actions/UI/Retina/Layout/GetRetinaDropshippingNavigation.php b/app/Actions/UI/Retina/Layout/GetRetinaDropshippingNavigation.php
@@ -36,19 +36,15 @@ public function handle(WebUser $webUser): array
             'root' => 'retina.dropshipping.platform.',
             'route' => [
                 'name' => 'retina.dropshipping.platform.dashboard'
-            ],
-            'topMenu' => [
-                'subSections' => [
-                    [
-                        'label' => __('Portfolios'),
-                        'icon' => ['fal', 'fa-cube'],
-                        'root' => 'retina.dropshipping.platform.portfolios.',
-                        'route' => [
-                            'name' => 'retina.dropshipping.platform.portfolios.index',
-
-                        ]
-                    ],
-                ]
+            ]
+        ];
+
+        $groupNavigation['portfolios'] = [
+            'label' => __('Portfolios'),
+            'icon' => ['fal', 'fa-cube'],
+            'root' => 'retina.dropshipping.portfolios.',
+            'route' => [
+                'name' => 'retina.dropshipping.portfolios.index'
             ]
         ];
 

diff --git a/app/Actions/UI/Retina/Layout/GetRetinaFulfilmentNavigation.php b/app/Actions/UI/Retina/Layout/GetRetinaFulfilmentNavigation.php
@@ -179,27 +179,27 @@ public function handle(WebUser $webUser): array
                 ]
             ];
 
-            $groupNavigation['dropshipping'] = [
-                'label'   => __('Dropshipping'),
-                'icon'    => ['fal', 'fa-parachute-box'],
-                'root'    => 'retina.dropshipping.',
-                'route'   => [
-                    'name' => 'retina.dropshipping.dashboard'
-                ],
-                'topMenu' => [
-                    'subSections' => [
-                        [
-                            'label' => __('Products'),
-                            'icon'  => ['fal', 'fa-cube'],
-                            'root'  => 'retina.dropshipping.products.',
-                            'route' => [
-                                'name' => 'retina.dropshipping.products.index',
-
+            /*            $groupNavigation['dropshipping'] = [
+                            'label'   => __('Dropshipping'),
+                            'icon'    => ['fal', 'fa-parachute-box'],
+                            'root'    => 'retina.dropshipping.',
+                            'route'   => [
+                                'name' => 'retina.dropshipping.dashboard'
+                            ],
+                            'topMenu' => [
+                                'subSections' => [
+                                    [
+                                        'label' => __('Products'),
+                                        'icon'  => ['fal', 'fa-cube'],
+                                        'root'  => 'retina.dropshipping.products.',
+                                        'route' => [
+                                            'name' => 'retina.dropshipping.products.index',
+
+                                        ]
+                                    ],
+                                ]
                             ]
-                        ],
-                    ]
-                ]
-            ];
+                        ];*/
 
         }
 

diff --git a/app/Http/Middleware/HandleIrisInertiaRequests.php b/app/Http/Middleware/HandleIrisInertiaRequests.php
@@ -40,7 +40,7 @@ public function share(Request $request): array
                     'user' => $webUser ? LoggedWebUserResource::make($webUser)->getArray() : null,
                 ],
                 'flash' => [
-                    'notification' => fn() => $request->session()->get('notification')
+                    'notification' => fn () => $request->session()->get('notification')
                 ],
                 'ziggy' => [
                     'location' => $request->url(),

diff --git a/routes/grp/web/models.php b/routes/grp/web/models.php
@@ -480,6 +480,7 @@
 
     Route::patch('autosave/header', [PublishWebsiteMarginal::class, 'header'])->name('autosave.header');
     Route::patch('autosave/footer', [PublishWebsiteMarginal::class, 'footer'])->name('autosave.footer');
+    Route::patch('autosave/menu', [PublishWebsiteMarginal::class, 'menu'])->name('autosave.menu');
 
     Route::post('publish/menu', [PublishWebsiteMarginal::class, 'menu'])->name('publish.menu');
 

diff --git a/routes/retina/web/dropshipping.php b/routes/retina/web/dropshipping.php
@@ -16,13 +16,16 @@
 
 Route::prefix('platform')->as('platform.')->group(function () {
     Route::get('/', ShowDropshipping::class)->name('dashboard');
-    Route::get('/portfolios', IndexDropshippingRetinaProducts::class)->name('portfolios.index');
-    Route::get('/portfolios/{portfolio}', ShowProduct::class)->name('portfolios.show');
 
     Route::post('shopify-user', StoreShopifyUser::class)->name('shopify_user.store');
     Route::delete('shopify-user', DeleteShopifyUser::class)->name('shopify_user.delete');
 });
 
+Route::prefix('portfolios')->as('portfolios.')->group(function () {
+    Route::get('/', IndexDropshippingRetinaProducts::class)->name('index');
+    Route::get('{portfolio}', ShowProduct::class)->name('show');
+});
+
 // Route::get('/users', IndexUsers::class)->name('web-users.index');
 // Route::get('/users/{user}', ShowUser::class)->name('web-users.show');
 // Route::get('/users/{user}/edit', EditUser::class)->name('web-users.edit');