Chingiz Esenbaev eeb02c0e19 Pull request #261: Feature/TV-863
Merge in TEA/mina-sidor-fa-web from feature/TV-863 to develop

Squashed commit of the following:

commit cfe34c8c9a467fb048b167d685cdc456ccdaf3e3
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Tue Nov 23 14:44:24 2021 +0100

    tog bort public

commit fbb20ddb255643a7ebc0d8d9352f9f11f578a346
Merge: a4862c1e f0354d0a
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Tue Nov 23 12:10:37 2021 +0100

    Merge branch 'develop' into feature/TV-863

commit a4862c1e30e13da8959f72a88b1b77e51ae60566
Merge: 999df7e6 fbd04112
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Fri Nov 19 09:56:34 2021 +0100

    Merge branch 'develop' into feature/TV-863

commit 999df7e665f8a0ae92d2ab25e43564ce68601ef9
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Thu Nov 18 12:51:46 2021 +0100

    ändrade till async i html

commit f7a55b6a6d34843b5d4d8ab43351853b08683768
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Thu Nov 18 12:32:53 2021 +0100

    tog bort komponenten och la in den i själva avrop, och la till en behavioursubject för lokal variabel

commit 6ecd2aee2eb6319265e39813f02c09f4e69aee1d
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Thu Nov 18 10:36:14 2021 +0100

    fixade till fil

commit 88f209e44fa0bacdbc002a2b8b4a82ea03f01259
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Thu Nov 18 10:28:52 2021 +0100

    senaste version av avrop-dialog

commit 63b928a8ded7929f80eccc99da10e473cba035d8
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Thu Nov 11 15:15:47 2021 +0100

    ändrar tillbak från senaste commit, blev css fel

commit e84b9bc6f1e956e8dae375626c69728d3a3c1b9a
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Thu Nov 11 14:57:21 2021 +0100

    tog bort lite i html o css

commit 199af40bd3237d7ffe37e4bab0ecf7abe4778a08
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Thu Nov 11 14:47:03 2021 +0100

    Tog bort mixins

commit 76713bc2c8e8a129dad73f1882e91f7c2ab2dade
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Thu Nov 11 14:29:52 2021 +0100

    Fixat till lite css och html

commit eb274ef554ae8ccc7f01f47e9066c231d5989842
Merge: ce4c4d25 bfb4f6e1
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Thu Nov 11 14:24:44 2021 +0100

    Merge branch 'develop' into feature/TV-863

commit ce4c4d25dd97ae90b7c076a00b4a2a0cbb9bc708
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Wed Nov 10 17:26:49 2021 +0100

    TV-863: Info dialog komponent
2021-11-23 14:45:43 +01:00
2021-11-23 14:45:43 +01:00
2021-11-17 14:09:43 +01:00
2021-03-16 13:00:57 +01:00
2021-10-01 09:20:35 +02:00
2021-03-16 13:11:11 +01:00
2021-05-04 15:55:21 +02:00
2021-03-16 13:00:57 +01:00
2021-09-03 15:52:29 +02:00
2021-11-16 13:57:46 +01:00
2021-03-16 13:00:57 +01:00
2021-03-16 13:00:57 +01:00
2021-11-16 13:57:46 +01:00
2021-09-06 10:59:35 +02:00

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-XXXX or bugfix/TV-XXXX
    • A useful CLI helper tool can be used: gitflow-avh.
  • 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:

  • develop is automatically deployed to AUTO and SYS.
  • next is automatically deployed to TEST.
  • main is 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 develop and pushes it to origin.
  • Merge develop into next and pushes next to 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.

General Nx documentation

Nx Documentation

10-minute video showing all Nx features

Interactive Tutorial

Description
No description provided
Readme 3.8 MiB
Languages
TypeScript 64.6%
HTML 18.9%
JavaScript 8.9%
SCSS 6.3%
Groovy 0.8%
Other 0.5%