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
Prev Previous commit
Next Next commit
feat: TTA-193 add spinner overlay and style it
  • Loading branch information
Andres Cabrera authored and Andres Cabrera committed Oct 6, 2022
commit 465c2c29bd403cfc564de8a3b752704f27698278
4 changes: 1 addition & 3 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
<app-page-loader></app-page-loader>
<router-outlet></router-outlet>
<button (click)="pageLoadTest()">Page LOAD</button>
<router-outlet></router-outlet>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<router-outlet></router-outlet>
<router-outlet></router-outlet>

15 changes: 2 additions & 13 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { NgxMaskModule, IConfig } from 'ngx-mask';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { OverlayRef, ToastrModule } from 'ngx-toastr';
import { ToastrModule } from 'ngx-toastr';
import { CommonModule, DatePipe } from '@angular/common';
import { BrowserModule } from '@angular/platform-browser';
import { NgModule, Component, Injectable } from '@angular/core';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
import { DataTablesModule } from 'angular-datatables';
import { ComponentPortal } from '@angular/cdk/portal';
import { StoreModule } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
Expand All @@ -24,8 +23,6 @@ import { NgxPaginationModule } from 'ngx-pagination';
import { AutocompleteLibModule } from 'angular-ng-autocomplete';
import { CalendarModule, DateAdapter } from 'angular-calendar';
import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
import { Observable, Subscription } from 'rxjs';
import { OverlayModule } from '@angular/cdk/overlay';

import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
Expand Down Expand Up @@ -100,12 +97,8 @@ 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';
<<<<<<< HEAD
import { PageLoaderComponent } from './page-loader/page-loader.component';
=======
import { SpinnerOverlayComponent } from './modules/shared/components/spinner-overlay/spinner-overlay.component';
import { SpinnerInterceptor } from './modules/shared/interceptors/spinner.interceptor';
>>>>>>> d58b5ef (feat: TTA-193 add service and interceptor for spinner loading)

const maskConfig: Partial<IConfig> = {
validation: false,
Expand Down Expand Up @@ -165,11 +158,7 @@ const maskConfig: Partial<IConfig> = {
TimeRangeCustomComponent,
TimeRangeHeaderComponent,
TimeRangeOptionsComponent,
<<<<<<< HEAD
PageLoaderComponent,
=======
SpinnerOverlayComponent,
>>>>>>> d58b5ef (feat: TTA-193 add service and interceptor for spinner loading)
],
imports: [
NgxMaskModule.forRoot(maskConfig),
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
<mat-spinner diameter="80" color="accent"></mat-spinner>
<mat-spinner diameter="80"></mat-spinner>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@use "../../../../../styles/colors.scss" as colors;

:host ::ng-deep .mat-progress-spinner circle, .mat-spinner circle {
stroke: colors.$warning;
}
16 changes: 0 additions & 16 deletions src/app/page-loader.service.spec.ts

This file was deleted.

46 changes: 0 additions & 46 deletions src/app/page-loader.service.ts

This file was deleted.

25 changes: 0 additions & 25 deletions src/app/page-loader/page-loader.component.css

This file was deleted.

8 changes: 0 additions & 8 deletions src/app/page-loader/page-loader.component.html

This file was deleted.

25 changes: 0 additions & 25 deletions src/app/page-loader/page-loader.component.spec.ts

This file was deleted.

50 changes: 0 additions & 50 deletions src/app/page-loader/page-loader.component.ts

This file was deleted.