Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/add reusable premium indicator component (#1041)

Thomas Kaul069ddcc6b2b2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfba98d143..0327fafe0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Added an icon and name column to the positions table
+- Added a reusable premium indicator component
### Changed
diff --git a/apps/client/src/app/components/admin-users/admin-users.html b/apps/client/src/app/components/admin-users/admin-users.html
index fab2e30102..39f778b2bf 100644
--- a/apps/client/src/app/components/admin-users/admin-users.html
+++ b/apps/client/src/app/components/admin-users/admin-users.html
@@ -35,11 +35,10 @@
>{{ userItem.alias || (userItem.id | slice:0:5) +
'...' }}</span
>
- <ion-icon
+ <gf-premium-indicator
*ngIf="userItem?.subscription?.type === 'Premium'"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon>
+ class="ml-1"
+ ></gf-premium-indicator>
</div>
</td>
<td class="mat-cell px-1 py-2 text-right">
diff --git a/apps/client/src/app/components/admin-users/admin-users.module.ts b/apps/client/src/app/components/admin-users/admin-users.module.ts
index 44b9696a3f..8c381b205a 100644
--- a/apps/client/src/app/components/admin-users/admin-users.module.ts
+++ b/apps/client/src/app/components/admin-users/admin-users.module.ts
@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatMenuModule } from '@angular/material/menu';
+import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
import { GfValueModule } from '@ghostfolio/ui/value';
import { AdminUsersComponent } from './admin-users.component';
@@ -9,7 +10,13 @@ import { AdminUsersComponent } from './admin-users.component';
@NgModule({
declarations: [AdminUsersComponent],
exports: [],
- imports: [CommonModule, GfValueModule, MatButtonModule, MatMenuModule],
+ imports: [
+ CommonModule,
+ GfPremiumIndicatorModule,
+ GfValueModule,
+ MatButtonModule,
+ MatMenuModule
+ ],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
export class GfAdminUsersModule {}
diff --git a/apps/client/src/app/pages/account/account-page.html b/apps/client/src/app/pages/account/account-page.html
index ed99abc568..5a312fc097 100644
--- a/apps/client/src/app/pages/account/account-page.html
+++ b/apps/client/src/app/pages/account/account-page.html
@@ -19,11 +19,10 @@
<a [routerLink]="['/pricing']"
>{{ user?.subscription?.type }}</a
>
- <ion-icon
+ <gf-premium-indicator
*ngIf="user?.subscription?.type === 'Premium'"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon>
+ class="ml-1"
+ ></gf-premium-indicator>
</div>
<div *ngIf="user?.subscription?.type === 'Premium'">
Valid until {{ user?.subscription?.expiresAt | date:
@@ -56,11 +55,11 @@
class="mr-2 my-2"
mat-stroked-button
[href]="trySubscriptionMail"
- ><span i18n>Try Premium</span
- ><ion-icon
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon
+ ><span i18n>Try Premium</span>
+ <gf-premium-indicator
+ class="d-inline-block ml-1"
+ [enableLink]="false"
+ ></gf-premium-indicator
></a>
<a
class="mr-2 my-2"
diff --git a/apps/client/src/app/pages/account/account-page.module.ts b/apps/client/src/app/pages/account/account-page.module.ts
index d583e47cd7..fbe5700a5d 100644
--- a/apps/client/src/app/pages/account/account-page.module.ts
+++ b/apps/client/src/app/pages/account/account-page.module.ts
@@ -10,6 +10,7 @@ import { MatSelectModule } from '@angular/material/select';
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import { RouterModule } from '@angular/router';
import { GfPortfolioAccessTableModule } from '@ghostfolio/client/components/access-table/access-table.module';
+import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
import { GfValueModule } from '@ghostfolio/ui/value';
import { AccountPageRoutingModule } from './account-page-routing.module';
@@ -25,6 +26,7 @@ import { GfCreateOrUpdateAccessDialogModule } from './create-or-update-access-di
FormsModule,
GfCreateOrUpdateAccessDialogModule,
GfPortfolioAccessTableModule,
+ GfPremiumIndicatorModule,
GfValueModule,
MatButtonModule,
MatCardModule,
diff --git a/apps/client/src/app/pages/features/features-page.html b/apps/client/src/app/pages/features/features-page.html
index 32258a3cf3..6b9c2b105e 100644
--- a/apps/client/src/app/pages/features/features-page.html
+++ b/apps/client/src/app/pages/features/features-page.html
@@ -108,11 +108,10 @@
<div class="flex-grow-1">
<h4 class="align-items-center d-flex">
<span i18n>Portfolio Calculations</span>
- <ion-icon
+ <gf-premium-indicator
*ngIf="hasPermissionForSubscription"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon>
+ class="ml-1"
+ ></gf-premium-indicator>
</h4>
<p class="m-0">
Check the rate of return of your portfolio for
@@ -127,11 +126,10 @@
<div class="flex-grow-1">
<h4 class="align-items-center d-flex">
<span i18n>Portfolio Allocations</span>
- <ion-icon
+ <gf-premium-indicator
*ngIf="hasPermissionForSubscription"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon>
+ class="ml-1"
+ ></gf-premium-indicator>
</h4>
<p class="m-0">
Check the allocations of your portfolio by account, asset class,
@@ -169,10 +167,7 @@
<div class="flex-grow-1">
<h4 class="align-items-center d-flex">
<span i18n>Market Mood</span>
- <ion-icon
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon>
+ <gf-premium-indicator class="ml-1"></gf-premium-indicator>
</h4>
<p class="m-0">
Check the current market mood (<a [routerLink]="['/resources']"
@@ -187,11 +182,10 @@
<div class="flex-grow-1">
<h4 class="align-items-center d-flex">
<span i18n>Static Analysis</span>
- <ion-icon
+ <gf-premium-indicator
*ngIf="hasPermissionForSubscription"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon>
+ class="ml-1"
+ ></gf-premium-indicator>
</h4>
<p class="m-0">
Identify potential risks in your portfolio with Ghostfolio
diff --git a/apps/client/src/app/pages/features/features-page.module.ts b/apps/client/src/app/pages/features/features-page.module.ts
index 2a42043045..9c90ccc00d 100644
--- a/apps/client/src/app/pages/features/features-page.module.ts
+++ b/apps/client/src/app/pages/features/features-page.module.ts
@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
+import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
import { FeaturesPageRoutingModule } from './features-page-routing.module';
import { FeaturesPageComponent } from './features-page.component';
@@ -9,8 +10,9 @@ import { FeaturesPageComponent } from './features-page.component';
@NgModule({
declarations: [FeaturesPageComponent],
imports: [
- FeaturesPageRoutingModule,
CommonModule,
+ FeaturesPageRoutingModule,
+ GfPremiumIndicatorModule,
MatButtonModule,
MatCardModule
],
diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
index 9a71dbe276..e4cc809086 100644
--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
@@ -37,12 +37,11 @@
<mat-card class="mb-3">
<mat-card-header class="overflow-hidden w-100">
<mat-card-title class="align-items-center d-flex text-truncate"
- ><span i18n>By Currency</span
- ><ion-icon
+ ><span i18n>By Currency</span>
+ <gf-premium-indicator
*ngIf="user?.subscription?.type === 'Basic'"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon
+ class="ml-1"
+ ></gf-premium-indicator
></mat-card-title>
<gf-toggle
[defaultValue]="period"
@@ -67,11 +66,10 @@
<mat-card-header class="overflow-hidden w-100">
<mat-card-title class="align-items-center d-flex text-truncate"
><span i18n>By Asset Class</span
- ><ion-icon
+ ><gf-premium-indicator
*ngIf="user?.subscription?.type === 'Basic'"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon
+ class="ml-1"
+ ></gf-premium-indicator
></mat-card-title>
<gf-toggle
[defaultValue]="period"
@@ -96,11 +94,10 @@
<mat-card-header class="overflow-hidden w-100">
<mat-card-title class="align-items-center d-flex text-truncate"
><span i18n>By Position</span
- ><ion-icon
+ ><gf-premium-indicator
*ngIf="user?.subscription?.type === 'Basic'"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon
+ class="ml-1"
+ ></gf-premium-indicator
></mat-card-title>
<gf-toggle
[defaultValue]="period"
@@ -129,11 +126,10 @@
<mat-card-header class="overflow-hidden w-100">
<mat-card-title class="align-items-center d-flex text-truncate"
><span i18n>By Sector</span
- ><ion-icon
+ ><gf-premium-indicator
*ngIf="user?.subscription?.type === 'Basic'"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon
+ class="ml-1"
+ ></gf-premium-indicator
></mat-card-title>
<gf-toggle
[defaultValue]="period"
@@ -159,11 +155,10 @@
<mat-card-header class="overflow-hidden w-100">
<mat-card-title class="align-items-center d-flex text-truncate"
><span i18n>By Continent</span
- ><ion-icon
+ ><gf-premium-indicator
*ngIf="user?.subscription?.type === 'Basic'"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon
+ class="ml-1"
+ ></gf-premium-indicator
></mat-card-title>
<gf-toggle
[defaultValue]="period"
@@ -188,11 +183,10 @@
<mat-card-header class="overflow-hidden w-100">
<mat-card-title class="align-items-center d-flex text-truncate"
><span i18n>By Country</span
- ><ion-icon
+ ><gf-premium-indicator
*ngIf="user?.subscription?.type === 'Basic'"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon
+ class="ml-1"
+ ></gf-premium-indicator
></mat-card-title>
<gf-toggle
[defaultValue]="period"
@@ -220,11 +214,10 @@
<mat-card-header class="overflow-hidden w-100">
<mat-card-title class="align-items-center d-flex text-truncate"
><span i18n>Regions</span
- ><ion-icon
+ ><gf-premium-indicator
*ngIf="user?.subscription?.type === 'Basic'"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon
+ class="ml-1"
+ ></gf-premium-indicator
></mat-card-title>
<gf-toggle
[defaultValue]="period"
diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.module.ts b/apps/client/src/app/pages/portfolio/allocations/allocations-page.module.ts
index fc87917752..5b5d80216a 100644
--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.module.ts
+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.module.ts
@@ -6,6 +6,7 @@ import { GfToggleModule } from '@ghostfolio/client/components/toggle/toggle.modu
import { GfWorldMapChartModule } from '@ghostfolio/client/components/world-map-chart/world-map-chart.module';
import { GfActivitiesFilterModule } from '@ghostfolio/ui/activities-filter/activities-filter.module';
import { GfPortfolioProportionChartModule } from '@ghostfolio/ui/portfolio-proportion-chart/portfolio-proportion-chart.module';
+import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
import { GfValueModule } from '@ghostfolio/ui/value';
import { AllocationsPageRoutingModule } from './allocations-page-routing.module';
@@ -20,6 +21,7 @@ import { AllocationsPageComponent } from './allocations-page.component';
GfActivitiesFilterModule,
GfPortfolioProportionChartModule,
GfPositionsTableModule,
+ GfPremiumIndicatorModule,
GfToggleModule,
GfWorldMapChartModule,
GfValueModule,
diff --git a/apps/client/src/app/pages/portfolio/portfolio-page.html b/apps/client/src/app/pages/portfolio/portfolio-page.html
index f7bc75f91b..682504df5e 100644
--- a/apps/client/src/app/pages/portfolio/portfolio-page.html
+++ b/apps/client/src/app/pages/portfolio/portfolio-page.html
@@ -24,11 +24,10 @@
<mat-card class="d-flex flex-column h-100">
<h4 class="align-items-center d-flex">
<span i18n>Allocations</span>
- <ion-icon
+ <gf-premium-indicator
*ngIf="user?.subscription?.type === 'Basic'"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon>
+ class="ml-1"
+ ></gf-premium-indicator>
</h4>
<div class="flex-grow-1">
Check the allocations of your portfolio by account, asset class,
@@ -50,11 +49,10 @@
<mat-card class="d-flex flex-column h-100">
<h4 class="align-items-center d-flex">
<span i18n>Analysis</span>
- <ion-icon
+ <gf-premium-indicator
*ngIf="user?.subscription?.type === 'Basic'"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon>
+ class="ml-1"
+ ></gf-premium-indicator>
</h4>
<div class="flex-grow-1">
Ghostfolio Analysis visualizes your portfolio and shows your top and
@@ -76,11 +74,10 @@
<mat-card class="d-flex flex-column h-100">
<h4 class="align-items-center d-flex">
<span i18n>X-ray</span>
- <ion-icon
+ <gf-premium-indicator
*ngIf="user?.subscription?.type === 'Basic'"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon>
+ class="ml-1"
+ ></gf-premium-indicator>
</h4>
<div class="flex-grow-1">
Ghostfolio X-ray uses static analysis to identify potential issues and
@@ -98,11 +95,10 @@
<mat-card class="d-flex flex-column h-100">
<h4 class="align-items-center d-flex">
<span i18n>FIRE</span>
- <ion-icon
+ <gf-premium-indicator
*ngIf="user?.subscription?.type === 'Basic'"
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon>
+ class="ml-1"
+ ></gf-premium-indicator>
</h4>
<div class="flex-grow-1">
Ghostfolio FIRE calculates metrics for the
diff --git a/apps/client/src/app/pages/portfolio/portfolio-page.module.ts b/apps/client/src/app/pages/portfolio/portfolio-page.module.ts
index e997b372cd..4fe3fed6a8 100644
--- a/apps/client/src/app/pages/portfolio/portfolio-page.module.ts
+++ b/apps/client/src/app/pages/portfolio/portfolio-page.module.ts
@@ -3,6 +3,7 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { RouterModule } from '@angular/router';
+import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
import { PortfolioPageRoutingModule } from './portfolio-page-routing.module';
import { PortfolioPageComponent } from './portfolio-page.component';
@@ -12,6 +13,7 @@ import { PortfolioPageComponent } from './portfolio-page.component';
exports: [],
imports: [
CommonModule,
+ GfPremiumIndicatorModule,
MatButtonModule,
MatCardModule,
PortfolioPageRoutingModule,
diff --git a/apps/client/src/app/pages/pricing/pricing-page.html b/apps/client/src/app/pages/pricing/pricing-page.html
index 5730a4d5b9..428700acf5 100644
--- a/apps/client/src/app/pages/pricing/pricing-page.html
+++ b/apps/client/src/app/pages/pricing/pricing-page.html
@@ -125,10 +125,10 @@
<div class="flex-grow-1">
<h4 class="align-items-center d-flex">
<span i18n>Premium</span>
- <ion-icon
- class="ml-1 text-muted"
- name="diamond-outline"
- ></ion-icon>
+ <gf-premium-indicator
+ class="ml-1"
+ [enableLink]="false"
+ ></gf-premium-indicator>
</h4>
<p>
For ambitious investors who need the full picture of their
diff --git a/apps/client/src/app/pages/pricing/pricing-page.module.ts b/apps/client/src/app/pages/pricing/pricing-page.module.ts
index 02d59a364d..7c68a3c505 100644
--- a/apps/client/src/app/pages/pricing/pricing-page.module.ts
+++ b/apps/client/src/app/pages/pricing/pricing-page.module.ts
@@ -3,6 +3,7 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { RouterModule } from '@angular/router';
+import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
import { PricingPageRoutingModule } from './pricing-page-routing.module';
import { PricingPageComponent } from './pricing-page.component';
@@ -12,6 +13,7 @@ import { PricingPageComponent } from './pricing-page.component';
exports: [],
imports: [
CommonModule,
+ GfPremiumIndicatorModule,
MatButtonModule,
MatCardModule,
PricingPageRoutingModule,
diff --git a/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.stories.ts b/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.stories.ts
index e76e670eaf..4e26d00834 100644
--- a/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.stories.ts
+++ b/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.stories.ts
@@ -1,3 +1,4 @@
+import { RouterTestingModule } from '@angular/router/testing';
import { GfLogoModule } from '@ghostfolio/ui/logo';
import { Meta, Story, moduleMetadata } from '@storybook/angular';
@@ -8,7 +9,7 @@ export default {
component: NoTransactionsInfoComponent,
decorators: [
moduleMetadata({
- imports: [GfLogoModule]
+ imports: [GfLogoModule, RouterTestingModule]
})
]
} as Meta<NoTransactionsInfoComponent>;
diff --git a/libs/ui/src/lib/premium-indicator/index.ts b/libs/ui/src/lib/premium-indicator/index.ts
new file mode 100644
index 0000000000..593823bbd7
--- /dev/null
+++ b/libs/ui/src/lib/premium-indicator/index.ts
@@ -0,0 +1 @@
+export * from './premium-indicator.module';
diff --git a/libs/ui/src/lib/premium-indicator/premium-indicator.component.html b/libs/ui/src/lib/premium-indicator/premium-indicator.component.html
new file mode 100644
index 0000000000..69ce63f20e
--- /dev/null
+++ b/libs/ui/src/lib/premium-indicator/premium-indicator.component.html
@@ -0,0 +1,6 @@
+<a
+ class="align-items-center d-flex"
+ [ngStyle]="{ 'pointer-events': enableLink ? 'initial' : 'none' }"
+ [routerLink]="['/pricing']"
+ ><ion-icon class="text-muted" name="diamond-outline"></ion-icon
+></a>
diff --git a/libs/ui/src/lib/premium-indicator/premium-indicator.component.scss b/libs/ui/src/lib/premium-indicator/premium-indicator.component.scss
new file mode 100644
index 0000000000..5d4e87f30f
--- /dev/null
+++ b/libs/ui/src/lib/premium-indicator/premium-indicator.component.scss
@@ -0,0 +1,3 @@
+:host {
+ display: block;
+}
diff --git a/libs/ui/src/lib/premium-indicator/premium-indicator.component.stories.ts b/libs/ui/src/lib/premium-indicator/premium-indicator.component.stories.ts
new file mode 100644
index 0000000000..bdb9c65434
--- /dev/null
+++ b/libs/ui/src/lib/premium-indicator/premium-indicator.component.stories.ts
@@ -0,0 +1,29 @@
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { Meta, Story, moduleMetadata } from '@storybook/angular';
+
+import { PremiumIndicatorComponent } from './premium-indicator.component';
+
+export default {
+ title: 'Premium Indicator',
+ component: PremiumIndicatorComponent,
+ decorators: [
+ moduleMetadata({
+ imports: [CommonModule, RouterTestingModule]
+ })
+ ]
+} as Meta<PremiumIndicatorComponent>;
+
+const Template: Story<PremiumIndicatorComponent> = (
+ args: PremiumIndicatorComponent
+) => ({
+ props: args
+});
+
+export const Default = Template.bind({});
+Default.args = {};
+
+export const WithoutLink = Template.bind({});
+WithoutLink.args = {
+ enableLink: false
+};
diff --git a/libs/ui/src/lib/premium-indicator/premium-indicator.component.ts b/libs/ui/src/lib/premium-indicator/premium-indicator.component.ts
new file mode 100644
index 0000000000..3711a28dd9
--- /dev/null
+++ b/libs/ui/src/lib/premium-indicator/premium-indicator.component.ts
@@ -0,0 +1,13 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
+@Component({
+ selector: 'gf-premium-indicator',
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ templateUrl: './premium-indicator.component.html',
+ styleUrls: ['./premium-indicator.component.scss']
+})
+export class PremiumIndicatorComponent {
+ @Input() enableLink = true;
+
+ public constructor() {}
+}
diff --git a/libs/ui/src/lib/premium-indicator/premium-indicator.module.ts b/libs/ui/src/lib/premium-indicator/premium-indicator.module.ts
new file mode 100644
index 0000000000..87eeb2f972
--- /dev/null
+++ b/libs/ui/src/lib/premium-indicator/premium-indicator.module.ts
@@ -0,0 +1,14 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { PremiumIndicatorComponent } from './premium-indicator.component';
+
+@NgModule({
+ declarations: [PremiumIndicatorComponent],
+ exports: [PremiumIndicatorComponent],
+ imports: [CommonModule, RouterModule],
+ providers: [],
+ schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class GfPremiumIndicatorModule {}