Corrected link of 'home'-item in navbar

Author: PI-Mathis

README.md

@@ -49,4 +49,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package-lock.json

@@ -27,6 +27,7 @@
     "core-js": "^2.5.4",
     "hammerjs": "^2.0.8",
     "json-server": "^0.14.0",
+    "ngx-spinner": "^6.1.2",
     "rxjs": "^6.0.0",
     "rxjs-compat": "^6.2.2",
     "zone.js": "^0.8.26"

package.json

@@ -5,13 +5,16 @@ import { environment } from '@env/environment';
 import { AuthGuard } from './guards/auth.guard';
 import { NoAuthGuard } from './guards/no-auth.guard';
 
+import { NgxSpinnerModule } from 'ngx-spinner';
+
 import { TokenInterceptor } from './interceptors/token.interceptor';
 
 import { throwIfAlreadyLoaded } from './guards/module-import.guard';
 
 @NgModule({
     imports: [
-        HttpClientModule
+        HttpClientModule,
+        NgxSpinnerModule
     ],
     providers: [
         AuthGuard,

src/app/core/core.module.ts

@@ -4,23 +4,22 @@
 </div>
 
 <form (ngSubmit)="login()" [formGroup]="loginForm">
-  <div class="form-group">
-    <label class="d-block">
-      <input type="text" class="form-control" [placeholder]="'Username'" formControlName="username">
-      <app-control-messages [control]="f['username']"></app-control-messages>
-    </label>
-    <label class="d-block">
-      <input type="password" class="form-control" [placeholder]="'Password'" formControlName="password">
-      <app-control-messages [control]="f['password']"></app-control-messages>
-    </label>
     <div class="form-group">
-      <button type="submit" class="btn btn-primary btn-block btn-raised" type="submit">
-        <span [hidden]="isLoading">Submit</span>
-        <span [hidden]="!isLoading"><i class="fas fa-asterisk fa-2x fa-spin"></i></span>
-      </button>
-      <button type="button" class="btn btn-secondary btn-block btn-raised">Cancel</button>
+      <label class="d-block">
+        <input type="text" class="form-control" [placeholder]="'Username'" formControlName="username">
+        <app-control-messages [control]="f['username']"></app-control-messages>
+      </label>
+      <label class="d-block">
+        <input type="password" class="form-control" [placeholder]="'Password'" formControlName="password">
+        <app-control-messages [control]="f['password']"></app-control-messages>
+      </label>
+      <div class="form-group">
+        <button type="submit" class="btn btn-primary btn-block btn-raised" type="submit">
+          <span [hidden]="isLoading">Submit</span>
+          <span [hidden]="!isLoading"><i class="fas fa-asterisk fa-2x fa-spin"></i></span>
+        </button>
+        <button type="button" class="btn btn-secondary btn-block btn-raised">Cancel</button>
+      </div>
+      <a [routerLink]="['/auth/register']">Don't have an account? Sign up here!</a>
     </div>
-
-    <a [routerLink]="['/auth/register']">Don't have an account? Sign up here!</a>
-  </div>
 </form>

src/app/modules/auth/pages/login/login.component.html

@@ -39,7 +39,9 @@ export class LoginComponent implements OnInit {
       .pipe(
         delay(5000),
         tap(user => this.router.navigate(['/dashboard/home'])),
-        finalize(() => this.isLoading = false)
+        finalize(() => {
+          this.isLoading = false;
+        })
       ).subscribe();
   }
 

src/app/modules/auth/pages/login/login.component.ts

@@ -11,7 +11,7 @@ export class NavComponent implements OnInit {
   version = environment.version;
 
   navItems = [
-    { link: '/home', title: 'Home' },
+    { link: '/dashboard/home', title: 'Home' },
     { link: '/about', title: 'About' },
     { link: '/contact', title: 'Contact' }
   ];