From 40b67778149bd3015a9229fb56ec1a478903e684 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sun, 28 Jan 2024 09:58:38 +0100
Subject: [PATCH] Add upgrade plan button (#2937)

---
 apps/api/src/app/user/user.service.ts         |  8 +++---
 .../components/header/header.component.html   | 26 +++++++++++++++++++
 .../app/components/header/header.module.ts    |  2 ++
 .../user-account-membership.html              |  4 +--
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts
index a4812c136..734495474 100644
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@@ -219,18 +219,18 @@ export class UserService {
           new Date(),
           user.createdAt
         );
-        let frequency = 15;
+        let frequency = 10;
 
         if (daysSinceRegistration > 365) {
           frequency = 2;
         } else if (daysSinceRegistration > 180) {
           frequency = 3;
         } else if (daysSinceRegistration > 60) {
-          frequency = 5;
+          frequency = 4;
         } else if (daysSinceRegistration > 30) {
-          frequency = 8;
+          frequency = 6;
         } else if (daysSinceRegistration > 15) {
-          frequency = 12;
+          frequency = 8;
         }
 
         if (Analytics?.activityCount % frequency === 1) {
diff --git a/apps/client/src/app/components/header/header.component.html b/apps/client/src/app/components/header/header.component.html
index c4a361057..e192d7fee 100644
--- a/apps/client/src/app/components/header/header.component.html
+++ b/apps/client/src/app/components/header/header.component.html
@@ -165,6 +165,32 @@
           />
         </button>
         <mat-menu #accountMenu="matMenu" xPosition="before">
+          <ng-container
+            *ngIf="
+              hasPermissionForSubscription &&
+              user?.subscription?.type === 'Basic'
+            "
+          >
+            <a class="d-flex" mat-menu-item [routerLink]="routerLinkPricing"
+              ><span class="align-items-center d-flex"
+                ><span
+                  ><ng-container
+                    *ngIf="user.subscription.offer === 'default'"
+                    i18n
+                    >Upgrade Plan</ng-container
+                  >
+                  <ng-container
+                    *ngIf="user.subscription.offer === 'renewal'"
+                    i18n
+                    >Renew Plan</ng-container
+                  ></span
+                >
+                <gf-premium-indicator
+                  class="d-inline-block ml-1"
+                  [enableLink]="false" /></span
+            ></a>
+            <hr class="m-0" />
+          </ng-container>
           <ng-container *ngIf="user?.access?.length > 0">
             <button mat-menu-item (click)="impersonateAccount(null)">
               <span class="align-items-center d-flex">
diff --git a/apps/client/src/app/components/header/header.module.ts b/apps/client/src/app/components/header/header.module.ts
index 9ddf95de5..6ea60f8b6 100644
--- a/apps/client/src/app/components/header/header.module.ts
+++ b/apps/client/src/app/components/header/header.module.ts
@@ -7,6 +7,7 @@ import { RouterModule } from '@angular/router';
 import { LoginWithAccessTokenDialogModule } from '@ghostfolio/client/components/login-with-access-token-dialog/login-with-access-token-dialog.module';
 import { GfAssistantModule } from '@ghostfolio/ui/assistant';
 import { GfLogoModule } from '@ghostfolio/ui/logo';
+import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
 
 import { HeaderComponent } from './header.component';
 
@@ -17,6 +18,7 @@ import { HeaderComponent } from './header.component';
     CommonModule,
     GfAssistantModule,
     GfLogoModule,
+    GfPremiumIndicatorModule,
     LoginWithAccessTokenDialogModule,
     MatButtonModule,
     MatMenuModule,
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 df273e4f7..55fc3ca79 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
@@ -15,10 +15,10 @@
           >
             <button color="primary" mat-flat-button (click)="onCheckout()">
               <ng-container *ngIf="user.subscription.offer === 'default'" i18n
-                >Upgrade</ng-container
+                >Upgrade Plan</ng-container
               >
               <ng-container *ngIf="user.subscription.offer === 'renewal'" i18n
-                >Renew</ng-container
+                >Renew Plan</ng-container
               >
             </button>
             <div *ngIf="price" class="mt-1 text-center">