Merge pull request #9 from ovidiustanc123/update-v4

bugfixing

Author: teamupdivision

app/Http/Livewire/Auth/Login.php

@@ -2,13 +2,15 @@
 
 namespace App\Http\Livewire\Auth;
 
+use App\Models\User;
 use Livewire\Component;
 
 class Login extends Component
 {
 
     public $email = '';
     public $password = '';
+    public $remember_me = false;
 
     protected $rules = [
         'email' => 'required|email',
@@ -17,20 +19,23 @@ class Login extends Component
 
     //This mounts the default credentials for the admin. Remove this section if you want to make it public.
     public function mount()
-{
-    $this->fill([
-        'email' => 'admin@volt.com',
-        'password' => 'secret',
+    {
+        $this->fill([
+            'email' => 'admin@volt.com',
+            'password' => 'secret',
         ]);
-}
+    }
 
     public function login()
     {
         $credentials = $this->validate();
-        return auth()->attempt($credentials)
-                ? redirect()->intended('/profile')
-                : $this->addError('email', trans('auth.failed'));
-
+        if (auth()->attempt(['email' => $this->email, 'password' => $this->password], $this->remember_me)) {
+            $user = User::where(['email' => $this->email])->first();
+            auth()->login($user, $this->remember_me);
+            return redirect()->intended('/dashboard');
+        } else {
+            return $this->addError('email', trans('auth.failed'));
+        }
     }
 
     public function render()

app/Http/Livewire/Users.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use Livewire\Component;
+
+class Users extends Component
+{
+    public function render()
+    {
+        return view('livewire.users');
+    }
+}

database/seeders/UserSeeder.php

@@ -16,6 +16,7 @@ class UserSeeder extends Seeder
     public function run()
     {
         DB::table("users")->insert([
+            'first_name' => 'Admin',
             'email' => 'admin@volt.com',
             'password' => Hash::make('secret'),
         ]);

public/assets/img/updivision.png

@@ -1,29 +1,39 @@
 <x-layouts.base>
 
 
-    @if(in_array(request()->route()->getName(), ['dashboard', 'profile', 'bootstrap-tables', 'transactions', 'buttons', 'forms', 'modals', 'notifications', 'typography', 'upgrade-to-pro']))
-
-        {{-- Nav --}}
-        @include('layouts.nav')
-        {{-- SideNav --}}
-        @include('layouts.sidenav')
-        <main class="content">
+    @if(in_array(request()->route()->getName(), ['dashboard', 'profile', 'users', 'bootstrap-tables', 'transactions',
+    'buttons',
+    'forms', 'modals', 'notifications', 'typography', 'upgrade-to-pro']))
+
+    {{-- Nav --}}
+    @include('layouts.nav')
+    {{-- SideNav --}}
+    @include('layouts.sidenav')
+    <main class="content">
         {{-- TopBar --}}
         @include('layouts.topbar')
         {{ $slot }}
         {{-- Footer --}}
         @include('layouts.footer')
-        </main>
+    </main>
 
-    @elseif(in_array(request()->route()->getName(), ['register', 'register-example', 'login', 'login-example', '404', '500', 'forgot-password', 'forgot-password-example', 'reset-password','reset-password-example', 'lock']))
+    @elseif(in_array(request()->route()->getName(), ['register', 'register-example', 'login', 'login-example',
+    'forgot-password', 'forgot-password-example', 'reset-password','reset-password-example']))
+
+    {{ $slot }}
+    {{-- Footer --}}
+    @include('layouts.footer')
 
-        {{ $slot }}
+
+    @elseif(in_array(request()->route()->getName(), ['404', '500']))
+
+    {{ $slot }}
 
     @elseif(in_array(request()->route()->getName(), ['index']))
 
-        @include('layouts.index.indexnav')
-        {{ $slot }}
-        @include('layouts.index.indexfooter')
+    @include('layouts.index.indexnav')
+    {{ $slot }}
+    @include('layouts.index.indexfooter')
 
     @endif
 </x-layouts.base>

resources/views/layouts/app.blade.php

@@ -4,15 +4,19 @@
             href="#theme-settings" role="button" aria-expanded="false" aria-controls="theme-settings"></button>
         <div class="d-flex justify-content-between align-items-center mb-3">
             <p class="m-0 mb-1 me-4 fs-7">Open source <span role="img" aria-label="gratitude">💛</span></p>
-            <a class="github-button" href="https://github.com/themesberg/volt-bootstrap-5-dashboard"
+            <a class="github-button" href="https://github.com/themesberg/volt-laravel-admin-dashboard"
                 data-color-scheme="no-preference: dark; light: light; dark: light;" data-icon="octicon-star"
                 data-size="large" data-show-count="true"
                 aria-label="Star themesberg/volt-bootstrap-5-dashboard on GitHub">Star</a>
         </div>
-        <a href="https://themesberg.com/product/admin-dashboard/volt-bootstrap-5-dashboard" target="_blank"
+        <a href="https://themesberg.com/product/admin-dashboard/volt-laravel-admin-dashboard" target="_blank"
             class="btn btn-secondary d-inline-flex align-items-center justify-content-center mb-3 w-100">
-            Download 
-            <svg class="icon icon-xs ms-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 9.5A3.5 3.5 0 005.5 13H9v2.586l-1.293-1.293a1 1 0 00-1.414 1.414l3 3a1 1 0 001.414 0l3-3a1 1 0 00-1.414-1.414L11 15.586V13h2.5a4.5 4.5 0 10-.616-8.958 4.002 4.002 0 10-7.753 1.977A3.5 3.5 0 002 9.5zm9 3.5H9V8a1 1 0 012 0v5z" clip-rule="evenodd"></path></svg>
+            Download
+            <svg class="icon icon-xs ms-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd"
+                    d="M2 9.5A3.5 3.5 0 005.5 13H9v2.586l-1.293-1.293a1 1 0 00-1.414 1.414l3 3a1 1 0 001.414 0l3-3a1 1 0 00-1.414-1.414L11 15.586V13h2.5a4.5 4.5 0 10-.616-8.958 4.002 4.002 0 10-7.753 1.977A3.5 3.5 0 002 9.5zm9 3.5H9V8a1 1 0 012 0v5z"
+                    clip-rule="evenodd"></path>
+            </svg>
         </a>
         <p class="fs-7 text-gray-300 text-center">Available in the following technologies:</p>
         <div class="d-flex justify-content-center">
@@ -29,15 +33,21 @@ class="btn btn-secondary d-inline-flex align-items-center justify-content-center
 <div class="card theme-settings bg-gray-800 theme-settings-expand" id="theme-settings-expand">
     <div class="card-body bg-gray-800 text-white rounded-top p-3 py-2">
         <span class="fw-bold d-inline-flex align-items-center h6">
-            <svg class="icon icon-xs me-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.49 3.17c-.38-1.56-2.6-1.56-2.98 0a1.532 1.532 0 01-2.286.948c-1.372-.836-2.942.734-2.106 2.106.54.886.061 2.042-.947 2.287-1.561.379-1.561 2.6 0 2.978a1.532 1.532 0 01.947 2.287c-.836 1.372.734 2.942 2.106 2.106a1.532 1.532 0 012.287.947c.379 1.561 2.6 1.561 2.978 0a1.533 1.533 0 012.287-.947c1.372.836 2.942-.734 2.106-2.106a1.533 1.533 0 01.947-2.287c1.561-.379 1.561-2.6 0-2.978a1.532 1.532 0 01-.947-2.287c.836-1.372-.734-2.942-2.106-2.106a1.532 1.532 0 01-2.287-.947zM10 13a3 3 0 100-6 3 3 0 000 6z" clip-rule="evenodd"></path></svg>
+            <svg class="icon icon-xs me-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd"
+                    d="M11.49 3.17c-.38-1.56-2.6-1.56-2.98 0a1.532 1.532 0 01-2.286.948c-1.372-.836-2.942.734-2.106 2.106.54.886.061 2.042-.947 2.287-1.561.379-1.561 2.6 0 2.978a1.532 1.532 0 01.947 2.287c-.836 1.372.734 2.942 2.106 2.106a1.532 1.532 0 012.287.947c.379 1.561 2.6 1.561 2.978 0a1.533 1.533 0 012.287-.947c1.372.836 2.942-.734 2.106-2.106a1.533 1.533 0 01.947-2.287c1.561-.379 1.561-2.6 0-2.978a1.532 1.532 0 01-.947-2.287c.836-1.372-.734-2.942-2.106-2.106a1.532 1.532 0 01-2.287-.947zM10 13a3 3 0 100-6 3 3 0 000 6z"
+                    clip-rule="evenodd"></path>
+            </svg>
             Settings
         </span>
     </div>
 </div>
 <footer class="bg-white rounded shadow p-5 mb-4 mt-4">
     <div class="row">
         <div class="col-12 col-md-4 col-xl-6 mb-4 mb-md-0">
-            <p class="mb-0 text-center text-lg-start">© 2019-<span class="current-year"></span> <a class="text-primary fw-normal" href="https://themesberg.com" target="_blank">Themesberg</a></p>
+            <p class="mb-0 text-center text-lg-start">© 2019-<span class="current-year"></span> <a
+                    class="text-primary fw-normal" href="https://themesberg.com" target="_blank">Themesberg &
+                </a><a href="https://updivision.com/" target="_blank">Updivision</a></p>
         </div>
         <div class="col-12 col-md-8 col-xl-6 text-center text-lg-start">
             <!-- List -->