Skip to content

Commit 5c1a712

Browse files
committed
upgrade more deps and resolve issues
1 parent 9b4094d commit 5c1a712

File tree

20 files changed

+2372
-1188
lines changed

20 files changed

+2372
-1188
lines changed

.eslintrc.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
*/
44
module.exports = {
55
extends: [
6+
'plugin:@typescript-eslint/eslint-recommended',
67
'airbnb',
78
'plugin:jsx-a11y/recommended',
8-
'prettier',
99
'plugin:cypress/recommended',
1010
'plugin:storybook/recommended',
11-
'plugin:@typescript-eslint/eslint-recommended',
11+
'plugin:prettier/recommended',
12+
'prettier',
1213
],
1314
env: {
1415
browser: true,
@@ -19,7 +20,6 @@ module.exports = {
1920
},
2021
parser: '@babel/eslint-parser',
2122
plugins: [
22-
'prettier',
2323
'unicorn',
2424
'cypress',
2525
'@operation_code/custom-rules',
@@ -77,9 +77,6 @@ module.exports = {
7777
// Lodash Plugin Rules
7878
'lodash/import-scope': ['error', 'method'],
7979

80-
// Prettier Plugin Rules
81-
'prettier/prettier': 'error',
82-
8380
// React Plugin Rules
8481
'react/function-component-definition': [
8582
'error',

.prettierrc

Lines changed: 0 additions & 10 deletions
This file was deleted.

.stylelintrc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,16 @@
1111
"rules": {
1212
"prettier/prettier": true,
1313
"alpha-value-notation": null,
14-
"color-hex-case": "lower",
1514
"color-hex-length": "long",
1615
"custom-property-pattern": null,
1716
"hue-degree-notation": null,
18-
"indentation": 2,
1917
"keyframes-name-pattern": null,
2018
"color-function-notation": "legacy",
2119
"no-duplicate-selectors": true,
2220
"property-no-unknown": [true, { "ignoreProperties": ["composes", "composes-with"] }],
2321
"selector-id-pattern": null,
2422
"selector-class-pattern": null,
2523
"selector-pseudo-class-no-unknown": [true, { "ignorePseudoClasses": ["global"] }],
26-
"shorthand-property-no-redundant-values": null,
27-
"string-quotes": "double"
24+
"shorthand-property-no-redundant-values": null
2825
}
2926
}

common/styles/globals.css

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Do not attempt to change values in themeMap - only change in ./variables.css */
2-
@import "./variables.css";
2+
@import url('./variables.css');
33

44
/* stylelint-disable at-rule-no-unknown */
55
@tailwind base;
@@ -9,11 +9,13 @@
99

1010
/* Global Styles */
1111
@font-face {
12-
font-family: "DIN Condensed Bold";
12+
font-family: 'DIN Condensed Bold';
1313
font-style: normal;
1414
font-weight: normal;
1515
font-display: auto;
16+
/* stylelint-disable-next-line at-rule-descriptor-no-unknown */
1617
-webkit-font-smoothing: antialiased;
18+
/* stylelint-disable-next-line at-rule-descriptor-no-unknown */
1719
-moz-osx-font-smoothing: grayscale;
1820

1921
/* prettier-ignore */

common/styles/media-queries.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
@custom-media --medium-viewport (max-width: 768px);
66
@custom-media --large-viewport (max-width: 992px);
77
@custom-media --extra-large-viewport (max-width: 1200px);
8-
98
@custom-media --mobile-viewport (--large-viewport);
109
@custom-media --desktop-viewport (min-width: 992px);

common/styles/variables.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
--errorDeep: hsl(355, 63%, 34%, 1);
2121

2222
/* Fonts */
23-
--primaryFontFamily: "DIN Condensed Bold";
24-
--secondaryFontFamily: "Encode Sans";
23+
--primaryFontFamily: 'DIN Condensed Bold';
24+
--secondaryFontFamily: 'Encode Sans';
2525

2626
/*
2727
* Breakpoint definitions used in Storybook

common/utils/cookie-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const hasValidAuthToken = (token = cookie.get('token')) => {
2626
return false;
2727
}
2828

29-
const jwt = jwtDecode(token);
29+
const jwt = jwtDecode<{ exp: number }>(token);
3030
const currentTime = new Date().getTime() / 1000;
3131

3232
// Valid if jwt expiry is in the future

components/Alert/Alert.module.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,16 @@
3333
margin: 0 0.25rem;
3434
vertical-align: middle;
3535
transform: scale(1);
36-
transition: 0.2s color linear, 0.2s transform linear;
36+
transition:
37+
0.2s color linear,
38+
0.2s transform linear;
3739
}
3840

3941
.alertCloseButton:hover {
4042
color: black;
4143
cursor: pointer;
4244
transform: scale(1.1);
43-
transition: 0.2s color linear, 0.2s transform linear;
45+
transition:
46+
0.2s color linear,
47+
0.2s transform linear;
4448
}

components/Buttons/Button/Button.module.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
min-width: 175px;
1414
padding: 1rem 0.75rem 0.75rem;
1515
white-space: nowrap;
16-
transition: 0.2s linear background-color, 0.2s linear color;
16+
transition:
17+
0.2s linear background-color,
18+
0.2s linear color;
1719
text-shadow: none;
1820
}
1921

components/ErrorDisplay/ErrorDisplay.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ function ErrorDisplay({ statusCode }: ErrorDisplayPropsType) {
1414
<meta name="robots" content="noindex, nofollow" key={statusCode} />
1515
</Head>
1616

17-
<div
18-
className={
19-
'h-screen text-white bg-[url("/static/images/TankFlip.gif")] flex flex-col justify-center w-full bg-cover items-center'
20-
}
21-
>
17+
<div className='h-screen text-white bg-[url("/static/images/TankFlip.gif")] flex flex-col justify-center w-full bg-cover items-center'>
2218
<div className="mx-auto my-4 text-center">
2319
<h1 className="text-6xl text-white">{statusCode || 'Oh no'}!</h1>
2420
<p className="text-2xl text-white">

0 commit comments

Comments
 (0)