grassrootseconomics/cic-staff-client
8
0
Fork 0
Code Issues 26 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into spencer/pwa

Browse Source 
# Conflicts:
#	package-lock.json
#	src/app/shared/shared.module.ts
#	src/styles.scss
This commit is contained in:
Spencer Ofwiti
2021-05-11 18:28:54 +03:00
parent 4e9103479f 6ed07b4beb
commit d4d2837d2e
93 changed files with 1710 additions and 22524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/shared/shared.module.ts
View File

@@ -8,8 +8,9 @@ import { MenuToggleDirective } from '@app/shared/_directives/menu-toggle.directi
import {RouterModule} from '@angular/router';
import {MatIconModule} from '@angular/material/icon';
import {TokenRatioPipe} from '@app/shared/_pipes/token-ratio.pipe';
import { ErrorDialogComponent } from './error-dialog/error-dialog.component';
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';
@@ -23,16 +24,18 @@ import { NetworkStatusComponent } from './network-status/network-status.componen
MenuToggleDirective,
TokenRatioPipe,
ErrorDialogComponent,
SafePipe,
NetworkStatusComponent
],
exports: [
TopbarComponent,
FooterComponent,
SidebarComponent,
MenuSelectionDirective,
TokenRatioPipe,
SafePipe,
NetworkStatusComponent
],
exports: [
TopbarComponent,
FooterComponent,
SidebarComponent,
MenuSelectionDirective,
TokenRatioPipe,
NetworkStatusComponent
],
imports: [
CommonModule,
RouterModule,