Merge pull request #4 from libaro-io/feature/signage-dashboard

Feature/signage dashboard

Author: RosiersRobin

app/Http/Controllers/DisplayController.php

@@ -3,13 +3,14 @@
 namespace App\Http\Controllers;
 
 use App\Models\Company;
+use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
 
 class DisplayController extends Controller
 {
-    public function showDisplay($company_token)
+    public function showDisplayPublic($company_token)
     {
-        $company = Company::query()->where('token', $company_token)->firstOrFail();
+        $company = Company::query()->where('token', '=', $company_token)->firstOrFail();
         $oc = new OrderController();
         $deliveryMoment = $oc->getDeliveryMoment();
 
@@ -19,4 +20,10 @@ public function showDisplay($company_token)
                 'deliveryMoment' => $deliveryMoment,
             ]);
     }
+
+    public function showDisplayPrivate()
+    {
+        $company = Auth::user()->company;
+        return redirect()->to(route('displays.public.show', ['company_token' => $company->token]));
+    }
 }

app/Http/Controllers/OrderController.php

@@ -12,12 +12,12 @@
 
 class OrderController extends Controller
 {
-    public function getOrders(Request $request)
+    public function index(Request $request)
     {
         if(Auth::check()){
             $company = Auth::user()->company;
         }else{
-            $company = Company::query()->where('token', $request->input('company_token'))->firstOrFail();
+            $company = Company::query()->where('token', '=', $request->input('company_token'))->firstOrFail();
         }
         $orders = Order::getOrders($company, $this->getDate())->get();
         if($orders->count()){
@@ -31,13 +31,15 @@ public function getSelectedRunner(Request $request)
         if(Auth::check()){
             $company = Auth::user()->company;
         }else{
-            $company = Company::query()->where('token', $request->input('company_token'))->firstOrFail();
+            $company = Company::query()->where('token','=', $request->input('company_token'))->firstOrFail();
         }
         $order = Order::getOrders($company, $this->getDate())->first();
         if($order){
-            $runner = $order->deliverer;
+            $user = $order->deliverer;
+        }else{
+            $user = null;
         }
-        return response()->json(['runner' => $runner ?? null]);
+        return response()->json(['user' => $user]);
     }
 
     public function getSimulatedRunner(Request $request)

resources/js/Layouts/Authenticated.vue

@@ -36,6 +36,9 @@ const showingNavigationDropdown = ref(false);
                                 <BreezeNavLink :href="route('dashboard')" :active="route().current('dashboard')">
                                     Dashboard
                                 </BreezeNavLink>
+                                <BreezeNavLink :href="route('displays.private.show')" :active="route().current('displays.private.show')">
+                                    Display
+                                </BreezeNavLink>
                             </div>
                         </div>
 

resources/js/Pages/Dashboard.vue

@@ -24,7 +24,7 @@ const props = defineProps({
                     <Products :products="products" :deliveryMoment="deliveryMoment"/>
                     <div>
                         <Orders :delivery-moment="deliveryMoment"></Orders>
-                        <SelectedRunner class="mt-8" />
+                        <SelectedRunner :company="company" class="mt-8" />
                         <DeptList class="mt-4"></DeptList>
                     </div>
                 </div>

resources/views/layouts/navigation.blade.php

@@ -24,6 +24,6 @@
     Route::post('/order', [OrderController::class,  'order']);
     Route::post('/users', [UserController::class,  'getUsers']);
 });
-Route::post('/orders', [OrderController::class,  'getOrders']);
+Route::post('/orders', [OrderController::class, 'index']);
 Route::post('/selected-runner', [OrderController::class,  'getSelectedRunner']);
 Route::post('/simulated-runner', [OrderController::class,  'getSimulatedRunner']);

routes/api.php

@@ -20,6 +20,9 @@
 Route::redirect('/', '/dashboard');
 
 Route::get('/dashboard',[DashboardController::class, 'dashboard'])->middleware(['auth', 'verified'])->name('dashboard');
-Route::get('/display/{company_id}',[DisplayController::class, 'showDisplay'])->name('displays.show');
+Route::get('/display',[DisplayController::class, 'showDisplayPrivate'])->middleware(['auth', 'verified'])->name('displays.private.show');
+
+/*public routes*/
+Route::get('/display/{company_token}',[DisplayController::class, 'showDisplayPublic'])->name('displays.public.show');
 
 require __DIR__.'/auth.php';