improvements to login and sign-up pages (#3357)

* New login form ui
* Move InstanceAboutAccordion to shared components
* Update closed registration alert text
* Add alert for opened registration and move them bellow login form
* Adjust flex block on signup and login views
* Replace toggle accordion with expand on links in signup and login + scrollTo
* Improve display of login alerts
* Fix missing Component suffix
* Define min-width instance-information block sign-up and login for mobile screens
* Add ability to select specific panels in instanceAboutAccorddion
* Add instance title and short-description to common instanceAboutAccordion
* Clarify title alert in login page
* Add step terms for signup

Co-authored-by: kimsible <kimsible@users.noreply.github.com>
Co-authored-by: Rigel Kent <sendmemail@rigelk.eu>

4 files changed, 212 insertions, 76 deletions

diff --git a/client/src/app/+login/login.component.html b/client/src/app/+login/login.component.html
index 390d77dd7..a2362d978 100644
--- a/client/src/app/+login/login.component.html
+++ b/client/src/app/+login/login.component.html
@@ -8,73 +8,81 @@
   </div>
 
   <ng-container *ngIf="!externalAuthError && !isAuthenticatedWithExternalAuth">
-    <div class="looking-for-account alert alert-info" *ngIf="signupAllowed === false" role="alert">
-      <h6 class="alert-heading" i18n>
-        If you are looking for an account…
-      </h6>
-
-      <div i18n>
-        Currently this instance doesn't allow for user registration, but you can find an instance
-        that gives you the possibility to sign up for an account and upload your videos there.
-
-        <br />
-
-        Find yours among multiple instances at <a class="alert-link" href="https://joinpeertube.org/instances" target="_blank" rel="noopener noreferrer">https://joinpeertube.org/instances</a>.
-      </div>
-    </div>
-
     <div *ngIf="error" class="alert alert-danger">{{ error }}
       <span *ngIf="error === 'User email is not verified.'"> <a i18n routerLink="/verify-account/ask-send-email">Request new verification email.</a></span>
     </div>
 
-    <div class="login-form-and-externals">
-
-      <form role="form" (ngSubmit)="login()" [formGroup]="form">
-        <div class="form-group">
-          <div>
-            <label i18n for="username">User</label>
-            <input
-              type="text" id="username" i18n-placeholder placeholder="Username or email address" required tabindex="1"
-              formControlName="username" class="form-control" [ngClass]="{ 'input-error': formErrors['username'] }" #usernameInput
-            >
-            <a i18n *ngIf="signupAllowed === true" routerLink="/signup" class="create-an-account">
-              or create an account
-            </a>
+    <div class="wrapper">
+      <div class="login-form-and-externals">
+
+        <form role="form" (ngSubmit)="login()" [formGroup]="form">
+          <div class="form-group">
+            <div>
+              <label i18n for="username">User</label>
+              <input
+                type="text" id="username" i18n-placeholder placeholder="Username or email address" required tabindex="1"
+                formControlName="username" class="form-control" [ngClass]="{ 'input-error': formErrors['username'] }" #usernameInput
+              >
+            </div>
+
+            <div *ngIf="formErrors.username" class="form-error">
+              {{ formErrors.username }}
+            </div>
           </div>
 
-          <div *ngIf="formErrors.username" class="form-error">
-            {{ formErrors.username }}
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label i18n for="password">Password</label>
-          <div>
+          <div class="form-group">
+            <label i18n for="password">Password</label>
             <my-input-toggle-hidden formControlName="password" id="password"
                                     i18n-placeholder placeholder="Password"
                                     [ngClass]="{ 'input-error': formErrors['password'] }"
-                                    autocomplete="current-password"></my-input-toggle-hidden>
-            <a i18n-title class="forgot-password-button" (click)="openForgotPasswordModal()" title="Click here to reset your password">I forgot my password</a>
+                                    autocomplete="current-password" tabindex="2"></my-input-toggle-hidden>
+            <div *ngIf="formErrors.password" class="form-error">
+              {{ formErrors.password }}
+            </div>
           </div>
-          <div *ngIf="formErrors.password" class="form-error">
-            {{ formErrors.password }}
+
+          <input type="submit" i18n-value value="Login" [disabled]="!form.valid">
+          
+          <div class="additionnal-links">
+            <a class="forgot-password-button" (click)="openForgotPasswordModal()" i18n-title title="Click here to reset your password">I forgot my password</a>
+            <div *ngIf="signupAllowed" class="signup-link">
+              <span>·</span>
+              <a i18n routerLink="/signup" class="create-an-account">Create an account</a>
+            </div>
           </div>
-        </div>
 
-        <input type="submit" i18n-value value="Login" [disabled]="!form.valid">
-      </form>
+          <div class="looking-for-account alert alert-info"  role="alert">
+            <h6 class="alert-heading" i18n>
+              Logging into an account lets you publish content
+            </h6>
+
+            <div *ngIf="signupAllowed" i18n>
+              This instance allows registration. However, be careful to check the <a class="terms-anchor" (click)="onTermsClick($event, instanceInformation)" href='#'>Terms</a><a class="terms-link" target="_blank" routerLink="/about/instance" fragment="terms">Terms</a> before creating an account.
+              You may also search for another instance to match your exact needs at: <br /><a class="alert-link" href="https://joinpeertube.org/instances" target="_blank" rel="noopener noreferrer">https://joinpeertube.org/instances</a>.
+            </div>
+
+            <div *ngIf="!signupAllowed" i18n>
+              Currently this instance doesn't allow for user registration, you may check the <a (click)="onTermsClick($event, instanceInformation)" href='#'>Terms</a> for more details or find an instance that gives you the possibility to sign up for an account and upload your videos there.
+              Find yours among multiple instances at: <br /> <a class="alert-link" href="https://joinpeertube.org/instances" target="_blank" rel="noopener noreferrer">https://joinpeertube.org/instances</a>.
+            </div>
+          </div>
+        </form>
 
-      <div class="external-login-blocks" *ngIf="getExternalLogins().length !== 0">
-        <div class="block-title" i18n>Or sign in with</div>
+        <div class="external-login-blocks" *ngIf="getExternalLogins().length !== 0">
+          <div class="block-title" i18n>Or sign in with</div>
 
-        <div>
-          <a class="external-login-block" *ngFor="let auth of getExternalLogins()" [href]="getAuthHref(auth)" role="button">
-            {{ auth.authDisplayName }}
-          </a>
+          <div>
+            <a class="external-login-block" *ngFor="let auth of getExternalLogins()" [href]="getAuthHref(auth)" role="button">
+              {{ auth.authDisplayName }}
+            </a>
+          </div>
         </div>
       </div>
-    </div>
 
+      <div #instanceInformation class="instance-information">
+        <my-instance-about-accordion (init)="onInstanceAboutAccordionInit($event)" [panels]="instanceInformationPanels"></my-instance-about-accordion>
+      </div>
+    </div>
   </ng-container>
 </div>
 
diff --git a/client/src/app/+login/login.component.scss b/client/src/app/+login/login.component.scss
index 9ba09e9e4..3cc302aec 100644
--- a/client/src/app/+login/login.component.scss
+++ b/client/src/app/+login/login.component.scss
@@ -1,5 +1,8 @@
 @import '_variables';
 @import '_mixins';
+@import './_bootstrap-variables';
+@import '~bootstrap/scss/functions';
+@import '~bootstrap/scss/variables';
 
 label {
   display: block;
@@ -57,39 +60,138 @@ input[type=submit] {
   }
 }
 
-.login-form-and-externals {
+.wrapper {
   display: flex;
+  justify-content: space-around;
   flex-wrap: wrap;
-  font-size: 15px;
 
-  form {
-    margin: 0 50px 20px 0;
+  & > div {
+    flex: 1 1;
   }
 
-  .external-login-blocks {
-    min-width: 200px;
+  .login-form-and-externals {
+    display: flex;
+    flex-wrap: wrap;
+    font-size: 15px;
+    max-width: 450px;
+    margin-bottom: 40px;
+    margin-left: 10px;
+    margin-right: 10px;
 
-    .block-title {
-      font-weight: $font-semibold;
+    form {
+      margin: 0;
+
+      &, input {
+        width: 100%;
+      }
+
+      .additionnal-links {
+        display: block;
+        text-align: center;
+        margin-top: 20px;
+        margin-bottom: 20px;
+
+        .forgot-password-button,
+        .create-an-account {
+          padding: 4px;
+          display: inline-block;
+
+          color: var(--mainColor);
+
+          &:hover, &:active {
+            color: var(--mainHoverColor);
+          }
+        }
+      }
     }
 
-    .external-login-block {
-      @include disable-default-a-behaviour;
-
-      cursor: pointer;
-      border: 1px solid #d1d7e0;
-      border-radius: 5px;
-      color: pvar(--mainForegroundColor);
-      margin: 10px 10px 0 0;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      min-height: 35px;
-      min-width: 100px;
-
-      &:hover {
-        background-color: rgba(209, 215, 224, 0.5)
+    .external-login-blocks {
+      min-width: 200px;
+
+      .block-title {
+        font-weight: $font-semibold;
+      }
+
+      .external-login-block {
+        @include disable-default-a-behaviour;
+
+        cursor: pointer;
+        border: 1px solid #d1d7e0;
+        border-radius: 5px;
+        color: pvar(--mainForegroundColor);
+        margin: 10px 10px 0 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        min-height: 35px;
+        min-width: 100px;
+
+        &:hover {
+          background-color: rgba(209, 215, 224, 0.5)
+        }
       }
     }
+
+    .signup-link {
+      display: inline-block;
+    }
+  }
+
+  .instance-information {
+    max-width: 600px;
+    min-width: 350px;
+    margin-bottom: 40px;
+    margin-left: 10px;
+    margin-right: 10px;
+  }
+
+  .terms-anchor {
+    display: inline;
+  }
+
+  .terms-link {
+    display: none;
+  }
+}
+
+@mixin columnReverseDisplay {
+  flex-direction: column-reverse;
+
+  .login-form-and-externals,
+  .instance-information {
+    width: 100%;
+    margin-left: 0;
+    margin-right: 0;
+    max-width: 450px;
+    min-width: unset;
+    align-self: center;
+  }
+
+  .instance-information {
+    ::ng-deep .accordion {
+      display: none;
+    }
+  }
+
+  .terms-anchor {
+    display: none;
+  }
+
+  .terms-link {
+    display: inline;
+  }
+}
+
+@media screen and (max-width: breakpoint(md)) {
+  .wrapper {
+    @include columnReverseDisplay();
+  }
+}
+
+@media screen and (max-width: breakpoint(md) + $menu-width) {
+  :host-context(.main-col:not(.expanded)) {
+    .wrapper {
+      @include columnReverseDisplay();
+    }
   }
 }
diff --git a/client/src/app/+login/login.component.ts b/client/src/app/+login/login.component.ts
index 351750453..2567f21f1 100644
--- a/client/src/app/+login/login.component.ts
+++ b/client/src/app/+login/login.component.ts
@@ -3,9 +3,10 @@ import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angula
 import { ActivatedRoute } from '@angular/router'
 import { AuthService, Notifier, RedirectService, UserService } from '@app/core'
 import { HooksService } from '@app/core/plugins/hooks.service'
+import { InstanceAboutAccordionComponent } from '@app/shared/shared-instance'
 import { LOGIN_PASSWORD_VALIDATOR, LOGIN_USERNAME_VALIDATOR } from '@app/shared/form-validators/login-validators'
 import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
+import { NgbAccordion, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
 import { RegisteredExternalAuthConfig, ServerConfig } from '@shared/models'
 
 @Component({
@@ -18,6 +19,7 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni
   @ViewChild('usernameInput', { static: false }) usernameInput: ElementRef
   @ViewChild('forgotPasswordModal', { static: true }) forgotPasswordModal: ElementRef
 
+  accordion: NgbAccordion
   error: string = null
   forgotPasswordEmail = ''
 
@@ -25,6 +27,14 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni
   externalAuthError = false
   externalLogins: string[] = []
 
+  instanceInformationPanels = {
+    terms: true,
+    administrators: false,
+    features: false,
+    moderation: false,
+    codeOfConduct: false
+  }
+
   private openedForgotPasswordModal: NgbModalRef
   private serverConfig: ServerConfig
 
@@ -45,6 +55,15 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni
     return this.serverConfig.signup.allowed === true
   }
 
+  onTermsClick (event: Event, instanceInformation: HTMLElement) {
+    event.preventDefault()
+
+    if (this.accordion) {
+      this.accordion.expand('terms')
+      instanceInformation.scrollIntoView({ behavior: 'smooth' })
+    }
+  }
+
   isEmailDisabled () {
     return this.serverConfig.email.enabled === false
   }
@@ -122,6 +141,10 @@ The link will expire within 1 hour.`
     this.openedForgotPasswordModal.close()
   }
 
+  onInstanceAboutAccordionInit (instanceAboutAccordion: InstanceAboutAccordionComponent) {
+    this.accordion = instanceAboutAccordion.accordion
+  }
+
   private loadExternalAuthToken (username: string, token: string) {
     this.isAuthenticatedWithExternalAuth = true
 
diff --git a/client/src/app/+login/login.module.ts b/client/src/app/+login/login.module.ts
index c41902426..9d8607e5d 100644
--- a/client/src/app/+login/login.module.ts
+++ b/client/src/app/+login/login.module.ts
@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core'
 import { SharedFormModule } from '@app/shared/shared-forms'
 import { SharedGlobalIconModule } from '@app/shared/shared-icons'
+import { SharedInstanceModule } from '@app/shared/shared-instance'
 import { SharedMainModule } from '@app/shared/shared-main'
 import { LoginRoutingModule } from './login-routing.module'
 import { LoginComponent } from './login.component'
@@ -11,7 +12,9 @@ import { LoginComponent } from './login.component'
 
     SharedMainModule,
     SharedFormModule,
-    SharedGlobalIconModule
+    SharedGlobalIconModule,
+
+    SharedInstanceModule
   ],
 
   declarations: [