Merge pull request #253 from wanderlust-group-project-1/buttons

Buttons
wanderlust-group-project-1 · Apr 28, 2024 · 4dd03f4 · 4dd03f4
2 parents 06b52df + ae561cf
commit 4dd03f4
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 60 deletions.
diff --git a/app/controllers/Complaints.php b/app/controllers/Complaints.php
@@ -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');
         }
 

diff --git a/app/controllers/myBookings.php → app/controllers/MyBookings.php b/app/controllers/myBookings.php → app/controllers/MyBookings.php
@@ -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');

diff --git a/app/views/customer/profile.view.php b/app/views/customer/profile.view.php
@@ -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>
@@ -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>
@@ -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>

diff --git a/app/views/login.view.php b/app/views/login.view.php
@@ -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">
 

diff --git a/app/views/rental/components/equipmentlist.view.php b/app/views/rental/components/equipmentlist.view.php
@@ -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>
     </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>
@@ -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>

diff --git a/app/views/rental/equipments.view.php b/app/views/rental/equipments.view.php
@@ -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 -->
 
@@ -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>
@@ -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>
@@ -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>
@@ -347,9 +338,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";

diff --git a/app/views/signup.view.php b/app/views/signup.view.php
@@ -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>

diff --git a/public/assets/scss/wl/dashboard/_button.scss b/public/assets/scss/wl/dashboard/_button.scss
@@ -114,7 +114,7 @@
   width: fit-content;
   cursor: pointer;
   border: none;
-  padding: 10px;
+  padding: 5px;
   // font-family: "poppins", sans-serif;
 
   &:hover{
@@ -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;
@@ -176,7 +176,7 @@
 
 .btn-text-blue {
   background-color: transparent;
-  font-size: 14px;
+  font-size: 16px;
   font-weight: 600;
   color: $blue;
   width: fit-content;
@@ -209,7 +209,7 @@
 
 .btn-text-orange {
   background-color: transparent;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
   color: $orange;
   width: fit-content;
@@ -243,7 +243,7 @@
 
 .btn-text-red {
   background-color: transparent;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
   color: $red;
   width: fit-content;
@@ -413,7 +413,7 @@
 
 .btn-selected {
   background-color: transparent;
-  font-size: 14px;
+  font-size: 16px;
   color: $gray-text;
   width: fit-content;
   cursor: pointer;

diff --git a/public/assets/scss/wl/dashboard/_form.scss b/public/assets/scss/wl/dashboard/_form.scss
@@ -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 {

diff --git a/public/assets/scss/wl/dashboard/_table.scss b/public/assets/scss/wl/dashboard/_table.scss
@@ -112,7 +112,7 @@
     //   }
     // }
     border-spacing: 1; 
-    // border-collapse: collapse; 
+    border-collapse: collapse; 
     background: $color-white;
     border-radius:10px;
     overflow:hidden;