changed layout of login field and auto checked privacy statement

src/main/webapp/app/layouts/navbar/navbar.component.html

@@ -276,6 +276,17 @@
                   </button>
                 </div>
               </div>
+              <br />
+              <div class="" style="padding-top: 10pt">
+                <label for="acceptTerms" class="form-check-label">
+                  <input id="datapolicy" type="checkbox" [checked]="contentEditable" (change)="toggleEditable($event)" />
+                  {{ 'login.form.acceptTerms1' | translate }}
+                  <a jhitranslate="login.form.acceptTerms" href="/datapolicy">{{ 'login.form.acceptTerms2' | translate }}</a>
+                </label>
+                <div class="alert alert-danger" *ngIf="!contentEditable" jhiTranslate="login.messages.error.terms">
+                  Please accept the datapolicy terms to be able to log in.
+                </div>
+              </div>
             </li>
             <li class="dropdown-divider"></li>
           </ng-container>
@@ -322,17 +333,6 @@
               >
                 Sign in
               </button>
-              <br />
-              <div class="" style="padding-top: 10pt">
-                <label for="acceptTerms" class="form-check-label">
-                  <input id="datapolicy" type="checkbox" (change)="toggleEditable($event)" />
-                  {{ 'login.form.acceptTerms1' | translate }}
-                  <a jhitranslate="login.form.acceptTerms" href="/datapolicy">{{ 'login.form.acceptTerms2' | translate }}</a>
-                </label>
-                <div class="alert alert-danger" *ngIf="!contentEditable" jhiTranslate="login.messages.error.terms">
-                  Please accept the datapolicy terms to be able to log in.
-                </div>
-              </div>
             </form>
           </li>
           <li *ngSwitchCase="true">
@@ -376,7 +376,7 @@
               </div>
 
               <div class="col-12">
-                <a (click)="logout()" id="logout">
+                <a routerLink="" (click)="logout()" id="logout" style="color: #212529">
                   <fa-icon icon="sign-out-alt" [fixedWidth]="true"></fa-icon>
                   <span jhiTranslate="global.menu.account.logout">Sign out</span>
                 </a>

src/main/webapp/app/layouts/navbar/navbar.component.ts

@@ -29,7 +29,7 @@ export class NavbarComponent implements OnInit {
   languages = LANGUAGES;
   openAPIEnabled?: boolean;
   version = '';
-  contentEditable = false;
+  contentEditable = true;
   oerLink?: String;
 
   account: Account | null = null;
@@ -164,7 +164,7 @@ export class NavbarComponent implements OnInit {
   logout(): void {
     this.collapseNavbar();
     this.loginService.logout();
-    this.contentEditable = false;
+    this.contentEditable = true;
     this.router.navigate(['']);
   }
 

src/test/javascript/e2e/account/account.spec.ts

@@ -65,14 +65,13 @@ describe('account', () => {
     const alert = element(by.css('.alert-danger'));
     const value2 = await alert.getAttribute('jhiTranslate');
     expect(value2).to.eq(expect2);
-    settingsPage = await navBarPage.getSettingsPage();
+    // settingsPage = await navBarPage.getSettingsPage();
   });
 
   it('should be able to update password', async () => {
     passwordPage = await navBarPage.getPasswordPage();
 
     expect(await passwordPage.getTitle()).to.eq('password.title');
-
     await passwordPage.setCurrentPassword(password);
     await passwordPage.setPassword('newpassword');
     await passwordPage.setConfirmPassword('newpassword');
@@ -84,18 +83,15 @@ describe('account', () => {
     expect(alertValue).to.eq(successMsg);
     await navBarPage.autoSignOut();
 
-    signInPage = await navBarPage.getSignInPage();
+    // signInPage = await navBarPage.getSignInPage();
     await signInPage.autoSignInUsing(username, 'newpassword');
-
     // change back to default
     await navBarPage.clickOnPasswordMenu();
     expect(await passwordPage.getTitle()).to.eq('password.title');
-
     await passwordPage.setCurrentPassword('newpassword');
     await passwordPage.setPassword(password);
     await passwordPage.setConfirmPassword(password);
     await passwordPage.save();
-
     // wait for success message
     const alertValue2 = await alert.getAttribute('jhiTranslate');
     expect(alertValue2).to.eq(successMsg);

src/test/javascript/e2e/page-objects/jhi-page-objects.ts

 // eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { A } from '@angular/cdk/keycodes';
 import { element, by, ElementFinder, browser } from 'protractor';
 /* eslint @typescript-eslint/no-use-before-define: 0 */
 export class NavBarPage {
@@ -79,7 +80,7 @@ export class NavBarPage {
 
   async getSignInPage(): Promise<SignInPage> {
     await this.clickOnAccountMenu();
-    await this.acceptDatapolicy();
+    // await this.acceptDatapolicy();
     return new SignInPage();
   }
 
@@ -166,10 +167,12 @@ export class PasswordPage {
   title = element.all(by.css('h2')).first();
 
   async setCurrentPassword(password: string): Promise<void> {
+    await this.currentPassword.clear();
     await this.currentPassword.sendKeys(password);
   }
 
   async setPassword(password: string): Promise<void> {
+    await this.password.clear();
     await this.password.sendKeys(password);
   }
 
@@ -182,6 +185,7 @@ export class PasswordPage {
   }
 
   async setConfirmPassword(confirmPassword: string): Promise<void> {
+    await this.confirmPassword.clear();
     await this.confirmPassword.sendKeys(confirmPassword);
   }