Skip to content

Commit

Permalink
Merge pull request #116 from policy-design-lab/release/0.4.0
Browse files Browse the repository at this point in the history 
Release 0.4.0 to solve merge conflict problem
  • Loading branch information
@pengyin-shan
pengyin-shan authored May 10, 2023
2 parents 4f891c5 + 76cbded commit 9cc98bf
Show file tree
Hide file tree
Showing 48 changed files with 29,391 additions and 2,931 deletions.
257 changes: 192 additions & 65 deletions .eslintrc
View file
Original file line number Diff line number Diff line change
@@ -1,80 +1,207 @@
{
"root": true,
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:react/recommended",
"plugin:react/jsx-runtime"
"airbnb",
"prettier",
"plugin:prettier/recommended",
"plugin:react/recommended"
],
"plugins": [
"prettier",
"react"
],
"settings": {
"react": {
"version": "detect"
"parser": "@babel/eslint-parser",
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"parser": "@babel/eslint-parser",
"overrides": [
{
"files": ["*.ts", "*.tsx"],
"extends": [
"plugin:@typescript-eslint/recommended"
],
"plugins": [
"@typescript-eslint"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "./tsconfig.json",
"tsconfigRootDir": "./"
}
}
],
"env": {
"es6": true,
"browser": true,
"es6": true,
"node": true,
"jquery": true,
"mocha": true
"jest": true
},
"rules": {
"no-mixed-spaces-and-tabs": ["warn", "smart-tabs"],
"eqeqeq": ["warn", "smart"],
"no-eval": "warn",
"quotes": ["warn", "double"],
"indent": ["warn", "tab"],
"no-console": 1,
"no-debugger": 1,
"no-var": "error",
"semi": ["warn", "always"],
"no-trailing-spaces": 0,
"eol-last": "warn",
"no-underscore-dangle": 0,
"no-alert": 0,
"no-lone-blocks": 0,
"no-unused-vars": "warn",
"prefer-template": "warn",
"jsx-quotes": 1,
"prefer-const": ["warn", {
"destructuring": "any",
"ignoreReadBeforeAssign": false
}],
"react/display-name": [ 1, {"ignoreTranspilerName": false }],
"react/forbid-prop-types": [1, {"forbid": ["any"]}],
"react/jsx-boolean-value": 0,
"react/jsx-closing-bracket-location": 0,
"react/jsx-curly-spacing": 1,
"react/jsx-indent-props": 0,
"react/jsx-key": 1,
"react/jsx-max-props-per-line": 0,
"react/jsx-no-bind": 0,
"react/jsx-no-duplicate-props": 1,
"react/jsx-no-literals": 0,
"react/jsx-no-undef": 1,
"react/jsx-pascal-case": 1,
"react/jsx-sort-prop-types": 0,
"react/jsx-sort-props": 0,
"react/jsx-uses-react": 0,
"react/jsx-uses-vars": 1,
"react/no-danger": 1,
"react/no-did-mount-set-state": 1,
"react/no-did-update-set-state": 1,
"react/no-direct-mutation-state": 1,
"react/no-multi-comp": 1,
"react/no-set-state": 0,
"react/no-unknown-property": 1,
"react/prefer-es6-class": 1,
"react/prop-types": 0,
"react/react-in-jsx-scope": 0,
"react/self-closing-comp": 1,
"react/sort-comp": 1,
"react/jsx-wrap-multilines": 1
"settings": {
"import/resolver": {
"alias" : {
"map" : [
["@components","./src/components/"]
],
"extensions": [".js"]
},
"node": {
"moduleDirectory": [
"src",
"node_modules"
],
"extensions": [
".js",
".jsx",
".ts",
".tsx"
]
}
}
},
"globals": {
"rules": {
"prettier/prettier": ["error",{
"endOfLine": "auto"}
],
"brace-style": [
"error",
"1tbs",
{
"allowSingleLine": true
}
],
"camelcase": "off",
"comma-dangle": [
"error",
"never"
],
"default-case": "off",
"function-paren-newline": [
"error",
"consistent"
],
"import/extensions": [
"error",
"ignorePackages",
{
"js": "never",
"jsx": "never",
"ts": "never",
"tsx": "never"
}
],
"import/no-extraneous-dependencies": 0,
"import/no-unresolved": [
2,
{ "caseSensitive": false }
],
"import/prefer-default-export": "off",
"jsx-a11y/control-has-associated-label": "off",
"max-len": [
"warn",
{
"code": 120,
"tabWidth": 4,
"ignoreComments": true,
"ignoreTrailingComments": true,
"ignoreUrls": true,
"ignoreStrings": true,
"ignoreTemplateLiterals": true,
"ignoreRegExpLiterals": true
}
],
"no-console": [
"error",
{
"allow": [
"error",
"warn"
]
}
],
"no-mixed-operators": "error",
"no-multi-spaces": [
"error",
{
"ignoreEOLComments": true
}
],
"no-param-reassign": [
"error",
{
"props": false
}
],
"no-underscore-dangle": "off",
"no-unused-expressions": [
"error",
{
"allowShortCircuit": true
}
],
"no-use-before-define": "off",
"object-curly-spacing": [
"error",
"always"
],
"operator-linebreak": [
"warn",
"after"
],
"prefer-destructuring": "off",
"quotes": [
"error",
"double",
{
"avoidEscape": true
}
],
"quote-props": [
"error",
"consistent-as-needed",
{
"keywords": false,
"unnecessary": true,
"numbers": false
}
],
"semi": [
"error",
"always"
],
"react/destructuring-assignment": "off",
"react/jsx-curly-newline": "off",
"react/jsx-filename-extension": [
"error",
{
"extensions": [
".jsx",
".tsx"
]
}
],
"react/jsx-indent": [
"error",
4
],
"react/jsx-indent-props": [
"error",
4
],
"react/jsx-one-expression-per-line": "off",
"react/jsx-props-no-spreading": "off",
"react/jsx-tag-spacing": "error",
"react/jsx-wrap-multilines": "off",
"react/jsx-uses-vars": 2,
"react/jsx-uses-react": 2,
"react/require-default-props": "off",
"react/prop-types": "off",
"react/static-property-placement": [
"warn",
"static public field"
],
"@typescript-eslint/explicit-function-return-type": "off"
}
}
2 changes: 1 addition & 1 deletion .prettierrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"printWidth": 120,
"trailingComma": "none",
"tabWidth": 4,
"singleQuote": true,
"doubleQuote": true,
"quoteProps": "consistent"
}
13 changes: 12 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [0.4.0] - 2023-05-10

### Added
- SNAP page and connected to SNAP API Point [#59](https://github.com/policy-design-lab/pdl-frontend/issues/59)
- Local development work environment to connect dev api server [#93](https://github.com/policy-design-lab/pdl-frontend/issues/93/)
- CSP page [#74](https://github.com/policy-design-lab/pdl-frontend/issues/74)

### Changed
- eslint rules back to original [#94](https://github.com/policy-design-lab/pdl-frontend/issues/94)

## [0.3.0] - 2023-05-03

### Added
Expand Down Expand Up @@ -62,5 +72,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Map data json [#12](https://github.com/policy-design-lab/pdl-frontend/issues/12)
- Final landing page changes for initial milestone [#15](https://github.com/policy-design-lab/pdl-frontend/issues/15)

[unreleased]: https://github.com/policy-design-lab/pdl-frontend/compare/0.3.0...HEAD
[unreleased]: https://github.com/policy-design-lab/pdl-frontend/compare/0.4.0...HEAD
[0.4.0]: https://github.com/policy-design-lab/pdl-frontend/compare/0.3.0...0.4.0
[0.3.0]: https://github.com/policy-design-lab/pdl-frontend/tag/0.3.0
Loading

0 comments on commit 9cc98bf

Please sign in to comment.