Skip to content

Commit 677e8e6

Browse files
committed
Merge branch 'feature/refactor' into develop
2 parents 1b196c3 + 17ecd3b commit 677e8e6

File tree

134 files changed

+571
-412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+571
-412
lines changed

README.md

+30-30
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@
6161
```
6262
Types of pages
6363
64-
+ = main page
65-
- = response page
66-
= regular page
64+
public: everybody can see them
65+
private: only logged in users can see them
6766
```
6867

6968
- General
@@ -235,7 +234,6 @@ yarn remove tailwindcss autoprefixer postcss
235234
```console
236235
├───app
237236
│ ├───@core
238-
│ │ ├───core
239237
│ │ ├───directives
240238
│ │ │ └───click-outside
241239
│ │ ├───guards
@@ -251,34 +249,36 @@ yarn remove tailwindcss autoprefixer postcss
251249
│ │ ├───footer
252250
│ │ ├───header
253251
│ │ └───layout
254-
│ └───pages
255-
│ ├───+auth
256-
│ │ ├───forgot-password
257-
│ │ ├───forgot-password-email-sent
258-
│ │ ├───password-reset
259-
│ │ ├───password-reset-failed
260-
│ │ ├───password-reset-succeeded
261-
│ │ ├───sign-in
262-
│ │ ├───sign-up
263-
│ │ └───_services
264-
│ ├───+home
265-
│ ├───+settings
266-
│ │ ├───account
267-
│ │ ├───appearance
268-
│ │ ├───billing
269-
│ │ ├───blocked-users
270-
│ │ ├───notifications
271-
│ │ ├───security
272-
│ │ └───security-log
273-
│ ├───+user
274-
│ │ ├───my-profile
275-
│ │ └───overview
276-
│ ├───dashboard
277-
│ └───_not-found
252+
│ ├───pages
253+
│ │ ├───private
254+
│ │ │ ├───dashboard
255+
│ │ │ ├───settings
256+
│ │ │ │ ├───account
257+
│ │ │ │ ├───appearance
258+
│ │ │ │ ├───billing
259+
│ │ │ │ ├───blocked-users
260+
│ │ │ │ ├───notifications
261+
│ │ │ │ ├───security
262+
│ │ │ │ └───security-log
263+
│ │ │ └───user
264+
│ │ │ ├───my-profile
265+
│ │ │ └───overview
266+
│ │ └───public
267+
│ │ ├───auth
268+
│ │ │ ├───forgot-password
269+
│ │ │ ├───forgot-password-email-sent
270+
│ │ │ ├───password-reset
271+
│ │ │ ├───password-reset-failed
272+
│ │ │ ├───password-reset-succeeded
273+
│ │ │ ├───sign-in
274+
│ │ │ ├───sign-up
275+
│ │ │ └───_services
276+
│ │ ├───home
277+
│ │ └───not-found
278+
│ └───router
278279
├───assets
279-
├───environments
280-
├───public
281280
│ └───icons
281+
├───environments
282282
└───theme
283283
├───01-base
284284
├───02-components

angular.json

+10-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@
2929
"polyfills": "src/polyfills.ts",
3030
"tsConfig": "tsconfig.app.json",
3131
"aot": true,
32-
"assets": ["src/favicon.ico", "src/assets", "src/public"],
32+
"assets": [
33+
"src/favicon.ico",
34+
"src/assets",
35+
"src/manifest.webmanifest"
36+
],
3337
"styles": ["src/theme/styles.scss"],
3438
"scripts": []
3539
},
@@ -81,7 +85,11 @@
8185
"options": {
8286
"polyfills": "src/polyfills.ts",
8387
"tsConfig": "tsconfig.spec.json",
84-
"assets": ["src/public/favicon.ico", "src/assets"],
88+
"assets": [
89+
"src/favicon.ico",
90+
"src/assets",
91+
"src/manifest.webmanifest"
92+
],
8593
"styles": ["src/theme/styles.scss"],
8694
"scripts": []
8795
}

locale/messages.es.xlf

-39
This file was deleted.

locale/messages.xlf

-36
This file was deleted.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
RouterStateSnapshot,
77
UrlTree,
88
} from '@angular/router';
9-
import { AuthService } from '@app/pages/+auth/_services/auth.service';
9+
import { AuthService } from '@app/pages/public/auth/_services/auth.service';
1010
import { Path } from '@core/structs';
1111
import { Observable } from 'rxjs';
1212

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Injectable } from '@angular/core';
22
import { CanActivate, Router, UrlTree } from '@angular/router';
3-
import { AuthService } from '@app/pages/+auth/_services/auth.service';
3+
import { AuthService } from '@app/pages/public/auth/_services/auth.service';
44
import { Path } from '@core/structs';
55
import { Observable } from 'rxjs';
66

@@ -18,7 +18,7 @@ export class NoAuthGuard implements CanActivate {
1818
const isLoggedIn = this.authService.isLoggedIn;
1919

2020
if (isLoggedIn) {
21-
this.router.navigate([Path.App]);
21+
this.router.navigate([Path.Dashboard]);
2222
return false;
2323
}
2424

src/app/@core/structs/path.enum.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ export enum Path {
44
NotFound = '404',
55

66
// Auth
7-
Auth = '',
87
SignIn = 'sign-in',
98
SignUp = 'sign-up',
109
ForgotPassword = 'forgot-password',
@@ -14,8 +13,7 @@ export enum Path {
1413
PasswordResetSucceeded = 'password-reset-succeeded',
1514

1615
// App base url
17-
App = 'app',
18-
Dashboard = '',
16+
Dashboard = 'dashboard',
1917

2018
// Settings
2119
Settings = 'settings',

0 commit comments

Comments
 (0)