From 16fc5456e0b8ce9b6eebd7adfd5996138f3ae61e Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Thu, 19 Oct 2023 22:10:14 +0200
Subject: [PATCH] Refactoring

---
 .../user-account-membership.html              | 18 +++--------
 .../user-account-membership.module.ts         |  2 ++
 .../about/overview/about-overview-page.html   |  1 -
 .../overview/about-overview-page.module.ts    |  2 --
 libs/ui/src/lib/logo/logo.component.html      |  6 +++-
 libs/ui/src/lib/logo/logo.component.ts        |  1 +
 .../membership-card.component.html            | 32 +++++++++++--------
 .../membership-card.component.scss            | 19 +++++------
 .../membership-card.component.ts              |  4 ++-
 .../membership-card/membership-card.module.ts |  5 +--
 10 files changed, 48 insertions(+), 42 deletions(-)

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 @@
   <h1 class="d-none d-sm-block h3 mb-3 text-center" i18n>Membership</h1>
   <div class="row">
     <div class="col">
+      <gf-membership-card
+        class="mb-5 mx-auto"
+        [expiresAt]="(user?.subscription?.expiresAt | date: defaultDateFormat) ?? '∞'"
+        [name]="user?.subscription?.type"
+      ></gf-membership-card>
       <div class="d-flex">
         <div class="mx-auto">
-          <div class="align-items-center d-flex mb-1">
-            <a [routerLink]="routerLinkPricing"
-              >{{ user?.subscription?.type }}</a
-            >
-            <gf-premium-indicator
-              *ngIf="user?.subscription?.type === 'Premium'"
-              class="ml-1"
-            ></gf-premium-indicator>
-          </div>
-          <div *ngIf="user?.subscription?.type === 'Premium'">
-            <ng-container i18n>Valid until</ng-container> {{
-            user?.subscription?.expiresAt | date: defaultDateFormat }}
-          </div>
           <div *ngIf="user?.subscription?.type === 'Basic'">
             <ng-container
               *ngIf="hasPermissionForSubscription && hasPermissionToUpdateUserSettings"
diff --git a/apps/client/src/app/components/user-account-membership/user-account-membership.module.ts b/apps/client/src/app/components/user-account-membership/user-account-membership.module.ts
index bef027c62..abf2b4e77 100644
--- a/apps/client/src/app/components/user-account-membership/user-account-membership.module.ts
+++ b/apps/client/src/app/components/user-account-membership/user-account-membership.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
 import { RouterModule } from '@angular/router';
+import { GfMembershipCardModule } from '@ghostfolio/ui/membership-card';
 import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
 import { GfValueModule } from '@ghostfolio/ui/value';
 
@@ -13,6 +14,7 @@ import { UserAccountMembershipComponent } from './user-account-membership.compon
   exports: [UserAccountMembershipComponent],
   imports: [
     CommonModule,
+    GfMembershipCardModule,
     GfPremiumIndicatorModule,
     GfValueModule,
     MatButtonModule,
diff --git a/apps/client/src/app/pages/about/overview/about-overview-page.html b/apps/client/src/app/pages/about/overview/about-overview-page.html
index acfb04f57..a9bada763 100644
--- a/apps/client/src/app/pages/about/overview/about-overview-page.html
+++ b/apps/client/src/app/pages/about/overview/about-overview-page.html
@@ -155,5 +155,4 @@
       >
     </div>
   </div>
-  <gf-membership-card></gf-membership-card>
 </div>
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 @@
 <span class="align-items-center d-flex"
-  ><span class="d-inline-block logo mr-1"></span>
+  ><span
+    class="d-inline-block logo"
+    [ngClass]="{ 'mr-1': showLabel }"
+    [ngStyle]="{ 'background-color': color }"
+  ></span>
   <span *ngIf="showLabel" class="label">{{ label ?? 'Ghostfolio' }}</span></span
 >
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 @@
-<div
-  class="card-item d-flex flex-column justify-content-between px-3 py-4 bg-dark mx-auto"
+<a
+  class="card-item d-flex flex-column justify-content-between p-4"
+  [ngClass]="{ premium: name === 'Premium' }"
+  [routerLink]="routerLinkPricing"
 >
-  <div class="d-flex justify-content-end mr-2">
-    <gf-logo [showLabel]="false"></gf-logo>
+  <div class="d-flex justify-content-end">
+    <gf-logo
+      color="rgba(255, 255, 255, 1)"
+      size="large"
+      [showLabel]="false"
+    ></gf-logo>
   </div>
   <div class="d-flex justify-content-between">
-    <div class="px-3">
-      <p class="card-item-heading" i18n>Card Holder</p>
-      <p class="card-item-name line-height-1 text-truncate">{{ name }}</p>
+    <div>
+      <div class="card-item-heading mb-1 text-muted" i18n>Membership</div>
+      <div class="card-item-name line-height-1 text-truncate">{{ name }}</div>
     </div>
-    <div class="px-3">
-      <p class="card-item-heading" i18n>Expires</p>
-      <p class="card-item-name line-height-1 text-truncate">
-        {{ expiresAt | date: 'MM/yy' }}
-      </p>
+    <div>
+      <div class="card-item-heading mb-1 text-muted" i18n>Valid until</div>
+      <div class="card-item-name line-height-1 text-truncate">
+        {{ expiresAt }}
+      </div>
     </div>
   </div>
-</div>
+</a>
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 {}