Browse Source

Refactoring

pull/4955/head
Thomas Kaul 2 weeks ago
parent
commit
71fdc5bafb
  1. 20
      libs/common/src/lib/routes/routes.ts
  2. 5
      libs/ui/src/lib/assistant/assistant.component.ts

20
libs/common/src/lib/routes/routes.ts

@ -59,17 +59,13 @@ export const internalRoutes: Record<string, IRoute> = {
title: $localize`Accounts` title: $localize`Accounts`
}, },
api: { api: {
excludeFromAssistant: () => { excludeFromAssistant: true,
return true;
},
path: 'api', path: 'api',
routerLink: ['/api'], routerLink: ['/api'],
title: 'Ghostfolio API' title: 'Ghostfolio API'
}, },
auth: { auth: {
excludeFromAssistant: () => { excludeFromAssistant: true,
return true;
},
path: 'auth', path: 'auth',
routerLink: ['/auth'], routerLink: ['/auth'],
title: $localize`Sign in` title: $localize`Sign in`
@ -102,9 +98,7 @@ export const internalRoutes: Record<string, IRoute> = {
title: $localize`Overview` title: $localize`Overview`
}, },
i18n: { i18n: {
excludeFromAssistant: () => { excludeFromAssistant: true,
return true;
},
path: 'i18n', path: 'i18n',
routerLink: ['/i18n'], routerLink: ['/i18n'],
title: $localize`Internationalization` title: $localize`Internationalization`
@ -142,17 +136,13 @@ export const internalRoutes: Record<string, IRoute> = {
title: $localize`Portfolio` title: $localize`Portfolio`
}, },
webauthn: { webauthn: {
excludeFromAssistant: () => { excludeFromAssistant: true,
return true;
},
path: 'webauthn', path: 'webauthn',
routerLink: ['/webauthn'], routerLink: ['/webauthn'],
title: $localize`Sign in` title: $localize`Sign in`
}, },
zen: { zen: {
excludeFromAssistant: () => { excludeFromAssistant: true,
return true;
},
path: 'zen', path: 'zen',
routerLink: ['/zen'], routerLink: ['/zen'],
subRoutes: { subRoutes: {

5
libs/ui/src/lib/assistant/assistant.component.ts

@ -41,6 +41,7 @@ import { MatSelectModule } from '@angular/material/select';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { Account, AssetClass, DataSource } from '@prisma/client'; import { Account, AssetClass, DataSource } from '@prisma/client';
import { differenceInYears } from 'date-fns'; import { differenceInYears } from 'date-fns';
import { isFunction } from 'lodash';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { EMPTY, Observable, Subject, merge, of } from 'rxjs'; import { EMPTY, Observable, Subject, merge, of } from 'rxjs';
import { import {
@ -627,8 +628,8 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
const allRoutes = Object.values(internalRoutes) const allRoutes = Object.values(internalRoutes)
.filter(({ excludeFromAssistant }) => { .filter(({ excludeFromAssistant }) => {
if (typeof excludeFromAssistant === 'function') { if (isFunction(excludeFromAssistant)) {
return !excludeFromAssistant(this.user); return excludeFromAssistant(this.user);
} }
return !excludeFromAssistant; return !excludeFromAssistant;

Loading…
Cancel
Save