machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge conflict fix.

Browse Source
This commit is contained in:
softsimon 2022-05-24 18:40:59 +04:00
parent 473cb55dc4
commit b87308e14f
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/app/app-routing.module.ts
View File

@ -20,7 +20,6 @@ import { AssetsFeaturedComponent } from './components/assets/assets-featured/ass
import { AssetsComponent } from './components/assets/assets.component'; import { AssetsComponent } from './components/assets/assets.component';
import { AssetComponent } from './components/asset/asset.component'; import { AssetComponent } from './components/asset/asset.component';
import { AssetsNavComponent } from './components/assets/assets-nav/assets-nav.component'; import { AssetsNavComponent } from './components/assets/assets-nav/assets-nav.component';
import { LightningDashboardComponent } from './lightning/lightning-dashboard/lightning-dashboard.component';
let routes: Routes = [ let routes: Routes = [
{ {
@ -99,7 +98,6 @@ let routes: Routes = [
}, },
{ {
path: 'lightning', path: 'lightning',
component: LightningDashboardComponent,
loadChildren: () => import('./lightning/lightning.module').then(m => m.LightningModule) loadChildren: () => import('./lightning/lightning.module').then(m => m.LightningModule)
}, },
], ],
@ -194,7 +192,6 @@ let routes: Routes = [
}, },
{ {
path: 'lightning', path: 'lightning',
component: LightningDashboardComponent,
loadChildren: () => import('./lightning/lightning.module').then(m => m.LightningModule) loadChildren: () => import('./lightning/lightning.module').then(m => m.LightningModule)
}, },
], ],
@ -286,7 +283,6 @@ let routes: Routes = [
}, },
{ {
path: 'lightning', path: 'lightning',
component: LightningDashboardComponent,
loadChildren: () => import('./lightning/lightning.module').then(m => m.LightningModule) loadChildren: () => import('./lightning/lightning.module').then(m => m.LightningModule)
}, },
], ],

8
frontend/src/app/shared/shared.module.ts
View File

@ -4,7 +4,7 @@ import { NgbCollapse, NgbCollapseModule, NgbRadioGroup, NgbTypeaheadModule } fro
import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome'; import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome';
import { faFilter, faAngleDown, faAngleUp, faAngleRight, faAngleLeft, faBolt, faChartArea, faCogs, faCubes, faHammer, faDatabase, faExchangeAlt, faInfoCircle, import { faFilter, faAngleDown, faAngleUp, faAngleRight, faAngleLeft, faBolt, faChartArea, faCogs, faCubes, faHammer, faDatabase, faExchangeAlt, faInfoCircle,
faLink, faList, faSearch, faCaretUp, faCaretDown, faTachometerAlt, faThList, faTint, faTv, faAngleDoubleDown, faSortUp, faAngleDoubleUp, faChevronDown, faLink, faList, faSearch, faCaretUp, faCaretDown, faTachometerAlt, faThList, faTint, faTv, faAngleDoubleDown, faSortUp, faAngleDoubleUp, faChevronDown,
faFileAlt, faRedoAlt, faArrowAltCircleRight, faExternalLinkAlt, faBook, faListUl, faDownload } from '@fortawesome/free-solid-svg-icons'; faFileAlt, faRedoAlt, faArrowAltCircleRight, faExternalLinkAlt, faBook, faListUl, faDownload, faQrcode } from '@fortawesome/free-solid-svg-icons';
import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { InfiniteScrollModule } from 'ngx-infinite-scroll';
import { MasterPageComponent } from '../components/master-page/master-page.component'; import { MasterPageComponent } from '../components/master-page/master-page.component';
import { BisqMasterPageComponent } from '../components/bisq-master-page/bisq-master-page.component'; import { BisqMasterPageComponent } from '../components/bisq-master-page/bisq-master-page.component';
@ -75,6 +75,7 @@ import { IndexingProgressComponent } from '../components/indexing-progress/index
import { SvgImagesComponent } from '../components/svg-images/svg-images.component'; import { SvgImagesComponent } from '../components/svg-images/svg-images.component';
import { ChangeComponent } from '../components/change/change.component'; import { ChangeComponent } from '../components/change/change.component';
import { SatsComponent } from './components/sats/sats.component'; import { SatsComponent } from './components/sats/sats.component';
import { SearchResultsComponent } from '../components/search-form/search-results/search-results.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
@ -144,6 +145,7 @@ import { SatsComponent } from './components/sats/sats.component';
SvgImagesComponent, SvgImagesComponent,
ChangeComponent, ChangeComponent,
SatsComponent, SatsComponent,
SearchResultsComponent,
], ],
imports: [ imports: [
CommonModule, CommonModule,
@ -240,7 +242,8 @@ import { SatsComponent } from './components/sats/sats.component';
IndexingProgressComponent, IndexingProgressComponent,
SvgImagesComponent, SvgImagesComponent,
ChangeComponent, ChangeComponent,
SatsComponent SatsComponent,
SearchResultsComponent,
] ]
}) })
export class SharedModule { export class SharedModule {
@ -279,5 +282,6 @@ export class SharedModule {
library.addIcons(faBook); library.addIcons(faBook);
library.addIcons(faListUl); library.addIcons(faListUl);
library.addIcons(faDownload); library.addIcons(faDownload);
library.addIcons(faQrcode);
} }
} }