diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.ts index 47c406959..46473d35d 100644 --- a/apps/client/src/app/app-routing.module.ts +++ b/apps/client/src/app/app-routing.module.ts @@ -99,7 +99,7 @@ const routes: Routes = [ ) }, { - path: ghostfolioRoutes.openStartup, + path: publicRoutes.openStartup.path, loadChildren: () => import('./pages/open/open-page.module').then((m) => m.OpenPageModule) }, diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts index ca65e2340..f0be8c76e 100644 --- a/apps/client/src/app/app.component.ts +++ b/apps/client/src/app/app.component.ts @@ -78,7 +78,7 @@ export class AppComponent implements OnDestroy, OnInit { public routerLinkFaq = ['/' + routes.faq]; public routerLinkFeatures = ['/' + routes.features]; public routerLinkMarkets = ['/' + routes.markets]; - public routerLinkOpenStartup = ['/' + routes.openStartup]; + public routerLinkOpenStartup = ['/' + publicRoutes.openStartup.path]; public routerLinkPricing = ['/' + routes.pricing]; public routerLinkRegister = ['/' + publicRoutes.register.path]; public routerLinkResources = ['/' + routes.resources]; diff --git a/apps/client/src/app/core/auth.guard.ts b/apps/client/src/app/core/auth.guard.ts index 94118b28d..0aa4db097 100644 --- a/apps/client/src/app/core/auth.guard.ts +++ b/apps/client/src/app/core/auth.guard.ts @@ -25,7 +25,7 @@ export class AuthGuard { `/${routes.faq}`, `/${routes.features}`, `/${routes.markets}`, - `/${routes.openStartup}`, + `/${publicRoutes.openStartup.path}`, `/${routes.pricing}`, `/${routes.public}`, `/${publicRoutes.register.path}`, diff --git a/apps/client/src/app/pages/about/overview/about-overview-page.component.ts b/apps/client/src/app/pages/about/overview/about-overview-page.component.ts index d12bfacdd..a2d911a8e 100644 --- a/apps/client/src/app/pages/about/overview/about-overview-page.component.ts +++ b/apps/client/src/app/pages/about/overview/about-overview-page.component.ts @@ -2,7 +2,7 @@ import { DataService } from '@ghostfolio/client/services/data.service'; import { UserService } from '@ghostfolio/client/services/user/user.service'; import { User } from '@ghostfolio/common/interfaces'; import { hasPermission, permissions } from '@ghostfolio/common/permissions'; -import { routes } from '@ghostfolio/common/routes'; +import { publicRoutes, routes } from '@ghostfolio/common/routes'; import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { Subject } from 'rxjs'; @@ -21,7 +21,7 @@ export class AboutOverviewPageComponent implements OnDestroy, OnInit { public routerLinkBlog = ['/' + routes.blog]; public routerLinkFaq = ['/' + routes.faq]; public routerLinkFeatures = ['/' + routes.features]; - public routerLinkOpenStartup = ['/' + routes.openStartup]; + public routerLinkOpenStartup = ['/' + publicRoutes.openStartup.path]; public user: User; private unsubscribeSubject = new Subject(); diff --git a/apps/client/src/app/pages/blog/2023/09/hacktoberfest-2023/hacktoberfest-2023-page.component.ts b/apps/client/src/app/pages/blog/2023/09/hacktoberfest-2023/hacktoberfest-2023-page.component.ts index 7994f00d2..0525adc93 100644 --- a/apps/client/src/app/pages/blog/2023/09/hacktoberfest-2023/hacktoberfest-2023-page.component.ts +++ b/apps/client/src/app/pages/blog/2023/09/hacktoberfest-2023/hacktoberfest-2023-page.component.ts @@ -1,4 +1,4 @@ -import { routes } from '@ghostfolio/common/routes'; +import { publicRoutes, routes } from '@ghostfolio/common/routes'; import { Component } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; @@ -13,5 +13,5 @@ import { RouterModule } from '@angular/router'; export class Hacktoberfest2023PageComponent { public routerLinkAbout = ['/' + routes.about]; public routerLinkBlog = ['/' + routes.blog]; - public routerLinkOpenStartup = ['/' + routes.openStartup]; + public routerLinkOpenStartup = ['/' + publicRoutes.openStartup.path]; } diff --git a/apps/client/src/app/pages/blog/2024/09/hacktoberfest-2024/hacktoberfest-2024-page.component.ts b/apps/client/src/app/pages/blog/2024/09/hacktoberfest-2024/hacktoberfest-2024-page.component.ts index c8855c81e..5a559dd95 100644 --- a/apps/client/src/app/pages/blog/2024/09/hacktoberfest-2024/hacktoberfest-2024-page.component.ts +++ b/apps/client/src/app/pages/blog/2024/09/hacktoberfest-2024/hacktoberfest-2024-page.component.ts @@ -1,4 +1,4 @@ -import { routes } from '@ghostfolio/common/routes'; +import { publicRoutes, routes } from '@ghostfolio/common/routes'; import { Component } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; @@ -13,5 +13,5 @@ import { RouterModule } from '@angular/router'; export class Hacktoberfest2024PageComponent { public routerLinkAbout = ['/' + routes.about]; public routerLinkBlog = ['/' + routes.blog]; - public routerLinkOpenStartup = ['/' + routes.openStartup]; + public routerLinkOpenStartup = ['/' + publicRoutes.openStartup.path]; } diff --git a/apps/client/src/app/pages/landing/landing-page.component.ts b/apps/client/src/app/pages/landing/landing-page.component.ts index 2704c8797..84a2e4768 100644 --- a/apps/client/src/app/pages/landing/landing-page.component.ts +++ b/apps/client/src/app/pages/landing/landing-page.component.ts @@ -27,7 +27,7 @@ export class LandingPageComponent implements OnDestroy, OnInit { public hasPermissionToCreateUser: boolean; public routerLinkAbout = ['/' + routes.about]; public routerLinkDemo = ['/' + routes.demo]; - public routerLinkOpenStartup = ['/' + routes.openStartup]; + public routerLinkOpenStartup = ['/' + publicRoutes.openStartup.path]; public routerLinkRegister = ['/' + publicRoutes.register.path]; public statistics: Statistics; public testimonials = [ diff --git a/apps/client/src/app/pages/open/open-page-routing.module.ts b/apps/client/src/app/pages/open/open-page-routing.module.ts index b9db4ab10..cd113d361 100644 --- a/apps/client/src/app/pages/open/open-page-routing.module.ts +++ b/apps/client/src/app/pages/open/open-page-routing.module.ts @@ -1,4 +1,5 @@ import { AuthGuard } from '@ghostfolio/client/core/auth.guard'; +import { publicRoutes } from '@ghostfolio/common/routes'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; @@ -10,7 +11,7 @@ const routes: Routes = [ canActivate: [AuthGuard], component: OpenPageComponent, path: '', - title: 'Open Startup' + title: publicRoutes.openStartup.title } ]; diff --git a/libs/common/src/lib/routes.ts b/libs/common/src/lib/routes.ts index e32d49c3c..0a9a32c18 100644 --- a/libs/common/src/lib/routes.ts +++ b/libs/common/src/lib/routes.ts @@ -38,7 +38,6 @@ export const routes = { license: $localize`:kebab-case:license`, markets: $localize`:kebab-case:markets`, openSourceAlternativeTo: $localize`:kebab-case:open-source-alternative-to`, - openStartup: 'open', ossFriends: 'oss-friends', pricing: $localize`:kebab-case:pricing`, privacyPolicy: $localize`:kebab-case:privacy-policy`, @@ -73,9 +72,12 @@ export const internalRoutes = { }; export const publicRoutes = { + openStartup: { + path: 'open', + title: 'Open Startup' + }, register: { path: $localize`:kebab-case:register`, - subRoutes: {}, title: $localize`Registration` } };