Skip to content

Commit

Permalink
Merge branch 'develop' into feature/SWED-2335-input_field_ui_update
Browse files Browse the repository at this point in the history
  • Loading branch information
goldenraphti committed Apr 9, 2024
2 parents eec5e46 + a2a7b7f commit 16d4c60
Show file tree
Hide file tree
Showing 14 changed files with 3,291 additions and 3,475 deletions.
2 changes: 0 additions & 2 deletions .github/scripts/sentry.sh

This file was deleted.

9 changes: 4 additions & 5 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,17 @@ Design Guide is hosted on Azure Storage with Locally-redundant storage (LRS). Th

The deploy procedure is set up to run with GitHub Actions. All workflows can be accessed within this folder.

- **GitHub repository** needs to be specified (`SwedbankPay/design.swedbankpay.com`).
- **Default branch** needs to be set to `master`.
- **GitHub repository** needs to be specified (`SwedbankPay/design.swedbankpay.com`).
- **Default branch** needs to be set to `master`.

The current configuration is set to make sure a pushed tag will deploy the project.

### General configuration

Setting the following GitHub secrets variables:

- `AZURE_CREDENTIALS` - Azure credentials used to authenticate with our azure containers.
- `AZURE_CREDENTIALS_STAGE` - Azure credentials used to authenticate with our azure stage containers.
- `SENTRY_TOKEN` - API key to sentry. Used by the `sentry.sh` script during release workflow.
- `AZURE_CREDENTIALS` - Azure credentials used to authenticate with our azure containers.
- `AZURE_CREDENTIALS_STAGE` - Azure credentials used to authenticate with our azure stage containers.

## Workflows

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ jobs:
id: variables
run: ./.github/scripts/variables.sh --brand ${{ matrix.brand }} --ref ${{ github.ref }}

# Add sentry token
- name: Sentry token
run: ./.github/scripts/sentry.sh
env:
TOKEN: ${{ secrets.SENTRY_TOKEN }}

- name: Set Node.js 18.x
uses: actions/setup-node@v4
with:
Expand Down
7 changes: 0 additions & 7 deletions .sentryclirc

This file was deleted.

26 changes: 12 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,19 +226,18 @@ GitHub Actions will also create and deploy a release on Azure for the PayEx bran

## Notable files

|  File | Description |
| :------------------ | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `.babelrc` | [Babel][babel] configuration. |
| `.eslintignore` | List of files/directories ESLint will ignore (similar to `.gitignore`) |
| `.eslintrc` | [Eslint][eslint] configuration. |
| `.prettierignore` | List of files/directories ESLint will ignore (similar to `.gitignore`) |
| `.prettierrc.json` | [Prettier][prettier] configuration. |
| `.sentryclirc` | [Sentry][sentry] configuration used by Webpack to configure a new release on sentry. _(Do **not** change the line `token = <token>`, as this placeholder is used by AppVeyor to insert the sentry api key.)_ |
| `.stylelintrc` | [Stylelint][stylelint] configuration. |
| `CHANGELOG.md` | Collection of changes made to the project. Insert your changes here. |
| `jest.config.js` | [jest][jest] configuration. |
| `jest.setup.js` | Script file that will run before jest executes the tests, polyfills and other useful snippets. |
| `webpack.config.js` | [Webpack][webpack] configuration. |
|  File | Description |
| :------------------ | :--------------------------------------------------------------------------------------------- |
| `.babelrc` | [Babel][babel] configuration. |
| `.eslintignore` | List of files/directories ESLint will ignore (similar to `.gitignore`) |
| `.eslintrc` | [Eslint][eslint] configuration. |
| `.prettierignore` | List of files/directories ESLint will ignore (similar to `.gitignore`) |
| `.prettierrc.json` | [Prettier][prettier] configuration. |
| `.stylelintrc` | [Stylelint][stylelint] configuration. |
| `CHANGELOG.md` | Collection of changes made to the project. Insert your changes here. |
| `jest.config.js` | [jest][jest] configuration. |
| `jest.setup.js` | Script file that will run before jest executes the tests, polyfills and other useful snippets. |
| `webpack.config.js` | [Webpack][webpack] configuration. |

## Copyright, license and credits

Expand All @@ -265,7 +264,6 @@ Inspired by [Bootstrap][bootstrap] and [Materialize][materialize].
[babel]: https://babeljs.io/
[eslint]: https://eslint.org/
[prettier]: https://prettier.io/
[sentry]: https://sentry.io
[stylelint]: https://stylelint.io/
[jest]: https://facebook.github.io/jest/
[bootstrap]: http://getbootstrap.com/
Expand Down
10 changes: 9 additions & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,16 @@
## Component changes

- Input fields
- labels line-hieght increased

- labels line-height increased

- Buttons
- add Danish MitId button style (you can use either `i.bank-id-dk` OR `i.mitid-dk`, both are supported)

## Technical changes

- chore deps (update deps packages minor versions)

- remove Sentry from codebase

## Design System website
Loading

0 comments on commit 16d4c60

Please sign in to comment.