updated docker

resources/views/auth/login.blade.php

@@ -67,18 +67,24 @@
             </div>
 
             <div class="col-lg-8 mt-5">
-              <form action="">
+			
+			<div id="login-response-msg"></div>
+			<form role="form" id="frm-login">
+				<input type="hidden" name="redirect" value="{{ Request::get('redirectUrl')  }}">
+				<input type="hidden" name="_token" value="{{ csrf_token() }}">
                 <div class="mb-3">
                   <input
                     type="text"
                     class="form-control form-control-lg contact-input-custom"
                     placeholder="Username*"
+					name="email" value="{{ old('email') }}" 
                     required
                   />
                 </div>
                 <div class="mb-3">
                   <input
                     type="password"
+					name="password"
                     class="form-control form-control-lg contact-input-custom"
                     required
                     placeholder="Password*"

resources/views/auth/register.blade.php

@@ -188,7 +188,7 @@
 
               <p class="text-start">
                 Already have an account?
-                <router-link to="/login">Login</router-link>
+                <a href="{{ url('./auth/login') }}">Login</a>
               </p>
             </form>
           </div>

resources/views/merchbay/navbar.blade.php

@@ -84,24 +84,64 @@
         </ul>
 
         <ul class="navbar-nav ms-auto">
+          @if (Auth::guest())
+            <li class="nav-item">
+              <a class="nav-link" href="{{ url('./auth/register') }}">
+                <i class="icon icon-sign-up"></i> Sign Up
+              </a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="{{ url('./auth/login') }}">
+                <i class="icon icon-sign-in"></i>
+                Log In
+              </a>
+            </li>
+          @else
+
+          
+          @if(Auth::user()->role == "admin")
           <li class="nav-item">
-            <a class="nav-link" href="{{ url('./auth/register') }}">
-              <i class="icon icon-sign-up"></i> Sign Up
+            <a class="nav-link" href="{{ url('./auth/admin') }}">
+              {{-- <i class="icon icon-sign-in"></i> --}}
+              Dashboard
             </a>
           </li>
+          @elseif(Auth::user()->role == "store_owner")
           <li class="nav-item">
-            <!-- <router-link to="/login" class="nav-link">
-              <i class="icon icon-sign-in"></i>
-              Log In
-            </router-link> -->
-            <a class="nav-link" href="{{ url('./auth/login') }}">
-              <i class="icon icon-sign-in"></i>
-              Log In
+            {{-- <a href="{{ url('user') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Dashboard</a> --}}
+            <a class="nav-link" href="{{ url('./auth/user') }}">
+              {{-- <i class="icon icon-sign-in"></i> --}}
+              Dashboard
             </a>
           </li>
+          @else
           <li class="nav-item">
-            <a class="nav-link" href="#!">
+            <a class="nav-link" href="{{ url('./auth/user') }}">
+              {{-- <i class="icon icon-sign-in"></i> --}}
+              Dashboard
+            </a>
+          </li>
+          @endif
+
+
+          <li class="nav-item">
+            {{-- <a href="{{ url('./auth/logout') }}" class="nav-link btn btn-white-outline btn-sm text-uppercase mx-1">Logout</a> --}}
+            <a class="nav-link" href="{{ url('./auth/logout') }}">
+              <i class="icon icon-sign-in"></i>
+              Logout
+            </a>
+          </li>
+
+          @endif
+            
+          <li class="nav-item">
+            {{-- <a href="{{ url('cart') }}" type="button" class="nav-link btn btn-navbar-cart btn-sm">
+            <i class="icon icon-cart"></i>
+              <span class="badge bg-secondary">{{ \App\Http\Controllers\MainController::getCountCart() }}</span>
+            </a> --}}
+            <a class="nav-link" href="{{ url('cart') }}" type="button">
               <i class="icon icon-cart"></i>
+              <span class="badge bg-secondary">{{ \App\Http\Controllers\MainController::getCountCart() }}</span>
             </a>
           </li>
         </ul>