Merge branch 'feature/refactor' into develop

jm2097 · Apr 28, 2021 · 677e8e6 · 677e8e6
2 parents 1b196c3 + 17ecd3b
commit 677e8e6
Show file tree

Hide file tree

Showing 134 changed files with 571 additions and 412 deletions.
diff --git a/README.md b/README.md
@@ -61,9 +61,8 @@
 ```
 Types of pages
 
-+ = main page
-- = response page
-  = regular page
+public: everybody can see them
+private: only logged in users can see them
 ```
 
 - General
@@ -235,7 +234,6 @@ yarn remove tailwindcss autoprefixer postcss
 ```console
 ├───app
 │   ├───@core
-│   │   ├───core
 │   │   ├───directives
 │   │   │   └───click-outside
 │   │   ├───guards
@@ -251,34 +249,36 @@ yarn remove tailwindcss autoprefixer postcss
 │   │   ├───footer
 │   │   ├───header
 │   │   └───layout
-│   └───pages
-│       ├───+auth
-│       │   ├───forgot-password
-│       │   ├───forgot-password-email-sent
-│       │   ├───password-reset
-│       │   ├───password-reset-failed
-│       │   ├───password-reset-succeeded
-│       │   ├───sign-in
-│       │   ├───sign-up
-│       │   └───_services
-│       ├───+home
-│       ├───+settings
-│       │   ├───account
-│       │   ├───appearance
-│       │   ├───billing
-│       │   ├───blocked-users
-│       │   ├───notifications
-│       │   ├───security
-│       │   └───security-log
-│       ├───+user
-│       │   ├───my-profile
-│       │   └───overview
-│       ├───dashboard
-│       └───_not-found
+│   ├───pages
+│   │   ├───private
+│   │   │   ├───dashboard
+│   │   │   ├───settings
+│   │   │   │   ├───account
+│   │   │   │   ├───appearance
+│   │   │   │   ├───billing
+│   │   │   │   ├───blocked-users
+│   │   │   │   ├───notifications
+│   │   │   │   ├───security
+│   │   │   │   └───security-log
+│   │   │   └───user
+│   │   │       ├───my-profile
+│   │   │       └───overview
+│   │   └───public
+│   │       ├───auth
+│   │       │   ├───forgot-password
+│   │       │   ├───forgot-password-email-sent
+│   │       │   ├───password-reset
+│   │       │   ├───password-reset-failed
+│   │       │   ├───password-reset-succeeded
+│   │       │   ├───sign-in
+│   │       │   ├───sign-up
+│   │       │   └───_services
+│   │       ├───home
+│   │       └───not-found
+│   └───router
 ├───assets
-├───environments
-├───public
 │   └───icons
+├───environments
 └───theme
     ├───01-base
     ├───02-components

diff --git a/angular.json b/angular.json
@@ -29,7 +29,11 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
             "aot": true,
-            "assets": ["src/favicon.ico", "src/assets", "src/public"],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets",
+              "src/manifest.webmanifest"
+            ],
             "styles": ["src/theme/styles.scss"],
             "scripts": []
           },
@@ -81,7 +85,11 @@
           "options": {
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.spec.json",
-            "assets": ["src/public/favicon.ico", "src/assets"],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets",
+              "src/manifest.webmanifest"
+            ],
             "styles": ["src/theme/styles.scss"],
             "scripts": []
           }

diff --git a/locale/messages.es.xlf b/locale/messages.es.xlf
diff --git a/locale/messages.xlf b/locale/messages.xlf
diff --git a/src/app/@core/guards/auth.guard.ts b/src/app/@core/guards/auth.guard.ts
@@ -6,7 +6,7 @@ import {
   RouterStateSnapshot,
   UrlTree,
 } from '@angular/router';
-import { AuthService } from '@app/pages/+auth/_services/auth.service';
+import { AuthService } from '@app/pages/public/auth/_services/auth.service';
 import { Path } from '@core/structs';
 import { Observable } from 'rxjs';
 

diff --git a/src/app/@core/guards/no-auth.guard.ts b/src/app/@core/guards/no-auth.guard.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { CanActivate, Router, UrlTree } from '@angular/router';
-import { AuthService } from '@app/pages/+auth/_services/auth.service';
+import { AuthService } from '@app/pages/public/auth/_services/auth.service';
 import { Path } from '@core/structs';
 import { Observable } from 'rxjs';
 
@@ -18,7 +18,7 @@ export class NoAuthGuard implements CanActivate {
     const isLoggedIn = this.authService.isLoggedIn;
 
     if (isLoggedIn) {
-      this.router.navigate([Path.App]);
+      this.router.navigate([Path.Dashboard]);
       return false;
     }
 

diff --git a/src/app/@core/structs/path.enum.ts b/src/app/@core/structs/path.enum.ts
@@ -4,7 +4,6 @@ export enum Path {
   NotFound = '404',
 
   // Auth
-  Auth = '',
   SignIn = 'sign-in',
   SignUp = 'sign-up',
   ForgotPassword = 'forgot-password',
@@ -14,8 +13,7 @@ export enum Path {
   PasswordResetSucceeded = 'password-reset-succeeded',
 
   // App base url
-  App = 'app',
-  Dashboard = '',
+  Dashboard = 'dashboard',
 
   // Settings
   Settings = 'settings',