cleanup

ovidiustanc123 · ovidiustanc123 · commit e0c18476fe46 · 2021-05-21T14:24:56.000+03:00
diff --git a/.env.example b/.env.example
@@ -1,3 +1,5 @@
+IS_DEMO=false
+
 APP_NAME=Laravel
 APP_ENV=local
 APP_KEY=
@@ -45,5 +47,3 @@ PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
-IS_DEMO=false
diff --git a/app/Http/Livewire/Auth/Login.php b/app/Http/Livewire/Auth/Login.php
@@ -15,6 +15,15 @@ class Login extends Component
         'password' => 'required',
     ];
 
+    //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',
+        ]);
+}
+
     public function login()
     {
         $credentials = $this->validate();
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
@@ -13,6 +13,9 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        \App\Models\User::factory(10)->create();
+        // \App\Models\User::factory(10)->create();
+        $this->call([
+            UserSeeder::class
+        ]);
     }
 }
diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
+
+class UserSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        DB::table("users")->insert([
+            'email' => 'admin@volt.com',
+            'password' => Hash::make('secret'),
+        ]);
+    }
+}
diff --git a/resources/views/layouts/topbar.blade.php b/resources/views/layouts/topbar.blade.php
@@ -7,8 +7,9 @@
             <div class="input-group input-group-merge search-bar">
                 <span class="input-group-text" id="topbar-addon"><span class="fas fa-search"></span></span>
                 <input type="text" class="form-control" id="topbarInputIconLeft" placeholder="Search" aria-label="Search" aria-describedby="topbar-addon">
-            </div>
-          </form>
+              </div>
+            </form>
+            <a href="#"><button class="btn mx-1 me-2 btn-secondary" type="button"><i class="fas fa-arrow-down mx-1"></i>Download</button></a>
         </div>
         <!-- Navbar links -->
         <ul class="navbar-nav align-items-center">
diff --git a/resources/views/livewire/auth/login.blade.php b/resources/views/livewire/auth/login.blade.php
@@ -3,7 +3,7 @@
         <!-- Section -->
         <section class="d-flex align-items-center my-5 mt-lg-6 mb-lg-5">
             <div class="container">
-                <p class="text-center"><a href="{{ route('dashboard') }}" class="text-gray-700"><i class="fas fa-angle-left me-2"></i> Back to homepage</a></p>
+                {{-- <p class="text-center"><a href="{{ route('dashboard') }}" class="text-gray-700"><i class="fas fa-angle-left me-2"></i> Back to homepage</a></p> --}}
                 <div wire:ignore.self class="row justify-content-center form-bg-image" data-background-lg="/assets/img/illustrations/signin.svg">
                     <div class="col-12 d-flex align-items-center justify-content-center">
                         <div class="bg-white shadow-soft border rounded border-light p-4 p-lg-5 w-100 fmxw-500">
diff --git a/resources/views/livewire/auth/register.blade.php b/resources/views/livewire/auth/register.blade.php
@@ -3,7 +3,7 @@
         <!-- Section -->
         <section class="d-flex align-items-center my-5 mt-lg-6 mb-lg-5">
             <div class="container">
-                <p class="text-center"><a href="{{ route('dashboard') }}" class="text-gray-700"><i class="fas fa-angle-left me-2"></i> Back to homepage</a></p>
+                {{-- <p class="text-center"><a href="{{ route('dashboard') }}" class="text-gray-700"><i class="fas fa-angle-left me-2"></i> Back to homepage</a></p> --}}
                 <div wire:ignore.self class="row justify-content-center form-bg-image" data-background-lg="/assets/img/illustrations/signin.svg">
                     <div class="col-12 d-flex align-items-center justify-content-center">
                         <div class="mb-4 mb-lg-0 bg-white shadow-soft border rounded border-light p-4 p-lg-5 w-100 fmxw-500">
diff --git a/resources/views/livewire/forgot-password.blade.php b/resources/views/livewire/forgot-password.blade.php
@@ -20,12 +20,12 @@
                             </div>
                             <!-- End of Form -->
                             @if($mailSentAlert)
-                                <div class="alert alert-info" role="alert">
+                                <div class="alert alert-success" role="alert">
                                     An email containing the password reset link has been sent.
                                 </div>
                             @endif
                             @if($showDemoNotification)
-                                <div class="alert alert-info" role="alert">
+                                <div class="alert alert-danger" role="alert">
                                     You cannot do that in the demo version.
                                 </div>
                             @endif
diff --git a/resources/views/livewire/profile.blade.php b/resources/views/livewire/profile.blade.php
@@ -30,6 +30,11 @@
     </div>
     <div class="row">
         <div class="col-12 col-xl-8">
+            @if($showSavedAlert)
+            <div class="alert alert-success" role="alert">
+                    Saved!
+                </div>
+            @endif
             <div class="card card-body shadow-sm mb-4">
                 <h2 class="h5 mb-4">General information</h2>
                 <form wire:submit.prevent="save" action="#" method="POST">
@@ -112,12 +117,7 @@
                     <div class="mt-3">
                         <button type="submit" class="btn btn-dark">Save All</button>
                       </div>
-                    </form>
-                    @if($showSavedAlert)
-                      <div class="alert alert-primary mt-2" role="alert">
-                        Saved!
-                      </div>
-                    @endif
+                    </form>                   
                     @if($showDemoNotification)
                         <div class="alert alert-info mt-2" role="alert">
                             You cannot do that in the demo version.
diff --git a/resources/views/reset-password-example.blade.php b/resources/views/reset-password-example.blade.php
@@ -7,7 +7,7 @@
                 <div class="col-12 d-flex align-items-center justify-content-center">
                     <div class="bg-white shadow-soft border rounded border-light p-4 p-lg-5 w-100 fmxw-500">
                         <h1 class="h3 mb-4">Reset password</h1>
-                        <form action="#" method="POST">
+                        <form action="#">
                             {{-- <input wire:model="token" type="hidden" name="token" value="..."> --}}
                             <!-- Form -->
                             <div class="mb-4">
diff --git a/resources/views/transactions.blade.php b/resources/views/transactions.blade.php
@@ -388,6 +388,4 @@
         </nav>
         <div class="fw-bold small d-none d-lg-block">Showing <b>5</b> out of <b>25</b> entries</div>
     </div>
-</div>
-
-</main>
+</div>
diff --git a/routes/web.php b/routes/web.php
@@ -42,20 +42,23 @@
 Route::get('/login', Login::class)->name('login');
 
 Route::get('/forgot-password', ForgotPassword::class)->name('forgot-password');
-Route::middleware('auth')->group(function () {
-    Route::get('/profile', Profile::class)->name('profile');
-});
 
 Route::get('/reset-password/{id}', ResetPassword::class)->name('reset-password')->middleware('signed');
-Route::get('/reset-password-example', ResetPasswordExample::class)->name('reset-password');
-Route::get('/dashboard', Dashboard::class)->name('dashboard');
-Route::get('/transactions', Transactions::class)->name('transactions');
-Route::get('/bootstrap-tables', BootstrapTables::class)->name('bootstrap-tables');
-Route::get('/lock', Lock::class)->name('lock');
+
 Route::get('/404', Err404::class)->name('404');
 Route::get('/500', Err500::class)->name('500');
-Route::get('/buttons', Buttons::class)->name('buttons');
-Route::get('/notifications', Notifications::class)->name('notifications');
-Route::get('/forms', Forms::class)->name('forms');
-Route::get('/modals', Modals::class)->name('modals');
-Route::get('/typography', Typography::class)->name('typography');
+
+Route::middleware('auth')->group(function () {
+    Route::get('/profile', Profile::class)->name('profile');
+    Route::get('/reset-password-example', ResetPasswordExample::class)->name('reset-password-example');
+    Route::get('/dashboard', Dashboard::class)->name('dashboard');
+    Route::get('/transactions', Transactions::class)->name('transactions');
+    Route::get('/bootstrap-tables', BootstrapTables::class)->name('bootstrap-tables');
+    Route::get('/lock', Lock::class)->name('lock');
+    Route::get('/buttons', Buttons::class)->name('buttons');
+    Route::get('/notifications', Notifications::class)->name('notifications');
+    Route::get('/forms', Forms::class)->name('forms');
+    Route::get('/modals', Modals::class)->name('modals');
+    Route::get('/typography', Typography::class)->name('typography');
+});
+

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@ class DatabaseSeeder extends Seeder`
`13`	`13`	`*/`
`14`	`14`	`public function run()`
`15`	`15`	`{`
`16`		`- \App\Models\User::factory(10)->create();`
	`16`	`+ // \App\Models\User::factory(10)->create();`
	`17`	`+ $this->call([`
	`18`	`+ UserSeeder::class`
	`19`	`+ ]);`
`17`	`20`	`}`
`18`	`21`	`}`