Merge branch 'master' into spencer/docs

# Conflicts:
#	package-lock.json
#	package.json
#	src/app/_eth/accountIndex.ts
#	src/app/_eth/token-registry.ts
#	src/app/_guards/auth.guard.ts
#	src/app/_guards/role.guard.ts
#	src/app/_helpers/array-sum.ts
#	src/app/_helpers/clipboard-copy.ts
#	src/app/_helpers/custom-error-state-matcher.ts
#	src/app/_helpers/custom.validator.ts
#	src/app/_helpers/export-csv.ts
#	src/app/_helpers/global-error-handler.ts
#	src/app/_helpers/http-getter.ts
#	src/app/_helpers/mock-backend.ts
#	src/app/_helpers/read-csv.ts
#	src/app/_helpers/schema-validation.ts
#	src/app/_services/user.service.spec.ts
This commit is contained in:
Spencer Ofwiti
2021-05-11 20:41:47 +03:00
173 changed files with 54786 additions and 6103 deletions

View File

@@ -1,8 +1,10 @@
import { MenuSelectionDirective } from '@app/shared/_directives/menu-selection.directive';
import {ElementRef, Renderer2} from '@angular/core';
import { ElementRef, Renderer2 } from '@angular/core';
describe('MenuSelectionDirective', () => {
// tslint:disable-next-line:prefer-const
let elementRef: ElementRef;
// tslint:disable-next-line:prefer-const
let renderer: Renderer2;
beforeEach(() => {

View File

@@ -1,14 +1,10 @@
import {Directive, ElementRef, Renderer2} from '@angular/core';
import { Directive, ElementRef, Renderer2 } from '@angular/core';
@Directive({
selector: '[appMenuSelection]'
selector: '[appMenuSelection]',
})
export class MenuSelectionDirective {
constructor(
private elementRef: ElementRef,
private renderer: Renderer2
) {
constructor(private elementRef: ElementRef, private renderer: Renderer2) {
this.renderer.listen(this.elementRef.nativeElement, 'click', () => {
const mediaQuery = window.matchMedia('(max-width: 768px)');
if (mediaQuery.matches) {

View File

@@ -1,8 +1,10 @@
import { MenuToggleDirective } from '@app/shared/_directives/menu-toggle.directive';
import {ElementRef, Renderer2} from '@angular/core';
import { ElementRef, Renderer2 } from '@angular/core';
describe('MenuToggleDirective', () => {
// tslint:disable-next-line:prefer-const
let elementRef: ElementRef;
// tslint:disable-next-line:prefer-const
let renderer: Renderer2;
it('should create an instance', () => {
const directive = new MenuToggleDirective(elementRef, renderer);

View File

@@ -1,14 +1,10 @@
import {Directive, ElementRef, Renderer2} from '@angular/core';
import { Directive, ElementRef, Renderer2 } from '@angular/core';
@Directive({
selector: '[appMenuToggle]'
selector: '[appMenuToggle]',
})
export class MenuToggleDirective {
constructor(
private elementRef: ElementRef,
private renderer: Renderer2
) {
constructor(private elementRef: ElementRef, private renderer: Renderer2) {
this.renderer.listen(this.elementRef.nativeElement, 'click', () => {
this.onMenuToggle();
});

View File

@@ -1,15 +1,13 @@
import { Pipe, PipeTransform } from '@angular/core';
import {DomSanitizer} from '@angular/platform-browser';
import { DomSanitizer } from '@angular/platform-browser';
@Pipe({
name: 'safe'
name: 'safe',
})
export class SafePipe implements PipeTransform {
constructor(private sanitizer: DomSanitizer) {}
transform(url: string, ...args: unknown[]): unknown {
return this.sanitizer.bypassSecurityTrustResourceUrl(url);
}
}

View File

@@ -1,6 +1,6 @@
import {Pipe, PipeTransform} from '@angular/core';
import { Pipe, PipeTransform } from '@angular/core';
@Pipe({name: 'tokenRatio'})
@Pipe({ name: 'tokenRatio' })
export class TokenRatioPipe implements PipeTransform {
transform(value: any, ...args): any {
return Number(value) / Math.pow(10, 6);

View File

@@ -8,9 +8,8 @@ describe('ErrorDialogComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ ErrorDialogComponent ]
})
.compileComponents();
declarations: [ErrorDialogComponent],
}).compileComponents();
});
beforeEach(() => {

View File

@@ -1,14 +1,12 @@
import {Component, ChangeDetectionStrategy, Inject} from '@angular/core';
import {MAT_DIALOG_DATA} from '@angular/material/dialog';
import { Component, ChangeDetectionStrategy, Inject } from '@angular/core';
import { MAT_DIALOG_DATA } from '@angular/material/dialog';
@Component({
selector: 'app-error-dialog',
templateUrl: './error-dialog.component.html',
styleUrls: ['./error-dialog.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class ErrorDialogComponent {
constructor(@Inject(MAT_DIALOG_DATA) public data: any) { }
constructor(@Inject(MAT_DIALOG_DATA) public data: any) {}
}

View File

@@ -8,9 +8,8 @@ describe('FooterComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ FooterComponent ]
})
.compileComponents();
declarations: [FooterComponent],
}).compileComponents();
});
beforeEach(() => {

View File

@@ -1,16 +1,13 @@
import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
@Component({
selector: 'app-footer',
templateUrl: './footer.component.html',
styleUrls: ['./footer.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class FooterComponent implements OnInit {
constructor() {}
constructor() { }
ngOnInit(): void {
}
ngOnInit(): void {}
}

View File

@@ -0,0 +1,13 @@
<nav class="navbar navbar-dark bg-dark">
<h1 class="navbar-brand">
<div *ngIf="noInternetConnection; then offlineBlock else onlineBlock"></div>
<ng-template #offlineBlock>
<strong style="color: red;">OFFLINE </strong>
<img width="20rem" src="assets/images/no-wifi.svg" alt="Internet Disconnected">
</ng-template>
<ng-template #onlineBlock>
<strong style="color: lawngreen;">ONLINE </strong>
<img width="20rem" src="assets/images/wifi.svg" alt="Internet Connected">
</ng-template>
</h1>
</nav>

View File

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

View File

@@ -0,0 +1,27 @@
import { Component, OnInit, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
@Component({
selector: 'app-network-status',
templateUrl: './network-status.component.html',
styleUrls: ['./network-status.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class NetworkStatusComponent implements OnInit {
noInternetConnection: boolean = !navigator.onLine;
constructor(private cdr: ChangeDetectorRef) {
this.handleNetworkChange();
}
ngOnInit(): void {}
handleNetworkChange(): void {
setTimeout(() => {
if (!navigator.onLine !== this.noInternetConnection) {
this.noInternetConnection = !navigator.onLine;
this.cdr.detectChanges();
}
this.handleNetworkChange();
}, 5000);
}
}

View File

@@ -5,14 +5,13 @@ import { FooterComponent } from '@app/shared/footer/footer.component';
import { SidebarComponent } from '@app/shared/sidebar/sidebar.component';
import { MenuSelectionDirective } from '@app/shared/_directives/menu-selection.directive';
import { MenuToggleDirective } from '@app/shared/_directives/menu-toggle.directive';
import {RouterModule} from '@angular/router';
import {MatIconModule} from '@angular/material/icon';
import {TokenRatioPipe} from '@app/shared/_pipes/token-ratio.pipe';
import { RouterModule } from '@angular/router';
import { MatIconModule } from '@angular/material/icon';
import { TokenRatioPipe } from '@app/shared/_pipes/token-ratio.pipe';
import { ErrorDialogComponent } from '@app/shared/error-dialog/error-dialog.component';
import {MatDialogModule} from '@angular/material/dialog';
import { MatDialogModule } from '@angular/material/dialog';
import { SafePipe } from '@app/shared/_pipes/safe.pipe';
import { NetworkStatusComponent } from './network-status/network-status.component';
@NgModule({
declarations: [
@@ -23,7 +22,8 @@ import { SafePipe } from '@app/shared/_pipes/safe.pipe';
MenuToggleDirective,
TokenRatioPipe,
ErrorDialogComponent,
SafePipe
SafePipe,
NetworkStatusComponent,
],
exports: [
TopbarComponent,
@@ -31,13 +31,9 @@ import { SafePipe } from '@app/shared/_pipes/safe.pipe';
SidebarComponent,
MenuSelectionDirective,
TokenRatioPipe,
SafePipe
SafePipe,
NetworkStatusComponent,
],
imports: [
CommonModule,
RouterModule,
MatIconModule,
MatDialogModule,
]
imports: [CommonModule, RouterModule, MatIconModule, MatDialogModule],
})
export class SharedModule { }
export class SharedModule {}

View File

@@ -8,9 +8,8 @@ describe('SidebarComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ SidebarComponent ]
})
.compileComponents();
declarations: [SidebarComponent],
}).compileComponents();
});
beforeEach(() => {

View File

@@ -1,16 +1,13 @@
import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
@Component({
selector: 'app-sidebar',
templateUrl: './sidebar.component.html',
styleUrls: ['./sidebar.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class SidebarComponent implements OnInit {
constructor() {}
constructor() { }
ngOnInit(): void {
}
ngOnInit(): void {}
}

View File

@@ -8,9 +8,8 @@ describe('TopbarComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ TopbarComponent ]
})
.compileComponents();
declarations: [TopbarComponent],
}).compileComponents();
});
beforeEach(() => {

View File

@@ -1,16 +1,13 @@
import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
@Component({
selector: 'app-topbar',
templateUrl: './topbar.component.html',
styleUrls: ['./topbar.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class TopbarComponent implements OnInit {
constructor() {}
constructor() { }
ngOnInit(): void {
}
ngOnInit(): void {}
}