Merge pull request #12 from HideyoshiNakazone/devel

Devel - Better Loading Response and Validations

.editorconfig

@@ -4,7 +4,7 @@ root = true
 [*]
 charset = utf-8
 indent_style = space
-indent_size = 2
+indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 

package.json

@@ -2,7 +2,8 @@
     "name": "frontend-hideyoshi.com",
     "version": "0.0.0",
     "scripts": {
-        "start": "node ./server.js"
+        "start": "node ./server.js",
+        "serve": "ng serve"
     },
     "proxy": {
         "/callback": {

server.js

@@ -1,5 +1,5 @@
 const express = require('express');
-var cors = require('cors');
+const cors = require('cors');
 const path = require('path');
 
 const PKG_NAME = "frontend-hideyoshi.com";

src/app/header/header-popup/callback/callback.component.ts

@@ -19,10 +19,16 @@ export class CallbackComponent implements OnInit {
 
             let auth: 'google' | 'github' = p['auth'];
 
-            if (auth === 'google') {
+            switch (auth) {
-                this.loginGoogle(p);
+            case "github":
-            } else if (auth === 'github') {
+                this.authService.loginGithubUser(p)
-                this.loginGithub(p);
+                break;
+            case "google":
+                this.authService.loginGoogleUser(p)
+                break;
+            default:
+                console.log(`Unimplemented auth: ${auth}`)
+                break;
             }
 
             this.router.navigate(['/home'])
@@ -30,12 +36,4 @@ export class CallbackComponent implements OnInit {
         })
     }
 
-    private loginGoogle(p: any) {
-        this.authService.loginGoogleUser(p)
-    }
-
-    private loginGithub(p: any) {
-        this.authService.loginGithubUser(p)
-    }
-
 }

src/app/header/header-popup/error-box/error-box.component.css

@@ -0,0 +1,11 @@
+.error-box {
+    background-color: #ff00001a;
+    max-width: 320px;
+    display: flex;
+    border-radius: 5px;
+    padding: 25px;
+    margin: 0 auto;
+    color: #ff0000;
+    font-size: 14px;
+    font-weight: 500;
+}

src/app/header/header-popup/error-box/error-box.component.html

@@ -0,0 +1,3 @@
+<div class="error-box" *ngIf="errorMessage">
+    {{errorMessage}}
+</div>

src/app/header/header-popup/error-box/error-box.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ErrorBoxComponent } from './error-box.component';
+
+describe('ErrorBoxComponent', () => {
+  let component: ErrorBoxComponent;
+  let fixture: ComponentFixture<ErrorBoxComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ErrorBoxComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(ErrorBoxComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/header/header-popup/error-box/error-box.component.ts

@@ -0,0 +1,14 @@
+import {Component, Input} from '@angular/core';
+
+@Component({
+    selector: 'app-error-box',
+    templateUrl: './error-box.component.html',
+    styleUrls: ['./error-box.component.css']
+})
+export class ErrorBoxComponent  {
+    @Input()
+        errorMessage: string|null = "Error, please try again later."
+
+    constructor() { }
+
+}

src/app/header/header-popup/login/login.component.css

@@ -78,13 +78,14 @@
     background-color: #f44336;
     border-radius: 15px;
 }
-.input-div:hover:after {
+.input-div:hover:after,
+.input-div:has(input.form-control:focus):after {
     width: 100%;
     transition: .4s;
     overflow: hidden;
 }
 
-.input-div > .form-control, .input-div > .form-control:focus {
+.input-div > .form-control, .input-div > .form-control:hover{
     border: none;
     border-color: inherit;
     -webkit-box-shadow: none;
@@ -103,16 +104,21 @@
     -webkit-box-shadow: 0 0 0px 1000px #ffffff inset;
 }
 
+.input-div:has(input.form-control:focus) > .form-control::placeholder,
 .input-div:hover > .form-control::placeholder,
-.input-div:hover > .input-div-icon {
+.input-div:hover > .input-div-icon,
+.input-div:has(input.form-control:focus) > .input-div-icon {
     color: #D8291C;
     transition: .3s;
 }
-.input-div:hover > .form-control::placeholder {
+.input-div:hover > .form-control::placeholder,
+.input-div:has(input.form-control:focus) > .form-control::placeholder {
     font-weight: 500;
     transition: .3s;
 }
 
+
+
 @media (min-width:767px) {
 
     .authentication-container {

src/app/header/header-popup/login/login.component.html

@@ -1,10 +1,17 @@
-<app-popup [state]="popupState" 
+<app-popup [state]="state"
     (stateChange)="onStateChange($event)"
     [ignoreClickOutside]="ignoreClickOutside">
 
-    {{errorMessage}}
+    <div class="container m-0 overflow-hidden"
+         [@resizeContainerForErrorMessage]="hideErrorMessage()">
 
-    <div class="container authentication-container">
+        <app-error-box [errorMessage]="errorMessage"
+                       [@showErrorMessage]="showErrorMessage()">
+        </app-error-box>
+
+        <div class="container authentication-container"
+             [@hideAuthContainer]="hideErrorMessage()"
+             (@hideAuthContainer.done)="hideAuthContainer($event)">
             <div class="row">
                 <div class="col-lg-6 authentication-body">
                     <form [formGroup]="loginForm" (ngSubmit)="onLogin()">
@@ -27,6 +34,7 @@
                                    placeholder="Password">
                         </div>
                         <button class="btn"
+                                [disabled]="loginForm.invalid"
                                 type="submit">
                             Login
                         </button>
@@ -54,4 +62,6 @@
             </div>
         </div>
 
+    </div>
+
 </app-popup>

src/app/header/header-popup/login/login.component.ts

@@ -9,6 +9,9 @@ import { HttpError } from 'src/app/shared/model/httpError/httpError.model';
 import HttpErrorChecker from 'src/app/shared/model/httpError/httpErrorChecker';
 import UserChecker from 'src/app/shared/model/user/user.checker';
 import { User } from 'src/app/shared/model/user/user.model';
+import {animate, animateChild, group, query, state, style, transition, trigger} from "@angular/animations";
+import {ValidatePasswordValidator} from "../../../shared/validators/validate-password.validator";
+import {ValidateNotEmptyValidator} from "../../../shared/validators/validate-not-empty.validator";
 
 
 const GOOGLE_LOGO_SVG = "assets/img/providers/google.svg";
@@ -17,7 +20,70 @@ const GITHUB_LOGO_SVG = "assets/img/providers/github.svg";
 @Component({
     selector: 'app-login',
     templateUrl: './login.component.html',
-    styleUrls: ['./login.component.css']
+    styleUrls: ['./login.component.css'],
+    animations: [
+        trigger('resizeContainerForErrorMessage', [
+            state('hide',
+                style({
+                    height: '100px',
+                    width: '320px',
+                })
+            ),
+            transition(
+                'show => hide',
+                group([
+                    query(
+                        "@*",
+                        animateChild(),
+                        { optional: true }
+                    ),
+                    animate('1s ease')
+                ])
+            )
+        ]),
+        trigger('showErrorMessage', [
+            state('show',
+                style({
+                    opacity: 1,
+                    height: '100px',
+                    width: '320px',
+                })
+            ),
+            state('hide',
+                style({
+                    opacity: 0,
+                    height: '0px',
+                    width: '0px',
+                })
+            ),
+            transition(
+                '* => show',
+                animate(
+                    '500ms ease-in'
+                )
+            ),
+        ]),
+        trigger('hideAuthContainer', [
+            state('hide',
+                style({
+                    opacity: 0,
+                })
+            ),
+            transition(
+                'show => hide',
+                group([
+                    query(
+                        "@*",
+                        animateChild(),
+                        { optional: true }
+                    ),
+                    animate(
+                        '250ms ease-out'
+                    )
+                ])
+            )
+        ]),
+    ]
 })
 export class LoginComponent implements OnInit, AfterViewInit, OnDestroy {
 
@@ -30,14 +96,14 @@ export class LoginComponent implements OnInit, AfterViewInit, OnDestroy {
     @Output()
         stateChange = new EventEmitter<boolean>();
 
-    popupState = false;
-
     loginForm!: FormGroup;
 
     authSubject!: Subscription;
 
     errorMessage!: string | null;
 
+    isShowErrorMessage = false;
+
     _userIcon = faUser;
 
     _passwordIcon = faLock;
@@ -59,8 +125,8 @@ export class LoginComponent implements OnInit, AfterViewInit, OnDestroy {
 
     ngOnInit(): void {
         this.loginForm = new FormGroup({
-            'username': new FormControl(null, [Validators.required]),
+            'username': new FormControl(null, [Validators.required, ValidateNotEmptyValidator]),
-            'password': new FormControl(null, [Validators.required])
+            'password': new FormControl(null, [Validators.required, ValidatePasswordValidator])
         });
         this.errorMessage = null;
         this.authSubject = this.authService.authSubject.subscribe(
@@ -71,7 +137,6 @@ export class LoginComponent implements OnInit, AfterViewInit, OnDestroy {
     }
 
     ngAfterViewInit(): void {
-        this.popupState = this.state;
         this.changeDetectorRef.detectChanges();
     }
 
@@ -89,7 +154,6 @@ export class LoginComponent implements OnInit, AfterViewInit, OnDestroy {
             password: this.loginForm.controls['password'].value
         }
         this.authService.login(user);
-
     }
 
     onGoogleLogin() {
@@ -110,8 +174,29 @@ export class LoginComponent implements OnInit, AfterViewInit, OnDestroy {
     }
 
     private closePopup() {
-        this.popupState = false;
+        this.state = false;
         this.loginForm.reset();
     }
 
+    public showErrorMessage(): string {
+        if (this.isShowErrorMessage) {
+            return "show";
+        }
+        return "hide";
+    }
+
+    public hideErrorMessage(): string {
+        if (!!this.errorMessage) {
+            return "hide";
+        }
+        return "show";
+    }
+
+    hideAuthContainer(event: any) {
+        if (event.toState === "hide") {
+            event.element.style.display = "none";
+            this.isShowErrorMessage = true;
+        }
+    }
+
 }

src/app/header/header-popup/signup/signup.component.css

@@ -81,7 +81,8 @@
     background-color: #f44336;
     border-radius: 15px;
 }
-.input-div:hover:after {
+.input-div:hover:after,
+.input-div:has(input.form-control:focus):after {
     width: 100%;
     transition: .4s;
     overflow: hidden;
@@ -106,12 +107,15 @@
     -webkit-box-shadow: 0 0 0px 1000px #ffffff inset;
 }
 
+.input-div:has(input.form-control:focus) > .form-control::placeholder,
 .input-div:hover > .form-control::placeholder,
-.input-div:hover > .input-div-icon {
+.input-div:hover > .input-div-icon,
+.input-div:has(input.form-control:focus) > .input-div-icon {
     color: #D8291C;
     transition: .3s;
 }
-.input-div:hover > .form-control::placeholder {
+.input-div:hover > .form-control::placeholder,
+.input-div:focus > .form-control::placeholder{
     font-weight: 500;
     transition: .3s;
 }

src/app/header/header-popup/signup/signup.component.html

@@ -1,8 +1,18 @@
 <app-popup [state]="state"
     (stateChange)="onStateChange($event)"
     [ignoreClickOutside]="ignoreClickOutside">
-    {{errorMessage}}
+
-    <div class="container authentication-container">
+
+    <div class="container m-0 overflow-hidden"
+         [@resizeContainerForErrorMessage]="hideErrorMessage()">
+
+        <app-error-box [errorMessage]="errorMessage"
+                       [@showErrorMessage]="showErrorMessage()">
+        </app-error-box>
+
+        <div class="container authentication-container"
+             [@hideAuthContainer]="hideErrorMessage()"
+             (@hideAuthContainer.done)="hideAuthContainer($event)">
             <div class="row">
                 <div class="col-lg-6 auth-body auth-body-form">
                     <form [formGroup]="signupForm" (ngSubmit)="onSignUp()">
@@ -43,6 +53,7 @@
                                 placeholder="Password">
                         </div>
                         <button class="btn"
+                                [disabled]="!signupForm.valid"
                             type="submit">
                             SignUp
                         </button>
@@ -70,4 +81,6 @@
             </div>
         </div>
 
+    </div>
+
 </app-popup>

src/app/header/header-popup/signup/signup.component.ts

@@ -9,6 +9,10 @@ import { HttpError } from 'src/app/shared/model/httpError/httpError.model';
 import HttpErrorChecker from 'src/app/shared/model/httpError/httpErrorChecker';
 import UserChecker from 'src/app/shared/model/user/user.checker';
 import { User } from 'src/app/shared/model/user/user.model';
+import {animate, animateChild, group, query, state, style, transition, trigger} from "@angular/animations";
+import {ValidateEmailValidator} from "../../../shared/validators/validate-email.validator";
+import {ValidatePasswordValidator} from "../../../shared/validators/validate-password.validator";
+import {ValidateNotEmptyValidator} from "../../../shared/validators/validate-not-empty.validator";
 
 
 const GOOGLE_LOGO_SVG = "assets/img/providers/google.svg";
@@ -17,7 +21,70 @@ const GITHUB_LOGO_SVG = "assets/img/providers/github.svg";
 @Component({
     selector: 'app-signup',
     templateUrl: './signup.component.html',
-    styleUrls: ['./signup.component.css']
+    styleUrls: ['./signup.component.css'],
+    animations: [
+        trigger('resizeContainerForErrorMessage', [
+            state('hide',
+                style({
+                    height: '100px',
+                    width: '320px',
+                })
+            ),
+            transition(
+                'show => hide',
+                group([
+                    query(
+                        "@*",
+                        animateChild(),
+                        { optional: true }
+                    ),
+                    animate('1s ease')
+                ])
+            )
+        ]),
+        trigger('showErrorMessage', [
+            state('show',
+                style({
+                    opacity: 1,
+                    height: '100px',
+                    width: '320px',
+                })
+            ),
+            state('hide',
+                style({
+                    opacity: 0,
+                    height: '0px',
+                    width: '0px',
+                })
+            ),
+            transition(
+                '* => show',
+                animate(
+                    '500ms ease-in'
+                )
+            ),
+        ]),
+        trigger('hideAuthContainer', [
+            state('hide',
+                style({
+                    opacity: 0,
+                })
+            ),
+            transition(
+                'show => hide',
+                group([
+                    query(
+                        "@*",
+                        animateChild(),
+                        { optional: true }
+                    ),
+                    animate(
+                        '250ms ease-out'
+                    )
+                ])
+            )
+        ]),
+    ]
 })
 export class SignupComponent implements OnInit {
 
@@ -36,6 +103,8 @@ export class SignupComponent implements OnInit {
 
     errorMessage!: string | null;
 
+    isShowErrorMessage = false;
+
     _fullnameIcon = faFingerprint;
 
     _emailIcon = faEnvelope;
@@ -59,12 +128,12 @@ export class SignupComponent implements OnInit {
 
     ngOnInit(): void {
         this.signupForm = new FormGroup({
-            'fullname': new FormControl(null, [Validators.required]),
+            'fullname': new FormControl(null, [Validators.required, ValidateNotEmptyValidator]),
             // Create a Email Validator
-            'email': new FormControl(null, [Validators.required]),
+            'email': new FormControl(null, [Validators.required, ValidateEmailValidator]),
-            'username': new FormControl(null, [Validators.required]),
+            'username': new FormControl(null, [Validators.required, ValidateNotEmptyValidator]),
             // Create a Password Validator
-            'password': new FormControl(null, [Validators.required])
+            'password': new FormControl(null, [Validators.required, ValidatePasswordValidator])
         });
         this.errorMessage = null;
         this.authSubject = this.authService.authSubject.subscribe(
@@ -110,5 +179,26 @@ export class SignupComponent implements OnInit {
         this.signupForm.reset();
     }
 
+    public showErrorMessage(): string {
+        if (this.isShowErrorMessage) {
+            return "show";
+        }
+        return "hide";
+    }
+
+    public hideErrorMessage(): string {
+        if (!!this.errorMessage) {
+            return "hide";
+        }
+        return "show";
+    }
+
+    hideAuthContainer(event: any) {
+        if (event.toState === "hide") {
+            event.element.style.display = "none";
+            this.isShowErrorMessage = true;
+        }
+    }
+
 
 }

src/app/header/header.module.ts

@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import {CommonModule, NgOptimizedImage} from '@angular/common';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
 
 import { HeaderComponent } from './header.component';
@@ -15,6 +15,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { SignupComponent } from './header-popup/signup/signup.component';
 import { CallbackComponent } from './header-popup/callback/callback.component';
 import {MatIconModule} from '@angular/material/icon';
+import { ErrorBoxComponent } from './header-popup/error-box/error-box.component';
 
 
 
@@ -27,7 +28,8 @@ import {MatIconModule} from '@angular/material/icon';
         HeaderDropdownComponent,
         LoginComponent,
         SignupComponent,
-        CallbackComponent
+        CallbackComponent,
+        ErrorBoxComponent,
     ],
     imports: [
         CommonModule,
@@ -37,7 +39,8 @@ import {MatIconModule} from '@angular/material/icon';
         FormsModule,
         ReactiveFormsModule,
         MatIconModule,
-        SharedModule
+        SharedModule,
+        NgOptimizedImage
     ], exports: [
         HeaderComponent,
         HeaderSliderComponent,

src/app/shared/auth/auth.service.ts

@@ -1,8 +1,8 @@
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { first, firstValueFrom, Observable, Subject, take } from 'rxjs';
+import {first, firstValueFrom, Observable, of, Subject, take} from 'rxjs';
+import { catchError } from 'rxjs/operators';
 import { environment } from 'src/environments/environment';
-import { param } from 'ts-interface-checker';
 import { HttpError } from '../model/httpError/httpError.model';
 import { Token } from '../model/token/token.model';
 import { User } from '../model/user/user.model';
@@ -133,18 +133,6 @@ export class AuthService {
         )
     }
 
-    private validateUser(userAuthAtempt: Observable<User>) {
-        userAuthAtempt.subscribe({
-            next: userAuthentication => {
-                this.userAuthenticated = <User>userAuthentication;
-                this.authSubject.next(this.userAuthenticated);
-            },
-            error: err => {
-                this.authSubject.next(<HttpError>err.error);
-            }
-        });
-    }
-
     private refreshAccessToken() {
         return firstValueFrom(this.http.post(
             this.BACKEND_PATH + "/user/login/refresh",
@@ -157,19 +145,37 @@ export class AuthService {
         return this.http.get<User>(
             this.BACKEND_PATH + '/session/validate',
             { withCredentials: true }
-        ).pipe(
-            first()
         );
     }
 
     private destroySessions() {
-        return this.http.post(
+        return this.http.delete(
             this.BACKEND_PATH + '/session/destroy',
-            {},
             { withCredentials: true }
-        ).pipe(
-            take(1)
         );
     }
 
+    private validateUser(userAuthAtempt: Observable<User>) {
+        userAuthAtempt.pipe(
+            catchError(error => {
+                if (error.status == 0) {
+                    return of(<HttpError>{
+                        title: "Service Unavailable",
+                        status: 500,
+                        details: "Service Unavailable, please try again later.",
+                        developerMessage: "Service Unavailable, please try again later.",
+                        timestamp: new Date().toISOString()
+                    });
+                }
+                return of(<HttpError>error.error);
+            }),
+            first()
+        ).subscribe({
+            next: userAuthentication => {
+                this.userAuthenticated = <User>userAuthentication;
+                this.authSubject.next(this.userAuthenticated);
+            }
+        });
+    }
+
 }

src/app/shared/components/popup/popup.component.css

@@ -64,7 +64,7 @@
 
 .popup-body {
     height: calc(100% - 120px);
-    padding: 0px 60px;
+    padding: 0px 30px;
     width: 100%;
     margin: 0;
 }

src/app/shared/shared.module.ts

@@ -11,7 +11,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
     declarations: [
         ClickedOutsideDirective,
         SliderItemComponent,
-        PopupComponent
+        PopupComponent,
     ],
     imports: [
         CommonModule,

src/app/shared/validators/validate-email.validator.ts

@@ -0,0 +1,11 @@
+import {AbstractControl} from "@angular/forms";
+
+export function ValidateEmailValidator(control: AbstractControl) {
+    const email = control.value;
+    const emailRegex = /^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$/g;
+    const emailValid = emailRegex.test(email);
+    if (!emailValid) {
+        return { invalidEmail: true };
+    }
+    return null;
+}

src/app/shared/validators/validate-not-empty.validator.ts

@@ -0,0 +1,9 @@
+import {AbstractControl} from "@angular/forms";
+
+export function ValidateNotEmptyValidator(control: AbstractControl) {
+    const value = control.value;
+    if (!value || value.length === 0) {
+        return { invalidNotEmpty: true };
+    }
+    return null;
+}

src/app/shared/validators/validate-password.validator.ts

@@ -0,0 +1,11 @@
+import {AbstractControl} from "@angular/forms";
+
+export function ValidatePasswordValidator(control: AbstractControl) {
+    var password = control.value;
+    var passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/g;
+    var passwordValid = passwordRegex.test(password);
+    if (!passwordValid) {
+        return { invalidPassword: true };
+    }
+    return null;
+}