Merge remote-tracking branch 'origin/master' into 42-add-typescript

# Conflicts:
#	package-lock.json
#	package.json
#	src/components/BankCard.tsx
#	src/pages/Payslip.tsx

.github/in-solidarity.yml

@@ -0,0 +1,17 @@
+rules:
+    master:
+        level: off
+    slave:
+        level: failure
+        message: >
+            Please consider an alternative to ``. 
+
+            See http://example.com/ for more information
+    foo:
+        regex:
+            - /foo/gi
+            - /foobar/gi
+        level: failure
+ignore:
+    - '.github/in-solidarity.yml' # default
+    - '**/*.yml'

package.json

@@ -17,20 +17,19 @@
         "react-favicon": "^1.0.1",
         "react-is": "^18.2.0",
         "react-router-dom": "^6.10.0",
-        "react-select": "^5.4.0",
-        "styled-components": "^5.3.8"
+        "react-select": "^5.7.2",
+        "styled-components": "^5.3.10"
     },
     "devDependencies": {
-        "@types/styled-components": "^5.1.26",
-        "@types/react": "^18.0.21",
+        "@types/react": "^18.0.38",
         "@vitejs/plugin-react": "^3.1.0",
         "compass-mixins": "^0.12.12",
         "eslint": "^8.23.0",
-        "eslint-config-prettier": "^8.5.0",
+        "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-react": "^7.32.2",
         "prettier": "2.7.1",
         "typescript": "^5.0.4",
         "sass": "^1.55.0",
-        "vite": "^4.2.1"
+        "vite": "^4.3.1"
     }
 }

src/App.tsx

@@ -18,6 +18,9 @@ const GlobalStyles = createGlobalStyle`
         box-sizing: border-box;
         padding: 0;
         margin: 0;
+        -webkit-print-color-adjust:exact !important;
+        print-color-adjust:exact !important;
+        color-adjust: exact !important;
     }
     body, h1, h2, h3, h4, p, figure, blockquote, dl, dd { margin: 0; }
     ul[role='list'], ol[role='list'] { list-style: none; }
@@ -33,6 +36,12 @@ const GlobalStyles = createGlobalStyle`
         max-width: 100%;
     }
     input, button, textarea, select { font: inherit; }
+    
+    @page { 
+        size: tabloid landscape;
+        margin: 0; 
+    }
+
     @media (prefers-reduced-motion: reduce) {
         html:focus-within { scroll-behavior: auto; }
         

src/components/BankCard.tsx

@@ -32,4 +32,4 @@ overflow: hidden;
 text-overflow: ellipsis;
 `
 
-export default BankCard;
+export default BankCard