Added more session checks

Raccoon254 · Jun 10, 2024 · a71bcb8 · a71bcb8
1 parent c587594
commit a71bcb8
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 14 deletions.
diff --git a/app/Http/Controllers/PagesController.php b/app/Http/Controllers/PagesController.php
@@ -15,19 +15,13 @@ public function dashboard(): View
         return view('dashboard');
     }
 
-    #[NoReturn]
-    public function orderCreate(): void
+    public function orderCreate(): View
     {
         $orderData = session('orderData');
-        dd($orderData);
-        //array:5 [▼ // app/Http/Controllers/PagesController.php:22
-        //  "user_id" => null
-        //  "title" => null
-        //  "description" => null
-        //  "total_price" => 28
-        //  "status" => "pending"
-        //]
+        //set the user_id to the authenticated user
+        $orderData['user_id'] = auth()->id();
 
+        return view('order.create', ['orderData' => $orderData]);
     }
 
     public function contact(): View

diff --git a/app/Http/Controllers/StaticPageController.php b/app/Http/Controllers/StaticPageController.php
@@ -8,6 +8,8 @@ class StaticPageController extends Controller
 {
     public function welcome(): View
     {
+        session()->flash('success', 'Welcome to Scholarspace! Get help with your assignments from expert writers.');
+
         $process_steps = [
             [
                 'icon' => 'fas avatar fa-pen-nib',

diff --git a/app/Livewire/PriceCalculator.php b/app/Livewire/PriceCalculator.php
@@ -94,7 +94,14 @@ public function placeOrder()
         $this->reset(['topic', 'subject', 'word_count']);
 
         // redirect to the order creation page
-        return redirect()->route('orders.create.new');
+        if (!auth()->check()) {
+            $message = 'You need to login or register to place an order';
+            session()->flash('error', $message);
+        }else{
+            $message = 'Order placed successfully';
+        }
+
+        return redirect()->route('orders.create.new')->with('success', $message);
     }
 
     public function render(): View

diff --git a/resources/views/components/logged-out.blade.php b/resources/views/components/logged-out.blade.php
@@ -19,6 +19,7 @@
 </head>
 <body class="font-sans min-h-screen flex justify-between flex-col bg-gray-50 antialiased">
 @include('layouts.navigation.logged-out')
+@include('session.alerts')
 {{ $slot }}
 @include('layouts.footer')
 </body>

diff --git a/resources/views/order/create.blade.php b/resources/views/order/create.blade.php
@@ -0,0 +1,3 @@
+<x-app-layout>
+
+</x-app-layout>
diff --git a/resources/views/session/alerts.blade.php b/resources/views/session/alerts.blade.php
@@ -1,18 +1,30 @@
 <!--Check if there are any messages within the session-->
 @if(session('success'))
-    <div class="alert rounded mt-3 alert-success">
+    <div class="alert rounded-none mt-3 alert-success">
         {{ session('success') }}
     </div>
 @endif
 
 @if(session('error'))
-    <div class="alert rounded mt-3 bg-red-500 alert-danger">
+    <div class="alert rounded-none mt-3 bg-red-500 alert-danger">
         {{ session('error') }}
     </div>
 @endif
 
+@if(session('info'))
+    <div class="alert rounded-none mt-3 bg-blue-500 alert-info">
+        {{ session('info') }}
+    </div>
+@endif
+
+@if(session('warning'))
+    <div class="alert rounded-none mt-3 bg-yellow-500 alert-warning">
+        {{ session('warning') }}
+    </div>
+@endif
+
 @if ($errors->any())
-    <div class="alert rounded mt-3 bg-red-500 alert-danger">
+    <div class="alert rounded-none mt-3 bg-red-500 alert-danger">
         <ul>
             @foreach ($errors->all() as $error)
                 <li>{{ $error }}</li>