Squashed commit of the following:
commit 40fd52f67264a76a43c3567c3d56c939c02d19e9
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date: Fri Sep 24 13:35:03 2021 +0200
Update server.js
commit 7db635ff6264d21a8377369d0f3da08cb0d9e7bc
Merge: 48a4d19 f624369
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date: Fri Sep 24 13:30:53 2021 +0200
Merge branch 'develop' into feature/TV-606-corrections
commit 48a4d199eac9c416c73470d22b0200268d8d5816
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date: Fri Sep 24 13:27:36 2021 +0200
fix comments
commit 8cf12e9a9a98c9686adc9133ab1128b7ec12fb6a
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date: Fri Sep 24 11:25:41 2021 +0200
Update proxy.conf.api.json
commit 206f41f571b1f1df7e8f0a7583963d2abff4a150
Merge: 3c868a6 342102f
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date: Fri Sep 24 11:23:38 2021 +0200
Merge branch 'feature/TV-606-corrections' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into feature/TV-606-corrections
commit 3c868a6fdf66039779162b5f2d1e188b62166df2
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date: Fri Sep 24 11:10:17 2021 +0200
ändrade urler till apier och lade till felmeddelanden
commit 342102f40ea209d0418a4a0a46bb4966a188d816
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date: Fri Sep 24 11:10:17 2021 +0200
new api
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.