Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: unify prettier configs between back-end and front-end #393

Merged
merged 1 commit into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"tabWidth": 2,
"singleQuote": true,
"trailingComma": "all"
"trailingComma": "none"
}
12 changes: 8 additions & 4 deletions client/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{
"tabWidth": 2,
"singleQuote": true,
"bracketSpacing": true,
"printWidth": 80,
"trailingComma": "none",
"arrowParens": "always",
"quoteProps": "consistent"
"overrides": [
{
"files": ["*.html", "*.md"],
"options": {
"printWidth": 120
}
}
]
}
66 changes: 11 additions & 55 deletions client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,12 @@
<meta name="description" content="Broken Crystals" />

<!-- Favicons -->
<link
rel="apple-touch-icon"
sizes="180x180"
href="/favicons/apple-icon-180x180.png"
/>
<link
rel="icon"
type="image/png"
sizes="192x192"
href="/favicons/android-icon-192x192.png"
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href="/favicons/favicon-32x32.png"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="/favicons/favicon-16x16.png"
/>
<link rel="apple-touch-icon" sizes="180x180" href="/favicons/apple-icon-180x180.png" />
<link rel="icon" type="image/png" sizes="192x192" href="/favicons/android-icon-192x192.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/favicons/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicons/favicon-16x16.png" />
<meta name="theme-color" content="#ffffff" />
<meta
name="insight-app-sec-validation"
content="38936a45-0c2c-4f3c-89c0-a26817f2a5a8"
/>
<meta name="insight-app-sec-validation" content="38936a45-0c2c-4f3c-89c0-a26817f2a5a8" />
<script id="config" type="application/json" src="/api/config"></script>

<!--
Expand All @@ -49,41 +27,19 @@
/>

<!-- Vendor CSS Files -->
<link
href="/assets/vendor/bootstrap/css/bootstrap.min.css"
rel="stylesheet"
/>
<link href="/assets/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
<link href="/assets/vendor/icofont/icofont.min.css" rel="stylesheet" />
<link
href="/assets/vendor/boxicons/css/boxicons.min.css"
rel="stylesheet"
/>
<link href="/assets/vendor/boxicons/css/boxicons.min.css" rel="stylesheet" />
<link href="/assets/vendor/venobox/venobox.css" rel="stylesheet" />
<link href="/assets/vendor/aos/aos.css" rel="stylesheet" />

<!-- Fontfaces CSS-->
<link
href="/vendor/font-awesome-4.7/css/font-awesome.min.css"
rel="stylesheet"
media="all"
/>
<link
href="/vendor/font-awesome-5/css/fontawesome-all.min.css"
rel="stylesheet"
media="all"
/>
<link
href="/vendor/mdi-font/css/material-design-iconic-font.min.css"
rel="stylesheet"
media="all"
/>
<link href="/vendor/font-awesome-4.7/css/font-awesome.min.css" rel="stylesheet" media="all" />
<link href="/vendor/font-awesome-5/css/fontawesome-all.min.css" rel="stylesheet" media="all" />
<link href="/vendor/mdi-font/css/material-design-iconic-font.min.css" rel="stylesheet" media="all" />

<!-- Vendor CSS-->
<link
href="/vendor/animsition/animsition.min.css"
rel="stylesheet"
media="all"
/>
<link href="/vendor/animsition/animsition.min.css" rel="stylesheet" media="all" />
<link href="/vendor/wow/animate.css" rel="stylesheet" media="all" />
<link href="/vendor/slick/slick.css" rel="stylesheet" media="all" />

Expand Down
6 changes: 3 additions & 3 deletions client/src/api/httpClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ export function putUserData(user: UserData): Promise<UserData> {
method: 'put',
headers: {
'content-type': 'application/json',
'authorization':
authorization:
sessionStorage.getItem('token') || localStorage.getItem('token')
},
data: user
Expand All @@ -231,7 +231,7 @@ export function putPhoto(photo: File, email: string): Promise<any> {
method: 'put',
headers: {
'content-type': 'image/png',
'authorization':
authorization:
sessionStorage.getItem('token') || localStorage.getItem('token')
},
data
Expand Down Expand Up @@ -287,7 +287,7 @@ export function viewProduct(productName: string): Promise<any> {
url: `${ApiUrl.Products}/views`,
method: 'get',
headers: {
'authorization':
authorization:
sessionStorage.getItem('token') || localStorage.getItem('token'),
'x-product-name': productName
}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
'-U',
'${POSTGRES_USER}',
'-P',
'${POSTGRES_PASSWORD}',
'${POSTGRES_PASSWORD}'
]
timeout: 45s
environment:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
'-U',
'${POSTGRES_USER}',
'-P',
'${POSTGRES_PASSWORD}',
'${POSTGRES_PASSWORD}'
]
timeout: 45s
volumes:
Expand Down Expand Up @@ -69,7 +69,7 @@ services:
'-U',
'${POSTGRES_USER}',
'-P',
'${POSTGRES_PASSWORD}',
'${POSTGRES_PASSWORD}'
]
timeout: 45s
restart: on-failure
Expand Down
12 changes: 6 additions & 6 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ export default tseslint.config(
eslint.configs.recommended,
...tseslint.configs.strict,
{
ignores: ['**/charts', '**/dist', '**/client'],
ignores: ['**/charts', '**/dist', '**/client']
},
{
rules: {
'@typescript-eslint/no-extraneous-class': [
'error',
{
allowWithDecorator: true,
},
],
},
},
allowWithDecorator: true
}
]
}
}
);
Loading