Browse Source

Do not show registration button if token auth is disabled

pull/5915/head
Germán Martín 2 months ago
committed by Thomas Kaul
parent
commit
315464d2b2
  1. 6
      apps/client/src/app/components/header/header.component.html
  2. 6
      apps/client/src/app/pages/features/features-page.component.ts
  3. 2
      apps/client/src/app/pages/features/features-page.html
  4. 6
      apps/client/src/app/pages/landing/landing-page.component.ts
  5. 6
      apps/client/src/app/pages/landing/landing-page.html
  6. 9
      apps/client/src/app/pages/pricing/pricing-page.component.ts
  7. 4
      apps/client/src/app/pages/pricing/pricing-page.html

6
apps/client/src/app/components/header/header.component.html

@ -422,7 +422,11 @@
<ng-container i18n>Sign in</ng-container> <ng-container i18n>Sign in</ng-container>
</button> </button>
</li> </li>
@if (currentRoute !== 'register' && hasPermissionToCreateUser) { @if (
currentRoute !== 'register' &&
hasPermissionToCreateUser &&
hasPermissionForAuthToken
) {
<li class="list-inline-item ml-1"> <li class="list-inline-item ml-1">
<a <a
class="d-none d-sm-block" class="d-none d-sm-block"

6
apps/client/src/app/pages/features/features-page.component.ts

@ -24,6 +24,7 @@ import { Subject, takeUntil } from 'rxjs';
templateUrl: './features-page.html' templateUrl: './features-page.html'
}) })
export class GfFeaturesPageComponent implements OnDestroy { export class GfFeaturesPageComponent implements OnDestroy {
public hasPermissionForAuthToken: boolean;
public hasPermissionForSubscription: boolean; public hasPermissionForSubscription: boolean;
public info: InfoItem; public info: InfoItem;
public routerLinkRegister = publicRoutes.register.routerLink; public routerLinkRegister = publicRoutes.register.routerLink;
@ -51,6 +52,11 @@ export class GfFeaturesPageComponent implements OnDestroy {
} }
}); });
this.hasPermissionForAuthToken = hasPermission(
this.info?.globalPermissions,
permissions.enableAuthToken
);
this.hasPermissionForSubscription = hasPermission( this.hasPermissionForSubscription = hasPermission(
this.info?.globalPermissions, this.info?.globalPermissions,
permissions.enableSubscription permissions.enableSubscription

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

@ -309,7 +309,7 @@
</div> </div>
</div> </div>
</div> </div>
@if (!user) { @if (!user && hasPermissionForAuthToken) {
<div class="row"> <div class="row">
<div class="col mt-3 text-center"> <div class="col mt-3 text-center">
<a <a

6
apps/client/src/app/pages/landing/landing-page.component.ts

@ -46,6 +46,7 @@ export class GfLandingPageComponent implements OnDestroy, OnInit {
} = {}; } = {};
public currentYear = format(new Date(), 'yyyy'); public currentYear = format(new Date(), 'yyyy');
public deviceType: string; public deviceType: string;
public hasPermissionForAuthToken: boolean;
public hasPermissionForDemo: boolean; public hasPermissionForDemo: boolean;
public hasPermissionForStatistics: boolean; public hasPermissionForStatistics: boolean;
public hasPermissionForSubscription: boolean; public hasPermissionForSubscription: boolean;
@ -127,6 +128,11 @@ export class GfLandingPageComponent implements OnDestroy, OnInit {
} }
this.hasPermissionForDemo = !!demoAuthToken; this.hasPermissionForDemo = !!demoAuthToken;
this.hasPermissionForAuthToken = hasPermission(
globalPermissions,
permissions.enableAuthToken
);
this.hasPermissionForStatistics = hasPermission( this.hasPermissionForStatistics = hasPermission(
globalPermissions, globalPermissions,
permissions.enableStatistics permissions.enableStatistics

6
apps/client/src/app/pages/landing/landing-page.html

@ -32,7 +32,7 @@
<div class="container"> <div class="container">
<div class="button-container mb-5 row"> <div class="button-container mb-5 row">
<div class="align-items-center col d-flex justify-content-center"> <div class="align-items-center col d-flex justify-content-center">
@if (hasPermissionToCreateUser) { @if (hasPermissionToCreateUser && hasPermissionForAuthToken) {
<a <a
color="primary" color="primary"
i18n i18n
@ -42,7 +42,7 @@
> >
} }
@if (hasPermissionForDemo) { @if (hasPermissionForDemo) {
@if (hasPermissionToCreateUser) { @if (hasPermissionToCreateUser && hasPermissionForAuthToken) {
<div class="mx-3 text-muted" i18n>or</div> <div class="mx-3 text-muted" i18n>or</div>
} }
<a i18n mat-stroked-button [routerLink]="routerLinkDemo">Live Demo</a> <a i18n mat-stroked-button [routerLink]="routerLinkDemo">Live Demo</a>
@ -323,7 +323,7 @@
</div> </div>
} }
@if (hasPermissionToCreateUser) { @if (hasPermissionToCreateUser && hasPermissionForAuthToken) {
<div class="row my-5"> <div class="row my-5">
<div class="col"> <div class="col">
<h2 class="h4 mb-1 text-center" i18n> <h2 class="h4 mb-1 text-center" i18n>

9
apps/client/src/app/pages/pricing/pricing-page.component.ts

@ -52,6 +52,7 @@ export class GfPricingPageComponent implements OnDestroy, OnInit {
public coupon: number; public coupon: number;
public couponId: string; public couponId: string;
public durationExtension: StringValue; public durationExtension: StringValue;
public hasPermissionForAuthToken: boolean;
public hasPermissionToUpdateUserSettings: boolean; public hasPermissionToUpdateUserSettings: boolean;
public importAndExportTooltipBasic = translate( public importAndExportTooltipBasic = translate(
'DATA_IMPORT_AND_EXPORT_TOOLTIP_BASIC' 'DATA_IMPORT_AND_EXPORT_TOOLTIP_BASIC'
@ -100,9 +101,15 @@ export class GfPricingPageComponent implements OnDestroy, OnInit {
} }
public ngOnInit() { public ngOnInit() {
const { baseCurrency, subscriptionOffer } = this.dataService.fetchInfo(); const { baseCurrency, globalPermissions, subscriptionOffer } =
this.dataService.fetchInfo();
this.baseCurrency = baseCurrency; this.baseCurrency = baseCurrency;
this.hasPermissionForAuthToken = hasPermission(
globalPermissions,
permissions.enableAuthToken
);
this.coupon = subscriptionOffer?.coupon; this.coupon = subscriptionOffer?.coupon;
this.durationExtension = subscriptionOffer?.durationExtension; this.durationExtension = subscriptionOffer?.durationExtension;
this.label = subscriptionOffer?.label; this.label = subscriptionOffer?.label;

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

@ -367,7 +367,7 @@
</p> </p>
</div> </div>
</div> </div>
} @else if (!user) { } @else if (!user && hasPermissionForAuthToken) {
<div class="row"> <div class="row">
<div class="col mt-3 text-center"> <div class="col mt-3 text-center">
<a <a
@ -377,7 +377,7 @@
[routerLink]="routerLinkRegister" [routerLink]="routerLinkRegister"
>Get Started</a >Get Started</a
> >
<p class="m-0 text-muted"><small i18n>Its free.</small></p> <p class="m-0 text-muted"><small i18n>It's free.</small></p>
</div> </div>
</div> </div>
} }

Loading…
Cancel
Save