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

Buttons #253

Merged
merged 4 commits into from
Apr 28, 2024
Merged

Buttons #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cf3181
guide-controller
Zaras00 Apr 28, 2024
b77320d
buttons-changed
Zaras00 Apr 28, 2024
5bddf47
login-signup-bg
Zaras00 Apr 28, 2024
ae561cf
rental-table
Zaras00 Apr 28, 2024
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
3 changes: 1 addition & 2 deletions app/controllers/Complaints.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ public function index(){
$this->view('rental/complaints');
}elseif (UserMiddleware::getUser()['role']=='customer') {
$this->view('customer/complaints');
}
elseif(UserMiddleware::getUser()['role']=='guide'){
}elseif(UserMiddleware::getUser()['role']=='guide'){
$this->view('guide/complaints');
}

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/myBookings.php → app/controllers/MyBookings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

class myBookings{
class MyBookings{
use Controller;
public function index(string $a = '', string $b = '', string $c = ''): void {
$this->view('customer/myBookings');
Expand Down
66 changes: 37 additions & 29 deletions app/views/customer/profile.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@

<div class="profile col-lg-12 align-items-center">

<div class="flex-d-c col-lg-12 profile-content align-items-center py-4 mt-6">
<div class="flex-d-c col-lg-12 profile-content align-items-center py-5 mt-9">
<div class="customer-bg-image">
<img src="<?php echo ROOT_DIR?>/assets/images/customerbg.jpg" alt="customer-bg-image" class="customer-bg-image">
</div>
<!-- <?php show ($user);?> -->
<div class="profile-details">
<div class="col-lg-3 profile-details-colum">
<div class="card-normal-glass mt-6 py-6 align-items-center justify-content-center mih-100">
<div class="col-lg-3 px-1 profile-details-colum">
<div class="card-normal-glass py-5 align-items-center justify-content-center mih-100">
<div class="profile-picture">
<img src="<?php echo htmlspecialchars(OSURL); ?>images/customers/<?php echo htmlspecialchars($user->image); ?>" alt="Image" class="img">
</div>
<h1 class="mb-5"> Hello <?php echo $user->name?>!</h1>
<h1 class="mb-4"> Hello <?php echo $user->name?>!</h1>
<div class="row">
<h4><i class="fas fa-envelope"></i> <?php echo $user->email ?></h4>
</div>
Expand All @@ -32,12 +32,12 @@
<h4><i class="fas fa-id-card"></i> <?php echo $user->nic ?></h4>
</div>
<div class="row mt-4">
<button type="submit" class="btn mt-4" id="edit-profile">Edit Profile</button>
<button type="submit" class="btn-text-green border mb-3" id="edit-profile">Edit Profile</button>
</div>
</div>
</div>
<div class="col-lg-6 flex-d-c mt-5 mh-50">
<div class="card-normal-glass ">
<div class="col-lg-6 flex-d-c mh-50 gap-4">
<div class="card-normal-glass miw-50">
<div class="row justify-content-start ml-4">
<h1>Recent Booking</h1>
</div>
Expand Down Expand Up @@ -68,34 +68,42 @@


</div>
<div class="card-normal-glass mt-4">
<div class="card-normal-glass mt-4 miw-50">
<div class="row justify-content-start ml-4 mw-75">
<h1>Usage</h1>
</div>
<div class="flex-d-r mw-75 gap-0">
<div class="card-normal usage-card">
<div class="row justify-content-center">
<h3 class="equipment-booking">Equipment Booking</h3>
</div>
<div class="row">
<h2>11</h2>
</div>
<div class="card-normal usage-card justify-content-center">
<a href="<?php echo ROOT_DIR?>/myOrders">
<div class="row">
<div class="btn-icon">
<h3 class="equipment-booking">Equipment</h3>
</div>
</div>
<div class="row">
<h2>11</h2>
</div>
</a>
</div>
<div class="card-normal usage-card">
<div class="row">
<h3>Guide Booking</h3>
</div>
<div class="row">
<h2>02</h2>
</div>
<div class="card-normal usage-card justify-content-center">
<a href="<?php echo ROOT_DIR?>/myBookings">
<div class="row">
<h3>Guides</h3>
</div>
<div class="row">
<h2>02</h2>
</div>
</a>
</div>
<div class="card-normal usage-card">
<div class="row">
<h3>Complaints</h3>
</div>
<div class="row">
<h2>00</h2>
</div>
<div class="card-normal usage-card justify-content-center">
<a href="<?php echo ROOT_DIR?>/complaints">
<div class="row">
<h3>Complaints</h3>
</div>
<div class="row">
<h2>00</h2>
</div>
</a>
</div>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions app/views/login.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
?>

<div class="login-container">
<div class="customer-bg-image">
<img src="<?php echo ROOT_DIR?>/assets/images/customerbg.jpg" alt="customer-bg-image" class="customer-bg-image">
</div>

<div class="column">

Expand Down
15 changes: 11 additions & 4 deletions app/views/rental/components/equipmentlist.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,19 @@

<!-- Table filter for each column -->
<!-- button for show filter -->
<div class="filter-btn mb-3 ml-2">
<button id="show-filter" class="btn-text-green border" aria-expanded="false"><i class="fa fa-filter" aria-hidden="true"></i> Filter</button>
<div class="row justify-content-between">
<div class="filter-btn align-content-center">
<button id="show-filter" class="btn-text-green ml-3" aria-expanded="false"><i class="fa fa-filter" aria-hidden="true"></i> Filter</button>
</div>
<div class="add-equipment">
<button type="submit" class="btn-text-green mr-4" id="add-equipment">
<i class="fa fa-plus" aria-hidden="true"></i>Add new
</button>
</div>
Comment on lines +5 to +13
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactor the filter button layout for better alignment and accessibility.

- <div class="row justify-content-between">
-     <div class="filter-btn align-content-center">
-         <button id="show-filter" class="btn-text-green ml-3" aria-expanded="false"><i class="fa fa-filter" aria-hidden="true"></i> Filter</button>
-     </div>
-     <div class="add-equipment">
-         <button type="submit" class="btn-text-green mr-4" id="add-equipment">
-             <i class="fa fa-plus" aria-hidden="true"></i>Add new
-         </button>
-     </div>
- </div>
+ <div class="row justify-content-between align-items-center">
+     <div class="col-auto">
+         <button id="show-filter" class="btn btn-primary"><i class="fa fa-filter" aria-hidden="true"></i> Filter</button>
+     </div>
+     <div class="col-auto">
+         <button type="submit" class="btn btn-success" id="add-equipment"><i class="fa fa-plus" aria-hidden="true"></i> Add new</button>
+     </div>
+ </div>
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
<div class="row justify-content-between">
<div class="filter-btn align-content-center">
<button id="show-filter" class="btn-text-green ml-3" aria-expanded="false"><i class="fa fa-filter" aria-hidden="true"></i> Filter</button>
</div>
<div class="add-equipment">
<button type="submit" class="btn-text-green mr-4" id="add-equipment">
<i class="fa fa-plus" aria-hidden="true"></i>Add new
</button>
</div>
<div class="row justify-content-between align-items-center">
<div class="col-auto">
<button id="show-filter" class="btn btn-primary"><i class="fa fa-filter" aria-hidden="true"></i> Filter</button>
</div>
<div class="col-auto">
<button type="submit" class="btn btn-success" id="add-equipment"><i class="fa fa-plus" aria-hidden="true"></i> Add new</button>
</div>
</div>

</div>


<div class="table-filter ">
<div class="table-filter">
<div class="row ">
<div class="back-btn mb-3">
<button id="hide-filter" class="btn-icon" aria-expanded="true"><i class="fa fa-chevron-left" aria-hidden="true"></i></button>
Expand Down Expand Up @@ -42,7 +49,7 @@
</div>
</div>

<table class="data-table table-custom" id="equipment-table">
<table class="data-table table-custom align-items-center" id="equipment-table">
<thead>
<tr>
<th>Equipment Name</th>
Expand Down
25 changes: 9 additions & 16 deletions app/views/rental/equipments.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,7 @@
</button>
</div> -->
</div>
<div class="row justify-content-end">
<div class="add-equipment mr-5">
<button type="submit" class="btn-text-green border" id="add-equipment">
<i class="fa fa-plus" aria-hidden="true"></i>
Add new
</button>
</div>


</div>


<!-- Add Equipment -->

Expand Down Expand Up @@ -108,7 +99,7 @@
<input type="text" name="address" id="address" value="<?= $user->address ?>" required>

<!-- <label for="email">Email</label>
<input type="text" name="email" id="email" value="<?= $user->email ?>" required> -->
<input type="text" name="email" id="email" value="<?= $user->email ?>" required> -->

<label for="mobile">Mobile No</label>
<input type="text" name="mobile" id="mobile" value="<?= $user->mobile ?>" required>
Expand All @@ -117,7 +108,7 @@
<input type="text" name="regNo" id="regNo" value="<?= $user->regNo ?>" required>

<!-- <label for="password">Password</label>
<input type="password" name="password" id="password" required> -->
<input type="password" name="password" id="password" required> -->

<input type="submit" class="btn mt-4" name="submit" value="Update">
</form>
Expand Down Expand Up @@ -146,7 +137,7 @@
<input type="text" id="equipment-name" class="form-control-lg" name="equipment_name" required>

<!-- <label for="equipment-type">Type</label>
<input type="text" id="equipment-type" class="form-control-lg" name="equipment_type" required> -->
<input type="text" id="equipment-type" class="form-control-lg" name="equipment_type" required> -->
<label for="equipment-type">Type</label>
<select id="equipment-type" class="form-control-lg" name="equipment_type" required>
<option value="Tent">Tent</option>
Expand Down Expand Up @@ -339,9 +330,11 @@ function openModal() {
var addEquipmentBtn = document.getElementById("add-equipment");
var span = document.getElementsByClassName("close")[1]; // assuming this is the second modal

addEquipmentBtn.onclick = function() {
addEquipmentModal.style.display = "block";
}
// addEquipmentBtn.onclick = function() {
$(document).on('click', '#add-equipment', function(e) {
addEquipmentModal.style.display = "block";
});


span.onclick = function() {
addEquipmentModal.style.display = "none";
Expand Down
3 changes: 3 additions & 0 deletions app/views/signup.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@


<div class="signup-container" id="blur">
<div class="customer-bg-image">
<img src="<?php echo ROOT_DIR?>/assets/images/customerbg.jpg" alt="customer-bg-image" class="customer-bg-image">
</div>
<div class="column">
<div class="signup-form">
<h2>Who are you?</h2>
Expand Down
12 changes: 6 additions & 6 deletions public/assets/scss/wl/dashboard/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
width: fit-content;
cursor: pointer;
border: none;
padding: 10px;
padding: 5px;
// font-family: "poppins", sans-serif;

&:hover{
Expand All @@ -124,7 +124,7 @@

.btn-text-green {
background-color: transparent;
font-size: 14px;
font-size: 16px;
font-weight: 600;
color: $color-primary;
width: fit-content;
Expand Down Expand Up @@ -176,7 +176,7 @@

.btn-text-blue {
background-color: transparent;
font-size: 14px;
font-size: 16px;
font-weight: 600;
color: $blue;
width: fit-content;
Expand Down Expand Up @@ -209,7 +209,7 @@

.btn-text-orange {
background-color: transparent;
font-size: 18px;
font-size: 16px;
font-weight: 600;
color: $orange;
width: fit-content;
Expand Down Expand Up @@ -243,7 +243,7 @@

.btn-text-red {
background-color: transparent;
font-size: 18px;
font-size: 16px;
font-weight: 600;
color: $red;
width: fit-content;
Expand Down Expand Up @@ -413,7 +413,7 @@

.btn-selected {
background-color: transparent;
font-size: 14px;
font-size: 16px;
color: $gray-text;
width: fit-content;
cursor: pointer;
Expand Down
3 changes: 2 additions & 1 deletion public/assets/scss/wl/dashboard/_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
font-size: 1.5rem;
font-weight: 400;
line-height: 1.5;
color: black-text;
color: $gray-text;
// background-color: $color-lightest2;
background-color: $color-light;
background-clip: padding-box;
// border: 2px solid $color-lightest;
border-radius: 12px;
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
border: none;
}

.form-control {
Expand Down
2 changes: 1 addition & 1 deletion public/assets/scss/wl/dashboard/_table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
// }
// }
border-spacing: 1;
// border-collapse: collapse;
border-collapse: collapse;
background: $color-white;
border-radius:10px;
overflow:hidden;
Expand Down
Loading