Merge branch 'master' into spencer/linting

# Conflicts:
#	package-lock.json
#	src/app/app.component.ts
#	src/app/app.module.ts
#	src/app/shared/shared.module.ts
This commit is contained in:
Spencer Ofwiti
2021-05-11 20:04:02 +03:00
48 changed files with 9055 additions and 4647 deletions

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,25 @@
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,30 @@
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

@@ -11,6 +11,7 @@ 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 { SafePipe } from '@app/shared/_pipes/safe.pipe';
import { NetworkStatusComponent } from './network-status/network-status.component';
@NgModule({
declarations: [
@@ -22,6 +23,7 @@ import { SafePipe } from '@app/shared/_pipes/safe.pipe';
TokenRatioPipe,
ErrorDialogComponent,
SafePipe,
NetworkStatusComponent
],
exports: [
TopbarComponent,
@@ -30,6 +32,7 @@ import { SafePipe } from '@app/shared/_pipes/safe.pipe';
MenuSelectionDirective,
TokenRatioPipe,
SafePipe,
NetworkStatusComponent
],
imports: [CommonModule, RouterModule, MatIconModule, MatDialogModule],
})