Merge branch 'release/0.1.3' into main

Author: ju4n97

package-lock.json

@@ -1,6 +1,9 @@
 {
   "name": "angular-boilerplate",
-  "version": "0.1.2-beta",
+  "version": "0.1.3",
+  "description": "Angular starter for large front-end projects built under a clean architecture that helps to scale and maintain a fast workflow.",
+  "author": "juanmesa2097",
+  "license": "MIT",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -24,7 +27,7 @@
     "@angular/router": "~10.1.6",
     "@angular/service-worker": "~10.1.6",
     "rxjs": "~6.6.3",
-    "tslib": "^2.0.0",
+    "tslib": "^2.0.3",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
@@ -37,19 +40,19 @@
     "@types/node": "^14.11.10",
     "codelyzer": "^6.0.1",
     "jasmine-core": "~3.6.0",
-    "jasmine-spec-reporter": "~5.0.0",
+    "jasmine-spec-reporter": "~6.0.0",
     "karma": "~5.2.3",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "~3.3.0",
+    "karma-jasmine": "~4.0.1",
     "karma-jasmine-html-reporter": "^1.5.0",
     "postcss-import": "^12.0.1",
     "postcss-loader": "^4.0.4",
     "postcss-scss": "^3.0.2",
     "protractor": "~7.0.0",
     "tailwindcss": "^1.9.4",
-    "ts-node": "~8.3.0",
-    "tslint": "~6.1.0",
+    "ts-node": "~9.0.0",
+    "tslint": "~6.1.3",
     "typescript": "~3.9.6",
     "webpack-bundle-analyzer": "^3.8.0"
   }

package.json

@@ -1 +1 @@
-export { PathMap } from './path-map.enum';
+export { Path } from './path.enum';

src/app/@core/enums/index.ts

@@ -1,5 +1,9 @@
-export enum PathMap {
-  App = '',
+export enum Path {
+  // Public
+  Home = '',
+  InternalServerError = 'internal-server-error',
+  NotFound = '404',
+
   // Auth
   Auth = '',
   Login = 'login',
@@ -9,5 +13,10 @@ export enum PathMap {
   PasswordReset = 'password-reset',
   PasswordResetSucceeded = 'password-reset-succeeded',
   PasswordResetFailed = 'password-reset-failed',
-  Home = '',
+
+  // App base url
+  App = 'app',
+
+  // Features
+  Dashboard = 'dashboard',
 }

src/app/@core/enums/path-map.enum.ts renamed to src/app/@core/enums/path.enum.ts

@@ -6,9 +6,9 @@ import {
   RouterStateSnapshot,
   UrlTree,
 } from '@angular/router';
-import { AuthService } from '@app/@auth';
+import { AuthService } from '@app/features/_auth';
 import { Observable } from 'rxjs';
-import { PathMap } from '../enums';
+import { Path } from '../enums';
 
 @Injectable({
   providedIn: 'root',
@@ -31,7 +31,7 @@ export class AuthGuard implements CanActivate {
     }
 
     // not logged in so redirect to login page with the return url
-    this.router.navigate([`/${PathMap.Login}`], {
+    this.router.navigate([`/${Path.Login}`], {
       queryParams: { returnUrl: state.url },
     });
 

src/app/@core/guards/auth.guard.ts

@@ -6,7 +6,7 @@ import {
   RouterStateSnapshot,
   UrlTree,
 } from '@angular/router';
-import { AuthService } from '@app/@auth';
+import { AuthService } from '@app/features/_auth';
 import { Observable } from 'rxjs';
 
 @Injectable({

src/app/@core/guards/no-auth.guard.ts

@@ -6,7 +6,7 @@ import {
   RouterStateSnapshot,
   UrlTree,
 } from '@angular/router';
-import { AuthService } from '@app/@auth';
+import { AuthService } from '@app/features/_auth';
 import { Observable } from 'rxjs';
 
 @Injectable({

src/app/@core/guards/role.guard.ts

@@ -5,7 +5,7 @@ import {
   HttpRequest,
 } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { AuthService } from '@app/@auth';
+import { AuthService } from '@app/features/_auth';
 import { environment } from '@environments/environment';
 import { Observable } from 'rxjs';
 

src/app/@core/interceptors/jwt.interceptor.ts

@@ -7,7 +7,7 @@ import {
 } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
-import { AuthService } from '@app/@auth';
+import { AuthService } from '@app/features/_auth';
 import { Observable, throwError } from 'rxjs';
 import { catchError, retry } from 'rxjs/operators';
 

src/app/@core/interceptors/server-error.interceptor.ts

@@ -1,42 +1,47 @@
 import { NgModule } from '@angular/core';
 import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
-import { PathMap } from './@core/enums/path-map.enum';
+import { NotFoundPage } from '@public/pages/not-found/not-found.page';
+import { Path } from './@core/enums/path.enum';
 import { AuthGuard, NoAuthGuard } from './@core/guards';
 
 const routes: Routes = [
-  // ===== Uncomment if pathMap.Home is different from empty =====
-  // { path: '', redirectTo: PathMap.Home, pathMatch: 'full' },
+  // ===== Uncomment if Path.Home is different from empty =====
+  // { path: '', redirectTo: Path.Home, pathMatch: 'full' },
 
-  // Home page
+  // Public
   {
-    path: PathMap.Home,
-    canActivate: [AuthGuard],
+    path: '',
     loadChildren: () =>
-      import('@features/home/home.module').then((m) => m.HomeModule),
+      import('@public/public.module').then((m) => m.PublicModule),
   },
 
   // Auth
   {
-    path: PathMap.Auth,
+    path: Path.Auth,
     canActivate: [NoAuthGuard],
     loadChildren: () =>
-      import('@app/@auth/auth.module').then((m) => m.AuthModule),
+      import('@features/_auth/auth.module').then((m) => m.AuthModule),
   },
 
-  // Internal server error page response
+  // App
   {
-    path: 'internal-server-error',
-    loadChildren: () =>
-      import('@ui/_internal-server-error/internal-server-error.module').then(
-        (m) => m.InternalServerErrorModule
-      ),
+    path: Path.App,
+    canActivate: [AuthGuard],
+    children: [
+      {
+        path: Path.Dashboard,
+        loadChildren: () =>
+          import('@features/dashboard/dashboard.module').then(
+            (m) => m.DashboardModule
+          ),
+      },
+    ],
   },
 
   // Not found page (must go at the bottom)
   {
     path: '**',
-    loadChildren: () =>
-      import('@ui/_not-found/not-found.module').then((m) => m.NotFoundModule),
+    component: NotFoundPage,
   },
 ];