Browse Source

Various improvements

pull/1637/head
Thomas 3 years ago
parent
commit
521fbd10aa
  1. 6
      apps/api/src/app/user/user.service.ts
  2. 2
      apps/client/src/app/app.module.ts
  3. 21
      apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts
  4. 2
      apps/client/src/app/pages/pricing/pricing-page.html

6
apps/api/src/app/user/user.service.ts

@ -173,10 +173,10 @@ export class UserService {
) {
currentPermissions.push(permissions.enableSubscriptionInterstitial);
}
}
if (user.subscription?.type === 'Premium') {
currentPermissions.push(permissions.reportDataGlitch);
if (user.subscription?.type === 'Premium') {
currentPermissions.push(permissions.reportDataGlitch);
}
}
if (this.configurationService.get('ENABLE_FEATURE_READ_ONLY_MODE')) {

2
apps/client/src/app/app.module.ts

@ -9,7 +9,6 @@ import {
MAT_DATE_LOCALE,
MatNativeDateModule
} from '@angular/material/core';
import { MatDialog, MatDialogModule } from '@angular/material/dialog';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { MatTooltipModule } from '@angular/material/tooltip';
import { BrowserModule } from '@angular/platform-browser';
@ -26,7 +25,6 @@ import { DateFormats } from './adapter/date-formats';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { GfHeaderModule } from './components/header/header.module';
import { SubscriptionInterstitialDialog } from './components/subscription-interstitial-dialog/subscription-interstitial-dialog.component';
import { GfSubscriptionInterstitialDialogModule } from './components/subscription-interstitial-dialog/subscription-interstitial-dialog.module';
import { authInterceptorProviders } from './core/auth.interceptor';
import { httpResponseInterceptorProviders } from './core/http-response.interceptor';

21
apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts

@ -1,37 +1,22 @@
import {
ChangeDetectionStrategy,
Component,
Inject,
OnDestroy
} from '@angular/core';
import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { Subject } from 'rxjs';
import { SubscriptionInterstitialDialogParams } from './interfaces/interfaces';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
host: { class: 'd-flex flex-column flex-grow-1 h-100' },
selector: 'gf-subscription-interstitial-dialog',
changeDetection: ChangeDetectionStrategy.OnPush,
styleUrls: ['./subscription-interstitial-dialog.scss'],
templateUrl: 'subscription-interstitial-dialog.html'
})
export class SubscriptionInterstitialDialog implements OnDestroy {
private unsubscribeSubject = new Subject<void>();
export class SubscriptionInterstitialDialog {
public constructor(
@Inject(MAT_DIALOG_DATA) public data: SubscriptionInterstitialDialogParams,
public dialogRef: MatDialogRef<SubscriptionInterstitialDialog>
) {}
public ngOnInit() {}
public onCancel() {
this.dialogRef.close({});
}
public ngOnDestroy() {
this.unsubscribeSubject.next();
this.unsubscribeSubject.complete();
}
}

2
apps/client/src/app/pages/pricing/pricing-page.html

@ -95,7 +95,7 @@
</ul>
</div>
<p i18n>Self-hosted, update manually.</p>
<p class="h5 text-right">Free</p>
<p class="h5 text-right" i18n>Free</p>
<div
*ngIf="user?.subscription?.type === 'Basic'"
class="d-none d-lg-block hidden mt-3 text-center"

Loading…
Cancel
Save