Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

renaming_files #48

Merged
merged 1 commit into from
Oct 31, 2023
Merged

renaming_files #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions app/middlewares/UserMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand All @@ -43,11 +43,3 @@ static function user($user){
}

}







?>
1 change: 1 addition & 0 deletions app/views/components/navbar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<?php if (isset($_SESSION['USER']) && $_SESSION['USER']->role != 'admin') {
$user = $_SESSION['USER']; ?>


<!-- profile avatar with dropdown -->

<div class="profile-avatar">
Expand Down
226 changes: 116 additions & 110 deletions app/views/guide/GuideDashboard.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,151 +1,157 @@
<!DOCTYPE html>
<!-- <!DOCTYPE html>
<html lang="en">

<head>
<title></title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="GuideDashboard.css" rel="stylesheet">
<link href="<?php echo ROOT_DIR ?>GuideDashboard.css" rel="stylesheet">
</head>

<body>
<div class="guide-dash">
<div class="frame">
<div class="edit-prof-button">
<button type="submit" class="small-button-middle">
Edit Profile
</button>
</div>
<body> -->

<div class="div-1">
<div class="div-12">
<div class="text-wrapper">Hello William!</div>
<div class="img-1">
<img src="<?php echo ROOT_DIR?>/assets/images/../imgs/7.png" alt="">
</div>
<?php
require_once('../app/views/layout/header.php');

require_once('../app/views/components/navbar.php');
?>
<div class="guide-dash">
<div class="frame">
<div class="edit-prof-button">
<button type="submit" class="small-button-middle">
Edit Profile
</button>
</div>

<div class="div-1">
<div class="div-12">
<div class="text-wrapper">Hello William!</div>
<div class="img-1">
<img src="<?php echo ROOT_DIR ?>/assets/images/7.png" alt="">
</div>
</div>

<form class="div-3">
<form class="div-3">

<div class="div-4">
<div class="div-wrapper">
<div class="text-wrapper-2">Name : William Cooray</div>
</div>
<div class="div-wrapper">
<div class="text-wrapper-2">Age : 30</div>
</div>
<div class="div-wrapper">
<div class="text-wrapper-2">Role : Guide</div>
</div>
<div class="div-4">
<div class="div-wrapper">
<div class="text-wrapper-2">Name : <?php echo $user->name ?></div>
</div>

<div class="div-4">
<div class="div-wrapper">
<div class="text-wrapper-2">Name : William Cooray</div>
</div>
<div class="div-wrapper">
<div class="text-wrapper-2">Age : 30</div>
</div>
<div class="div-wrapper">
<div class="text-wrapper-2">Role : Guide</div>
</div>
<div class="div-wrapper">
<div class="text-wrapper-2">NIC : <?php echo $user->nic ?></div>
</div>
<div class="div-wrapper">
<div class="text-wrapper-2">Role : Guide</div>
</div>
</div>

</form>
<div class="div-4">
<div class="div-wrapper">
<div class="text-wrapper-2">Email : <?php echo $user->email ?></div>
</div>
<div class="div-wrapper">
<div class="text-wrapper-2">Age : 30</div>
</div>
<div class="div-wrapper">
<div class="text-wrapper-2">Role : Guide</div>
</div>
</div>

</div>
</form>

</div>

</div>


<div class="frame2">
<div class="yellow-card">
<div class="upper-card-text">
<div class="text-card-topic">Total Tours</div>
<div class="edit-prof-button">
<button type="submit" class="small-button-middle">
More &gt
</button>
</div>

<div class="frame2">
<div class="yellow-card">
<div class="upper-card-text">
<div class="text-card-topic">Total Tours</div>
<div class="edit-prof-button">
<button type="submit" class="small-button-middle">
More &gt
</button>
</div>
<div class="number-card">10</div>
</div>
<div class="number-card">10</div>
</div>

<div class="yellow-card">
<div class="upper-card-text">
<div class="text-card-topic">Tours per month</div>
<div class="edit-prof-button">
<button type="submit" class="small-button-middle">
More &gt
</button>
</div>
<div class="yellow-card">
<div class="upper-card-text">
<div class="text-card-topic">Tours per month</div>
<div class="edit-prof-button">
<button type="submit" class="small-button-middle">
More &gt
</button>
</div>
<div class="number-card">03</div>
</div>
<div class="number-card">03</div>
</div>

<div class="yellow-card">
<div class="upper-card-text">
<div class="text-card-topic">Tours in last month</div>
<div class="edit-prof-button">
<button type="submit" class="small-button-middle">
More &gt
</button>
</div>
<div class="yellow-card">
<div class="upper-card-text">
<div class="text-card-topic">Tours in last month</div>
<div class="edit-prof-button">
<button type="submit" class="small-button-middle">
More &gt
</button>
</div>
<div class="number-card">03</div>
</div>
</div>>
<div class="number-card">03</div>
</div>
</div>>



<div class="frame">
<div class="edit-prof-button">
<button type="submit" class="small-button-middle">
More &gt
</button>
</div>
<div class="frame">
<div class="edit-prof-button">
<button type="submit" class="small-button-middle">
More &gt
</button>
</div>

<div class="sec3-booking">
<div class="sec3-booking-main">
<div class="text-topic">Recent Booking</div>
<div class="img-2">
<img src="<?php echo ROOT_DIR?>/assets/images/../imgs/2.png" alt="">
</div>
<div class="sec3-booking">
<div class="sec3-booking-main">
<div class="text-topic">Recent Booking</div>
<div class="img-2">
<img src="<?php echo ROOT_DIR ?>/assets/images/../imgs/2.png" alt="">
</div>
</div>

<div class="div-5">
<div class="div-wrapper-2">
<div class="text-wrapper-2">Place : Nuwara Eliya</div>
</div>
<div class="div-wrapper-2">
<div class="text-wrapper-2">Name : Kamal Silva</div>
</div>
<div class="div-wrapper-2">
<div class="text-wrapper-2">Date : 20/08/2023</div>
</div>
<div class="div-wrapper-2">
<div class="text-wrapper-2">Time : 10:00</div>
</div>

<div class="div-5">
<div class="div-wrapper-2">
<div class="text-wrapper-2">Place : Nuwara Eliya</div>
</div>
<div class="div-wrapper-2">
<div class="text-wrapper-2">Name : Kamal Silva</div>
</div>
<div class="div-wrapper-2">
<div class="text-wrapper-2">Date : 20/08/2023</div>
</div>
<div class="div-wrapper-2">
<div class="text-wrapper-2">Time : 10:00</div>
</div>

</div>
</div>
</div>



<div class="frame">
<div class="edit-prof-button">
<button type="submit" class="small-button-middle">
More &gt
</button>
</div>
<div class="frame">
<div class="edit-prof-button">
<button type="submit" class="small-button-middle">
More &gt
</button>
</div>

<div class="text-topic">Booking History</div>
<div class="text-topic">Booking History</div>

<div class="div-6">
<div class="div-wrapper-3">
<table>
<div class="div-6">
<div class="div-wrapper-3">
<table>
<tr>
<th>Name</th>
<th>Status</th>
Expand Down Expand Up @@ -177,16 +183,16 @@
<td>01/09/2023</td>
<td>10.00</td>
</tr>

</table>
</div>
</div>

</table>
</div>
</div>
</div>
</div>



<!-- <form>
<!-- <form>
<div class="div-3">
<div class="div-4">
<div class="div-wrapper">
Expand Down
0 app/views/rental/AddEquipment.php → app/views/rental/AddEquipment.view.php
View file
Open in desktop
File renamed without changes.
0 app/views/rental/EditEquipment.php → app/views/rental/EditEquipment.view.php
View file
Open in desktop
File renamed without changes.
0 app/views/rental/EquipmentMyBooking.php → app/views/rental/EquipmentMyBooking.view.php
View file
Open in desktop
File renamed without changes.
0 app/views/rental/MyShop.php → app/views/rental/MyShop.view.php
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions app/views/rental/RentalBlog.php → app/views/rental/RentalBlog.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="frameBlog">
<div class="blog">
<div class="img-1">
<img src="<?php echo ROOT_DIR?>/assets/images/../imgs/4.png" alt="">
<img src="<?php echo ROOT_DIR ?>/assets/images/../imgs/4.png" alt="">
</div>
<div class="blog-content">
<div class="blog-reading">
Expand All @@ -43,7 +43,7 @@
<div class="frameBlog">
<div class="blog">
<div class="img-1">
<img src="<?php echo ROOT_DIR?>/assets/images/../imgs/4.png" alt="">
<img src="<?php echo ROOT_DIR ?>/assets/images/../imgs/4.png" alt="">
</div>
<div class="blog-content">
<div class="blog-reading">
Expand All @@ -66,7 +66,7 @@
<div class="frameBlog">
<div class="blog">
<div class="img-1">
<img src="<?php echo ROOT_DIR?>/assets/images/../imgs/4.png" alt="">
<img src="<?php echo ROOT_DIR ?>/assets/images/../imgs/4.png" alt="">
</div>
<div class="blog-content">
<div class="blog-reading">
Expand Down
Loading