From f5e75d523d4350e924627d55595c46e901bcae46 Mon Sep 17 00:00:00 2001 From: SandaliGunawardena Date: Tue, 31 Oct 2023 13:20:09 +0530 Subject: [PATCH] renaming_files --- app/middlewares/UserMiddleware.php | 10 +- app/views/components/navbar.php | 1 + app/views/guide/GuideDashboard.view.php | 226 +++++++++--------- ...AddEquipment.php => AddEquipment.view.php} | 0 ...itEquipment.php => EditEquipment.view.php} | 0 ...ooking.php => EquipmentMyBooking.view.php} | 0 .../rental/{MyShop.php => MyShop.view.php} | 0 .../{RentalBlog.php => RentalBlog.view.php} | 6 +- ...Dashboard.php => RentalDashboard.view.php} | 86 ++++--- .../{moreBlog.php => moreBlog.view.php} | 0 10 files changed, 162 insertions(+), 167 deletions(-) rename app/views/rental/{AddEquipment.php => AddEquipment.view.php} (100%) rename app/views/rental/{EditEquipment.php => EditEquipment.view.php} (100%) rename app/views/rental/{EquipmentMyBooking.php => EquipmentMyBooking.view.php} (100%) rename app/views/rental/{MyShop.php => MyShop.view.php} (100%) rename app/views/rental/{RentalBlog.php => RentalBlog.view.php} (92%) rename app/views/rental/{RentalDashboard.php => RentalDashboard.view.php} (81%) rename app/views/rental/{moreBlog.php => moreBlog.view.php} (100%) diff --git a/app/middlewares/UserMiddleware.php b/app/middlewares/UserMiddleware.php index 66db4024..5f44ec77 100755 --- a/app/middlewares/UserMiddleware.php +++ b/app/middlewares/UserMiddleware.php @@ -26,7 +26,7 @@ static function user($user){ $user = (object) array_merge((array) $user, (array) $guide); return $user; } - if ($user['role'] == 'rental_service') { + if ($user['role'] == 'rentalservice') { $rental_service = new RentalServiceModel; $rental_service = $rental_service->first([ 'user_id'=> $user['id'] @@ -43,11 +43,3 @@ static function user($user){ } } - - - - - - - -?> \ No newline at end of file diff --git a/app/views/components/navbar.php b/app/views/components/navbar.php index 3d6d95c5..4d4becce 100755 --- a/app/views/components/navbar.php +++ b/app/views/components/navbar.php @@ -15,6 +15,7 @@ role != 'admin') { $user = $_SESSION['USER']; ?> +
diff --git a/app/views/guide/GuideDashboard.view.php b/app/views/guide/GuideDashboard.view.php index deb1af1d..239a5d4a 100644 --- a/app/views/guide/GuideDashboard.view.php +++ b/app/views/guide/GuideDashboard.view.php @@ -1,151 +1,157 @@ - + -
-
-
Hello William!
-
- -
+ +
+
+
+ +
+ +
+
+
Hello William!
+
+
+
-
+ -
-
-
Name : William Cooray
-
-
-
Age : 30
-
-
-
Role : Guide
-
+
+
+
Name : name ?>
- -
-
-
Name : William Cooray
-
-
-
Age : 30
-
-
-
Role : Guide
-
+
+
NIC : nic ?>
+
+
Role : Guide
+
+
- +
+
+
Email : email ?>
+
+
+
Age : 30
+
+
+
Role : Guide
+
+
-
+
+
-
-
-
-
Total Tours
-
- -
+ +
+
+
+
Total Tours
+
+
-
10
+
10
+
-
-
-
Tours per month
-
- -
+
+
+
Tours per month
+
+
-
03
+
03
+
-
-
-
Tours in last month
-
- -
+
+
+
Tours in last month
+
+
-
03
-
> +
03
+
+
> -
-
- -
+
+
+ +
-
-
-
Recent Booking
-
- -
+
+
+
Recent Booking
+
+
+
-
-
-
Place : Nuwara Eliya
-
-
-
Name : Kamal Silva
-
-
-
Date : 20/08/2023
-
-
-
Time : 10:00
-
- +
+
+
Place : Nuwara Eliya
+
+
+
Name : Kamal Silva
+
+
Date : 20/08/2023
+
+
+
Time : 10:00
+
+
+
-
-
- -
+
+
+ +
-
Booking History
+
Booking History
-
-
- +
+
+
@@ -177,16 +183,16 @@ - -
Name Status01/09/2023 10.00
-
-
+ + +
+
-