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/css changes #2466

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
82836f0
chore(deps): bump sass from 1.80.6 to 1.80.7 (#2433)
dependabot[bot] Nov 14, 2024
a97314c
chore(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 (#2434)
dependabot[bot] Nov 14, 2024
32eb6a9
chore(deps): bump @mui/x-charts from 7.22.1 to 7.22.2 (#2435)
dependabot[bot] Nov 14, 2024
ab509f6
chore(deps): bump @types/react from 18.3.3 to 18.3.12 (#2436)
dependabot[bot] Nov 14, 2024
fb913e1
Update pull-request.yml
palisadoes Nov 14, 2024
8d43aae
css for color blinds
AVtheking Nov 24, 2024
438651b
Merge branch 'develop-postgres' into chore/css_changes
AVtheking Nov 24, 2024
146fe5c
fix
AVtheking Nov 24, 2024
f616b62
lint fix
AVtheking Nov 24, 2024
77356a6
lint fix
AVtheking Nov 24, 2024
437e976
fix failing test
AVtheking Nov 24, 2024
fbb3c84
fix
AVtheking Nov 24, 2024
31e4c01
fix
AVtheking Nov 24, 2024
ae24537
fix
AVtheking Nov 25, 2024
f8fec63
fix
AVtheking Nov 25, 2024
e81e11f
fix
AVtheking Nov 25, 2024
db2fa22
fix
AVtheking Nov 25, 2024
5816180
Merge branch 'develop-postgres' into chore/css_changes
AVtheking Nov 25, 2024
c588c65
fix
AVtheking Nov 25, 2024
ba84f5f
lock file changes
AVtheking Nov 25, 2024
f6a7a4c
Merge branch 'develop-postgres' into chore/css_changes
AVtheking Nov 27, 2024
b8647ac
fix type
AVtheking Nov 27, 2024
4fcc338
fix type
AVtheking Nov 27, 2024
f955733
Update tagTemplate.ts
AVtheking Nov 27, 2024
ec524b3
Update tagTemplate.ts
AVtheking Nov 27, 2024
55e65c1
Update tagTemplate.ts
AVtheking Nov 27, 2024
955e932
Update tagTemplate.ts
AVtheking Nov 27, 2024
bc02375
Update tagTemplate.ts
AVtheking Nov 27, 2024
3567b7c
Update tagTemplate.ts
AVtheking Nov 27, 2024
0e162ac
Update TableRow.tsx
AVtheking Nov 27, 2024
1e2930f
Update tsconfig.json
AVtheking Nov 27, 2024
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
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ src/components/CheckIn/tagTemplate.ts
package.json
package-lock.json
tsconfig.json

15 changes: 5 additions & 10 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"es6": true
},

// Specify the rulesets from other ESLint Plugins tobe used
"extends": [
"plugin:react/recommended",
"eslint:recommended",
Expand All @@ -28,7 +27,6 @@
"sourceType": "module"
},

// Specify the ESLint plugins tobe used
"plugins": [
"react",
"@typescript-eslint",
Expand Down Expand Up @@ -78,13 +76,13 @@
"camelcase": "off",
"@typescript-eslint/naming-convention": [
"error",
// Interfaces must begin with Interface or TestInterface followed by a PascalCase name

{
"selector": "interface",
"format": ["PascalCase"],
"prefix": ["Interface", "TestInterface"]
},
// Type Aliases must be in PascalCase

AVtheking marked this conversation as resolved.
Show resolved Hide resolved
{
"selector": ["typeAlias", "typeLike", "enum"],
"format": ["PascalCase"]
Expand Down Expand Up @@ -121,20 +119,17 @@
"format": null
}
],
// Ensures that components are always written in PascalCase

"react/jsx-pascal-case": [
"error",
{ "allowAllCaps": false, "allowNamespace": false }
],

// Enforces whitespace around equal sign operators
"react/jsx-equals-spacing": ["warn", "never"],
"react/no-this-in-sfc": "error",

// All tests must need not have an assertion
"jest/expect-expect": 0,

// Enforce Strictly functional components
"react/no-unstable-nested-components": ["error", { "allowAsProps": true }],
"react/function-component-definition": [
0,
Expand All @@ -143,10 +138,10 @@
"prettier/prettier": "error"
},

// Let ESLint use the react version in the package.json
"settings": {
"react": {
"version": "detect"
}
}
},
"ignorePatterns": ["**/*.css", "**/*.scss", "**/*.less", "**/*.json"]
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@
"@vitest/coverage-istanbul": "^2.1.5",
"babel-jest": "^29.7.0",
"cross-env": "^7.0.3",
"eslint": "^8.49.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jest": "^28.8.0",
Expand Down
23 changes: 23 additions & 0 deletions src/assets/css/app.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import styles from './AdvertisementRegister.module.css';
import styles from '../../../../style/app.module.css';
import { Button, Form, Modal } from 'react-bootstrap';
import {
ADD_ADVERTISEMENT_MUTATION,
Expand Down Expand Up @@ -263,7 +263,7 @@ function advertisementRegister({
</div>
)}
<Modal show={show} onHide={handleClose}>
<Modal.Header closeButton className={styles.editHeader}>
<Modal.Header closeButton>
{formStatus === 'register' ? (
<Modal.Title> {t('addNew')}</Modal.Title>
) : (
Expand Down Expand Up @@ -405,6 +405,7 @@ function advertisementRegister({
<Button
variant="secondary"
onClick={handleClose}
className={styles.closeButton}
data-testid="addonclose"
>
{tCommon('close')}
Expand All @@ -414,6 +415,7 @@ function advertisementRegister({
variant="primary"
onClick={handleRegister}
data-testid="addonregister"
className={styles.addButton}
>
{tCommon('register')}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/CheckIn/tagTemplate.ts

Large diffs are not rendered by default.

Loading
Loading