converting codes to laravel php

app/Livewire/AboutUs/TermAndPrivacy/TermAndPrivacyCreate.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\AboutUs\TermAndPrivacy;
+namespace App\Livewire\AboutUs\TermAndPrivacy;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;

app/Livewire/AboutUs/TermAndPrivacy/TermAndPrivacyEdit.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\AboutUs\TermAndPrivacy;
+namespace App\Livewire\AboutUs\TermAndPrivacy;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;

app/Livewire/AboutUs/TermAndPrivacy/TermAndPrivacyList.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\AboutUs\TermAndPrivacy;
+namespace App\Livewire\AboutUs\TermAndPrivacy;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;

app/Livewire/AboutUs/TermAndPrivacy/TermAndPrivacyView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\AboutUs\TermAndPrivacy;
+namespace App\Livewire\AboutUs\TermAndPrivacy;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;

app/Livewire/MemberManagement/CardMemberList.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire\MemberManagement;
 
 use Livewire\Component;
 use Livewire\WithPagination;

app/Livewire/MemberManagement/CardMemberView.php

@@ -1,6 +1,7 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire\MemberManagement;
+
 
 use Livewire\Component;
 

app/Livewire/MyProfile/MyProfileView.php

@@ -4,11 +4,10 @@ namespace App\Livewire\MyProfile;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class MyProfileView extends Component
 {
-    use LivewireAlert;
+   
 
     public $userInfo = null;
 

app/Livewire/Notifications/NotificationList.php

@@ -4,12 +4,11 @@ namespace App\Livewire\Notifications;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
+
 
 class NotificationList extends Component
 {
-    use LivewireAlert;
+   
-
     public $notifications = [];
     public $updating = false;
 

app/Livewire/Notifications/NotificationsCreate.php

@@ -4,11 +4,10 @@ namespace App\Livewire\Notifications;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class NotificationsCreate extends Component
 {
-    use LivewireAlert;
+   
 
     public $subject = '';
     public $content = '';

app/Livewire/PhotoSlider/PhotoSlider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\PhotoSlider;
+namespace App\Livewire\PhotoSlider;
 
 use Livewire\Component;
 

app/Livewire/PhotoSlider/PhotoSliderCreate.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\PhotoSlider;
+namespace App\Livewire\PhotoSlider;
 
 use Livewire\Component;
 use Livewire\WithFileUploads;

app/Livewire/PhotoSlider/PhotoSliderEdit.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\PhotoSlider;
+namespace App\Livewire\PhotoSlider;
 
 use Livewire\Component;
 use Livewire\WithFileUploads;

app/Livewire/PhotoSlider/PhotoSliderList.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\PhotoSlider;
+namespace App\Livewire\PhotoSlider;
 
 use Livewire\Component;
 

app/Livewire/PhotoSlider/PhotoSliderView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\PhotoSlider;
+namespace App\Livewire\PhotoSlider;
 
 use Livewire\Component;
 

app/Livewire/Promotions/PromotionsCreate.php

@@ -5,11 +5,11 @@ namespace App\Livewire\Promotions;
 use Livewire\Component;
 use Livewire\WithFileUploads;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
+
 
 class PromotionsCreate extends Component
 {
-    use LivewireAlert, WithFileUploads;
+    use  WithFileUploads;
 
     public $title = '';
     public $description = '';

app/Livewire/Promotions/PromotionsEdit.php

@@ -5,11 +5,10 @@ namespace App\Livewire\Promotions;
 use Livewire\Component;
 use Livewire\WithFileUploads;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class PromotionsEdit extends Component
 {
-    use LivewireAlert, WithFileUploads;
+    use WithFileUploads;
 
     public $id;
     public $promotion = null;

app/Livewire/Promotions/PromotionsList.php

@@ -4,11 +4,10 @@ namespace App\Livewire\Promotions;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class PromotionsList extends Component
 {
-    use LivewireAlert;
+   
 
     public $promotions = [];
 

app/Livewire/Promotions/PromotionsView.php

@@ -4,11 +4,10 @@ namespace App\Livewire\Promotions;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class PromotionsView extends Component
 {
-    use LivewireAlert;
+    
 
     public $id;
     public $promotion = null;

app/Livewire/Reports/MobileUsageList.php

@@ -4,11 +4,10 @@ namespace App\Livewire\Reports;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class MobileUsageList extends Component
 {
-    use LivewireAlert;
+    
 
     public $data = [];
     public $updating = false;

app/Livewire/Reports/RegistrationList.php

@@ -4,11 +4,10 @@ namespace App\Livewire\Reports;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class RegistrationList extends Component
 {
-    use LivewireAlert;
+    
 
     public $data = [];
     public $updating = false;

app/Livewire/Reports/StationRatingList.php

@@ -4,11 +4,10 @@ namespace App\Livewire\Reports;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class StationRatingList extends Component
 {
-    use LivewireAlert;
+    
 
     public $data = [];
     public $updating = false;

app/Livewire/Reports/TopUpList.php

@@ -4,11 +4,10 @@ namespace App\Livewire\Reports;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class TopUpList extends Component
 {
-    use LivewireAlert;
+    
 
     public $data = [];
     public $updating = false;

app/Livewire/StationLocator/AddBranch.php

@@ -4,11 +4,10 @@ namespace App\Livewire\StationLocator;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class AddBranch extends Component
 {
-    use LivewireAlert;
+   
 
     public $code = '';
     public $name = '';

app/Livewire/StationLocator/BranchList.php

@@ -4,11 +4,10 @@ namespace App\Livewire\StationLocator;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class BranchList extends Component
 {
-    use LivewireAlert;
+    
 
     public $branches = [];
     public $updating = false;

app/Livewire/StationLocator/CreateBranch.php

@@ -4,11 +4,10 @@ namespace App\Livewire\StationLocator;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class CreateBranch extends Component
 {
-    use LivewireAlert;
+    
 
     public $code = '';
     public $name = '';

app/Livewire/StationLocator/CreateFuel.php

@@ -3,11 +3,10 @@ namespace App\Livewire\StationLocator;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class CreateFuel extends Component
 {
-    use LivewireAlert;
+    
 
     public $name = '';
     public $loading = false;

app/Livewire/StationLocator/EditBranch.php

@@ -4,11 +4,10 @@ namespace App\Livewire\StationLocator;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class EditBranch extends Component
 {
-    use LivewireAlert;
+    
 
     public $id;
     public $code = '';

app/Livewire/StationLocator/EditFuel.php

@@ -4,11 +4,10 @@ namespace App\Livewire\StationLocator;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class EditFuel extends Component
 {
-    use LivewireAlert;
+    
 
     public $id;
     public $name = '';

app/Livewire/StationLocator/EditStation.php

@@ -4,11 +4,10 @@ namespace App\Livewire\StationLocator;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class EditStation extends Component
 {
-    use LivewireAlert;
+   
 
     public $id;
     public $name = '';

app/Livewire/StationLocator/FuelList.php

@@ -3,11 +3,10 @@ namespace App\Livewire\StationLocator;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class FuelList extends Component
 {
-    use LivewireAlert;
+   
 
     public $fuels = [];
     public $updating = false;

app/Livewire/StationLocator/StationCreate.php

@@ -3,11 +3,10 @@ namespace App\Livewire\StationLocator;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class StationCreate extends Component
 {
-    use LivewireAlert;
+   
 
     public $name = '';
     public $location = '';

app/Livewire/StationLocator/StationList.php

@@ -4,11 +4,10 @@ namespace App\Livewire\StationLocator;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Http;
-use Jantinnerezo\LivewireAlert\LivewireAlert;
 
 class StationList extends Component
 {
-    use LivewireAlert;
+   
 
     public $stations = [];
     public $uploadPriceModal = false;

composer.lock

@@ -2419,16 +2419,16 @@
         },
         {
             "name": "livewire/livewire",
-            "version": "v3.6.2",
+            "version": "v3.6.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/livewire/livewire.git",
-                "reference": "8f8914731f5eb43b6bb145d87c8d5a9edfc89313"
+                "reference": "56aa1bb63a46e06181c56fa64717a7287e19115e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/8f8914731f5eb43b6bb145d87c8d5a9edfc89313",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/56aa1bb63a46e06181c56fa64717a7287e19115e",
-                "reference": "8f8914731f5eb43b6bb145d87c8d5a9edfc89313",
+                "reference": "56aa1bb63a46e06181c56fa64717a7287e19115e",
                 "shasum": ""
             },
             "require": {
@@ -2483,7 +2483,7 @@
             "description": "A front-end framework for Laravel.",
             "support": {
                 "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v3.6.2"
+                "source": "https://github.com/livewire/livewire/tree/v3.6.3"
             },
             "funding": [
                 {
@@ -2491,7 +2491,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-12T20:24:15+00:00"
+            "time": "2025-04-12T22:26:52+00:00"
         },
         {
             "name": "maennchen/zipstream-php",

resources/views/components/main-sidebar.blade.php

@@ -0,0 +1,97 @@
+<div x-data="sidebar()" x-init="init()" class="bg-white border-end d-flex flex-column"
+     :class="collapsed ? 'w-25' : 'w-75'" style="min-height: 100vh; transition: width 0.3s;">
+
+    <!-- Logo Section -->
+    <div class="text-center border-bottom" :style="collapsed ? 'height: 64px;' : 'height: 65px;'">
+        <template x-if="!collapsed">
+            <img src="https://via.placeholder.com/100x40?text=LOGO" alt="Logo" style="height: 100%;">
+        </template>
+        <template x-if="collapsed">
+            <div class="py-4" style="background: url('https://via.placeholder.com/40') no-repeat center / contain;"></div>
+        </template>
+    </div>
+
+    <!-- Navigation -->
+    <div class="nav flex-column flex-grow-1 overflow-auto pt-3">
+        <template x-for="item in navigation" :key="item.label">
+            <template x-if="!item.child">
+                <a class="nav-link text-dark px-4" :href="item.path">
+                    <i :class="item.icon + ' me-2'"></i>
+                    <span x-show="!collapsed" x-text="item.label"></span>
+                </a>
+            </template>
+
+            <template x-if="item.child">
+                <div class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle text-dark px-4" href="#" data-bs-toggle="dropdown">
+                        <i :class="item.icon + ' me-2'"></i>
+                        <span x-show="!collapsed" x-text="item.label"></span>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <template x-for="sub in item.child" :key="sub.label">
+                            <li><a class="dropdown-item" :href="sub.path" x-text="sub.label"></a></li>
+                        </template>
+                    </ul>
+                </div>
+            </template>
+        </template>
+    </div>
+
+    <!-- Toggle Button -->
+    <button @click="toggle()" class="btn btn-outline-secondary m-3 align-self-end">
+        <i :class="collapsed ? 'bi bi-chevron-right' : 'bi bi-chevron-left'"></i>
+    </button>
+</div>
+
+<script>
+    function sidebar() {
+        return {
+            collapsed: false,
+            navigation: [
+                { label: 'Dashboard', path: '/dashboard', icon: 'bi-speedometer2' },
+                { label: 'Notifications', path: '/notifications', icon: 'bi-bell' },
+                {
+                    label: 'Member Management', path: '#', icon: 'bi-credit-card', child: [
+                        { label: 'Card Member', path: '/member-management/card-member' },
+                        { label: 'Locked Accounts', path: '/member-management/lock-account' }
+                    ]
+                },
+                {
+                    label: 'Home Page (Mobile)', path: '#', icon: 'bi-house', child: [
+                        { label: 'Photo Slider', path: '/home-page/photo-slider' }
+                    ]
+                },
+                { label: 'Top-Up', path: '/top-up', icon: 'bi-plus-circle' },
+                {
+                    label: 'About Us', path: '#', icon: 'bi-info-circle', child: [
+                        { label: 'Card Types', path: '/about-us/card-types' },
+                        { label: 'Terms & Privacy', path: '/about-us/term-privacy' }
+                    ]
+                },
+                {
+                    label: 'Reports', path: '#', icon: 'bi-file-text', child: [
+                        { label: 'Registration Report', path: '/reports/registration-report' },
+                        { label: 'Top-Up Usage Report', path: '/reports/top-up' },
+                        { label: 'Mobile Usage Report', path: '/reports/mobile-report' },
+                        { label: 'Station Rating Report', path: '/reports/station-rating' },
+                    ]
+                },
+                {
+                    label: 'Station Locator', path: '#', icon: 'bi-geo-alt', child: [
+                        { label: 'Branches', path: '/branches' },
+                        { label: 'Stations', path: '/stations' },
+                        { label: 'Fuels', path: '/fuels' },
+                    ]
+                },
+            ],
+
+            init() {
+                this.collapsed = JSON.parse(localStorage.getItem('sidebar-collapsed')) ?? false;
+            },
+            toggle() {
+                this.collapsed = !this.collapsed;
+                localStorage.setItem('sidebar-collapsed', JSON.stringify(this.collapsed));
+            }
+        }
+    }
+</script>

resources/views/layouts/app.blade.php

@@ -8,21 +8,14 @@
     <head>
     <!-- ... other meta tags -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" rel="stylesheet">
-    <!-- ... other meta tags -->
+    <link rel="icon" type="image/png" href="{{ asset('img/favicon_unioil.ico') }}">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" rel="stylesheet">
+    <script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js"></script>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css" rel="stylesheet">
+</head>
+   
 
-</head>
+<body class="d-flex">
-    @if(app()->environment('local'))
+  
-        <script>
-            localStorage.setItem('debug', 'awesome-react-app:*');
-        </script>
-    @endif
-</head>
-<body>
-    <div id="root" class="app-container h-100">
-        @yield('content')
-    </div>
-    <script src="{{ asset('js/app.js') }}"></script>
-    @stack('scripts')
 </body>
+
 </html>

resources/views/layouts/login.blade.php

@@ -6,6 +6,8 @@
     <title>Login - Laravel</title>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.css" rel="stylesheet">
+    <link rel="icon" type="image/png" href="{{ asset('img/favicon_unioil.ico') }}">
+
     @livewireStyles
 </head>
 <body>

resources/views/login.blade.php

@@ -2,9 +2,59 @@
 
 @section('content')
     <div class="container py-5">
-        <h1 class="text-center mb-4">Login</h1>
+        <div class="row justify-content-center">
-        <p class="text-center">Placeholder for login form.</p>
+            <div class="col-12 col-md-6">
+                
+                    <img src="{{ asset('img/logo.png') }}" alt="Unioil Logo" class="img-fluid" style="max-width: 150px;">
+                
+                <div class="mb-3 text-center">
+                    <h4 class="mb-1 fw-bold">Welcome</h4>
+                    <span style="font-size: 14px;" class="text-muted">Sign in to continue</span>
+                </div>
 
-   
+                <form>
+                    <div class="mb-3">
+                    <label class="form-label fw-semibold" style="font-size: 13px; color: #003366;">Enter Username</label>
+
+                        <input type="text" class="form-control" placeholder="Username">
+                    </div>
+
+                    <!-- Mockup password input -->
+                    <div class="mb-3">
+                    <label class="form-label fw-semibold text-primary" style="font-size: 13px; color: #003366 !important;">Enter Password</label>
+                     <input type="password" class="form-control" placeholder="Password">
+                    </div>
+
+                    <div class="row mt-4">
+                        <div class="col-6">
+                            <a href="#" class="text-decoration-none text-primary">Forgot Username</a>
+                        </div>
+                        <div class="col-6 text-end">
+                            <button type="submit" class="btn btn-primary w-100" style="background-color: #E74610; border-color: #E74610;">
+                                Login
+                            </button>
+                        </div>
+                    </div>
+                </form>
+
+                <!-- Modal Simulation -->
+                <!-- <div class="modal fade show d-block mt-5" tabindex="-1" style="background-color: rgba(0,0,0,0.3); display: none;">
+                    <div class="modal-dialog modal-dialog-centered" style="max-width: 337px;">
+                        <div class="modal-content">
+                            <div class="modal-body">
+                                <h4>Forgot Password</h4>
+                                <p>
+                                    To have your password reset, please contact <br>
+                                    Unioil's admin at <a href="mailto:admin@unioil.com" class="text-primary">admin@unioil.com</a>
+                                </p>
+                            </div>
+                            <div class="modal-footer justify-content-end">
+                                <button class="btn btn-primary" style="background-color: #E74610; border-color: #E74610; width: 64px;">Ok</button>
+                            </div>
+                        </div>
+                    </div>
+                </div> -->
+            </div>
+        </div>
     </div>
-@endsection
+@endsection

resources/views/welcome.blade.php

@@ -1,34 +0,0 @@
-<x-main-content :routes="[
-    ['path' => 'dashboard', 'name' => 'Dashboard'],
-    ['path' => 'dashboard/users', 'name' => 'Users'],
-    ['path' => 'dashboard/users/123', 'name' => 'User Details', 'params' => true],
-]" :root="false">
-    <h1>Hello from main content!</h1>
-    <p>This is the page body.</p>
-</x-main-content>
-
-<x-main-footer />
-
-
-     <!-- Top nav -->
-<!-- @livewire('header-dropdown') -->
-
-<!-- Breadcrumbs -->
-<x-main-breadcrumbs :routes="[
-    ['path' => 'dashboard', 'name' => 'Dashboard'],
-    ['path' => 'dashboard/settings', 'name' => 'Settings'],
-    ['path' => 'dashboard/settings/details', 'name' => 'Details', 'params' => true],
-]" />
-
-
-@extends('layouts.app')
-
-@section('content')
-    <div class="card">
-        <div class="card-body">
-            <h1>Welcome</h1>
-            <a href="{{ route('fetch.data', 'data') }}" class="btn btn-primary">Fetch Data</a>
-            <a href="{{ route('logout') }}" class="btn btn-danger">Logout</a>
-        </div>
-    </div>
-@endsection

routes/web.php

@@ -80,26 +80,32 @@ use App\Livewire\MemberManagement\LockAccountList;
 use App\Livewire\MemberManagement\LockAccountView;
 
 
-use App\Http\Livewire\PhotoSlider\PhotoSlider;
+use App\Livewire\PhotoSlider\PhotoSlider;
-use App\Http\Livewire\PhotoSlider\PhotoSliderView;
+use App\Livewire\PhotoSlider\PhotoSliderView;
-use App\Http\Livewire\PhotoSlider\PhotoSliderList;
+use App\Livewire\PhotoSlider\PhotoSliderList;
-use App\Http\Livewire\PhotoSlider\PhotoSliderCreate;
+use App\Livewire\PhotoSlider\PhotoSliderCreate;
-use App\Http\Livewire\PhotoSlider\PhotoSliderEdit;
+use App\Livewire\PhotoSlider\PhotoSliderEdit;
 
 
-use App\Http\Livewire\AboutUs\TermAndPrivacy\TermAndPrivacy;
+use App\Livewire\AboutUs\TermAndPrivacy\TermAndPrivacy;
-use App\Http\Livewire\AboutUs\TermAndPrivacy\TermAndPrivacyList;
+use App\Livewire\AboutUs\TermAndPrivacy\TermAndPrivacyList;
-use App\Http\Livewire\AboutUs\TermAndPrivacy\TermAndPrivacyCreate;
+use App\Livewire\AboutUs\TermAndPrivacy\TermAndPrivacyCreate;
-use App\Http\Livewire\AboutUs\TermAndPrivacy\TermAndPrivacyEdit;
+use App\Livewire\AboutUs\TermAndPrivacy\TermAndPrivacyEdit;
-use App\Http\Livewire\AboutUs\TermAndPrivacy\TermAndPrivacyView;
+use App\Livewire\AboutUs\TermAndPrivacy\TermAndPrivacyView;
 
-use App\Http\Livewire\AboutUs\CardTypes\CardTypes;
+use App\Livewire\AboutUs\CardTypes\CardTypes;
-use App\Http\Livewire\AboutUs\CardTypes\CardTypesList;
+use App\Livewire\AboutUs\CardTypes\CardTypesList;
-use App\Http\Livewire\AboutUs\CardTypes\CardTypesCreate;
+use App\Livewire\AboutUs\CardTypes\CardTypesCreate;
-use App\Http\Livewire\AboutUs\CardTypes\CardTypesEdit;
+use App\Livewire\AboutUs\CardTypes\CardTypesEdit;
-use App\Http\Livewire\AboutUs\CardTypes\CardTypesView;
+use App\Livewire\AboutUs\CardTypes\CardTypesView;
 
+Route::get('/', function () {
+    return view('login');
+});
 
+// Route::get('/', function () {
+//     return view('login');
+// });
 // Route::get('/about-us', CardTypes::class)->name('about-us.index');
 // Route::get('/about-us/card-types', CardTypesList::class)->name('card-types.list');
 // Route::get('/about-us/card-types/create', CardTypesCreate::class)->name('card-types.create');
@@ -123,159 +129,61 @@ use App\Http\Livewire\AboutUs\CardTypes\CardTypesView;
 // Route::get('/member-management/lock-account', LockAccountList::class)->name('member-management.lock-account');
 // Route::get('/member-management/lock-account/view/{id}', LockAccountView::class)->name('member-management.lock-account.view');
 
-// Route::get('/my-profile', MyProfileView::class)->name('my-profile.view');
+Route::get('/my-profile', MyProfileView::class)->name('my-profile.view');
 
-// Route::get('/notifications', NotificationList::class)->name('notifications.list');
+Route::get('/notifications', NotificationList::class)->name('notifications.list');
-// Route::get('/notifications/create', NotificationsCreate::class)->name('notifications.create');
+Route::get('/notifications/create', NotificationsCreate::class)->name('notifications.create');
 
-// Route::get('/promotions', PromotionsList::class)->name('promotions.list');
+Route::get('/promotions', PromotionsList::class)->name('promotions.list');
-// Route::get('/promotions/create', PromotionsCreate::class)->name('promotions.create');
+Route::get('/promotions/create', PromotionsCreate::class)->name('promotions.create');
-// Route::get('/promotions/edit/{id}', PromotionsEdit::class)->name('promotions.edit');
+Route::get('/promotions/edit/{id}', PromotionsEdit::class)->name('promotions.edit');
-// Route::get('/promotions/view/{id}', PromotionsView::class)->name('promotions.view');
+Route::get('/promotions/view/{id}', PromotionsView::class)->name('promotions.view');
 
-// Route::get('/reports/top-up', TopUpList::class)->name('reports.top-up');
+Route::get('/reports/top-up', TopUpList::class)->name('reports.top-up');
-// Route::get('/reports/station-rating', StationRatingList::class)->name('reports.station-rating');
+Route::get('/reports/station-rating', StationRatingList::class)->name('reports.station-rating');
-// Route::get('/reports/mobile-report', MobileUsageList::class)->name('reports.mobile-report');
+Route::get('/reports/mobile-report', MobileUsageList::class)->name('reports.mobile-report');
-// Route::get('/reports/registration-report', RegistrationList::class)->name('reports.registration-report');
+Route::get('/reports/registration-report', RegistrationList::class)->name('reports.registration-report');
-// Route::get('/reports', function () {
+Route::get('/reports', function () {
-//     return redirect('/reports/top-up');
+    return redirect('/reports/top-up');
-// });
+});
 
-// Route::get('/fuels', FuelList::class)->name('fuels.list');
+Route::get('/fuels', FuelList::class)->name('fuels.list');
-// Route::get('/fuels/create', CreateFuel::class)->name('fuels.create');
+Route::get('/fuels/create', CreateFuel::class)->name('fuels.create');
-// Route::get('/fuels/view/{id}', EditFuel::class)->name('fuels.edit');
+Route::get('/fuels/view/{id}', EditFuel::class)->name('fuels.edit');
-// Route::get('/stations', StationList::class)->name('stations.list');
+Route::get('/stations', StationList::class)->name('stations.list');
-// Route::get('/stations/create', StationCreate::class)->name('stations.create');
+Route::get('/stations/create', StationCreate::class)->name('stations.create');
-// Route::get('/stations/view/{id}', EditStation::class)->name('stations.edit');
+Route::get('/stations/view/{id}', EditStation::class)->name('stations.edit');
-// Route::get('/branches', BranchList::class)->name('branches.list');
+Route::get('/branches', BranchList::class)->name('branches.list');
-// Route::get('/branches/create', CreateBranch::class)->name('branches.create');
+Route::get('/branches/create', CreateBranch::class)->name('branches.create');
-// Route::get('/branches/add', CreateBranch::class)->name('branches.add');
+Route::get('/branches/add', CreateBranch::class)->name('branches.add');
-// Route::get('/branches/view/{id}', EditBranch::class)->name('branches.edit');
+Route::get('/branches/view/{id}', EditBranch::class)->name('branches.edit');
 
 
 
 
-// Route::middleware(['auth'])->group(function () {
+Route::middleware(['auth'])->group(function () {
-//     Route::get('/user-management', \App\Livewire\UserManagement\UserList::class)->name('user-management');
+    Route::get('/user-management', \App\Livewire\UserManagement\UserList::class)->name('user-management');
-//     Route::get('/user-management/create', \App\Livewire\UserManagement\Create::class)->name('user-management.create');
+    Route::get('/user-management/create', \App\Livewire\UserManagement\Create::class)->name('user-management.create');
-//     Route::get('/user-management/edit/{id}', \App\Livewire\UserManagement\Edit::class)->name('user-management.edit');
+    Route::get('/user-management/edit/{id}', \App\Livewire\UserManagement\Edit::class)->name('user-management.edit');
-//     Route::get('/user-management/view/{id}', \App\Livewire\UserManagement\View::class)->name('user-management.view');
+    Route::get('/user-management/view/{id}', \App\Livewire\UserManagement\View::class)->name('user-management.view');
-// });
+});
 
-// Route::middleware(['auth'])->group(function () {
+Route::middleware(['auth'])->group(function () {
-//     Route::get('/top-up', \App\Livewire\TopUp\TopUpList::class)->name('top-up');
+    Route::get('/top-up', \App\Livewire\TopUp\TopUpList::class)->name('top-up');
-//     Route::get('/top-up/create', \App\Livewire\TopUp\Create::class)->name('top-up.create');
+    Route::get('/top-up/create', \App\Livewire\TopUp\Create::class)->name('top-up.create');
-//     Route::get('/top-up/edit/{id}', \App\Livewire\TopUp\Edit::class)->name('top-up.edit');
+    Route::get('/top-up/edit/{id}', \App\Livewire\TopUp\Edit::class)->name('top-up.edit');
-//     Route::get('/top-up/view/{id}', \App\Livewire\TopUp\View::class)->name('top-up.view');
+    Route::get('/top-up/view/{id}', \App\Livewire\TopUp\View::class)->name('top-up.view');
-// });
+});
 
 // Route::middleware(['auth'])->group(function () {
 //     Route::get('/system-parameters', \App\Livewire\SystemPreferences\Create::class)->name('system-parameters');
 // });
-// Route::middleware(['auth'])->group(function () {
-//     Route::get('/fuels', \App\Livewire\StationLocator\Fuels::class)->name('fuels');
-//     Route::get('/fuels/create', \App\Livewire\StationLocator\FuelCreate::class)->name('fuels.create');
-//     Route::get('/branches', \App\Livewire\StationLocator\Branches::class)->name('branches');
-//     Route::get('/branches/create', \App\Livewire\StationLocator\BranchCreate::class)->name('branches.create');
-// });
 
-
+Route::middleware(['auth'])->group(function () {
-
+    Route::get('/fuels', \App\Livewire\StationLocator\Fuels::class)->name('fuels');
-
+    Route::get('/fuels/create', \App\Livewire\StationLocator\FuelCreate::class)->name('fuels.create');
-
+    Route::get('/branches', \App\Livewire\StationLocator\Branches::class)->name('branches');
-
+    Route::get('/branches/create', \App\Livewire\StationLocator\BranchCreate::class)->name('branches.create');
-// Route::get('/change-password', \App\Livewire\ChangePassword::class)->name('change-password');
-// Route::get('/registration', \App\Livewire\Registration::class)->name('registration');
-// Route::get('/topup-success-page', \App\Livewire\PublicTopSuccessPage::class)->name('topup-success');
-// Route::get('/topup-error-page', \App\Livewire\PublicTopErrorPage::class)->name('topup-error');
-
-Route::get('/login', \App\Livewire\Login::class)->name('login');
-// Route::get('/change-password', \App\Livewire\ChangePassword::class)->name('change-password');
-
-
-// Route::get('/fetch-data/{url}', FetchData::class)->name('fetch.data');
-// Route::get('/logout', Logout::class)->name('logout');
-// Route::get('/error-handler', ErrorHandler::class)->name('error.handler');
-
-// Route::get('/404', function () {
-//     return view('errors.404');
-// })->name('404');
-
-// Route::get('/auth-status', function () {
-//     return view('auth-status');
-// })->name('auth.status');
-
-// Route::get('/fetch-data-status', function () {
-//     return view('fetch-data-status');
-// })->name('fetch.data.status');
-
-// Route::get('/logout-status', function () {
-//     return view('logout-status');
-// })->name('logout.status');
-
-// Route::get('/global-constants', function () { return view('global-constants'); })->name('global.constants');
-
-// Route::get('/validation-display', function () { return view('validation-display'); })->name('validation.display');
-
-// Route::get('/response-display', function () { return view('response-display'); })->name('response.display');
-
-// Route::get('/action-types', function () { return view('action-types'); })->name('action.types');
-// Route::get('/dashboard', function () { return view('dashboard'); })->name('dashboard');
-
-// Route::get('/my-profile', function () {
-//     return view('my-profile');
-// })->name('my-profile');
-
-
-// Route::get('/custom-table', function () {
-//     return view('custom-table');
-// })->name('custom.table');
-
-// Route::get('/dropdown-export', function () {
-//     return view('dropdown-export');
-// })->name('dropdown.export');
-
-// Route::get('/data-list', function () {
-//     return view('data-list');
-// })->name('data.list');
-
-// Route::get('/upload-image', function () { return view('upload-image'); })->name('upload.image');
-
-// Route::get('/radio-form', function () { return view('radio-form'); })->name('radio.form');
-// Route::get('/select-form', function () { return view('select-form'); })->name('select.form');
-// Route::get('/single-upload-image', function () { return view('single-upload-image'); })->name('single.upload.image');
-// Route::get('/time-picker-form', function () { return view('time-picker-form'); })->name('time.picker.form');
-
-// Route::get('/advance-table', function () { return view('advance-table'); })->name('advance.table');
-// Route::get('/table-layout', function () { return view('table-layout'); })->name('table.layout');
-// Route::get('/station-table', function () { return view('station-table'); })->name('station.table');
-// Route::get('/403', function () { return view('error-403'); })->name('error.403');
-// Route::get('/404', function () { return view('error-404'); })->name('error.404');
-// Route::get('/404-new', function () { return view('error-404-new'); })->name('error.404.new');
-// Route::get('/notifications', function () { return view('notification-table'); })->name('notifications');
-// Route::get('/locations', function () { return view('locations'); })->name('locations');
-// Route::get('/test-modal', function () { return view('test-modal'); })->name('test.modal');
-// Route::get('/login', function () { return view('login'); })->name('login');
-// Route::get('/loading', function () { return view('loading'); })->name('loading');
-// Route::get('/advance-search-filter', function () { return view('advance-search-filter'); })->name('advance.search.filter');
-// Route::get('/cascader-form', function () { return view('cascader-form'); })->name('cascader.form');
-// Route::get('/checkbox-form', function () { return view('checkbox-form'); })->name('checkbox.form');
-// Route::get('/date-picker-form', function () { return view('date-picker-form'); })->name('date.picker.form');
-// Route::get('/header-form', function () { return view('header-form'); })->name('header.form');
-// Route::get('/input-mask-number-form', function () { return view('input-mask-number-form'); })->name('input.mask.number.form');
-// Route::get('/input-number-ant-d', function () { return view('input-number-ant-d'); })->name('input.number.antd');
-
-// Route::get('/input-password', function () { return view('input-password'); })->name('input.password');
-// Route::get('/input-text-area', function () { return view('input-text-area'); })->name('input.text.area');
-// Route::get('/input-form', function () { return view('input-form'); })->name('input.form');
-// Route::get('/multi-select-form', function () { return view('multi-select-form'); })->name('multi.select.form');
-// Route::get('/multi-select-options', function () { return view('multi-select-options'); })->name('multi.select.options');
-
-
-
-
-Route::get('/', function () {
-    return view('welcome');
 });
 
 
@@ -283,6 +191,99 @@ Route::get('/', function () {
 
 
 
+Route::get('/change-password', \App\Livewire\ChangePassword::class)->name('change-password');
+Route::get('/registration', \App\Livewire\Registration::class)->name('registration');
+Route::get('/topup-success-page', \App\Livewire\PublicTopSuccessPage::class)->name('topup-success');
+Route::get('/topup-error-page', \App\Livewire\PublicTopErrorPage::class)->name('topup-error');
+
+Route::get('/login', \App\Livewire\Login::class)->name('login');
+Route::get('/change-password', \App\Livewire\ChangePassword::class)->name('change-password');
+
+
+Route::get('/fetch-data/{url}', FetchData::class)->name('fetch.data');
+Route::get('/logout', Logout::class)->name('logout');
+Route::get('/error-handler', ErrorHandler::class)->name('error.handler');
+
+Route::get('/404', function () {
+    return view('errors.404');
+})->name('404');
+
+Route::get('/auth-status', function () {
+    return view('auth-status');
+})->name('auth.status');
+
+Route::get('/fetch-data-status', function () {
+    return view('fetch-data-status');
+})->name('fetch.data.status');
+
+Route::get('/logout-status', function () {
+    return view('logout-status');
+})->name('logout.status');
+
+Route::get('/global-constants', function () { return view('global-constants'); })->name('global.constants');
+
+Route::get('/validation-display', function () { return view('validation-display'); })->name('validation.display');
+
+Route::get('/response-display', function () { return view('response-display'); })->name('response.display');
+
+Route::get('/action-types', function () { return view('action-types'); })->name('action.types');
+Route::get('/dashboard', function () { return view('dashboard'); })->name('dashboard');
+
+Route::get('/my-profile', function () {
+    return view('my-profile');
+})->name('my-profile');
+
+
+Route::get('/custom-table', function () {
+    return view('custom-table');
+})->name('custom.table');
+
+Route::get('/dropdown-export', function () {
+    return view('dropdown-export');
+})->name('dropdown.export');
+
+Route::get('/data-list', function () {
+    return view('data-list');
+})->name('data.list');
+
+Route::get('/upload-image', function () { return view('upload-image'); })->name('upload.image');
+
+Route::get('/radio-form', function () { return view('radio-form'); })->name('radio.form');
+Route::get('/select-form', function () { return view('select-form'); })->name('select.form');
+Route::get('/single-upload-image', function () { return view('single-upload-image'); })->name('single.upload.image');
+Route::get('/time-picker-form', function () { return view('time-picker-form'); })->name('time.picker.form');
+
+Route::get('/advance-table', function () { return view('advance-table'); })->name('advance.table');
+Route::get('/table-layout', function () { return view('table-layout'); })->name('table.layout');
+Route::get('/station-table', function () { return view('station-table'); })->name('station.table');
+Route::get('/403', function () { return view('error-403'); })->name('error.403');
+Route::get('/404', function () { return view('error-404'); })->name('error.404');
+Route::get('/404-new', function () { return view('error-404-new'); })->name('error.404.new');
+Route::get('/notifications', function () { return view('notification-table'); })->name('notifications');
+Route::get('/locations', function () { return view('locations'); })->name('locations');
+Route::get('/test-modal', function () { return view('test-modal'); })->name('test.modal');
+
+Route::get('/loading', function () { return view('loading'); })->name('loading');
+Route::get('/advance-search-filter', function () { return view('advance-search-filter'); })->name('advance.search.filter');
+Route::get('/cascader-form', function () { return view('cascader-form'); })->name('cascader.form');
+Route::get('/checkbox-form', function () { return view('checkbox-form'); })->name('checkbox.form');
+Route::get('/date-picker-form', function () { return view('date-picker-form'); })->name('date.picker.form');
+Route::get('/header-form', function () { return view('header-form'); })->name('header.form');
+Route::get('/input-mask-number-form', function () { return view('input-mask-number-form'); })->name('input.mask.number.form');
+Route::get('/input-number-ant-d', function () { return view('input-number-ant-d'); })->name('input.number.antd');
+
+Route::get('/input-password', function () { return view('input-password'); })->name('input.password');
+Route::get('/input-text-area', function () { return view('input-text-area'); })->name('input.text.area');
+Route::get('/input-form', function () { return view('input-form'); })->name('input.form');
+Route::get('/multi-select-form', function () { return view('multi-select-form'); })->name('multi.select.form');
+Route::get('/multi-select-options', function () { return view('multi-select-options'); })->name('multi.select.options');
+
+
+
+
+
+
+
 
 
 
@@ -294,57 +295,7 @@ Route::get('/', function () {
 
 
 
-// <?php
 
-// use Illuminate\Support\Facades\Route;
-// use App\Http\Middleware\Authenticate;
-// use App\Livewire\Login;
-// use App\Livewire\Registration;
-// use App\Livewire\ChangePassword;
-// use App\Livewire\PublicTopSuccessPage;
-// use App\Livewire\PublicTopErrorPage;
-// use App\Livewire\MyProfile;
-// use App\Livewire\Notifications;
-// use App\Livewire\UserManagement;
-// use App\Livewire\MemberManagement;
-// use App\Livewire\PhotoSlider;
-// use App\Livewire\Promotions;
-// use App\Livewire\TopUp;
-// use App\Livewire\CardTypes;
-// use App\Livewire\Reports;
-// use App\Livewire\SystemPreferences;
-// use App\Livewire\StationLocator;
-// use App\Livewire\Branches;
-// use App\Livewire\Fuels;
-// use App\Livewire\Page404;
 
-// Route::middleware(['check.auth'])->group(function () {
-//     // Public Routes
-//     Route::get('/', fn () => redirect('/login'));
-//     Route::get('/login', Login::class)->name('login');
-//     Route::get('/registration', Registration::class)->name('registration');
-//     Route::get('/change-password', ChangePassword::class)->name('change-password');
-//     Route::get('/topup-success-page', PublicTopSuccessPage::class)->name('topup-success');
-//     Route::get('/topup-error-page', PublicTopErrorPage::class)->name('topup-error');
 
-//     // Private Routes (require authentication)
-//     Route::middleware(['auth'])->group(function () {
-//         Route::get('/user-management', UserManagement::class)->name('user-management');
-//         Route::get('/notifications', Notifications::class)->name('notifications');
-//         Route::get('/member-management', MemberManagement::class)->name('member-management');
-//         Route::get('/home-page', PhotoSlider::class)->name('home-page');
-//         Route::get('/promotions', Promotions::class)->name('promotions');
-//         Route::get('/top-up', TopUp::class)->name('top-up');
-//         Route::get('/about-us', CardTypes::class)->name('about-us');
-//         Route::get('/reports', Reports::class)->name('reports');
-//         Route::get('/stations', StationLocator::class)->name('stations');
-//         Route::get('/branches', Branches::class)->name('branches');
-//         Route::get('/fuels', Fuels::class)->name('fuels');
-//         Route::get('/system-parameters', SystemPreferences::class)->name('system-parameters');
-//         Route::get('/my-profile', MyProfile::class)->name('my-profile');
-//     });
 
-//     // 404 Route
-//     Route::get('/404', Page404::class)->name('404');
-//     Route::any('{any}', fn () => redirect()->route('404'))->where('any', '.*');
-// });