From 2519afae6a99422e1aa455c2160dbcfb666dca2e Mon Sep 17 00:00:00 2001
From: rubikscraft <contact@rubikscraft.nl>
Date: Fri, 2 Sep 2022 10:43:23 +0200
Subject: [PATCH] Change register button location

---
 .vscode/settings.json                                     | 1 -
 backend/src/collections/role-db/role-db.module.ts         | 4 ++--
 frontend/src/app/components/header/header.component.ts    | 4 ++++
 frontend/src/app/routes/upload/upload.component.html      | 2 +-
 frontend/src/app/routes/user/login/login.component.html   | 2 +-
 .../src/app/routes/user/register/register.component.html  | 8 ++++----
 frontend/tsconfig.app.json                                | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index c3140e2..abe736e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,4 @@
 {
   "vsicons.presets.angular": true,
-  "skipRefreshExplorerOnWindowFocus": true,
   "angular.log": "verbose"
 }
diff --git a/backend/src/collections/role-db/role-db.module.ts b/backend/src/collections/role-db/role-db.module.ts
index 1f5c918..7c17b15 100644
--- a/backend/src/collections/role-db/role-db.module.ts
+++ b/backend/src/collections/role-db/role-db.module.ts
@@ -17,7 +17,7 @@ import { RolesService } from './role-db.service';
   exports: [RolesService],
 })
 export class RolesModule implements OnModuleInit {
-  private readonly logger = new Logger('RolesModule');
+  private readonly logger = new Logger(RolesModule.name);
 
   constructor(
     private readonly rolesService: RolesService,
@@ -28,7 +28,7 @@ export class RolesModule implements OnModuleInit {
     // Nuking roles in dev environment makes testing easier
     // This ensures that the roles are always started with their default permissions
     if (!this.hostConfig.isProduction()) {
-      await this.nukeRoles();
+      //await this.nukeRoles();
     }
 
     await this.ensureSystemRolesExist();
diff --git a/frontend/src/app/components/header/header.component.ts b/frontend/src/app/components/header/header.component.ts
index 2b2e6d8..2cb80b2 100644
--- a/frontend/src/app/components/header/header.component.ts
+++ b/frontend/src/app/components/header/header.component.ts
@@ -66,6 +66,10 @@ export class HeaderComponent implements OnInit {
     this.router.navigate(['/user/login']);
   }
 
+  doRegister() {
+    this.router.navigate(['/user/register']);
+  }
+
   async doLogout() {
     const user = await this.userService.logout();
     if (HasFailed(user)) {
diff --git a/frontend/src/app/routes/upload/upload.component.html b/frontend/src/app/routes/upload/upload.component.html
index f0f14bf..37a96a7 100644
--- a/frontend/src/app/routes/upload/upload.component.html
+++ b/frontend/src/app/routes/upload/upload.component.html
@@ -7,7 +7,7 @@
   </ngx-dropzone>
 
   <div class="centered" *ngIf="!canUpload">
-    <h1><a routerLink="/user/login">Please Log In</a></h1>
+    <h1><a routerLink="/user/login">Please log in</a></h1>
     <p>You do not yet have permission to upload</p>
   </div>
 </div>
diff --git a/frontend/src/app/routes/user/login/login.component.html b/frontend/src/app/routes/user/login/login.component.html
index a888a72..3e78e32 100644
--- a/frontend/src/app/routes/user/login/login.component.html
+++ b/frontend/src/app/routes/user/login/login.component.html
@@ -45,7 +45,7 @@
         </button>
         <button
           *ngIf="showRegister"
-          mat-raised-button
+          mat-flat-button
           color="primary"
           class="mx-2"
           (click)="onRegister()"
diff --git a/frontend/src/app/routes/user/register/register.component.html b/frontend/src/app/routes/user/register/register.component.html
index 5f5f426..fc465c5 100644
--- a/frontend/src/app/routes/user/register/register.component.html
+++ b/frontend/src/app/routes/user/register/register.component.html
@@ -56,12 +56,9 @@
       </div>
 
       <div class="col-12 py-2">
-        <button mat-raised-button color="accent" class="mx-2" type="submit">
-          REGISTER
-        </button>
         <button
           *ngIf="showLogin"
-          mat-raised-button
+          mat-flat-button
           color="primary"
           class="mx-2"
           (click)="onLogin()"
@@ -69,6 +66,9 @@
         >
           LOGIN
         </button>
+        <button mat-flat-button color="accent" class="mx-2" type="submit">
+          REGISTER
+        </button>
       </div>
     </form>
   </div>
diff --git a/frontend/tsconfig.app.json b/frontend/tsconfig.app.json
index c901983..d8aee16 100644
--- a/frontend/tsconfig.app.json
+++ b/frontend/tsconfig.app.json
@@ -13,7 +13,7 @@
   "include": [
     "src/**/*.d.ts",
     "src/app/**/*.ts",
-    "src/app/util/qoi/qoi-encode.ts.disabled"
+    "src/app/**/*.html",
   ],
   "exclude": ["src/**/*.worker.ts", "src/**/*.exclude.ts"]
 }