From eb5dd45e78ae1d2313671d182610646b1f1b1dbf Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Sun, 20 Aug 2023 09:29:49 +0200 Subject: [PATCH] Refactoring --- .../components/header/header.component.html | 36 ++++++------- .../app/components/header/header.component.ts | 9 ++++ .../about/oss-friends/oss-friends-page.html | 2 +- .../personal-finance-tools-page.component.ts | 2 +- .../personal-finance-tools-page.html | 2 +- apps/client/src/locales/messages.de.xlf | 52 ++++++++++++++++--- apps/client/src/locales/messages.es.xlf | 52 ++++++++++++++++--- apps/client/src/locales/messages.fr.xlf | 52 ++++++++++++++++--- apps/client/src/locales/messages.it.xlf | 52 ++++++++++++++++--- apps/client/src/locales/messages.nl.xlf | 52 ++++++++++++++++--- apps/client/src/locales/messages.pt.xlf | 52 ++++++++++++++++--- apps/client/src/locales/messages.xlf | 50 +++++++++++++++--- 12 files changed, 337 insertions(+), 76 deletions(-) diff --git a/apps/client/src/app/components/header/header.component.html b/apps/client/src/app/components/header/header.component.html index a247455b7..554668bf0 100644 --- a/apps/client/src/app/components/header/header.component.html +++ b/apps/client/src/app/components/header/header.component.html @@ -69,10 +69,10 @@ i18n mat-flat-button [ngClass]="{ - 'font-weight-bold': currentRoute === 'resources', - 'text-decoration-underline': currentRoute === 'resources' + 'font-weight-bold': currentRoute === routeResources, + 'text-decoration-underline': currentRoute === routeResources }" - [routerLink]="[routerLinkResources]" + [routerLink]="routerLinkResources" >Resources @@ -87,8 +87,8 @@ i18n mat-flat-button [ngClass]="{ - 'font-weight-bold': currentRoute === 'pricing', - 'text-decoration-underline': currentRoute === 'pricing' + 'font-weight-bold': currentRoute === routePricing, + 'text-decoration-underline': currentRoute === routePricing }" [routerLink]="routerLinkPricing" >PricingAboutResourcesPricing @@ -231,7 +231,7 @@ class="d-flex d-sm-none" i18n mat-menu-item - [ngClass]="{ 'font-weight-bold': currentRoute === 'about' }" + [ngClass]="{ 'font-weight-bold': currentRoute === routeAbout }" [routerLink]="routerLinkAbout" >About Ghostfolio @@ -260,8 +260,8 @@ i18n mat-flat-button [ngClass]="{ - 'font-weight-bold': currentRoute === 'features', - 'text-decoration-underline': currentRoute === 'features' + 'font-weight-bold': currentRoute === routeFeatures, + 'text-decoration-underline': currentRoute === routeFeatuers }" [routerLink]="routerLinkFeatures" >FeaturesAboutPricingMarkets(); diff --git a/apps/client/src/app/pages/about/oss-friends/oss-friends-page.html b/apps/client/src/app/pages/about/oss-friends/oss-friends-page.html index 77de91ee1..30db4c5ff 100644 --- a/apps/client/src/app/pages/about/oss-friends/oss-friends-page.html +++ b/apps/client/src/app/pages/about/oss-friends/oss-friends-page.html @@ -6,7 +6,7 @@ >Our OSS Friends Discover more Open Source Software projectsDiscover other exciting Open Source Software projects
diff --git a/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.component.ts b/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.component.ts index 18ea65e8d..b370bbdd4 100644 --- a/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.component.ts +++ b/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.component.ts @@ -10,10 +10,10 @@ import { products } from './products'; templateUrl: './personal-finance-tools-page.html' }) export class PersonalFinanceToolsPageComponent implements OnDestroy { + public pathResources = '/' + $localize`resources`; public products = products.filter(({ key }) => { return key !== 'ghostfolio'; }); - public resourcesPath = '/' + $localize`resources`; public routerLinkAbout = ['/' + $localize`about`]; private unsubscribeSubject = new Subject(); diff --git a/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.html b/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.html index 20f603eb7..81afc2fb0 100644 --- a/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.html +++ b/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.html @@ -29,7 +29,7 @@
diff --git a/apps/client/src/locales/messages.de.xlf b/apps/client/src/locales/messages.de.xlf index 607aeee1b..4f6339d77 100644 --- a/apps/client/src/locales/messages.de.xlf +++ b/apps/client/src/locales/messages.de.xlf @@ -986,7 +986,7 @@ Einloggen apps/client/src/app/components/header/header.component.ts - 121 + 130 apps/client/src/app/pages/webauthn/webauthn-page-routing.module.ts @@ -998,7 +998,7 @@ Ups! Falsches Sicherheits-Token. apps/client/src/app/components/header/header.component.ts - 135 + 144 @@ -7293,9 +7293,9 @@ 31 - - Discover more Open Source Software projects - Entdecke weitere Open Source Software Projekte + + Discover other exciting Open Source Software projects + Entdecke weitere interessante Open Source Software Projekte apps/client/src/app/pages/about/oss-friends/oss-friends-page.html 9 @@ -7666,7 +7666,11 @@ apps/client/src/app/components/header/header.component.ts - 45 + 46 + + + apps/client/src/app/components/header/header.component.ts + 51 apps/client/src/app/pages/about/overview/about-overview-page.component.ts @@ -7820,6 +7824,14 @@ apps/client/src/app/app.component.ts 45 + + apps/client/src/app/components/header/header.component.ts + 45 + + + apps/client/src/app/components/header/header.component.ts + 50 + apps/client/src/app/pages/about/about-page.component.ts 51 @@ -7992,6 +8004,14 @@ apps/client/src/app/app.component.ts 50 + + apps/client/src/app/components/header/header.component.ts + 47 + + + apps/client/src/app/components/header/header.component.ts + 52 + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts 13 @@ -8012,6 +8032,14 @@ apps/client/src/app/app.component.ts 51 + + apps/client/src/app/components/header/header.component.ts + 48 + + + apps/client/src/app/components/header/header.component.ts + 53 + apps/client/src/app/components/home-summary/home-summary.component.ts 124 @@ -8066,7 +8094,7 @@ apps/client/src/app/components/header/header.component.ts - 46 + 54 apps/client/src/app/core/auth.guard.ts @@ -8100,6 +8128,14 @@ apps/client/src/app/app.component.ts 53 + + apps/client/src/app/components/header/header.component.ts + 49 + + + apps/client/src/app/components/header/header.component.ts + 55 + apps/client/src/app/pages/blog/2021/07/hallo-ghostfolio/hallo-ghostfolio-page.component.ts 14 @@ -8118,7 +8154,7 @@ apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.component.ts - 16 + 13 apps/client/src/app/pages/resources/personal-finance-tools/products/altoo-page.component.ts diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlf index d1f0621a7..22ad003ca 100644 --- a/apps/client/src/locales/messages.es.xlf +++ b/apps/client/src/locales/messages.es.xlf @@ -987,7 +987,7 @@ Iniciar sesión apps/client/src/app/components/header/header.component.ts - 121 + 130 apps/client/src/app/pages/webauthn/webauthn-page-routing.module.ts @@ -999,7 +999,7 @@ Vaya! Token de seguridad incorrecto. apps/client/src/app/components/header/header.component.ts - 135 + 144 @@ -7294,9 +7294,9 @@ 31 - - Discover more Open Source Software projects - Discover more Open Source Software projects + + Discover other exciting Open Source Software projects + Discover other exciting Open Source Software projects apps/client/src/app/pages/about/oss-friends/oss-friends-page.html 9 @@ -7667,7 +7667,11 @@ apps/client/src/app/components/header/header.component.ts - 45 + 46 + + + apps/client/src/app/components/header/header.component.ts + 51 apps/client/src/app/pages/about/overview/about-overview-page.component.ts @@ -7821,6 +7825,14 @@ apps/client/src/app/app.component.ts 45 + + apps/client/src/app/components/header/header.component.ts + 45 + + + apps/client/src/app/components/header/header.component.ts + 50 + apps/client/src/app/pages/about/about-page.component.ts 51 @@ -7993,6 +8005,14 @@ apps/client/src/app/app.component.ts 50 + + apps/client/src/app/components/header/header.component.ts + 47 + + + apps/client/src/app/components/header/header.component.ts + 52 + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts 13 @@ -8013,6 +8033,14 @@ apps/client/src/app/app.component.ts 51 + + apps/client/src/app/components/header/header.component.ts + 48 + + + apps/client/src/app/components/header/header.component.ts + 53 + apps/client/src/app/components/home-summary/home-summary.component.ts 124 @@ -8067,7 +8095,7 @@ apps/client/src/app/components/header/header.component.ts - 46 + 54 apps/client/src/app/core/auth.guard.ts @@ -8101,6 +8129,14 @@ apps/client/src/app/app.component.ts 53 + + apps/client/src/app/components/header/header.component.ts + 49 + + + apps/client/src/app/components/header/header.component.ts + 55 + apps/client/src/app/pages/blog/2021/07/hallo-ghostfolio/hallo-ghostfolio-page.component.ts 14 @@ -8119,7 +8155,7 @@ apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.component.ts - 16 + 13 apps/client/src/app/pages/resources/personal-finance-tools/products/altoo-page.component.ts diff --git a/apps/client/src/locales/messages.fr.xlf b/apps/client/src/locales/messages.fr.xlf index b3ba9511e..efefa7da9 100644 --- a/apps/client/src/locales/messages.fr.xlf +++ b/apps/client/src/locales/messages.fr.xlf @@ -1286,7 +1286,7 @@ Se connecter apps/client/src/app/components/header/header.component.ts - 121 + 130 apps/client/src/app/pages/webauthn/webauthn-page-routing.module.ts @@ -1298,7 +1298,7 @@ Oups! Jeton de Sécurité Incorrect. apps/client/src/app/components/header/header.component.ts - 135 + 144 @@ -7293,9 +7293,9 @@ 31 - - Discover more Open Source Software projects - Discover more Open Source Software projects + + Discover other exciting Open Source Software projects + Discover other exciting Open Source Software projects apps/client/src/app/pages/about/oss-friends/oss-friends-page.html 9 @@ -7666,7 +7666,11 @@ apps/client/src/app/components/header/header.component.ts - 45 + 46 + + + apps/client/src/app/components/header/header.component.ts + 51 apps/client/src/app/pages/about/overview/about-overview-page.component.ts @@ -7820,6 +7824,14 @@ apps/client/src/app/app.component.ts 45 + + apps/client/src/app/components/header/header.component.ts + 45 + + + apps/client/src/app/components/header/header.component.ts + 50 + apps/client/src/app/pages/about/about-page.component.ts 51 @@ -7992,6 +8004,14 @@ apps/client/src/app/app.component.ts 50 + + apps/client/src/app/components/header/header.component.ts + 47 + + + apps/client/src/app/components/header/header.component.ts + 52 + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts 13 @@ -8012,6 +8032,14 @@ apps/client/src/app/app.component.ts 51 + + apps/client/src/app/components/header/header.component.ts + 48 + + + apps/client/src/app/components/header/header.component.ts + 53 + apps/client/src/app/components/home-summary/home-summary.component.ts 124 @@ -8066,7 +8094,7 @@ apps/client/src/app/components/header/header.component.ts - 46 + 54 apps/client/src/app/core/auth.guard.ts @@ -8100,6 +8128,14 @@ apps/client/src/app/app.component.ts 53 + + apps/client/src/app/components/header/header.component.ts + 49 + + + apps/client/src/app/components/header/header.component.ts + 55 + apps/client/src/app/pages/blog/2021/07/hallo-ghostfolio/hallo-ghostfolio-page.component.ts 14 @@ -8118,7 +8154,7 @@ apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.component.ts - 16 + 13 apps/client/src/app/pages/resources/personal-finance-tools/products/altoo-page.component.ts diff --git a/apps/client/src/locales/messages.it.xlf b/apps/client/src/locales/messages.it.xlf index a81b36344..0b7c30e8c 100644 --- a/apps/client/src/locales/messages.it.xlf +++ b/apps/client/src/locales/messages.it.xlf @@ -987,7 +987,7 @@ Accedi apps/client/src/app/components/header/header.component.ts - 121 + 130 apps/client/src/app/pages/webauthn/webauthn-page-routing.module.ts @@ -999,7 +999,7 @@ Ops! Token di sicurezza errato. apps/client/src/app/components/header/header.component.ts - 135 + 144 @@ -7294,9 +7294,9 @@ 31 - - Discover more Open Source Software projects - Discover more Open Source Software projects + + Discover other exciting Open Source Software projects + Discover other exciting Open Source Software projects apps/client/src/app/pages/about/oss-friends/oss-friends-page.html 9 @@ -7667,7 +7667,11 @@ apps/client/src/app/components/header/header.component.ts - 45 + 46 + + + apps/client/src/app/components/header/header.component.ts + 51 apps/client/src/app/pages/about/overview/about-overview-page.component.ts @@ -7821,6 +7825,14 @@ apps/client/src/app/app.component.ts 45 + + apps/client/src/app/components/header/header.component.ts + 45 + + + apps/client/src/app/components/header/header.component.ts + 50 + apps/client/src/app/pages/about/about-page.component.ts 51 @@ -7993,6 +8005,14 @@ apps/client/src/app/app.component.ts 50 + + apps/client/src/app/components/header/header.component.ts + 47 + + + apps/client/src/app/components/header/header.component.ts + 52 + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts 13 @@ -8013,6 +8033,14 @@ apps/client/src/app/app.component.ts 51 + + apps/client/src/app/components/header/header.component.ts + 48 + + + apps/client/src/app/components/header/header.component.ts + 53 + apps/client/src/app/components/home-summary/home-summary.component.ts 124 @@ -8067,7 +8095,7 @@ apps/client/src/app/components/header/header.component.ts - 46 + 54 apps/client/src/app/core/auth.guard.ts @@ -8101,6 +8129,14 @@ apps/client/src/app/app.component.ts 53 + + apps/client/src/app/components/header/header.component.ts + 49 + + + apps/client/src/app/components/header/header.component.ts + 55 + apps/client/src/app/pages/blog/2021/07/hallo-ghostfolio/hallo-ghostfolio-page.component.ts 14 @@ -8119,7 +8155,7 @@ apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.component.ts - 16 + 13 apps/client/src/app/pages/resources/personal-finance-tools/products/altoo-page.component.ts diff --git a/apps/client/src/locales/messages.nl.xlf b/apps/client/src/locales/messages.nl.xlf index 4467db408..4eb697def 100644 --- a/apps/client/src/locales/messages.nl.xlf +++ b/apps/client/src/locales/messages.nl.xlf @@ -986,7 +986,7 @@ Aanmelden apps/client/src/app/components/header/header.component.ts - 121 + 130 apps/client/src/app/pages/webauthn/webauthn-page-routing.module.ts @@ -998,7 +998,7 @@ Oeps! Onjuiste beveiligingstoken. apps/client/src/app/components/header/header.component.ts - 135 + 144 @@ -7293,9 +7293,9 @@ 31 - - Discover more Open Source Software projects - Discover more Open Source Software projects + + Discover other exciting Open Source Software projects + Discover other exciting Open Source Software projects apps/client/src/app/pages/about/oss-friends/oss-friends-page.html 9 @@ -7666,7 +7666,11 @@ apps/client/src/app/components/header/header.component.ts - 45 + 46 + + + apps/client/src/app/components/header/header.component.ts + 51 apps/client/src/app/pages/about/overview/about-overview-page.component.ts @@ -7820,6 +7824,14 @@ apps/client/src/app/app.component.ts 45 + + apps/client/src/app/components/header/header.component.ts + 45 + + + apps/client/src/app/components/header/header.component.ts + 50 + apps/client/src/app/pages/about/about-page.component.ts 51 @@ -7992,6 +8004,14 @@ apps/client/src/app/app.component.ts 50 + + apps/client/src/app/components/header/header.component.ts + 47 + + + apps/client/src/app/components/header/header.component.ts + 52 + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts 13 @@ -8012,6 +8032,14 @@ apps/client/src/app/app.component.ts 51 + + apps/client/src/app/components/header/header.component.ts + 48 + + + apps/client/src/app/components/header/header.component.ts + 53 + apps/client/src/app/components/home-summary/home-summary.component.ts 124 @@ -8066,7 +8094,7 @@ apps/client/src/app/components/header/header.component.ts - 46 + 54 apps/client/src/app/core/auth.guard.ts @@ -8100,6 +8128,14 @@ apps/client/src/app/app.component.ts 53 + + apps/client/src/app/components/header/header.component.ts + 49 + + + apps/client/src/app/components/header/header.component.ts + 55 + apps/client/src/app/pages/blog/2021/07/hallo-ghostfolio/hallo-ghostfolio-page.component.ts 14 @@ -8118,7 +8154,7 @@ apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.component.ts - 16 + 13 apps/client/src/app/pages/resources/personal-finance-tools/products/altoo-page.component.ts diff --git a/apps/client/src/locales/messages.pt.xlf b/apps/client/src/locales/messages.pt.xlf index fe5a3ed07..c245598f9 100644 --- a/apps/client/src/locales/messages.pt.xlf +++ b/apps/client/src/locales/messages.pt.xlf @@ -1166,7 +1166,7 @@ Iniciar sessão apps/client/src/app/components/header/header.component.ts - 121 + 130 apps/client/src/app/pages/webauthn/webauthn-page-routing.module.ts @@ -1178,7 +1178,7 @@ Oops! Token de Segurança Incorreto. apps/client/src/app/components/header/header.component.ts - 135 + 144 @@ -7293,9 +7293,9 @@ 31 - - Discover more Open Source Software projects - Discover more Open Source Software projects + + Discover other exciting Open Source Software projects + Discover other exciting Open Source Software projects apps/client/src/app/pages/about/oss-friends/oss-friends-page.html 9 @@ -7666,7 +7666,11 @@ apps/client/src/app/components/header/header.component.ts - 45 + 46 + + + apps/client/src/app/components/header/header.component.ts + 51 apps/client/src/app/pages/about/overview/about-overview-page.component.ts @@ -7820,6 +7824,14 @@ apps/client/src/app/app.component.ts 45 + + apps/client/src/app/components/header/header.component.ts + 45 + + + apps/client/src/app/components/header/header.component.ts + 50 + apps/client/src/app/pages/about/about-page.component.ts 51 @@ -7992,6 +8004,14 @@ apps/client/src/app/app.component.ts 50 + + apps/client/src/app/components/header/header.component.ts + 47 + + + apps/client/src/app/components/header/header.component.ts + 52 + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts 13 @@ -8012,6 +8032,14 @@ apps/client/src/app/app.component.ts 51 + + apps/client/src/app/components/header/header.component.ts + 48 + + + apps/client/src/app/components/header/header.component.ts + 53 + apps/client/src/app/components/home-summary/home-summary.component.ts 124 @@ -8066,7 +8094,7 @@ apps/client/src/app/components/header/header.component.ts - 46 + 54 apps/client/src/app/core/auth.guard.ts @@ -8100,6 +8128,14 @@ apps/client/src/app/app.component.ts 53 + + apps/client/src/app/components/header/header.component.ts + 49 + + + apps/client/src/app/components/header/header.component.ts + 55 + apps/client/src/app/pages/blog/2021/07/hallo-ghostfolio/hallo-ghostfolio-page.component.ts 14 @@ -8118,7 +8154,7 @@ apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.component.ts - 16 + 13 apps/client/src/app/pages/resources/personal-finance-tools/products/altoo-page.component.ts diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlf index a20df39f3..0b1f87045 100644 --- a/apps/client/src/locales/messages.xlf +++ b/apps/client/src/locales/messages.xlf @@ -914,7 +914,7 @@ Sign in apps/client/src/app/components/header/header.component.ts - 121 + 130 apps/client/src/app/pages/webauthn/webauthn-page-routing.module.ts @@ -925,7 +925,7 @@ Oops! Incorrect Security Token. apps/client/src/app/components/header/header.component.ts - 135 + 144 @@ -6843,8 +6843,8 @@ 6,8 - - Discover more Open Source Software projects + + Discover other exciting Open Source Software projects apps/client/src/app/pages/about/oss-friends/oss-friends-page.html 9 @@ -7158,7 +7158,11 @@ apps/client/src/app/components/header/header.component.ts - 45 + 46 + + + apps/client/src/app/components/header/header.component.ts + 51 apps/client/src/app/pages/about/overview/about-overview-page.component.ts @@ -7311,6 +7315,14 @@ apps/client/src/app/app.component.ts 45 + + apps/client/src/app/components/header/header.component.ts + 45 + + + apps/client/src/app/components/header/header.component.ts + 50 + apps/client/src/app/pages/about/about-page.component.ts 51 @@ -7480,6 +7492,14 @@ apps/client/src/app/app.component.ts 50 + + apps/client/src/app/components/header/header.component.ts + 47 + + + apps/client/src/app/components/header/header.component.ts + 52 + apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts 13 @@ -7499,6 +7519,14 @@ apps/client/src/app/app.component.ts 51 + + apps/client/src/app/components/header/header.component.ts + 48 + + + apps/client/src/app/components/header/header.component.ts + 53 + apps/client/src/app/components/home-summary/home-summary.component.ts 124 @@ -7552,7 +7580,7 @@ apps/client/src/app/components/header/header.component.ts - 46 + 54 apps/client/src/app/core/auth.guard.ts @@ -7585,6 +7613,14 @@ apps/client/src/app/app.component.ts 53 + + apps/client/src/app/components/header/header.component.ts + 49 + + + apps/client/src/app/components/header/header.component.ts + 55 + apps/client/src/app/pages/blog/2021/07/hallo-ghostfolio/hallo-ghostfolio-page.component.ts 14 @@ -7603,7 +7639,7 @@ apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page.component.ts - 16 + 13 apps/client/src/app/pages/resources/personal-finance-tools/products/altoo-page.component.ts