diff --git a/CHANGELOG.md b/CHANGELOG.md index d3d5c5c30..24149c9b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added a student discount to the pricing page - Added a prefix to the codes of the coupon system +### Changed + +- Optimized the page titles in the header for mobile + ## 1.222.0 - 2022-12-29 ### Added diff --git a/apps/client/src/app/app.component.html b/apps/client/src/app/app.component.html index 4525930cf..cdf0ba6b5 100644 --- a/apps/client/src/app/app.component.html +++ b/apps/client/src/app/app.component.html @@ -3,6 +3,7 @@ class="position-fixed w-100" [currentRoute]="currentRoute" [info]="info" + [pageTitle]="pageTitle" [user]="user" (signOut)="onSignOut()" > diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts index 957dc8f5a..a412a8054 100644 --- a/apps/client/src/app/app.component.ts +++ b/apps/client/src/app/app.component.ts @@ -5,7 +5,13 @@ import { OnDestroy, OnInit } from '@angular/core'; -import { NavigationEnd, PRIMARY_OUTLET, Router } from '@angular/router'; +import { Title } from '@angular/platform-browser'; +import { + ActivatedRoute, + NavigationEnd, + PRIMARY_OUTLET, + Router +} from '@angular/router'; import { primaryColorHex, secondaryColorHex, @@ -36,6 +42,7 @@ export class AppComponent implements OnDestroy, OnInit { public currentYear = new Date().getFullYear(); public deviceType: string; public info: InfoItem; + public pageTitle: string; public user: User; public version = environment.version; @@ -47,6 +54,7 @@ export class AppComponent implements OnDestroy, OnInit { private deviceService: DeviceDetectorService, private materialCssVarsService: MaterialCssVarsService, private router: Router, + private title: Title, private tokenStorageService: TokenStorageService, private userService: UserService ) { @@ -66,6 +74,19 @@ export class AppComponent implements OnDestroy, OnInit { this.currentRoute = urlSegments[0].path; this.info = this.dataService.fetchInfo(); + + if (this.deviceType === 'mobile') { + setTimeout(() => { + const index = this.title.getTitle().indexOf('–'); + const title = + index === -1 + ? '' + : this.title.getTitle().substring(0, index).trim(); + this.pageTitle = title.length <= 15 ? title : 'Ghostfolio'; + + this.changeDetectorRef.markForCheck(); + }); + } }); this.userService.stateChanged diff --git a/apps/client/src/app/components/header/header.component.html b/apps/client/src/app/components/header/header.component.html index ce3b98dff..5e060972b 100644 --- a/apps/client/src/app/components/header/header.component.html +++ b/apps/client/src/app/components/header/header.component.html @@ -5,7 +5,7 @@ mat-button [routerLink]="['/']" > - + - + (); diff --git a/apps/client/src/app/components/home-market/home-market.html b/apps/client/src/app/components/home-market/home-market.html index 331d6f83c..de706aba8 100644 --- a/apps/client/src/app/components/home-market/home-market.html +++ b/apps/client/src/app/components/home-market/home-market.html @@ -1,5 +1,5 @@
-

Markets

+

Markets

diff --git a/apps/client/src/app/components/home-summary/home-summary.html b/apps/client/src/app/components/home-summary/home-summary.html index 9401db451..2f5eda537 100644 --- a/apps/client/src/app/components/home-summary/home-summary.html +++ b/apps/client/src/app/components/home-summary/home-summary.html @@ -1,10 +1,8 @@
+

Summary

- - Summary -
-

About Ghostfolio

+

About Ghostfolio

Ghostfolio is a lightweight wealth management application for diff --git a/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.html b/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.html index 44f76264e..3dff9fd8b 100644 --- a/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.html +++ b/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.html @@ -1,7 +1,7 @@

-

Privacy Policy

+

Privacy Policy

diff --git a/apps/client/src/app/pages/account/account-page.html b/apps/client/src/app/pages/account/account-page.html index e5f8a6cec..e41d8ef0f 100644 --- a/apps/client/src/app/pages/account/account-page.html +++ b/apps/client/src/app/pages/account/account-page.html @@ -1,7 +1,7 @@
-

Account

+

Account

diff --git a/apps/client/src/app/pages/accounts/accounts-page.html b/apps/client/src/app/pages/accounts/accounts-page.html index 228ccdd78..77c487f98 100644 --- a/apps/client/src/app/pages/accounts/accounts-page.html +++ b/apps/client/src/app/pages/accounts/accounts-page.html @@ -1,7 +1,7 @@
-

Accounts

+

Accounts

diff --git a/apps/client/src/app/pages/admin/admin-page-routing.module.ts b/apps/client/src/app/pages/admin/admin-page-routing.module.ts index 76fde5561..49ce08ad3 100644 --- a/apps/client/src/app/pages/admin/admin-page-routing.module.ts +++ b/apps/client/src/app/pages/admin/admin-page-routing.module.ts @@ -13,14 +13,21 @@ const routes: Routes = [ canActivate: [AuthGuard], children: [ { path: '', redirectTo: 'overview', pathMatch: 'full' }, - { path: 'jobs', component: AdminJobsComponent }, - { path: 'market-data', component: AdminMarketDataComponent }, - { path: 'overview', component: AdminOverviewComponent }, - { path: 'users', component: AdminUsersComponent } + { path: 'jobs', component: AdminJobsComponent, title: $localize`Jobs` }, + { + path: 'market-data', + component: AdminMarketDataComponent, + title: $localize`Market Data` + }, + { + path: 'overview', + component: AdminOverviewComponent, + title: $localize`Admin Control` + }, + { path: 'users', component: AdminUsersComponent, title: $localize`Users` } ], component: AdminPageComponent, - path: '', - title: $localize`Admin Control` + path: '' } ]; diff --git a/apps/client/src/app/pages/blog/blog-page.html b/apps/client/src/app/pages/blog/blog-page.html index ccaf820b6..2e8379955 100644 --- a/apps/client/src/app/pages/blog/blog-page.html +++ b/apps/client/src/app/pages/blog/blog-page.html @@ -1,7 +1,7 @@
-

Blog

+

Blog

diff --git a/apps/client/src/app/pages/faq/faq-page.html b/apps/client/src/app/pages/faq/faq-page.html index 459d8987d..de73f3c2a 100644 --- a/apps/client/src/app/pages/faq/faq-page.html +++ b/apps/client/src/app/pages/faq/faq-page.html @@ -1,7 +1,9 @@
-

Frequently Asked Questions (FAQ)

+

+ Frequently Asked Questions (FAQ) +

What is Ghostfolio? diff --git a/apps/client/src/app/pages/features/features-page.html b/apps/client/src/app/pages/features/features-page.html index 8dc184326..8d0488e7f 100644 --- a/apps/client/src/app/pages/features/features-page.html +++ b/apps/client/src/app/pages/features/features-page.html @@ -1,7 +1,7 @@
-

Features

+

Features

Check out the numerous features of Ghostfolio to diff --git a/apps/client/src/app/pages/home/home-page-routing.module.ts b/apps/client/src/app/pages/home/home-page-routing.module.ts index c0e64715d..5463f0777 100644 --- a/apps/client/src/app/pages/home/home-page-routing.module.ts +++ b/apps/client/src/app/pages/home/home-page-routing.module.ts @@ -13,14 +13,28 @@ const routes: Routes = [ canActivate: [AuthGuard], children: [ { path: '', redirectTo: 'overview', pathMatch: 'full' }, - { path: 'overview', component: HomeOverviewComponent }, - { path: 'holdings', component: HomeHoldingsComponent }, - { path: 'summary', component: HomeSummaryComponent }, - { path: 'market', component: HomeMarketComponent } + { + path: 'overview', + component: HomeOverviewComponent + }, + { + path: 'holdings', + component: HomeHoldingsComponent, + title: $localize`Holdings` + }, + { + path: 'summary', + component: HomeSummaryComponent, + title: $localize`Summary` + }, + { + path: 'market', + component: HomeMarketComponent, + title: $localize`Markets` + } ], component: HomePageComponent, - path: '', - title: $localize`Overview` + path: '' } ]; diff --git a/apps/client/src/app/pages/landing/landing-page.html b/apps/client/src/app/pages/landing/landing-page.html index 48b448dca..0c8f20bce 100644 --- a/apps/client/src/app/pages/landing/landing-page.html +++ b/apps/client/src/app/pages/landing/landing-page.html @@ -256,7 +256,7 @@

diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.html b/apps/client/src/app/pages/portfolio/activities/activities-page.html index cc12176b6..b810d777e 100644 --- a/apps/client/src/app/pages/portfolio/activities/activities-page.html +++ b/apps/client/src/app/pages/portfolio/activities/activities-page.html @@ -1,7 +1,7 @@
-

Activities

+

Activities

-

Allocations

+

Allocations

-

Analysis

+

Analysis

-

FIRE

+

FIRE

Calculator
-

- X-ray -

+

X-ray

Ghostfolio X-ray uses static analysis to identify potential issues and risks in your portfolio. diff --git a/apps/client/src/app/pages/portfolio/holdings/holdings-page.html b/apps/client/src/app/pages/portfolio/holdings/holdings-page.html index 4c8e5b9e5..77696fcbd 100644 --- a/apps/client/src/app/pages/portfolio/holdings/holdings-page.html +++ b/apps/client/src/app/pages/portfolio/holdings/holdings-page.html @@ -1,7 +1,7 @@

-

Holdings

+

Holdings

-

- Pricing Plans -

+

Pricing Plans

Our official Ghostfolio Premium cloud offering is the easiest way to diff --git a/apps/client/src/app/pages/public/public-page-routing.module.ts b/apps/client/src/app/pages/public/public-page-routing.module.ts index a648bed2a..d4c22c112 100644 --- a/apps/client/src/app/pages/public/public-page-routing.module.ts +++ b/apps/client/src/app/pages/public/public-page-routing.module.ts @@ -8,8 +8,7 @@ const routes: Routes = [ { canActivate: [AuthGuard], component: PublicPageComponent, - path: ':id', - title: $localize`Portfolio` + path: ':id' } ]; diff --git a/apps/client/src/app/pages/resources/resources-page.html b/apps/client/src/app/pages/resources/resources-page.html index d3d7fa74e..32223b6cf 100644 --- a/apps/client/src/app/pages/resources/resources-page.html +++ b/apps/client/src/app/pages/resources/resources-page.html @@ -1,7 +1,7 @@

-

Resources

+

Resources

Guides

diff --git a/apps/client/src/locales/messages.de.xlf b/apps/client/src/locales/messages.de.xlf index 19a2a3a50..f5a592696 100644 --- a/apps/client/src/locales/messages.de.xlf +++ b/apps/client/src/locales/messages.de.xlf @@ -18,7 +18,7 @@ Das Ausfallrisiko beim Börsenhandel kann erheblich sein. Es ist nicht ratsam, Geld zu investieren, welches du kurzfristig benötigst. apps/client/src/app/app.component.html - 55,56 + 56,57 @@ -462,7 +462,7 @@ Bitte Währung hinzufügen: apps/client/src/app/components/admin-overview/admin-overview.component.ts - 106 + 110 @@ -470,7 +470,7 @@ Möchtest du diesen Gutscheincode wirklich löschen? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 120 + 124 @@ -478,7 +478,7 @@ Möchtest du diese Währung wirklich löschen? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 133 + 137 @@ -486,7 +486,7 @@ Möchtest du den Cache wirklich leeren? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 150 + 154 @@ -494,7 +494,7 @@ Bitte gebe deine Systemmeldung ein: apps/client/src/app/components/admin-overview/admin-overview.component.ts - 180 + 184 @@ -754,7 +754,7 @@ apps/client/src/app/components/header/header.component.html - 268 + 271 @@ -766,7 +766,7 @@ apps/client/src/app/components/header/header.component.html - 257 + 260 @@ -798,7 +798,7 @@ Features apps/client/src/app/components/header/header.component.html - 246 + 249 @@ -806,7 +806,7 @@ Märkte apps/client/src/app/components/header/header.component.html - 280 + 283 apps/client/src/app/components/home-market/home-market.html @@ -826,7 +826,7 @@ Einloggen apps/client/src/app/components/header/header.component.ts - 118 + 119 apps/client/src/app/pages/webauthn/webauthn-page-routing.module.ts @@ -838,7 +838,7 @@ Ups! Falsches Sicherheits-Token. apps/client/src/app/components/header/header.component.ts - 132 + 133 @@ -866,7 +866,7 @@ Zusammenfassung apps/client/src/app/components/home-summary/home-summary.html - 6 + 2 @@ -894,7 +894,7 @@ apps/client/src/app/pages/register/register-page.html - 31,33 + 31,32 apps/client/src/app/pages/webauthn/webauthn-page.html @@ -906,7 +906,7 @@ Einloggen mit Internet Identity apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 30,32 + 30,34 @@ -914,7 +914,7 @@ Einloggen mit Google apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 37,43 + 40,46 @@ -922,7 +922,7 @@ Eingeloggt bleiben apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 46,52 + 49,55 @@ -930,11 +930,11 @@ Einloggen apps/client/src/app/components/header/header.component.html - 289 + 292 apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 56,60 + 59,63 @@ -1610,7 +1610,7 @@ Administration apps/client/src/app/pages/admin/admin-page-routing.module.ts - 23 + 25 @@ -1648,10 +1648,6 @@ Overview Übersicht - - apps/client/src/app/pages/home/home-page-routing.module.ts - 23 - apps/client/src/app/pages/zen/zen-page-routing.module.ts 19 @@ -1660,6 +1656,10 @@ Markets Märkte + + apps/client/src/app/pages/home/home-page-routing.module.ts + 33 + apps/client/src/app/pages/markets/markets-page-routing.module.ts 12 @@ -1770,7 +1770,7 @@ Zeitstrahl der Investitionen apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 160 + 166 @@ -1778,7 +1778,7 @@ Gewinner apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 34 + 40 @@ -1786,7 +1786,7 @@ Verlierer apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 80 + 86 @@ -1824,6 +1824,10 @@ Holdings Positionen + + apps/client/src/app/pages/home/home-page-routing.module.ts + 23 + apps/client/src/app/pages/portfolio/holdings/holdings-page-routing.module.ts 12 @@ -1992,10 +1996,6 @@ apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts 48 - - apps/client/src/app/pages/public/public-page-routing.module.ts - 12 - Currencies @@ -2034,7 +2034,7 @@ Weiter mit Internet Identity apps/client/src/app/pages/register/register-page.html - 41,43 + 41,44 @@ -2042,7 +2042,7 @@ Weiter mit Google apps/client/src/app/pages/register/register-page.html - 48,53 + 51,56 @@ -2242,7 +2242,7 @@ Registrieren apps/client/src/app/components/header/header.component.html - 297 + 300 @@ -2438,7 +2438,7 @@ Monatlich apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 49 + 54 @@ -2446,11 +2446,11 @@ Einlage apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 43 + 48 apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 53 + 59 libs/ui/src/lib/fire-calculator/fire-calculator.component.ts @@ -2520,6 +2520,10 @@ apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts 136 + + apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts + 111 + apps/client/src/app/pages/portfolio/holdings/holdings-page.component.ts 87 @@ -2670,7 +2674,7 @@ Portfolio Wertentwicklung apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 130 + 136 @@ -2958,7 +2962,7 @@ Zeitstrahl der Dividenden apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 197 + 203 @@ -2966,7 +2970,7 @@ Dividenden apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 39 + 43 @@ -3009,6 +3013,38 @@ 9 + + Jobs + Jobs + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 16 + + + + Market Data + Marktdaten + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 20 + + + + Users + Benutzer + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 27 + + + + Summary + Zusammenfassung + + apps/client/src/app/pages/home/home-page-routing.module.ts + 28 + + diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlf index a2dbbb6b7..834e9220a 100644 --- a/apps/client/src/locales/messages.es.xlf +++ b/apps/client/src/locales/messages.es.xlf @@ -19,7 +19,7 @@ El riesgo de pérdida en trading puede ser importante. No es aconsejable invertir dinero que puedas necesitar a corto plazo. apps/client/src/app/app.component.html - 55,56 + 56,57 @@ -463,7 +463,7 @@ Por favor, añade una divisa: apps/client/src/app/components/admin-overview/admin-overview.component.ts - 106 + 110 @@ -471,7 +471,7 @@ ¿Estás seguro de eliminar este cupón? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 120 + 124 @@ -479,7 +479,7 @@ ¿Estás seguro de eliminar esta divisa? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 133 + 137 @@ -487,7 +487,7 @@ ¿Estás seguro de limpiar la caché? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 150 + 154 @@ -495,7 +495,7 @@ Por favor, establece tu mensaje del sistema: apps/client/src/app/components/admin-overview/admin-overview.component.ts - 180 + 184 @@ -755,7 +755,7 @@ apps/client/src/app/components/header/header.component.html - 268 + 271 @@ -767,7 +767,7 @@ apps/client/src/app/components/header/header.component.html - 257 + 260 @@ -799,7 +799,7 @@ Funcionalidades apps/client/src/app/components/header/header.component.html - 246 + 249 @@ -807,7 +807,7 @@ Mercados apps/client/src/app/components/header/header.component.html - 280 + 283 apps/client/src/app/components/home-market/home-market.html @@ -827,7 +827,7 @@ Iniciar sesión apps/client/src/app/components/header/header.component.ts - 118 + 119 apps/client/src/app/pages/webauthn/webauthn-page-routing.module.ts @@ -839,7 +839,7 @@ Vaya! Token de seguridad incorrecto. apps/client/src/app/components/header/header.component.ts - 132 + 133 @@ -867,7 +867,7 @@ Resumen apps/client/src/app/components/home-summary/home-summary.html - 6 + 2 @@ -895,7 +895,7 @@ apps/client/src/app/pages/register/register-page.html - 31,33 + 31,32 apps/client/src/app/pages/webauthn/webauthn-page.html @@ -907,7 +907,7 @@ Iniciar sesión con Internet Identity apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 30,32 + 30,34 @@ -915,7 +915,7 @@ Iniciar sesión con Google apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 37,43 + 40,46 @@ -923,7 +923,7 @@ Seguir conectado apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 46,52 + 49,55 @@ -931,11 +931,11 @@ Iniciar sesión apps/client/src/app/components/header/header.component.html - 289 + 292 apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 56,60 + 59,63 @@ -1611,7 +1611,7 @@ Control de administrador apps/client/src/app/pages/admin/admin-page-routing.module.ts - 23 + 25 @@ -1649,10 +1649,6 @@ Overview Visión general - - apps/client/src/app/pages/home/home-page-routing.module.ts - 23 - apps/client/src/app/pages/zen/zen-page-routing.module.ts 19 @@ -1661,6 +1657,10 @@ Markets Mercados + + apps/client/src/app/pages/home/home-page-routing.module.ts + 33 + apps/client/src/app/pages/markets/markets-page-routing.module.ts 12 @@ -1771,7 +1771,7 @@ Cronología de la inversión apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 160 + 166 @@ -1779,7 +1779,7 @@ Lo mejor apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 34 + 40 @@ -1787,7 +1787,7 @@ Lo peor apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 80 + 86 @@ -1825,6 +1825,10 @@ Holdings Participaciones + + apps/client/src/app/pages/home/home-page-routing.module.ts + 23 + apps/client/src/app/pages/portfolio/holdings/holdings-page-routing.module.ts 12 @@ -1993,10 +1997,6 @@ apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts 48 - - apps/client/src/app/pages/public/public-page-routing.module.ts - 12 - Currencies @@ -2035,7 +2035,7 @@ Continuar con Internet Identity apps/client/src/app/pages/register/register-page.html - 41,43 + 41,44 @@ -2043,7 +2043,7 @@ Continuar con Google apps/client/src/app/pages/register/register-page.html - 48,53 + 51,56 @@ -2243,7 +2243,7 @@ Comenzar apps/client/src/app/components/header/header.component.html - 297 + 300 @@ -2447,11 +2447,11 @@ Depósito apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 43 + 48 apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 53 + 59 libs/ui/src/lib/fire-calculator/fire-calculator.component.ts @@ -2471,7 +2471,7 @@ Mensual apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 49 + 54 @@ -2513,6 +2513,10 @@ apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts 136 + + apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts + 111 + apps/client/src/app/pages/portfolio/holdings/holdings-page.component.ts 87 @@ -2671,7 +2675,7 @@ Evolución cartera apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 130 + 136 @@ -2959,7 +2963,7 @@ Dividend apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 39 + 43 @@ -2967,7 +2971,7 @@ Dividend Timeline apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 197 + 203 @@ -3010,6 +3014,38 @@ 9 + + Jobs + Jobs + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 16 + + + + Market Data + Market Data + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 20 + + + + Users + Users + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 27 + + + + Summary + Summary + + apps/client/src/app/pages/home/home-page-routing.module.ts + 28 + + diff --git a/apps/client/src/locales/messages.it.xlf b/apps/client/src/locales/messages.it.xlf index 7fa5ed803..9a96eaa0f 100644 --- a/apps/client/src/locales/messages.it.xlf +++ b/apps/client/src/locales/messages.it.xlf @@ -19,7 +19,7 @@ Il rischio di perdita nel trading può essere notevole. Non è consigliabile investire denaro di cui potresti avere bisogno a breve termine. apps/client/src/app/app.component.html - 55,56 + 56,57 @@ -463,7 +463,7 @@ Aggiungi una valuta: apps/client/src/app/components/admin-overview/admin-overview.component.ts - 106 + 110 @@ -471,7 +471,7 @@ Vuoi davvero eliminare questo buono? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 120 + 124 @@ -479,7 +479,7 @@ Vuoi davvero eliminare questa valuta? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 133 + 137 @@ -487,7 +487,7 @@ Vuoi davvero svuotare la cache? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 150 + 154 @@ -495,7 +495,7 @@ Imposta il messaggio di sistema: apps/client/src/app/components/admin-overview/admin-overview.component.ts - 180 + 184 @@ -755,7 +755,7 @@ apps/client/src/app/components/header/header.component.html - 268 + 271 @@ -767,7 +767,7 @@ apps/client/src/app/components/header/header.component.html - 257 + 260 @@ -799,7 +799,7 @@ Funzionalità apps/client/src/app/components/header/header.component.html - 246 + 249 @@ -807,7 +807,7 @@ Mercati apps/client/src/app/components/header/header.component.html - 280 + 283 apps/client/src/app/components/home-market/home-market.html @@ -827,7 +827,7 @@ Accedi apps/client/src/app/components/header/header.component.ts - 118 + 119 apps/client/src/app/pages/webauthn/webauthn-page-routing.module.ts @@ -839,7 +839,7 @@ Ops! Token di sicurezza errato. apps/client/src/app/components/header/header.component.ts - 132 + 133 @@ -867,7 +867,7 @@ Riepilogo apps/client/src/app/components/home-summary/home-summary.html - 6 + 2 @@ -895,7 +895,7 @@ apps/client/src/app/pages/register/register-page.html - 31,33 + 31,32 apps/client/src/app/pages/webauthn/webauthn-page.html @@ -907,7 +907,7 @@ Accedi con Internet Identity apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 30,32 + 30,34 @@ -915,7 +915,7 @@ Accedi con Google apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 37,43 + 40,46 @@ -923,7 +923,7 @@ Rimani connesso apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 46,52 + 49,55 @@ -931,11 +931,11 @@ Accedi apps/client/src/app/components/header/header.component.html - 289 + 292 apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 56,60 + 59,63 @@ -1611,7 +1611,7 @@ Controllo amministrativo apps/client/src/app/pages/admin/admin-page-routing.module.ts - 23 + 25 @@ -1649,10 +1649,6 @@ Overview Panoramica - - apps/client/src/app/pages/home/home-page-routing.module.ts - 23 - apps/client/src/app/pages/zen/zen-page-routing.module.ts 19 @@ -1661,6 +1657,10 @@ Markets Mercati + + apps/client/src/app/pages/home/home-page-routing.module.ts + 33 + apps/client/src/app/pages/markets/markets-page-routing.module.ts 12 @@ -1771,7 +1771,7 @@ Cronologia degli investimenti apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 160 + 166 @@ -1779,7 +1779,7 @@ In alto apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 34 + 40 @@ -1787,7 +1787,7 @@ In basso apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 80 + 86 @@ -1825,6 +1825,10 @@ Holdings Partecipazioni + + apps/client/src/app/pages/home/home-page-routing.module.ts + 23 + apps/client/src/app/pages/portfolio/holdings/holdings-page-routing.module.ts 12 @@ -1993,10 +1997,6 @@ apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts 48 - - apps/client/src/app/pages/public/public-page-routing.module.ts - 12 - Currencies @@ -2035,7 +2035,7 @@ Continua con Internet Identity apps/client/src/app/pages/register/register-page.html - 41,43 + 41,44 @@ -2043,7 +2043,7 @@ Continua con Google apps/client/src/app/pages/register/register-page.html - 48,53 + 51,56 @@ -2243,7 +2243,7 @@ Inizia apps/client/src/app/components/header/header.component.html - 297 + 300 @@ -2447,11 +2447,11 @@ Deposito apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 43 + 48 apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 53 + 59 libs/ui/src/lib/fire-calculator/fire-calculator.component.ts @@ -2471,7 +2471,7 @@ Mensile apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 49 + 54 @@ -2513,6 +2513,10 @@ apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts 136 + + apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts + 111 + apps/client/src/app/pages/portfolio/holdings/holdings-page.component.ts 87 @@ -2671,7 +2675,7 @@ Portfolio Evolution apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 130 + 136 @@ -2959,7 +2963,7 @@ Dividend apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 39 + 43 @@ -2967,7 +2971,7 @@ Dividend Timeline apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 197 + 203 @@ -3010,6 +3014,38 @@ 9 + + Jobs + Jobs + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 16 + + + + Market Data + Market Data + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 20 + + + + Users + Users + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 27 + + + + Summary + Summary + + apps/client/src/app/pages/home/home-page-routing.module.ts + 28 + + diff --git a/apps/client/src/locales/messages.nl.xlf b/apps/client/src/locales/messages.nl.xlf index f606c08b5..3ada0affb 100644 --- a/apps/client/src/locales/messages.nl.xlf +++ b/apps/client/src/locales/messages.nl.xlf @@ -18,7 +18,7 @@ Het risico van verlies in de handel kan aanzienlijk zijn. Het is niet raadzaam om geld te beleggen dat u op korte termijn nodig kunt hebben. apps/client/src/app/app.component.html - 55,56 + 56,57 @@ -462,7 +462,7 @@ Voeg een valuta toe: apps/client/src/app/components/admin-overview/admin-overview.component.ts - 106 + 110 @@ -470,7 +470,7 @@ Wilt u deze coupon echt verwijderen? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 120 + 124 @@ -478,7 +478,7 @@ Wilt u deze valuta echt verwijderen? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 133 + 137 @@ -486,7 +486,7 @@ Wilt u echt de cache legen? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 150 + 154 @@ -494,7 +494,7 @@ Stel uw systeemboodschap in: apps/client/src/app/components/admin-overview/admin-overview.component.ts - 180 + 184 @@ -754,7 +754,7 @@ apps/client/src/app/components/header/header.component.html - 268 + 271 @@ -766,7 +766,7 @@ apps/client/src/app/components/header/header.component.html - 257 + 260 @@ -798,7 +798,7 @@ Kenmerken apps/client/src/app/components/header/header.component.html - 246 + 249 @@ -806,7 +806,7 @@ Markten apps/client/src/app/components/header/header.component.html - 280 + 283 apps/client/src/app/components/home-market/home-market.html @@ -826,7 +826,7 @@ Aanmelden apps/client/src/app/components/header/header.component.ts - 118 + 119 apps/client/src/app/pages/webauthn/webauthn-page-routing.module.ts @@ -838,7 +838,7 @@ Oeps! Onjuiste beveiligingstoken. apps/client/src/app/components/header/header.component.ts - 132 + 133 @@ -866,7 +866,7 @@ Samenvatting apps/client/src/app/components/home-summary/home-summary.html - 6 + 2 @@ -894,7 +894,7 @@ apps/client/src/app/pages/register/register-page.html - 31,33 + 31,32 apps/client/src/app/pages/webauthn/webauthn-page.html @@ -906,7 +906,7 @@ Aanmelden met Internet Identity apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 30,32 + 30,34 @@ -914,7 +914,7 @@ Aanmelden met Google apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 37,43 + 40,46 @@ -922,7 +922,7 @@ Aangemeld blijven apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 46,52 + 49,55 @@ -930,11 +930,11 @@ Aanmelden apps/client/src/app/components/header/header.component.html - 289 + 292 apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 56,60 + 59,63 @@ -1610,7 +1610,7 @@ Beheerderscontrole apps/client/src/app/pages/admin/admin-page-routing.module.ts - 23 + 25 @@ -1648,10 +1648,6 @@ Overview Overzicht - - apps/client/src/app/pages/home/home-page-routing.module.ts - 23 - apps/client/src/app/pages/zen/zen-page-routing.module.ts 19 @@ -1660,6 +1656,10 @@ Markets Markten + + apps/client/src/app/pages/home/home-page-routing.module.ts + 33 + apps/client/src/app/pages/markets/markets-page-routing.module.ts 12 @@ -1770,7 +1770,7 @@ Tijdlijn investeringen apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 160 + 166 @@ -1778,7 +1778,7 @@ Top apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 34 + 40 @@ -1786,7 +1786,7 @@ Onder apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 80 + 86 @@ -1824,6 +1824,10 @@ Holdings Participaties + + apps/client/src/app/pages/home/home-page-routing.module.ts + 23 + apps/client/src/app/pages/portfolio/holdings/holdings-page-routing.module.ts 12 @@ -1992,10 +1996,6 @@ apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts 48 - - apps/client/src/app/pages/public/public-page-routing.module.ts - 12 - Currencies @@ -2034,7 +2034,7 @@ Ga verder met Internet Identity apps/client/src/app/pages/register/register-page.html - 41,43 + 41,44 @@ -2042,7 +2042,7 @@ Verder met Google apps/client/src/app/pages/register/register-page.html - 48,53 + 51,56 @@ -2242,7 +2242,7 @@ Aan de slag apps/client/src/app/components/header/header.component.html - 297 + 300 @@ -2446,11 +2446,11 @@ Storting apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 43 + 48 apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 53 + 59 libs/ui/src/lib/fire-calculator/fire-calculator.component.ts @@ -2470,7 +2470,7 @@ Maandelijks apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 49 + 54 @@ -2512,6 +2512,10 @@ apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts 136 + + apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts + 111 + apps/client/src/app/pages/portfolio/holdings/holdings-page.component.ts 87 @@ -2670,7 +2674,7 @@ Portfolio Evolution apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 130 + 136 @@ -2958,7 +2962,7 @@ Dividend apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 39 + 43 @@ -2966,7 +2970,7 @@ Dividend Timeline apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 197 + 203 @@ -3009,6 +3013,38 @@ 9 + + Jobs + Jobs + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 16 + + + + Market Data + Market Data + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 20 + + + + Users + Users + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 27 + + + + Summary + Summary + + apps/client/src/app/pages/home/home-page-routing.module.ts + 28 + + diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlf index f1acd8057..9bff15054 100644 --- a/apps/client/src/locales/messages.xlf +++ b/apps/client/src/locales/messages.xlf @@ -17,7 +17,7 @@ The risk of loss in trading can be substantial. It is not advisable to invest money you may need in the short term. apps/client/src/app/app.component.html - 55,56 + 56,57 @@ -427,35 +427,35 @@ Please add a currency: apps/client/src/app/components/admin-overview/admin-overview.component.ts - 106 + 110 Do you really want to delete this coupon? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 120 + 124 Do you really want to delete this currency? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 133 + 137 Do you really want to flush the cache? apps/client/src/app/components/admin-overview/admin-overview.component.ts - 150 + 154 Please set your system message: apps/client/src/app/components/admin-overview/admin-overview.component.ts - 180 + 184 @@ -689,7 +689,7 @@ apps/client/src/app/components/header/header.component.html - 268 + 271 @@ -700,7 +700,7 @@ apps/client/src/app/components/header/header.component.html - 257 + 260 @@ -728,14 +728,14 @@ Features apps/client/src/app/components/header/header.component.html - 246 + 249 Markets apps/client/src/app/components/header/header.component.html - 280 + 283 apps/client/src/app/components/home-market/home-market.html @@ -753,7 +753,7 @@ Sign in apps/client/src/app/components/header/header.component.ts - 118 + 119 apps/client/src/app/pages/webauthn/webauthn-page-routing.module.ts @@ -764,7 +764,7 @@ Oops! Incorrect Security Token. apps/client/src/app/components/header/header.component.ts - 132 + 133 @@ -789,7 +789,7 @@ Summary apps/client/src/app/components/home-summary/home-summary.html - 6 + 2 @@ -815,7 +815,7 @@ apps/client/src/app/pages/register/register-page.html - 31,33 + 31,32 apps/client/src/app/pages/webauthn/webauthn-page.html @@ -826,32 +826,32 @@ Sign in with Internet Identity apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 30,32 + 30,34 Sign in with Google apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 37,43 + 40,46 Stay signed in apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 46,52 + 49,55 Sign in apps/client/src/app/components/header/header.component.html - 289 + 292 apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html - 56,60 + 59,63 @@ -1454,7 +1454,7 @@ Admin Control apps/client/src/app/pages/admin/admin-page-routing.module.ts - 23 + 25 @@ -1487,10 +1487,6 @@ Overview - - apps/client/src/app/pages/home/home-page-routing.module.ts - 23 - apps/client/src/app/pages/zen/zen-page-routing.module.ts 19 @@ -1498,6 +1494,10 @@ Markets + + apps/client/src/app/pages/home/home-page-routing.module.ts + 33 + apps/client/src/app/pages/markets/markets-page-routing.module.ts 12 @@ -1595,21 +1595,21 @@ Investment Timeline apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 160 + 166 Top apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 34 + 40 Bottom apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 80 + 86 @@ -1642,6 +1642,10 @@ Holdings + + apps/client/src/app/pages/home/home-page-routing.module.ts + 23 + apps/client/src/app/pages/portfolio/holdings/holdings-page-routing.module.ts 12 @@ -1795,10 +1799,6 @@ apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts 48 - - apps/client/src/app/pages/public/public-page-routing.module.ts - 12 - Currencies @@ -1832,14 +1832,14 @@ Continue with Internet Identity apps/client/src/app/pages/register/register-page.html - 41,43 + 41,44 Continue with Google apps/client/src/app/pages/register/register-page.html - 48,53 + 51,56 @@ -2014,7 +2014,7 @@ Get started apps/client/src/app/components/header/header.component.html - 297 + 300 @@ -2198,11 +2198,11 @@ Deposit apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 43 + 48 apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 53 + 59 libs/ui/src/lib/fire-calculator/fire-calculator.component.ts @@ -2220,7 +2220,7 @@ Monthly apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 49 + 54 @@ -2257,6 +2257,10 @@ apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts 136 + + apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts + 111 + apps/client/src/app/pages/portfolio/holdings/holdings-page.component.ts 87 @@ -2396,7 +2400,7 @@ Portfolio Evolution apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 130 + 136 @@ -2650,7 +2654,7 @@ Dividend Timeline apps/client/src/app/pages/portfolio/analysis/analysis-page.html - 197 + 203 @@ -2664,7 +2668,7 @@ Dividend apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts - 39 + 43 @@ -2695,6 +2699,34 @@ 94,99 + + Jobs + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 16 + + + + Users + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 27 + + + + Summary + + apps/client/src/app/pages/home/home-page-routing.module.ts + 28 + + + + Market Data + + apps/client/src/app/pages/admin/admin-page-routing.module.ts + 20 + + diff --git a/libs/ui/src/lib/logo/logo.component.html b/libs/ui/src/lib/logo/logo.component.html index 71524fb6f..313a16c79 100644 --- a/libs/ui/src/lib/logo/logo.component.html +++ b/libs/ui/src/lib/logo/logo.component.html @@ -1,4 +1,4 @@ - Ghostfolio{{ label ?? 'Ghostfolio' }} diff --git a/libs/ui/src/lib/logo/logo.component.scss b/libs/ui/src/lib/logo/logo.component.scss index 85315c55d..176f46126 100644 --- a/libs/ui/src/lib/logo/logo.component.scss +++ b/libs/ui/src/lib/logo/logo.component.scss @@ -1,12 +1,12 @@ :host { + .label { + font-weight: 600; + } + .logo { background-color: rgba(var(--dark-primary-text)); mask: url('/assets/ghost.svg') no-repeat center; } - - .name { - font-weight: 600; - } } :host-context(.is-dark-theme) { @@ -16,23 +16,23 @@ } :host-context(.large) { + .label { + font-size: 3rem; + } + .logo { height: 2.5rem; width: 2.5rem; } - - .name { - font-size: 3rem; - } } :host-context(.medium) { + .label { + font-size: 1.5rem; + } + .logo { height: 1.5rem; width: 1.5rem; } - - .name { - font-size: 1.5rem; - } } diff --git a/libs/ui/src/lib/logo/logo.component.stories.ts b/libs/ui/src/lib/logo/logo.component.stories.ts index ca9530eb8..196043eb3 100644 --- a/libs/ui/src/lib/logo/logo.component.stories.ts +++ b/libs/ui/src/lib/logo/logo.component.stories.ts @@ -24,7 +24,7 @@ Large.args = { size: 'large' }; -export const NoName = Template.bind({}); -NoName.args = { - hideName: true +export const NoLabel = Template.bind({}); +NoLabel.args = { + showLabel: false }; diff --git a/libs/ui/src/lib/logo/logo.component.ts b/libs/ui/src/lib/logo/logo.component.ts index 97947891e..ecb3885dc 100644 --- a/libs/ui/src/lib/logo/logo.component.ts +++ b/libs/ui/src/lib/logo/logo.component.ts @@ -2,8 +2,7 @@ import { ChangeDetectionStrategy, Component, HostBinding, - Input, - OnInit + Input } from '@angular/core'; @Component({ @@ -12,13 +11,10 @@ import { templateUrl: './logo.component.html', styleUrls: ['./logo.component.scss'] }) -export class LogoComponent implements OnInit { +export class LogoComponent { @HostBinding('class') @Input() size: 'large' | 'medium' = 'medium'; - @Input() hideName = false; + @Input() label: string; + @Input() showLabel = true; public constructor() {} - - public ngOnInit() { - this.hideName = this.hideName ?? false; - } } diff --git a/libs/ui/src/lib/logo/logo.module.ts b/libs/ui/src/lib/logo/logo.module.ts index bb0fe18a0..ced9bae30 100644 --- a/libs/ui/src/lib/logo/logo.module.ts +++ b/libs/ui/src/lib/logo/logo.module.ts @@ -7,7 +7,6 @@ import { LogoComponent } from './logo.component'; declarations: [LogoComponent], exports: [LogoComponent], imports: [CommonModule], - providers: [], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) export class GfLogoModule {} diff --git a/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.html b/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.html index 9f30d437a..103b21078 100644 --- a/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.html +++ b/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.html @@ -1,13 +1,13 @@