Squashed commit of the following: commit 1337b528d8234dd218805ecc75901755b20ed374 Merge: 92437fe5a97ebfAuthor: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Tue Jun 15 12:56:40 2021 +0200 fix: merged with latest from develp branch and resolved conflicts commit 92437fe3ce83582d4a0c662f8dd4399795e8123d Merge: 97b008948801a9Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Mon Jun 14 08:28:42 2021 +0200 Merge branch 'develop' into feature/TV-227 commit 97b0089d4910c47bde0d06e1df739affcf82b29f Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Fri Jun 4 17:01:36 2021 +0200 fix: minor css changes commit c4f7088c652821f42685783227a5f794b606f3b8 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Fri Jun 4 16:58:46 2021 +0200 fix: placed auth-checkbox and read-more button inside a grid commit dadc9abfde15890d7b5625f67cc51d6784b2fa72 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Fri Jun 4 13:59:14 2021 +0200 fix: removed an unused variable commit 81861428174b63016026e95e55a5c7742e31d860 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Fri Jun 4 13:52:31 2021 +0200 fix: minor changes plus added aria-label to read-more button commit be9b4edfadaefbc9728ce991e1361375c6acc238 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Fri Jun 4 13:42:21 2021 +0200 fix: minor changes to improve functionality commit 3d2ac66bed2183ddc1346f0fb88d629de48ebe02 Merge: 86b0598d91b3e6Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Fri Jun 4 12:56:32 2021 +0200 incoming changes through merge with develop-branch commit 86b0598d00406ee3d65504f452a03235a59f4580 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Jun 3 12:01:29 2021 +0200 fix: removed unnecessary variable commit 81887c0e8b1ce4b25bc326e362909a200983898f Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Jun 3 11:43:02 2021 +0200 Added modal-functionality to display authorization info when creating employee account commit 9d37e01a3aea83a00f126647495292b558d5883b Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Jun 3 10:57:23 2021 +0200 fix: changed name in autorizations.js in mock-api to go along with the current info
DAFA-web
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 DAFA-web
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 @dafa-web-monorepo/mylib.
Code scaffolding
Run npm run new-component my-component --project=my-app to generate a new component.
Build DAFA-web
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.
Dotnet API
Run npm run build:api to build the project using the Dotnet API.
Running unit tests on DAFA-web
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 DAFA-web
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/dafa-web-monorepo/commits/commit-hash))
-
-
Upon merge, Open Shift will deploy the application to AUTO and TEST.
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 TEST.nextis automatically deployed to SYS.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 SYS
To deploy the application to SYS 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 SYS.
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.