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

Sprint 5 #18

Merged
merged 49 commits into from
Feb 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
f9f4885
renaming components to match upcoming package scope name
DanielvanVliet Jan 7, 2021
1f5a1b9
Add repository field to all package.json
GewoonMaarten Jan 7, 2021
9fa5885
Merge branch 'feature/MDH-4539-renaming-components' of github.com:Gem…
GewoonMaarten Jan 7, 2021
127580a
updated readme
DanielvanVliet Jan 7, 2021
7246738
Add scope to package.json
GewoonMaarten Jan 9, 2021
7245d19
Merge branch 'feature/MDH-4539-renaming-components' of github.com:Gem…
GewoonMaarten Jan 9, 2021
5f74814
Publish
GewoonMaarten Jan 9, 2021
512313e
Fix name of avatar component
GewoonMaarten Jan 9, 2021
01ba6fa
Revert "Publish"
GewoonMaarten Jan 9, 2021
6522194
Fix name of avatar
GewoonMaarten Jan 9, 2021
30266a8
Update dependencies
GewoonMaarten Jan 9, 2021
f0d84db
Update README.md
GewoonMaarten Jan 9, 2021
97148a3
Add directory to package.json
GewoonMaarten Jan 9, 2021
b5647df
Update README.md
GewoonMaarten Jan 9, 2021
b896b86
Merge pull request #2 from Gemeente-DenHaag/feature/MDH-4539-renaming…
GewoonMaarten Jan 9, 2021
53c6251
Publish
GewoonMaarten Jan 9, 2021
41a5ce8
Version bump
GewoonMaarten Jan 9, 2021
e0570d0
Publish
GewoonMaarten Jan 9, 2021
1b56306
Voeg de configuratie van de App Service-implementatiewerkstroom toe o…
Test-Automation-Engineer Jan 14, 2021
026df58
Delete development_nldsreactstorybook-staging.yml
Test-Automation-Engineer Jan 14, 2021
d41332f
Fix local package import
GewoonMaarten Jan 16, 2021
f80781e
Add main and module to every package.json
GewoonMaarten Jan 16, 2021
692e619
Add export to grouped components
GewoonMaarten Jan 16, 2021
e86fcad
Removed tabscrollbutton from tab
GewoonMaarten Jan 16, 2021
1eb0104
Add index.tsx to group components
GewoonMaarten Jan 16, 2021
cf1f141
Add pickers back to package.json
GewoonMaarten Jan 16, 2021
7092026
Update imports in badge
GewoonMaarten Jan 16, 2021
e40ca70
Review changes
GewoonMaarten Jan 23, 2021
7f30d3e
Merge pull request #10 from Gemeente-DenHaag/fix/npm-packages-#5
GewoonMaarten Jan 23, 2021
b1d3996
Add GitHub actions yml (#9)
Test-Automation-Engineer Jan 27, 2021
9c9e1ab
Remove standard and install prettier
GewoonMaarten Jan 28, 2021
64fb919
Bring linting inline with nl-design-system
GewoonMaarten Jan 28, 2021
df33bef
Upgrade eslint packages
GewoonMaarten Jan 28, 2021
5ba5eb2
Update loading order and fix scripts
GewoonMaarten Jan 28, 2021
070a93f
Add typescript specific config
GewoonMaarten Jan 30, 2021
fb43580
Update lint staged command
GewoonMaarten Jan 30, 2021
c9cb237
Fix all js, ts linter errors
GewoonMaarten Jan 30, 2021
4cf8102
Revert "Fix all js, ts linter errors"
GewoonMaarten Jan 30, 2021
bb6da2b
Fix all js, ts linter errors
GewoonMaarten Jan 30, 2021
b4b6716
Merge branch 'feature/use-prettier' of github.com:Gemeente-DenHaag/nl…
GewoonMaarten Jan 30, 2021
4b29c1a
Fix issue with select component
GewoonMaarten Jan 30, 2021
f582363
Run prettier
GewoonMaarten Jan 30, 2021
35b4beb
Revert "Run prettier"
GewoonMaarten Jan 30, 2021
dddfd7c
Merge branch 'development' into feature/use-prettier
GewoonMaarten Feb 6, 2021
c89a40d
Run prettier
GewoonMaarten Feb 6, 2021
39187f7
Merge pull request #17 from Gemeente-DenHaag/feature/use-prettier
GewoonMaarten Feb 6, 2021
b218c4b
Add github actions yml (#16)
Test-Automation-Engineer Feb 8, 2021
079cb64
Feature/GitHub actions (#30)
Test-Automation-Engineer Feb 8, 2021
91fd17f
Feature/GitHub actions (#31)
Test-Automation-Engineer Feb 8, 2021
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
118 changes: 98 additions & 20 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"parser": "@typescript-eslint/parser",
"extends": [
"standard",
"standard-react",
"plugin:prettier/recommended",
"prettier/standard",
"prettier/react",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:jsx-a11y/recommended"
// !!!Keep this list in order.
"plugin:jsx-a11y/recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"prettier/@typescript-eslint",
"plugin:react/recommended"
],
"env": {
"node": true
},
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 2020,
"ecmaFeatures": {
"legacyDecorators": true,
Expand All @@ -21,21 +21,99 @@
},
"settings": {
"react": {
"version": "16"
"version": "detect"
}
},
"plugins": [
"jsx-a11y",
"@typescript-eslint"
],
"plugins": ["@typescript-eslint", "jsx-a11y", "prettier"],
"rules": {
"space-before-function-paren": 0,
"react/prop-types": 0,
"react/jsx-handler-names": 0,
"react/jsx-fragments": 0,
"react/no-unused-prop-types": 0,
"import/export": 0,
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "error"
"array-callback-return": ["error", { "checkForEach": false }],
"block-scoped-var": "error",
"consistent-return": "error",
"constructor-super": "error",
"eqeqeq": "error",
"for-direction": "error",
"getter-return": "error",
"no-alert": "error",
"no-async-promise-executor": "error",
"no-caller": "error",
"no-case-declarations": "error",
"no-class-assign": "error",
"no-compare-neg-zero": "error",
"no-cond-assign": "error",
"no-const-assign": "error",
"no-constant-condition": "error",
"no-constructor-return": "error",
"no-control-regex": "error",
"no-debugger": "error",
"no-delete-var": "error",
"no-dupe-args": "error",
"no-dupe-class-members": "error",
"no-dupe-else-if": "error",
"no-dupe-keys": "error",
"no-duplicate-case": "error",
"no-empty": "error",
"no-empty-character-class": "error",
"no-empty-pattern": "error",
"no-eval": "error",
"no-ex-assign": "error",
"no-extra-boolean-cast": "error",
"no-extra-semi": "error",
"no-fallthrough": "error",
"no-func-assign": "error",
"no-global-assign": "error",
"no-implicit-globals": "error",
"no-implied-eval": "error",
"no-import-assign": "error",
"no-inner-declarations": "error",
"no-invalid-regexp": "error",
"no-invalid-this": "error",
"no-irregular-whitespace": "error",
"no-lone-blocks": "error",
"no-loop-func": "error",
"no-misleading-character-class": "error",
"no-multi-str": "error",
"no-new-func": "error",
"no-new-symbol": "error",
"no-new-wrappers": "error",
"no-obj-calls": "error",
"no-octal": "error",
"no-octal-escape": "error",
"no-param-reassign": "error",
"no-prototype-builtins": "error",
"no-redeclare": "error",
"no-regex-spaces": "error",
"no-return-assign": "error",
"no-return-await": "error",
"no-self-assign": "error",
"no-self-compare": "error",
"no-sequences": "error",
"no-setter-return": "error",
"no-shadow-restricted-names": "error",
"no-sparse-arrays": "error",
"no-this-before-super": "error",
"no-throw-literal": "error",
"no-undef": "error",
"no-unexpected-multiline": "error",
"no-unmodified-loop-condition": "error",
"no-unreachable": "error",
"no-unsafe-finally": "error",
"no-unsafe-negation": "error",
"no-unused-expressions": "error",
"no-unused-labels": "error",
"no-unused-vars": "error",
"no-useless-call": "error",
"no-useless-catch": "error",
"no-useless-concat": "error",
"no-useless-escape": "error",
"no-useless-return": "error",
"no-void": "error",
"no-with": "error",
"prefer-regex-literals": "error",
"radix": "error",
"require-yield": "error",
"use-isnan": "error",
"valid-typeof": "error",
"vars-on-top": "off",
"yoda": "error"
}
}
75 changes: 75 additions & 0 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: Build and deploy Storybook to Azure Web App

on:
push:
branches:
- development
- master
pull_request:
branches:
- development
- master

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Set up Node.js version
uses: actions/setup-node@v2
with:
node-version: "14.x"

- name: yarn install, build storybook
run: |
npm install -g yarn
yarn install
yarn build-storybook

- name: Upload storybook
uses: actions/upload-artifact@v2
with:
name: storybook
path: storybook-static

deploy-staging:
needs: build
if: github.ref == 'refs/heads/development'
runs-on: ubuntu-latest

steps:
- name: Download storybook
uses: actions/download-artifact@v2
with:
name: storybook
path: storybook-static

- name: 'Deploy to Azure Web App'
uses: azure/webapps-deploy@v2
with:
app-name: 'nldsreactstorybook-staging'
slot-name: 'production'
publish-profile: ${{ secrets.AzureAppService_Nlds_Staging }}
package: storybook-static

deploy-production:
needs: build
if: github.ref == 'refs/heads/master'
runs-on: ubuntu-latest

steps:
- name: Download storybook
uses: actions/download-artifact@v2
with:
name: storybook
path: storybook-static

- name: 'Deploy to Azure Web App'
uses: azure/webapps-deploy@v2
with:
app-name: 'nldsreactstorybook'
slot-name: 'production'
publish-profile: ${{ secrets.AzureAppService_Nlds_Prod }}
package: storybook-static
2 changes: 1 addition & 1 deletion .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"package.json": "npmPkgJsonLint",
"*.{ts,tsx}": "ts-standard",
"*.{ts,tsx}": "eslint",
"*.css": "stylelint"
}
8 changes: 8 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Ignore 3rd party files
node_modules

# Ignore generated files
dist
CHANGELOG.md
package.json
package-lock.json
54 changes: 45 additions & 9 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,11 +1,47 @@
{
"singleQuote": true,
"jsxSingleQuote": true,
"semi": false,
"tabWidth": 2,
"bracketSpacing": true,
"jsxBracketSameLine": false,
"arrowParens": "always",
"trailingComma": "none",
"endOfLine":"auto"
"overrides": [
{
"files": ["*.js"],
"options": {
"parser": "flow",
"printWidth": 120,
"trailingComma": "all",
"tabWidth": 2,
"singleQuote": true
}
},
{
"files": ["*.json"],
"options": {
"parser": "json",
"printWidth": 120,
"tabWidth": 2
}
},
{
"files": ["*.ts"],
"options": {
"parser": "typescript",
"printWidth": 120,
"trailingComma": "all",
"tabWidth": 2,
"singleQuote": true
}
},
{
"files": ["*.css", "*.scss"],
"options": {
"parser": "css",
"tabWidth": 2
}
},
{
"files": ["*.html"],
"options": {
"parser": "html",
"printWidth": 120,
"tabWidth": 2
}
}
]
}
15 changes: 6 additions & 9 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
module.exports = {
"stories": [
"../src/stories/*.stories.mdx",
"../src/stories/*.stories.@(js|jsx|ts|tsx)",
"../src/stories/*/*.stories.@(js|jsx|ts|tsx)"
stories: [
'../src/stories/*.stories.mdx',
'../src/stories/*.stories.@(js|jsx|ts|tsx)',
'../src/stories/*/*.stories.@(js|jsx|ts|tsx)',
],
"addons": [
"@storybook/addon-links",
"@storybook/addon-essentials"
]
}
addons: ['@storybook/addon-links', '@storybook/addon-essentials'],
};
5 changes: 2 additions & 3 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

export const parameters = {
actions: { argTypesRegex: "^on[A-Z].*" },
}
actions: { argTypesRegex: '^on[A-Z].*' },
};
32 changes: 16 additions & 16 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
- Demonstrating empathy and kindness toward other people
- Being respectful of differing opinions, viewpoints, and experiences
- Giving and gracefully accepting constructive feedback
- Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
- Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
- The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
- Trolling, insulting or derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities
Expand All @@ -59,7 +59,7 @@ representative at an online or offline event.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at ***[method of contact not yet decided]***.
reported to the community leaders responsible for enforcement at **_[method of contact not yet decided]_**.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
Expand Down Expand Up @@ -105,7 +105,7 @@ Violating these terms may lead to a permanent ban.
### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
Expand All @@ -118,14 +118,14 @@ version 2.0, available at
[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].

Community Impact Guidelines were inspired by
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
[Mozilla's code of conduct enforcement ladder][mozilla coc].

For answers to common questions about this code of conduct, see the FAQ at
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
[https://www.contributor-covenant.org/faq][faq]. Translations are available
at [https://www.contributor-covenant.org/translations][translations].

[homepage]: https://www.contributor-covenant.org
[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
[Mozilla CoC]: https://github.com/mozilla/diversity
[FAQ]: https://www.contributor-covenant.org/faq
[mozilla coc]: https://github.com/mozilla/diversity
[faq]: https://www.contributor-covenant.org/faq
[translations]: https://www.contributor-covenant.org/translations
Loading