3 files changed, 65 insertions, 48 deletions

diff --git a/client/src/app/+signup/+register/register.component.html b/client/src/app/+signup/+register/register.component.html
index de72065d3..b51f08a4c 100644
--- a/client/src/app/+signup/+register/register.component.html
+++ b/client/src/app/+signup/+register/register.component.html
@@ -1,56 +1,62 @@
 <div class="margin-content">
 
-  <div i18n class="title-page title-page-single">
-    Create an account
+  <div class="signup-disabled" *ngIf="signupDisabled">
+    <div class="alert alert-warning" i18n>Signup is not enabled on this instance.</div>
   </div>
 
-  <my-signup-success *ngIf="signupDone" [message]="success"></my-signup-success>
-  <div *ngIf="info" class="alert alert-info">{{ info }}</div>
-
-  <div class="wrapper" [hidden]="signupDone">
-    <div class="register-form">
-      <my-custom-stepper linear *ngIf="!signupDone">
-        <cdk-step [stepControl]="formStepTerms" i18n-label="Stepper label for the registration page describing terms of service" label="Terms">
-          <div class="instance-information">
-            <my-instance-about-accordion (init)="onInstanceAboutAccordionInit($event)" [panels]="instanceInformationPanels"></my-instance-about-accordion>
-          </div>
-
-          <my-register-step-terms
-            [hasCodeOfConduct]="!!aboutHtml.codeOfConduct"
-            [minimumAge]="minimumAge"
-            (formBuilt)="onTermsFormBuilt($event)" (termsClick)="onTermsClick()" (codeOfConductClick)="onCodeOfConductClick()"
-          ></my-register-step-terms>
-
-          <button cdkStepperNext [disabled]="!formStepTerms || !formStepTerms.valid">{{ defaultNextStepButtonLabel }}</button>
-        </cdk-step>
-
-        <cdk-step [stepControl]="formStepUser" i18n-label="Stepper label for the registration page asking user informations" label="User">
-          <my-register-step-user (formBuilt)="onUserFormBuilt($event)" [videoUploadDisabled]="videoUploadDisabled"></my-register-step-user>
-
-          <button cdkStepperPrevious>{{ defaultPreviousStepButtonLabel }}</button>
-          <button cdkStepperNext [disabled]="!formStepUser || !formStepUser.valid" (click)="videoUploadDisabled && signup()">{{ stepUserButtonLabel }}</button>
-        </cdk-step>
-
-        <cdk-step [stepControl]="formStepChannel" i18n-label="Stepper label for the registration page asking information about the default channel" label="Channel" *ngIf="!videoUploadDisabled">
-          <my-register-step-channel (formBuilt)="onChannelFormBuilt($event)" [username]="getUsername()"></my-register-step-channel>
-
-          <button cdkStepperPrevious>{{ defaultPreviousStepButtonLabel }}</button>
-          <button cdkStepperNext [disabled]="!formStepChannel || !formStepChannel.valid || hasSameChannelAndAccountNames()" (click)="signup()" i18n>
-            Create my account
-          </button>
-        </cdk-step>
-
-        <cdk-step i18n-label label="Done" editable="false">
-          <div *ngIf="!signupDone && !error" class="done-loader">
-            <my-loader [loading]="true"></my-loader>
-
-            <div i18n>PeerTube is creating your account...</div>
-          </div>
+  <ng-container *ngIf="!signupDisabled">
+    <div i18n class="title-page title-page-single">
+      Create an account
+    </div>
 
-          <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
-        </cdk-step>
-      </my-custom-stepper>
+    <my-signup-success *ngIf="signupDone" [message]="success"></my-signup-success>
+    <div *ngIf="info" class="alert alert-info">{{ info }}</div>
+
+    <div class="wrapper" [hidden]="signupDone">
+      <div class="register-form">
+        <my-custom-stepper linear *ngIf="!signupDone">
+          <cdk-step [stepControl]="formStepTerms" i18n-label="Stepper label for the registration page describing terms of service" label="Terms">
+            <div class="instance-information">
+              <my-instance-about-accordion (init)="onInstanceAboutAccordionInit($event)" [panels]="instanceInformationPanels"></my-instance-about-accordion>
+            </div>
+
+            <my-register-step-terms
+              [hasCodeOfConduct]="!!aboutHtml.codeOfConduct"
+              [minimumAge]="minimumAge"
+              (formBuilt)="onTermsFormBuilt($event)" (termsClick)="onTermsClick()" (codeOfConductClick)="onCodeOfConductClick()"
+            ></my-register-step-terms>
+
+            <button cdkStepperNext [disabled]="!formStepTerms || !formStepTerms.valid">{{ defaultNextStepButtonLabel }}</button>
+          </cdk-step>
+
+          <cdk-step [stepControl]="formStepUser" i18n-label="Stepper label for the registration page asking user informations" label="User">
+            <my-register-step-user (formBuilt)="onUserFormBuilt($event)" [videoUploadDisabled]="videoUploadDisabled"></my-register-step-user>
+
+            <button cdkStepperPrevious>{{ defaultPreviousStepButtonLabel }}</button>
+            <button cdkStepperNext [disabled]="!formStepUser || !formStepUser.valid" (click)="videoUploadDisabled && signup()">{{ stepUserButtonLabel }}</button>
+          </cdk-step>
+
+          <cdk-step [stepControl]="formStepChannel" i18n-label="Stepper label for the registration page asking information about the default channel" label="Channel" *ngIf="!videoUploadDisabled">
+            <my-register-step-channel (formBuilt)="onChannelFormBuilt($event)" [username]="getUsername()"></my-register-step-channel>
+
+            <button cdkStepperPrevious>{{ defaultPreviousStepButtonLabel }}</button>
+            <button cdkStepperNext [disabled]="!formStepChannel || !formStepChannel.valid || hasSameChannelAndAccountNames()" (click)="signup()" i18n>
+              Create my account
+            </button>
+          </cdk-step>
+
+          <cdk-step i18n-label label="Done" editable="false">
+            <div *ngIf="!signupDone && !error" class="done-loader">
+              <my-loader [loading]="true"></my-loader>
+
+              <div i18n>PeerTube is creating your account...</div>
+            </div>
+
+            <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
+          </cdk-step>
+        </my-custom-stepper>
+      </div>
     </div>
-  </div>
+  </ng-container>
 
 </div>
diff --git a/client/src/app/+signup/+register/register.component.scss b/client/src/app/+signup/+register/register.component.scss
index fc7ddb0e9..e3ef95609 100644
--- a/client/src/app/+signup/+register/register.component.scss
+++ b/client/src/app/+signup/+register/register.component.scss
@@ -6,6 +6,10 @@
   text-align: center;
 }
 
+.signup-disabled {
+  padding-top: 30vh;
+}
+
 .wrapper {
   display: flex;
   flex-direction: column;
diff --git a/client/src/app/+signup/+register/register.component.ts b/client/src/app/+signup/+register/register.component.ts
index d8ac39c7c..bb7276459 100644
--- a/client/src/app/+signup/+register/register.component.ts
+++ b/client/src/app/+signup/+register/register.component.ts
@@ -42,6 +42,8 @@ export class RegisterComponent implements OnInit {
   defaultNextStepButtonLabel = $localize`:Button on the registration form to go to the previous step:Next`
   stepUserButtonLabel = this.defaultNextStepButtonLabel
 
+  signupDisabled = false
+
   private serverConfig: ServerConfig
 
   constructor (
@@ -62,6 +64,11 @@ export class RegisterComponent implements OnInit {
   ngOnInit (): void {
     this.serverConfig = this.route.snapshot.data.serverConfig
 
+    if (this.serverConfig.signup.allowed === false || this.serverConfig.signup.allowedForCurrentIP === false) {
+      this.signupDisabled = true
+      return
+    }
+
     this.videoUploadDisabled = this.serverConfig.user.videoQuota === 0
     this.stepUserButtonLabel = this.videoUploadDisabled
       ? $localize`:Button on the registration form to finalize the account and channel creation:Signup`