diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.ts index abae4b384..08f5b66c0 100644 --- a/apps/client/src/app/app-routing.module.ts +++ b/apps/client/src/app/app-routing.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes, TitleStrategy } from '@angular/router'; -import { routes as marketsRoutes } from '@ghostfolio/client/pages/markets/routes'; // TODO import { routes as pricingRoutes } from '@ghostfolio/client/pages/pricing/routes'; // TODO import { routes as registerRoutes } from '@ghostfolio/client/pages/register/routes'; // TODO import { routes as resourcesRoutes } from '@ghostfolio/client/pages/resources/routes'; // TODO @@ -13,6 +12,7 @@ export const paths = { faq: $localize`faq`, features: $localize`features`, license: $localize`license`, + markets: $localize`markets`, privacyPolicy: $localize`privacy-policy` }; @@ -73,13 +73,13 @@ const routes: Routes = [ loadChildren: () => import('./pages/home/home-page.module').then((m) => m.HomePageModule) }, - ...marketsRoutes.map((path) => ({ - path, + { + path: paths.markets, loadChildren: () => import('./pages/markets/markets-page.module').then( (m) => m.MarketsPageModule ) - })), + }, { path: 'open', loadChildren: () => diff --git a/apps/client/src/app/app.component.html b/apps/client/src/app/app.component.html index f99c16740..fd7d5c673 100644 --- a/apps/client/src/app/app.component.html +++ b/apps/client/src/app/app.component.html @@ -53,7 +53,7 @@
Personal Finance
diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts index b4527b178..29de13038 100644 --- a/apps/client/src/app/app.component.ts +++ b/apps/client/src/app/app.component.ts @@ -47,6 +47,7 @@ export class AppComponent implements OnDestroy, OnInit { ]; public routerLinkFaq = ['/' + $localize`faq`]; public routerLinkFeatures = ['/' + $localize`features`]; + public routerLinkMarkets = ['/' + $localize`markets`]; public showFooter = false; public user: User; public version = environment.version; @@ -103,7 +104,7 @@ export class AppComponent implements OnDestroy, OnInit { (this.currentRoute === 'blog' || this.currentRoute === this.routerLinkFaq[0].slice(1) || this.currentRoute === this.routerLinkFeatures[0].slice(1) || - this.currentRoute === 'markets' || + this.currentRoute === this.routerLinkMarkets[0].slice(1) || this.currentRoute === 'open' || this.currentRoute === 'p' || this.currentRoute === 'pricing' || diff --git a/apps/client/src/app/components/header/header.component.html b/apps/client/src/app/components/header/header.component.html index ec430ad72..b24d7583a 100644 --- a/apps/client/src/app/components/header/header.component.html +++ b/apps/client/src/app/components/header/header.component.html @@ -304,7 +304,7 @@ 'font-weight-bold': currentRoute === 'markets', 'text-decoration-underline': currentRoute === 'markets' }" - [routerLink]="['/markets']" + [routerLink]="routerLinkMarkets" >Markets diff --git a/apps/client/src/app/core/auth.guard.ts b/apps/client/src/app/core/auth.guard.ts index bf242af85..b8ea4a831 100644 --- a/apps/client/src/app/core/auth.guard.ts +++ b/apps/client/src/app/core/auth.guard.ts @@ -5,7 +5,6 @@ import { RouterStateSnapshot } from '@angular/router'; import { paths } from '@ghostfolio/client/app-routing.module'; -import { routes as marketsRoutes } from '@ghostfolio/client/pages/markets/routes'; import { routes as pricingRoutes } from '@ghostfolio/client/pages/pricing/routes'; import { routes as registerRoutes } from '@ghostfolio/client/pages/register/routes'; import { routes as resourcesRoutes } from '@ghostfolio/client/pages/resources/routes'; @@ -23,7 +22,7 @@ export class AuthGuard { '/demo', `/${paths.faq}`, `/${paths.features}`, - ...marketsRoutes.map((route) => `/${route}`), + `/${paths.markets}`, '/open', '/p', ...pricingRoutes.map((route) => `/${route}`), diff --git a/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts b/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts index 99842efb8..95b4a2b3d 100644 --- a/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts +++ b/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts @@ -9,4 +9,6 @@ import { RouterModule } from '@angular/router'; standalone: true, templateUrl: './500-stars-on-github-page.html' }) -export class FiveHundredStarsOnGitHubPageComponent {} +export class FiveHundredStarsOnGitHubPageComponent { + public routerLinkMarkets = ['/' + $localize`markets`]; +} diff --git a/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html b/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html index ba38219c9..873b7a2e6 100644 --- a/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html +++ b/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html @@ -71,9 +71,9 @@

Break-even Point

Despite the complicated - economic situation at this time, - the goal set at the beginning of the year to build a sustainable - business and reach break-even with the SaaS offering (economic situation at this + time, the goal set at the beginning of the year to build a + sustainable business and reach break-even with the SaaS offering (Ghostfolio Premium) has been achieved. We will continue to leverage the revenue to diff --git a/apps/client/src/app/pages/faq/faq-page.component.ts b/apps/client/src/app/pages/faq/faq-page.component.ts index 6b140ce0b..6e2c5b71d 100644 --- a/apps/client/src/app/pages/faq/faq-page.component.ts +++ b/apps/client/src/app/pages/faq/faq-page.component.ts @@ -11,6 +11,7 @@ import { Subject, takeUntil } from 'rxjs'; }) export class FaqPageComponent implements OnDestroy { public routerLinkFeatures = ['/' + $localize`features`]; + public routerLinkMarkets = ['/' + $localize`markets`]; public user: User; private unsubscribeSubject = new Subject(); diff --git a/apps/client/src/app/pages/faq/faq-page.html b/apps/client/src/app/pages/faq/faq-page.html index d687dd012..ad73a3261 100644 --- a/apps/client/src/app/pages/faq/faq-page.html +++ b/apps/client/src/app/pages/faq/faq-page.html @@ -144,8 +144,8 @@ managed Ghostfolio cloud offering for ambitious investors. The revenue is used to cover the hosting infrastructure and to fund the ongoing development. It is the Open Source code base with some extras like the - markets overview and a professional - data provider.markets overview and a + professional data provider. diff --git a/apps/client/src/app/pages/markets/routes.ts b/apps/client/src/app/pages/markets/routes.ts deleted file mode 100644 index 68b7a6e0b..000000000 --- a/apps/client/src/app/pages/markets/routes.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const routes = [ - 'markets', - ///// - 'maerkte', - 'marches', - 'markten', - 'mercados', - 'mercati' -] as const; diff --git a/apps/client/src/locales/messages.de.xlf b/apps/client/src/locales/messages.de.xlf index 0cf919d03..e44468cb9 100644 --- a/apps/client/src/locales/messages.de.xlf +++ b/apps/client/src/locales/messages.de.xlf @@ -7642,7 +7642,7 @@ haeufig-gestellte-fragen apps/client/src/app/app-routing.module.ts - 13 + 12 apps/client/src/app/app.component.ts @@ -7658,7 +7658,7 @@ features apps/client/src/app/app-routing.module.ts - 14 + 13 apps/client/src/app/app.component.ts @@ -7802,7 +7802,7 @@ ueber-uns apps/client/src/app/app-routing.module.ts - 12 + 11 apps/client/src/app/app.component.ts @@ -7970,7 +7970,7 @@ lizenz apps/client/src/app/app-routing.module.ts - 15 + 14 apps/client/src/app/app.component.ts @@ -7981,6 +7981,26 @@ 61 + + markets + maerkte + + apps/client/src/app/app-routing.module.ts + 15 + + + apps/client/src/app/app.component.ts + 50 + + + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts + 13 + + + apps/client/src/app/pages/faq/faq-page.component.ts + 14 + + diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlf index dab55d1de..feb47ab22 100644 --- a/apps/client/src/locales/messages.es.xlf +++ b/apps/client/src/locales/messages.es.xlf @@ -7643,7 +7643,7 @@ preguntas-mas-frecuentes apps/client/src/app/app-routing.module.ts - 13 + 12 apps/client/src/app/app.component.ts @@ -7659,7 +7659,7 @@ funcionalidades apps/client/src/app/app-routing.module.ts - 14 + 13 apps/client/src/app/app.component.ts @@ -7803,7 +7803,7 @@ sobre apps/client/src/app/app-routing.module.ts - 12 + 11 apps/client/src/app/app.component.ts @@ -7971,7 +7971,7 @@ licencia apps/client/src/app/app-routing.module.ts - 15 + 14 apps/client/src/app/app.component.ts @@ -7982,6 +7982,26 @@ 61 + + markets + mercados + + apps/client/src/app/app-routing.module.ts + 15 + + + apps/client/src/app/app.component.ts + 50 + + + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts + 13 + + + apps/client/src/app/pages/faq/faq-page.component.ts + 14 + + diff --git a/apps/client/src/locales/messages.fr.xlf b/apps/client/src/locales/messages.fr.xlf index b22ed3cef..b31061945 100644 --- a/apps/client/src/locales/messages.fr.xlf +++ b/apps/client/src/locales/messages.fr.xlf @@ -7642,7 +7642,7 @@ foire-aux-questions apps/client/src/app/app-routing.module.ts - 13 + 12 apps/client/src/app/app.component.ts @@ -7658,7 +7658,7 @@ fonctionnalites apps/client/src/app/app-routing.module.ts - 14 + 13 apps/client/src/app/app.component.ts @@ -7802,7 +7802,7 @@ a-propos apps/client/src/app/app-routing.module.ts - 12 + 11 apps/client/src/app/app.component.ts @@ -7970,7 +7970,7 @@ licence apps/client/src/app/app-routing.module.ts - 15 + 14 apps/client/src/app/app.component.ts @@ -7981,6 +7981,26 @@ 61 + + markets + marches + + apps/client/src/app/app-routing.module.ts + 15 + + + apps/client/src/app/app.component.ts + 50 + + + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts + 13 + + + apps/client/src/app/pages/faq/faq-page.component.ts + 14 + + diff --git a/apps/client/src/locales/messages.it.xlf b/apps/client/src/locales/messages.it.xlf index 74fd70f9a..f70df9e4a 100644 --- a/apps/client/src/locales/messages.it.xlf +++ b/apps/client/src/locales/messages.it.xlf @@ -7643,7 +7643,7 @@ domande-piu-frequenti apps/client/src/app/app-routing.module.ts - 13 + 12 apps/client/src/app/app.component.ts @@ -7659,7 +7659,7 @@ funzionalita apps/client/src/app/app-routing.module.ts - 14 + 13 apps/client/src/app/app.component.ts @@ -7803,7 +7803,7 @@ informazioni-su apps/client/src/app/app-routing.module.ts - 12 + 11 apps/client/src/app/app.component.ts @@ -7971,7 +7971,7 @@ licenza apps/client/src/app/app-routing.module.ts - 15 + 14 apps/client/src/app/app.component.ts @@ -7982,6 +7982,26 @@ 61 + + markets + mercati + + apps/client/src/app/app-routing.module.ts + 15 + + + apps/client/src/app/app.component.ts + 50 + + + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts + 13 + + + apps/client/src/app/pages/faq/faq-page.component.ts + 14 + + diff --git a/apps/client/src/locales/messages.nl.xlf b/apps/client/src/locales/messages.nl.xlf index a4157b0ac..1f6ad0ca1 100644 --- a/apps/client/src/locales/messages.nl.xlf +++ b/apps/client/src/locales/messages.nl.xlf @@ -7642,7 +7642,7 @@ vaak-gestelde-vragen apps/client/src/app/app-routing.module.ts - 13 + 12 apps/client/src/app/app.component.ts @@ -7658,7 +7658,7 @@ kenmerken apps/client/src/app/app-routing.module.ts - 14 + 13 apps/client/src/app/app.component.ts @@ -7802,7 +7802,7 @@ over apps/client/src/app/app-routing.module.ts - 12 + 11 apps/client/src/app/app.component.ts @@ -7970,7 +7970,7 @@ licentie apps/client/src/app/app-routing.module.ts - 15 + 14 apps/client/src/app/app.component.ts @@ -7981,6 +7981,26 @@ 61 + + markets + markten + + apps/client/src/app/app-routing.module.ts + 15 + + + apps/client/src/app/app.component.ts + 50 + + + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts + 13 + + + apps/client/src/app/pages/faq/faq-page.component.ts + 14 + + diff --git a/apps/client/src/locales/messages.pt.xlf b/apps/client/src/locales/messages.pt.xlf index 1e6dcb29f..668440b68 100644 --- a/apps/client/src/locales/messages.pt.xlf +++ b/apps/client/src/locales/messages.pt.xlf @@ -7642,7 +7642,7 @@ perguntas-mais-frequentes apps/client/src/app/app-routing.module.ts - 13 + 12 apps/client/src/app/app.component.ts @@ -7658,7 +7658,7 @@ funcionalidades apps/client/src/app/app-routing.module.ts - 14 + 13 apps/client/src/app/app.component.ts @@ -7802,7 +7802,7 @@ sobre apps/client/src/app/app-routing.module.ts - 12 + 11 apps/client/src/app/app.component.ts @@ -7970,7 +7970,7 @@ licenca apps/client/src/app/app-routing.module.ts - 15 + 14 apps/client/src/app/app.component.ts @@ -7981,6 +7981,26 @@ 61 + + markets + mercados + + apps/client/src/app/app-routing.module.ts + 15 + + + apps/client/src/app/app.component.ts + 50 + + + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts + 13 + + + apps/client/src/app/pages/faq/faq-page.component.ts + 14 + + diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlf index 853c1096e..7c2d55dc5 100644 --- a/apps/client/src/locales/messages.xlf +++ b/apps/client/src/locales/messages.xlf @@ -7135,7 +7135,7 @@ faq apps/client/src/app/app-routing.module.ts - 13 + 12 apps/client/src/app/app.component.ts @@ -7150,7 +7150,7 @@ features apps/client/src/app/app-routing.module.ts - 14 + 13 apps/client/src/app/app.component.ts @@ -7293,7 +7293,7 @@ about apps/client/src/app/app-routing.module.ts - 12 + 11 apps/client/src/app/app.component.ts @@ -7444,7 +7444,7 @@ license apps/client/src/app/app-routing.module.ts - 15 + 14 apps/client/src/app/app.component.ts @@ -7470,6 +7470,25 @@ 69 + + markets + + apps/client/src/app/app-routing.module.ts + 15 + + + apps/client/src/app/app.component.ts + 50 + + + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts + 13 + + + apps/client/src/app/pages/faq/faq-page.component.ts + 14 + + \ No newline at end of file