Merge pull request #55 from wanderlust-group-project-1/nirmal

Nirmal
wanderlust-group-project-1 · Oct 31, 2023 · d3b759e · d3b759e
2 parents 8e531a8 + 67ee282
commit d3b759e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/app/middlewares/AuthMiddleware.php b/app/middlewares/AuthMiddleware.php
@@ -23,7 +23,7 @@ public static function getUser(): array {
 
     public static function run_middleware(string $controller, string $method): mixed {
          $authRequired = [
-            'Home' => ['index', 'method2'],
+            // 'Home' => ['index', 'method2'],
             'Controller2' => ['method3'],
             'Customer' => ['index', 'edit', 'update'],
             'Profile' => ['index', 'edit', 'update'],

diff --git a/app/views/components/navbar.php b/app/views/components/navbar.php
@@ -11,8 +11,8 @@
         <li class="nav-menu-item"><a href="#">Tips & Knowhows</a></li>
         <li class="nav-menu-item"><a href="#">Complaints</a></li>
     </ul>
-
-    <?php if (isset($_SESSION['USER']) && $_SESSION['USER']->role != 'admin') {
+<!-- check role avalable or not -->
+    <?php if (isset($_SESSION['USER']) && is_object($_SESSION['USER']) &&    $_SESSION['USER']->role != 'admin') {
         $user = $_SESSION['USER'];   ?>
 
 
@@ -31,7 +31,7 @@
 
 
 
-    <?php } else if (isset($_SESSION['USER']) && $_SESSION['USER']->role == 'admin') {
+    <?php } else if (isset($_SESSION['USER']) && is_object($_SESSION['USER']) && $_SESSION['USER']->role == 'admin') {
         $admin = $_SESSION['USER'];   ?>
 
         <!-- profile avatar with dropdown -->

diff --git a/public/assets/css/admin-style.css b/public/assets/css/admin-style.css
@@ -2,7 +2,7 @@
 .sidebar {
     width: 250px;
     height: 100vh;
-    background-color: #eb8484; /* Off-white background color */
+    background-color: #947f7f; /* Off-white background color */
     color: #4C5039; /* Theme color */
     position: fixed;
     left: 0;

diff --git a/public/assets/css/signUp.css b/public/assets/css/signUp.css
@@ -1,4 +1,4 @@
-.login-container .header{
+/* .login-container .header{
     width: 100%;
     text-align: center;
 }
@@ -7,7 +7,7 @@
     font-family:Verdana, Geneva, Tahoma, sans-serif;
     color: #5d6149;
     font-size: 50px;
-}
+} */
 
 .login-container .login-form{
     background-color: #F4F4F4;   
@@ -28,10 +28,10 @@
     color: #6c7058;
 }
 
-.login-container .login-form p{
+/* .login-container .login-form p{
     font-family:'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
     font-style:inherit;
     font-size:x-small;
     transform: translateY(-25px);
     color: #6c7058;
-}
+} */