small changes

Author: snykk

.gitattributes

@@ -1,7 +1,8 @@
 * text=auto
 
 *.blade.php diff=html
-*.css linguist-vendored
+*global.css linguist-vendored
+*auth.css linguist-vendored
 *.html diff=html
 *.md diff=markdown
 *.php diff=php

public/css/customers.css

@@ -58,7 +58,7 @@
     --bs-body-font-weight: 400;
     --bs-body-line-height: 1.5;
     --bs-body-color: #212529;
-    --bs-body-bg: #fff;
+    --bs-body-bg: #eee;
 }
 
 *,
@@ -81,7 +81,7 @@ body {
     line-height: var(--bs-body-line-height);
     color: var(--bs-body-color);
     text-align: var(--bs-body-text-align);
-    background-color: var(--bs-body-bg);
+    background-color: var(--bs-body-bg) !important;
     -webkit-text-size-adjust: 100%;
     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }

public/css/global.css

@@ -1,3 +1,7 @@
+body {
+    background-color: #fff !important;
+}
+
 /* Hero home user */
 #hero {
     height: calc(100vh - 56px);

public/css/home.css

@@ -1,7 +1,6 @@
 @extends('/layouts/main')
 
 @push('css-dependencies')
-<link rel="stylesheet" href="/css/customers.css">
 <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.5/css/jquery.dataTables.min.css" />
 @endpush
 

public/css/transaction.css

@@ -387,7 +387,7 @@ class="form-control @error('quantity') is-invalid @enderror" onchange="myCounter
                 (no coupon)
                 @else
                 <span class="align-items-center">
-                  <label for="use_coupon">Use</label>
+                  <label for="use_coupon" style="cursor:pointer">(use coupon</label>
                 </span>
                 <span>
                   <input id="use_coupon" type="checkbox" onchange="changeStatesCoupon()">

resources/views/home/customers.blade.php

@@ -35,17 +35,18 @@
         </a>
         @endif
 
-        @if (isset($row->product_id) && auth()->user()->id == 2 && $row->is_done == 1)
+        @if (isset($row->product_id) && auth()->user()->role_id == 2 && $row->is_done == 1)
         <div>
-          <a href="/order/rewiew/" class="link-info" style="text-decoration: none; font-size:0.9rem;">
+          <a href="/review/product/{{ $row->product_id }}" class="link-info"
+            style="text-decoration: none; font-size:0.9rem;">
             Review Now!
           </a>
         </div>
         @endif
       </div>
       @php
-      if (auth()->user()->id == 1) {
-      $dest = "/home/customers?username=" . $row["username"];
+      if (auth()->user()->role_id == 1) {
+      $dest = "/home/customers?username=" . $row->user->username;
       }
       else {
       $dest = "/profile/my_profile";
@@ -58,7 +59,7 @@
       </div>
       @else
       <div class="col-md-12">order created at {{ $row->created_at->format('d M Y') }} by <a href="{{ $dest }}"
-          style="text-decoration:none;">{{ "@" . auth()->user()->username }}</a>
+          style="text-decoration:none;">{{ "@" . $row->user->username }}</a>
       </div>
       @endif
     </div>

resources/views/order/make_order.blade.php

@@ -1,4 +1,4 @@
-<nav class="sb-sidenav accordion sb-sidenav-dark" id="sidenavAccordion">
+<nav class="sb-sidenav accordion sb-sidenav-light" id="sidenavAccordion">
     <div class="sb-sidenav-menu">
         <div class="nav">
             @can("is_admin")

resources/views/partials/order/order_lists.blade.php

@@ -1,13 +1,13 @@
-<nav class="sb-topnav navbar navbar-expand navbar-dark bg-dark">
+<nav class="sb-topnav navbar navbar-expand navbar-light bg-light">
 
   <a class="navbar-brand ps-3" href="/home">Laracoffee</i> </a>
 
   <!-- Sidebar Toggle-->
-  <button class="btn btn-link btn-dark btn-sm order-1 order-lg-0 me-3 me-lg-0" id="sidebarToggle" href="#!"><i
+  <button class="btn btn-link btn-light btn-sm order-1 order-lg-0 me-3 me-lg-0" id="sidebarToggle" href="#!"><i
       class="fas fa-bars"></i></button>
 
   <!-- Nama User/Admin -->
-  <div style="color: white; " class="d-none d-md-inline-block form-inline ms-auto me-0 me-md-3 my-2 my-md-0">{{
+  <div style="color: black; " class="d-none d-md-inline-block form-inline ms-auto me-0 me-md-3 my-2 my-md-0">{{
     auth()->user()->username }}</div>
 
   <!-- Navbar-->

resources/views/partials/sidebar.blade.php

@@ -9,7 +9,7 @@
 @endpush
 
 @section('content')
-<div class="main-body px-5">
+<div class="main-body px-1 px-md-3 px-lg-4 px-xl-5">
 
     @include('/partials/breadcumb')
 
@@ -105,7 +105,7 @@
                     </div>
 
                     <!-- Save changes button-->
-                    <div class="col-6 d-flex justify-content-start align-items-center">
+                    <div class="col-12 d-flex justify-content-start align-items-center">
                         <a href="/profile/my_profile" class="btn btn-outline-secondary me-2">Back</a>
                         <button class="btn btn-dark" type="submit">Save Changes</button>
                     </div>

resources/views/partials/topbar.blade.php

@@ -1,9 +1,5 @@
 @extends('/layouts/main')
 
-@push('css-dependencies')
-<link href="/css/transaction.css" rel="stylesheet" />
-@endpush
-
 @section('content')
 <div class="container-fluid pt-4">
 

resources/views/profile/edit_profile.blade.php

@@ -1,9 +1,5 @@
 @extends('/layouts/main')
 
-@push('css-dependencies')
-<link href="/css/transaction.css" rel="stylesheet" />
-@endpush
-
 @section('content')
 <div class="container-fluid pt-4">
 

resources/views/transaction/add_outcome.blade.php

@@ -1,7 +1,6 @@
 @extends('/layouts/main')
 
 @push('css-dependencies')
-<link href="/css/transaction.css" rel="stylesheet" />
 <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.5/css/jquery.dataTables.min.css" />
 @endpush