Skip to content

Commit

Permalink
Chore/css changes (#2466)
Browse files Browse the repository at this point in the history
* chore(deps): bump sass from 1.80.6 to 1.80.7 (#2433)

Bumps [sass](https://github.com/sass/dart-sass) from 1.80.6 to 1.80.7.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](sass/dart-sass@1.80.6...1.80.7)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 (#2434)

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.30.0 to 2.31.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](import-js/eslint-plugin-import@v2.30.0...v2.31.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump @mui/x-charts from 7.22.1 to 7.22.2 (#2435)

Bumps [@mui/x-charts](https://github.com/mui/mui-x/tree/HEAD/packages/x-charts) from 7.22.1 to 7.22.2.
- [Release notes](https://github.com/mui/mui-x/releases)
- [Changelog](https://github.com/mui/mui-x/blob/v7.22.2/CHANGELOG.md)
- [Commits](https://github.com/mui/mui-x/commits/v7.22.2/packages/x-charts)

---
updated-dependencies:
- dependency-name: "@mui/x-charts"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump @types/react from 18.3.3 to 18.3.12 (#2436)

Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.3.3 to 18.3.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update pull-request.yml

* css for color blinds

* fix

* lint fix

* lint fix

* fix failing test

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* lock file changes

* fix type

* fix type

* Update tagTemplate.ts

* Update tagTemplate.ts

* Update tagTemplate.ts

* Update tagTemplate.ts

* Update tagTemplate.ts

* Update tagTemplate.ts

* Update TableRow.tsx

* Update tsconfig.json

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Harrison <16875803+palisadoes@users.noreply.github.com>
  • Loading branch information
3 people authored Nov 28, 2024
1 parent 1332fec commit 305071b
Show file tree
Hide file tree
Showing 29 changed files with 507 additions and 304 deletions.
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

{
"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

0 comments on commit 305071b

Please sign in to comment.