diff --git a/apps/client/src/app/components/user-account-membership/user-account-membership.html b/apps/client/src/app/components/user-account-membership/user-account-membership.html index 1681e3e16..191c63184 100644 --- a/apps/client/src/app/components/user-account-membership/user-account-membership.html +++ b/apps/client/src/app/components/user-account-membership/user-account-membership.html @@ -2,21 +2,13 @@

Membership

+
- -
- Valid until {{ - user?.subscription?.expiresAt | date: defaultDateFormat }} -
-
diff --git a/apps/client/src/app/pages/about/overview/about-overview-page.module.ts b/apps/client/src/app/pages/about/overview/about-overview-page.module.ts index 8bdd8dda7..594f5b362 100644 --- a/apps/client/src/app/pages/about/overview/about-overview-page.module.ts +++ b/apps/client/src/app/pages/about/overview/about-overview-page.module.ts @@ -2,7 +2,6 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { RouterModule } from '@angular/router'; -import { GfMembershipCardModule } from '@ghostfolio/ui/membership-card'; import { AboutOverviewPageRoutingModule } from './about-overview-page-routing.module'; import { AboutOverviewPageComponent } from './about-overview-page.component'; @@ -12,7 +11,6 @@ import { AboutOverviewPageComponent } from './about-overview-page.component'; imports: [ AboutOverviewPageRoutingModule, CommonModule, - GfMembershipCardModule, MatButtonModule, RouterModule ], diff --git a/libs/ui/src/lib/logo/logo.component.html b/libs/ui/src/lib/logo/logo.component.html index 313a16c79..3e5ed230d 100644 --- a/libs/ui/src/lib/logo/logo.component.html +++ b/libs/ui/src/lib/logo/logo.component.html @@ -1,4 +1,8 @@ + > {{ label ?? 'Ghostfolio' }} diff --git a/libs/ui/src/lib/logo/logo.component.ts b/libs/ui/src/lib/logo/logo.component.ts index ecb3885dc..648e771dd 100644 --- a/libs/ui/src/lib/logo/logo.component.ts +++ b/libs/ui/src/lib/logo/logo.component.ts @@ -13,6 +13,7 @@ import { }) export class LogoComponent { @HostBinding('class') @Input() size: 'large' | 'medium' = 'medium'; + @Input() color: string; @Input() label: string; @Input() showLabel = true; diff --git a/libs/ui/src/lib/membership-card/membership-card.component.html b/libs/ui/src/lib/membership-card/membership-card.component.html index 10fa116cf..048a6b79a 100644 --- a/libs/ui/src/lib/membership-card/membership-card.component.html +++ b/libs/ui/src/lib/membership-card/membership-card.component.html @@ -1,19 +1,25 @@ -
-
- +
+
-
-

Card Holder

-

{{ name }}

+
+
Membership
+
{{ name }}
-
-

Expires

-

- {{ expiresAt | date: 'MM/yy' }} -

+
+
Valid until
+
+ {{ expiresAt }} +
-
+ diff --git a/libs/ui/src/lib/membership-card/membership-card.component.scss b/libs/ui/src/lib/membership-card/membership-card.component.scss index 9c9e2e2c8..e9a83a67b 100644 --- a/libs/ui/src/lib/membership-card/membership-card.component.scss +++ b/libs/ui/src/lib/membership-card/membership-card.component.scss @@ -1,23 +1,24 @@ :host { display: block; + max-width: 25rem; .card-item { - max-width: 430px; - height: 270px; - border-radius: 15px; + aspect-ratio: 1.586; + background-color: #343a40 !important; + border-radius: 1rem; + box-shadow: 0 1px 6px rgba(0, 0, 0, 0.3); + + &.premium { + background-color: #1d2124 !important; + } .card-item-heading { - opacity: 0.7; font-size: 13px; - margin-bottom: 5px; } .card-item-name { + color: rgba(var(--light-primary-text)); font-size: 18px; - white-space: nowrap; - max-width: 100%; - text-transform: uppercase; - margin-bottom: 3px; } } } diff --git a/libs/ui/src/lib/membership-card/membership-card.component.ts b/libs/ui/src/lib/membership-card/membership-card.component.ts index 1413a7f29..0ae760aba 100644 --- a/libs/ui/src/lib/membership-card/membership-card.component.ts +++ b/libs/ui/src/lib/membership-card/membership-card.component.ts @@ -7,6 +7,8 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; templateUrl: './membership-card.component.html' }) export class MembershipCardComponent { - @Input() public expiresAt: Date; + @Input() public expiresAt: string; @Input() public name: string; + + public routerLinkPricing = ['/' + $localize`pricing`]; } diff --git a/libs/ui/src/lib/membership-card/membership-card.module.ts b/libs/ui/src/lib/membership-card/membership-card.module.ts index 99f32870e..4f51cc756 100644 --- a/libs/ui/src/lib/membership-card/membership-card.module.ts +++ b/libs/ui/src/lib/membership-card/membership-card.module.ts @@ -1,13 +1,14 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { GfLogoModule } from '@ghostfolio/ui/logo'; import { MembershipCardComponent } from './membership-card.component'; -import { GfLogoModule } from '@ghostfolio/ui/logo'; @NgModule({ declarations: [MembershipCardComponent], exports: [MembershipCardComponent], - imports: [CommonModule, GfLogoModule], + imports: [CommonModule, GfLogoModule, RouterModule], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) export class GfMembershipCardModule {}