a7aa94e084
Squashed commit of the following: commit 92501f038a2e9d43a62ee7ef606fe8ff95b3a994 Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se> Date: Mon Sep 27 10:06:56 2021 +0200 updating models, services, api commit bc9815f457ef4e80e40e3f0ea9f0f71d14cf5c65 Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se> Date: Mon Sep 27 07:07:34 2021 +0200 updated html file commit a5842fd33b9909679c091d7b2657eb7d8cd2e094 Merge: 1b51bf685242b0Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se> Date: Mon Sep 27 06:56:01 2021 +0200 Merge branch 'develop' into feature/TV-591 commit 1b51bf6c73e831b6b0f46c0b75b09c86f813b237 Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se> Date: Mon Sep 27 06:55:26 2021 +0200 base structure done commit fd0900411a0365d9c92337ab5ee7c8fae4282fe3 Merge: 43338919bedbd3Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se> Date: Thu Sep 23 16:44:11 2021 +0200 Merge branch 'develop' into feature/TV-591 commit 43338914fa67d40357f68d20ef2d6fe0cb19e218 Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se> Date: Thu Sep 23 16:43:42 2021 +0200 formgroup and more commit 96086b08b10ca785d3271e38e5cd81cade91acf0 Merge: d263f275846c2cAuthor: Chingiz <chingiz.esenbaev@arbetsformedlingen.se> Date: Tue Sep 21 19:57:06 2021 +0200 Merge branch 'develop' into feature/TV-591 commit d263f270c643cc0a8f36a1edb4f87813b1916eba Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se> Date: Tue Sep 21 19:56:24 2021 +0200 sÃparar filer innan merge commit 4352b00d0eed60ea2703b5a3957a608ee053e8d3 Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se> Date: Mon Sep 20 10:58:12 2021 +0200 updating to match other tasks commit d51e22bc8a61e67cec711eb4915c3a381eb67aaf Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se> Date: Thu Sep 16 18:52:25 2021 +0200 Created some base-structure
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.