Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat: TTA-193 add preload page
  • Loading branch information
andresacg30 committed Oct 5, 2022
commit d41a02cba02ae1472a78fa997d0abb00ec1e5506
33,037 changes: 32,881 additions & 156 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
<app-page-loader></app-page-loader>
<router-outlet></router-outlet>
<button (click)="pageLoadTest()">Page LOAD</button>
2 changes: 2 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ import { SearchUserComponent } from './modules/shared/components/search-user/sea
import { TimeRangeCustomComponent } from './modules/reports/components/time-range-custom/time-range-custom.component';
import { TimeRangeHeaderComponent } from './modules/reports/components/time-range-custom/time-range-header/time-range-header.component';
import { TimeRangeOptionsComponent } from './modules/reports/components/time-range-custom/time-range-options/time-range-options.component';
import { PageLoaderComponent } from './page-loader/page-loader.component';

const maskConfig: Partial<IConfig> = {
validation: false,
Expand Down Expand Up @@ -154,6 +155,7 @@ const maskConfig: Partial<IConfig> = {
TimeRangeCustomComponent,
TimeRangeHeaderComponent,
TimeRangeOptionsComponent,
PageLoaderComponent,
],
imports: [
NgxMaskModule.forRoot(maskConfig),
Expand Down
16 changes: 16 additions & 0 deletions src/app/page-loader.service.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { TestBed } from '@angular/core/testing';

import { PageLoaderService } from './page-loader.service';

describe('PageLoaderService', () => {
let service: PageLoaderService;

beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(PageLoaderService);
});

it('should be created', () => {
expect(service).toBeTruthy();
});
});
46 changes: 46 additions & 0 deletions src/app/page-loader.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import { Injectable } from '@angular/core';
import { BehaviorSubject, Subject } from 'rxjs';

@Injectable({
providedIn: 'root'
})
export class PageLoaderService {

constructor() { }

private loading$: Subject<boolean> = new BehaviorSubject(false);
private message$: Subject<string> = new BehaviorSubject(null);
private progressValue$: Subject<number> = new BehaviorSubject(null);

show(message: string = null, progressValue: number = null) {
this.loading$.next(true);
this.message$.next(message);
this.progressValue$.next(progressValue);
}

hide() {
this.loading$.next(false);
this.message$.next(null);
this.progressValue$.next(null);
}

get state() {
return this.loading$.asObservable();
}

get message() {
return this.message$.asObservable();
}

setMessage(message: string) {
this.message$.next(message);
}

get progressValue() {
return this.progressValue$.asObservable();
}

setProgressValue(progressValue: number) {
this.progressValue$.next(progressValue);
}
}
25 changes: 25 additions & 0 deletions src/app/page-loader/page-loader.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.loader-container {
position: absolute;
top: 0;
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
background-color: #000000aa;
pointer-events: none;
}
.loader-message-container {
color: whitesmoke;
font-size: 1.5rem;
}
.loader-progress-container {
padding: 5px;
min-height: 1.3rem;
width: 100%;
background-color: black;
}
.progress-bar {
min-height: 1rem;
background-color: orange;
}
8 changes: 8 additions & 0 deletions src/app/page-loader/page-loader.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<div *ngIf="loading" class="loader-container">
<div *ngIf="!!message">
<div class="loader-message-container">{{ message }}></div>
<div *ngIf="!!progressValue" class="loader-progress-container">
<div class="progress-bar" [style.width]="progressValueStyle"></div>
</div>
</div>
</div>
25 changes: 25 additions & 0 deletions src/app/page-loader/page-loader.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { PageLoaderComponent } from './page-loader.component';

describe('PageLoaderComponent', () => {
let component: PageLoaderComponent;
let fixture: ComponentFixture<PageLoaderComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ PageLoaderComponent ]
})
.compileComponents();
});

beforeEach(() => {
fixture = TestBed.createComponent(PageLoaderComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
50 changes: 50 additions & 0 deletions src/app/page-loader/page-loader.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import { Component, OnInit } from '@angular/core';
import { takeWhile } from 'rxjs/operators';
import { PageLoaderService } from '../page-loader.service';

@Component({
selector: 'app-page-loader',
templateUrl: './page-loader.component.html',
styleUrls: ['./page-loader.component.css']
})
export class PageLoaderComponent implements OnInit {

constructor(private pageLoaderService: PageLoaderService) { }

loading: boolean;
message: string;
progressValue: number;
progressValueStyle: string;
private _subscribed: boolean = true;

ngOnInit(): void {
this.subscribe();
}

private subscribe() {
this.pageLoaderService.state
.pipe(takeWhile(() => this._subscribed))
.subscribe(loading => {
this.loading = loading;
});
this.pageLoaderService.message
.pipe(takeWhile(() => this._subscribed))
.subscribe(message => {
if (!!message) {
this.message = message;
}
});
this.pageLoaderService.progressValue
.pipe(takeWhile(() => this._subscribed))
.subscribe(progressValue => {
if (!!progressValue) {
this.progressValue = progressValue;
this.progressValueStyle = `${progressValue}%`;
}
});
}
ngOnDestroy() {
this._subscribed = false;
}

}