Squashed commit of the following: commit 72fe0460be679ccbd89987a9a6b167c78cf1f950 Merge: 844a94473d941fddAuthor: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Wed Oct 6 10:21:33 2021 +0200 Merge branch 'develop' into bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande commit 844a9447e3729e5d75df68eba893ff12a5dcd32e Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Wed Oct 6 10:21:26 2021 +0200 Amends commit c601e1a02fa9b7976ee071e93b0c6623dd89588e Merge: 9f979e125cee9695Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Tue Oct 5 15:01:37 2021 +0200 Merge branch 'develop' into bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande commit 9f979e12243328cdf5fbb19ee178115dcffbda12 Merge: a16b6c2707ec3c4aAuthor: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Tue Oct 5 11:10:36 2021 +0200 Merge branch 'develop' into bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande commit a16b6c27d86f6c1442bc725485e5ebc1c532a6f5 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Tue Oct 5 11:03:36 2021 +0200 - Changed additional text to be more detailed and only accessible for screen-readers - Created a mixin for screen-reader only (sr-only) - reverted back accessibillity for selected organization for screen readers commit 253c64998d7b3ab8415af35a3d27423c69980d75 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Oct 4 16:44:04 2021 +0200 Changed title to aria-labelledby commit 9ef22ec8f861a90c49d30ad1b1ab6e76082168a9 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Oct 4 16:24:10 2021 +0200 Amends after PR commit a5dc1afc4c2bed922ddb5dcb29ee2dc5a0e43318 Merge: 7577640ed139f750Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Oct 4 13:07:38 2021 +0200 Merge branch 'develop' into bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande commit 7577640e80b4fc17be54d9fe9235abc3f1b792d4 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Fri Oct 1 14:08:44 2021 +0200 Accessibility adaptation
mina-sidor-fa
The project was generated using Nx.
Quick Start & Documentation
For all commands we will refer to the npm scripts located inside package.json. When using these commands, you do not need to have @angular/cli installed globally on your computer.
To get started, clone the repository and run npm install in the root of the project, this will install all dependencies.
Development server mina-sidor-fa
Run npm start for a dev server. Navigate to http://localhost:4200/. The app will automatically reload if you change any of the source files.
Dotnet API
Run npm run start:api to run against the Dotnet API.
Generate an application
Run npm run new-app my-app to generate an application. When using Nx, you can create multiple applications and libraries in the same workspace.
Generate a library
Run npm run new-lib my-lib to generate a library. Libraries are shareable across libraries and applications. They can be imported from @mina-sidor-fa/mylib.
Code scaffolding
Run npm run new-component my-component --project=my-app to generate a new component.
Build mina-sidor-fa
Run npm run build to build the project. The build artifacts will be stored in the dist/ directory. Use the --prod flag for a production build.
Mock-api
If you want to use the mock-api, read the README here.
Dotnet API
Run npm run build:api to build the project using the Dotnet API.
Running unit tests on mina-sidor-fa
Run npm run test to execute the unit tests via Jest.
Run npm run nx affected:test to execute the unit tests affected by a change.
Running end-to-end tests on mina-sidor-fa
Run npm run e2e to execute the end-to-end tests via Cypress.
Run npm run nx affected:e2e to execute the end-to-end tests affected by a change.
Understand your workspace
Run npm run nx dep-graph to see a diagram of the dependencies of your projects.
Git workflow
-
Use branching model Gitflow.
- Example:
feature/TV-XXXXorbugfix/TV-XXXX - A useful CLI helper tool can be used: gitflow-avh.
- Example:
-
Clone origin, create feature/bugfix branches and push back to origin.
-
Don't forget to commit and push your changes regulary!
-
Create a pull request for each feature branch.
-
When merging the pull request, follow conventional commits structure inside the merge message.
-
The merge-message, which follows conventional commits, will be added to the CHANGELOG after a release is made.
-
A commit message could look like this:
feat(startpage): Added headings and description to the startpage (TV-1234). -
The changelog would look something like this:
### Features - **startpage:** Added headings and description to the startpage ([TV-1234](https://jira.arbetsformedlingen.se/browse/TV-1234)) ([commit-hash](https://bitbucket.arbetsformedlingen.se/projects/tea/repos/mina-sidor-fa-web/commits/commit-hash))
-
-
Upon merge, Open Shift will deploy the application to AUTO and SYS.
Release and deploy
We use a semi-automated release and deploy to different test-enviroments. A release script is used in combination with semantic-release to add the correct version of the application and changes to the changelog. The deployments are made depending on which branches are updated:
developis automatically deployed to AUTO and SYS.nextis automatically deployed to TEST.mainis automatically deployed to ACC. After this is completed, a question needs to be answered whether the image should be deployed to PROD.
Deploy to TEST
To deploy the application to TEST you need to create a release. Make sure you are in the develop branch and are up-to-date with origin. Then run npm run release. This will:
- Update the CHANGELOG.md and copies the CHANGELOG to assets.
- Bump the applications version according to semantic versioning.
- Commits the CHANGELOG to
developand pushes it to origin. - Merge
developintonextand pushesnextto origin.
Open Shift will deploy the application to TEST.
Release to ACC and PROD
To release the latest version of next to ACC and eventually to PROD; a pull request should be created to merge next into main. The next branch is protected and will not be deleted upon merge.
Open Shift will deploy the application to ACC and a question inside the pipeline is asked if the application also should be deployed to PROD. This question will persist for 24 hours.