Browse Source
Feature/add subscription expiration dates to the admin control panel (#1796)
* Add expiration date
* Update changelog
pull/1795/head^2
Thomas Kaul
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
13 additions and
1 deletions
-
CHANGELOG.md
-
apps/client/src/app/components/admin-users/admin-users.component.ts
-
apps/client/src/app/components/admin-users/admin-users.html
|
|
@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. |
|
|
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), |
|
|
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). |
|
|
|
|
|
|
|
## Unreleased |
|
|
|
|
|
|
|
### Added |
|
|
|
|
|
|
|
- Added the subscription expiration date to the users table of the admin control panel |
|
|
|
|
|
|
|
## 1.246.0 - 2023-03-18 |
|
|
|
|
|
|
|
### Added |
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; |
|
|
|
import { DataService } from '@ghostfolio/client/services/data.service'; |
|
|
|
import { UserService } from '@ghostfolio/client/services/user/user.service'; |
|
|
|
import { getEmojiFlag } from '@ghostfolio/common/helper'; |
|
|
|
import { getDateFormatString, getEmojiFlag } from '@ghostfolio/common/helper'; |
|
|
|
import { AdminData, InfoItem, User } from '@ghostfolio/common/interfaces'; |
|
|
|
import { hasPermission, permissions } from '@ghostfolio/common/permissions'; |
|
|
|
import { |
|
|
@ -18,6 +18,7 @@ import { takeUntil } from 'rxjs/operators'; |
|
|
|
templateUrl: './admin-users.html' |
|
|
|
}) |
|
|
|
export class AdminUsersComponent implements OnDestroy, OnInit { |
|
|
|
public defaultDateFormat: string; |
|
|
|
public getEmojiFlag = getEmojiFlag; |
|
|
|
public hasPermissionForSubscription: boolean; |
|
|
|
public info: InfoItem; |
|
|
@ -43,6 +44,10 @@ export class AdminUsersComponent implements OnDestroy, OnInit { |
|
|
|
.subscribe((state) => { |
|
|
|
if (state?.user) { |
|
|
|
this.user = state.user; |
|
|
|
|
|
|
|
this.defaultDateFormat = getDateFormatString( |
|
|
|
this.user.settings.locale |
|
|
|
); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
@ -53,6 +53,7 @@ |
|
|
|
*ngIf="userItem?.subscription?.type === 'Premium'" |
|
|
|
class="ml-1" |
|
|
|
[enableLink]="false" |
|
|
|
[title]="userItem.subscription.expiresAt | date: defaultDateFormat" |
|
|
|
></gf-premium-indicator> |
|
|
|
</div> |
|
|
|
</td> |
|
|
|