From 00621cf63766158f0bb1690437f3b4e88be5ee88 Mon Sep 17 00:00:00 2001
From: rubikscraft <contact@rubikscraft.nl>
Date: Sun, 25 Dec 2022 13:59:43 +0100
Subject: [PATCH] fix css problems

---
 backend/package.json                          |  4 +-
 frontend/package.json                         |  2 +-
 .../components/header/header.component.html   |  2 +-
 .../src/scss/material/material-theme.scss     | 37 ++-------------
 yarn.lock                                     | 46 ++++++++++++-------
 5 files changed, 37 insertions(+), 54 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index f247acb..4f32e9f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -41,7 +41,7 @@
     "p-timeout": "^6.0.0",
     "passport": "^0.6.0",
     "passport-headerapikey": "^1.2.2",
-    "passport-jwt": "^4.0.0",
+    "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
     "passport-strategy": "^1.0.0",
     "pg": "^8.8.0",
@@ -51,7 +51,7 @@
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
     "rxjs": "^7.8.0",
-    "sharp": "^0.31.2",
+    "sharp": "^0.31.3",
     "stream-parser": "^0.3.1",
     "thunks": "^4.9.6",
     "typeorm": "0.3.11",
diff --git a/frontend/package.json b/frontend/package.json
index 1a9b855..617a1ea 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -37,7 +37,7 @@
     "@types/resize-observer-browser": "^0.1.7",
     "@types/validator": "^13.7.10",
     "bootstrap": "^5.2.3",
-    "caniuse-lite": "^1.0.30001439",
+    "caniuse-lite": "^1.0.30001441",
     "fuse.js": "^6.6.2",
     "jwt-decode": "^3.1.2",
     "moment": "^2.29.4",
diff --git a/frontend/src/app/components/header/header.component.html b/frontend/src/app/components/header/header.component.html
index c8f7f02..2a50f37 100644
--- a/frontend/src/app/components/header/header.component.html
+++ b/frontend/src/app/components/header/header.component.html
@@ -1,4 +1,4 @@
-<mat-toolbar color="primary">
+<mat-toolbar>
   <button
     *ngIf="_enableHamburger"
     class="me-3"
diff --git a/frontend/src/scss/material/material-theme.scss b/frontend/src/scss/material/material-theme.scss
index a8c4f4c..356c261 100644
--- a/frontend/src/scss/material/material-theme.scss
+++ b/frontend/src/scss/material/material-theme.scss
@@ -9,36 +9,9 @@ mat.$theme-ignore-duplication-warnings: true;
 $dark-primary-text: rgba(black, 0.87);
 $light-primary-text: white;
 
-$mat-primary: (
-  main: #272727,
-  lighter: #bebebe,
-  darker: #171717,
-  200: #272727,
-  // For slide toggle,
-  contrast:
-    (
-      main: $light-primary-text,
-      lighter: $dark-primary-text,
-      darker: $light-primary-text,
-    ),
-);
-$mat-accent: (
-  main: #43a047,
-  lighter: #c7e3c8,
-  darker: #1b5e20,
-  200: #43a047,
-  // For slide toggle,
-  contrast:
-    (
-      main: $light-primary-text,
-      lighter: $dark-primary-text,
-      darker: $light-primary-text,
-    ),
-);
-
-$picsur-primary: mat.define-palette($mat-primary, main, lighter, darker);
-$picsur-accent: mat.define-palette($mat-accent, main, lighter, darker);
-$picsur-warn: mat.define_palette(mat.$red-palette);
+$picsur-primary: mat.define-palette(mat.$green-palette, 600, 100, 900);
+$picsur-accent: mat.define-palette(mat.$blue-grey-palette, 600, 200, 800);
+$picsur-warn: mat.define-palette(mat.$red-palette);
 
 // Light Theme Text
 $dark-text: #000000;
@@ -137,7 +110,7 @@ $light-bg-alpha-12: rgba(#fafafa, 0.12);
 $mat-dark-theme-background-palette: (
   background: $dark-background,
   status-bar: $dark-bg-lighter-20,
-  app-bar: $dark-bg-lighter-5,
+  app-bar: $dark-bg-lighter-10,
   hover: $light-bg-alpha-4,
   card: $dark-bg-lighter-5,
   dialog: $dark-bg-lighter-5,
@@ -176,8 +149,6 @@ $mat-theme-light: mat.define-light-theme(
 
 @include mat.all-component-themes($mat-theme);
 @include mat.all-component-typographies($mat-theme);
-@include mat.legacy-slide-toggle-theme($mat-theme);
-@include mat.slide-toggle-theme($mat-theme);
 @include custom-mat.custom-material($mat-theme);
 
 .theme-alternate {
diff --git a/yarn.lock b/yarn.lock
index d3f54fe..2a68a23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4722,10 +4722,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.30001400, caniuse-lite@npm:^1.0.30001426, caniuse-lite@npm:^1.0.30001439":
-  version: 1.0.30001439
-  resolution: "caniuse-lite@npm:1.0.30001439"
-  checksum: 3912dd536c9735713ca85e47721988bbcefb881ddb4886b0b9923fa984247fd22cba032cf268e57d158af0e8a2ae2eae042ae01942a1d6d7849fa9fa5d62fb82
+"caniuse-lite@npm:^1.0.30001400, caniuse-lite@npm:^1.0.30001426, caniuse-lite@npm:^1.0.30001441":
+  version: 1.0.30001441
+  resolution: "caniuse-lite@npm:1.0.30001441"
+  checksum: 0f5aa8f7ea4d165e88e0d1eaa44564c5bfee66641f265a1fd959e74f0a7e6bc0207db6c28e2fb63dc8b2cd23e0e3cee06c4f372de11c93c57ff5ff4207962c3f
   languageName: node
   linkType: hard
 
@@ -7571,7 +7571,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonwebtoken@npm:8.5.1, jsonwebtoken@npm:^8.2.0":
+"jsonwebtoken@npm:8.5.1":
   version: 8.5.1
   resolution: "jsonwebtoken@npm:8.5.1"
   dependencies:
@@ -7589,6 +7589,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsonwebtoken@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "jsonwebtoken@npm:9.0.0"
+  dependencies:
+    jws: ^3.2.2
+    lodash: ^4.17.21
+    ms: ^2.1.1
+    semver: ^7.3.8
+  checksum: b9181cecf9df99f1dc0253f91ba000a1aa4d91f5816d1608c0dba61a5623726a0bfe200b51df25de18c1a6000825d231ad7ce2788aa54fd48dcb760ad9eb9514
+  languageName: node
+  linkType: hard
+
 "jwa@npm:^1.4.1":
   version: 1.4.1
   resolution: "jwa@npm:1.4.1"
@@ -9067,13 +9079,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"passport-jwt@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "passport-jwt@npm:4.0.0"
+"passport-jwt@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "passport-jwt@npm:4.0.1"
   dependencies:
-    jsonwebtoken: ^8.2.0
+    jsonwebtoken: ^9.0.0
     passport-strategy: ^1.0.0
-  checksum: d0499ebb819c714d885a9c03a6c5d6dfae916c1a81ccb62357136d5bf477529327e9b8fc658f61f97c565651d2bd78eccec4543474a08e944132f0e2ec47cc3d
+  checksum: 0669d5bf8fc18ee57eb39601491c59ac084acfa6c972e0a3289e9d88a3ee6fab9e9fb279f359eee81939fedb66904c4a74423004480b60c54621af0d7b2ee0d5
   languageName: node
   linkType: hard
 
@@ -9317,7 +9329,7 @@ __metadata:
     p-timeout: ^6.0.0
     passport: ^0.6.0
     passport-headerapikey: ^1.2.2
-    passport-jwt: ^4.0.0
+    passport-jwt: ^4.0.1
     passport-local: ^1.0.0
     passport-strategy: ^1.0.0
     pg: ^8.8.0
@@ -9328,7 +9340,7 @@ __metadata:
     reflect-metadata: ^0.1.13
     rimraf: ^3.0.2
     rxjs: ^7.8.0
-    sharp: ^0.31.2
+    sharp: ^0.31.3
     source-map-support: ^0.5.21
     stream-parser: ^0.3.1
     thunks: ^4.9.6
@@ -9368,7 +9380,7 @@ __metadata:
     "@types/resize-observer-browser": ^0.1.7
     "@types/validator": ^13.7.10
     bootstrap: ^5.2.3
-    caniuse-lite: ^1.0.30001439
+    caniuse-lite: ^1.0.30001441
     fuse.js: ^6.6.2
     jwt-decode: ^3.1.2
     moment: ^2.29.4
@@ -10471,9 +10483,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sharp@npm:^0.31.2":
-  version: 0.31.2
-  resolution: "sharp@npm:0.31.2"
+"sharp@npm:^0.31.3":
+  version: 0.31.3
+  resolution: "sharp@npm:0.31.3"
   dependencies:
     color: ^4.2.3
     detect-libc: ^2.0.1
@@ -10484,7 +10496,7 @@ __metadata:
     simple-get: ^4.0.1
     tar-fs: ^2.1.1
     tunnel-agent: ^0.6.0
-  checksum: 076717b7a073ea47bb522ff2931b74b6608daeb6f7ae334e4848d47fdf4d23bcb18cd49044fd5fb27ef27a1a4aa87d141894d67d1c4bb15a6e2e63cf4dbe329e
+  checksum: 29fd1dfbc616c6389f53f366cec342b4353d9f2a37e98952ca273db38dca57dfa0f336322d6d763f0fae876042ead22fd86ffe26d70c32ade2458d421db60d04
   languageName: node
   linkType: hard