arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119 Commits 1 Branch 0 Tags
ba34b202273df004dca6801406703a379cfdffef
Commit Graph

119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aden Hassan
ba34b20227 Merge pull request #17 in TEA/dafa-web-monorepo from feature/TV-227 to develop 
Squashed commit of the following:

commit 1337b528d8234dd218805ecc75901755b20ed374
Merge: 92437fe 5a97ebf
Author: 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: 97b0089 48801a9
Author: 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: 86b0598 d91b3e6
Author: 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
 2021-06-15 14:49:49 +02:00
Erik Tiekstra
5a97ebff78 feat(employee-list): Added search functionality using API. (TV-221) 
Squashed commit of the following:

commit 4b93fcf4b8442a30c8d56cf8364f710b2d24c4e2
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Jun 14 15:50:17 2021 +0200

    Added fullName inside mock-api and filtering using api
 2021-06-15 09:16:15 +02:00
Daniel Appelgren
c0202ccd78 Merge pull request #22 in TEA/dafa-web-monorepo from feature/TV-252-and-TV-255-login-sidor to develop 
Squashed commit of the following:

commit 39d7130c131ac7a7dda050e5894f4762e841627f
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Jun 14 08:40:44 2021 +0200

    Update mock-login.component.html

commit 6012a7f526e3b9410a364c39a74e6c9a9ae2426a
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Jun 9 10:59:35 2021 +0200

    Fixat enligt kommentarer

commit 3c76368b772f37498e419299554bcb4b5f519164
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Jun 9 10:03:49 2021 +0200

    Bytt ut jwt-referenser

commit 853387f8cc18e38387bed50ed2d65342ec68dcc2
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Jun 9 09:50:16 2021 +0200

    merge with develop

commit 553431a880f97eda948b13a2b967c8dee4cf9dd3
Merge: 8b1cca3 48801a9
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Jun 9 09:46:17 2021 +0200

    Merge branch 'develop' into feature/TV-252-and-TV-255-login-sidor

    # Conflicts:
    #	apps/dafa-web/src/app/data/models/employee.model.ts
    #	apps/dafa-web/src/app/data/models/participant.model.ts
    #	apps/dafa-web/src/app/data/models/sort.model.ts
    #	apps/dafa-web/src/app/pages/administration/pages/employee-card/employee-card.component.ts
    #	apps/dafa-web/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.ts
    #	apps/dafa-web/src/app/pages/administration/pages/employees/employees.component.html
    #	apps/dafa-web/src/app/services/api/employee.service.ts
    #	apps/dafa-web/src/app/services/api/participants.service.ts
    #	apps/dafa-web/src/app/services/api/user.service.ts
    #	apps/dafa-web/src/app/utils/sort.util.ts
    #	mock-api/dafa-web/server.js

commit 8b1cca3553be37cb9bf68f67ae4612095e2b67d8
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Jun 8 16:44:07 2021 +0200

    fix basic styling at login and logout pages

commit cdad17716bac1510d34c9d4bc8653455b6c16d24
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Jun 8 16:34:12 2021 +0200

    Bryter ut logged-in-shell

commit bf294eefe448d3c708c6299154f376e264b53c81
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Jun 8 16:14:18 2021 +0200

    extract logged in shell to own component

commit b44e6f0dc6e45f4f27fb4375ecfc59bc35ba745c
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Jun 8 16:14:03 2021 +0200

    auth interceptor

commit 1540759b97afe18b47d86ea5f33d5cc29663ba3a
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Jun 8 15:05:41 2021 +0200

    lägg till skelett för ciam landing sida och en mock-login-sida

commit d211f7cdb46bea0d9ac1d6400c7171b924ddff77
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Jun 8 15:03:59 2021 +0200

    return singular token

commit e0e725cee778d488fd3ec467d28592c1c8e9e3eb
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Jun 8 14:20:36 2021 +0200

    add auth check and an API to get the token http://localhost:4200/api/get-token?code=auth_code_from_CIAM_with_all_permissions

commit 4055d3a14eda9737ef76ed5e85ea35480e19e71c
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Jun 7 15:20:26 2021 +0200

    updates after PR comments

commit f515ed6d06087f62de7522745691429d7ca91153
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Jun 7 12:07:50 2021 +0200

    Now using Sort interface again

commit 5c793a5a7579a520c3792bb3d13c00bb68dbfcd4
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Jun 7 11:54:27 2021 +0200

    Fixed bug showing wrong amount in pagination component

commit 7c55751147e05c1279b75356dc143b069e63e6b2
Merge: 11eab63 a701888
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Jun 7 11:42:59 2021 +0200

    Updated after merge with develop

commit 11eab6330191a140c2cfd7094838495793e02719
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Jun 7 11:23:52 2021 +0200

    Added functionality to sort on different columns

commit f13422a2aa53a69a243f32f9cd0b7ed6bd3441fc
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Fri Jun 4 11:40:22 2021 +0200

    Fixed other mappings after changes in the mock-api

commit ba2d3200167281422354f5e3cfdf7720444a9c4c
Merge: 6232b32 d91b3e6
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Fri Jun 4 10:00:00 2021 +0200

    Added paging functionality

commit 6232b3274ff73f2da929342a244fbc87430b796f
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Fri Jun 4 09:25:01 2021 +0200

    Added meta model and changed services to adapt new API data structure

... and 1 more commit
 2021-06-14 08:41:01 +02:00
Erik Tiekstra
48801a93a0 feat(employee-list): Added possibility to sort and paginate inside the list of employees (TV-217) (TV-222) 
Squashed commit of the following:

commit f13b52a134693bb6237b2df6408020504c3fbe1c
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed Jun 9 07:47:56 2021 +0200

    Updated after PR

commit 4055d3a14eda9737ef76ed5e85ea35480e19e71c
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Jun 7 15:20:26 2021 +0200

    updates after PR comments

commit f515ed6d06087f62de7522745691429d7ca91153
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Jun 7 12:07:50 2021 +0200

    Now using Sort interface again

commit 5c793a5a7579a520c3792bb3d13c00bb68dbfcd4
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Jun 7 11:54:27 2021 +0200

    Fixed bug showing wrong amount in pagination component

commit 7c55751147e05c1279b75356dc143b069e63e6b2
Merge: 11eab63 a701888
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Jun 7 11:42:59 2021 +0200

    Updated after merge with develop

commit 11eab6330191a140c2cfd7094838495793e02719
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon Jun 7 11:23:52 2021 +0200

    Added functionality to sort on different columns

commit f13422a2aa53a69a243f32f9cd0b7ed6bd3441fc
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Fri Jun 4 11:40:22 2021 +0200

    Fixed other mappings after changes in the mock-api

commit ba2d3200167281422354f5e3cfdf7720444a9c4c
Merge: 6232b32 d91b3e6
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Fri Jun 4 10:00:00 2021 +0200

    Added paging functionality

commit 6232b3274ff73f2da929342a244fbc87430b796f
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Fri Jun 4 09:25:01 2021 +0200

    Added meta model and changed services to adapt new API data structure

commit 3ea0046bb713a6ee13d2a2cb2983e92d10559aa3
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu Jun 3 13:02:44 2021 +0200

    Adjusted mock-api functionality
 2021-06-09 07:51:22 +02:00
Erik Tiekstra
a70188863c fix(create-account): Fixed form-submit so it submits correct data and uses correct data to redirect (TV-241) 
Squashed commit of the following:

commit 5c0f8d9b86b638801184f38016d16ffce2fddc56
Merge: 76eba37 d91b3e6
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Fri Jun 4 09:26:41 2021 +0200

    Merged develop and resolved conflicts

commit 76eba37ca12407ba86ae08c8ef7fc06b873286cd
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu Jun 3 07:46:40 2021 +0200

    Added functionality to create account inside mock-api

commit f0af4736b6a196db9a1306ca8b355c62610905ee
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu Jun 3 06:32:21 2021 +0200

    Removed PEGA references from repository
 2021-06-07 10:05:52 +02:00
Erik Tiekstra
d91b3e6445 refactor(pega): Removed Pega references from the application (TV-242) 
Squashed commit of the following:

commit f0af4736b6a196db9a1306ca8b355c62610905ee
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu Jun 3 06:32:21 2021 +0200

    Removed PEGA references from repository
 2021-06-04 09:23:55 +02:00
Erik Tiekstra
61c3c2ff59 feat(creat-account): Services: replaced multi-select-dropdown with selectboxes (TV-225) 
Squashed commit of the following:

commit b11ee4f4c7eeb2c556a97ce3c3182a27ef26ead1
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed Jun 2 09:33:43 2021 +0200

    Replaced multi-select-dropdown with checkboxes
 2021-06-04 09:22:09 +02:00
Erik Tiekstra
b3f7c823b3 Updated @digi/core 2021-06-02 08:30:24 +02:00
Erik Tiekstra
c4440a2bbe Merge pull request #14 in TEA/dafa-web-monorepo from feature/more-mock-api-fixes to develop 
Squashed commit of the following:

commit 9473ca4e23eb6c5967d9df3403cc071d48e0ab73
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Jun 1 08:18:39 2021 +0200

    Adding footer

commit 8f13809ad3928fd09fd67d713a61c2ca4ef27bc4
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Jun 1 06:57:34 2021 +0200

    Added footer

commit ee8a5be048786843e3c5672368a0663ead424852
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon May 31 16:07:14 2021 +0200

    Added size to edit icon

commit b8e99713bc0190075cfe201f8cd515dca78e184e
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon May 24 15:54:15 2021 +0200

    Renamed create account to employee form and fixed some validation

commit 935509bc5dd6bc7f6533b580197da2f8c15affc3
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Mon May 24 08:28:40 2021 +0200

    More changes to mock-api and views

commit d0bb8e1c0130c996ee89413f5ddda015fcf49ec5
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Fri May 21 11:22:40 2021 +0200

    Modified mock-api and implemented a part inside employee-list
 2021-06-01 11:19:22 +02:00
Erik Tiekstra
4334fd7364 feat(api): Added connection to the dotnet api (TV-189) 
Squashed commit of the following:

commit 6f06bf69b87c77473c21fbe5fcc5669964793b17
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu May 20 15:01:16 2021 +0200

    Fixed issue with including qp insde breadcrumbs

commit 579b6105acc7a60864f07b6082329872a2105bd3
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu May 20 14:46:54 2021 +0200

    Added some more data to the mock-api and fixed navigation-bar

commit f9b820136017584655fadafaf716155aec85316e
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu May 20 10:11:55 2021 +0200

    Updated mock-api

commit 5367d2a475b1c0b8807cf5a9c3f8987b3a586de4
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed May 19 16:00:07 2021 +0200

    Added different config for dotnet api

commit 47de5b8ad7c0924c82f07568aa2a4386613e3bd6
Merge: 22d5e9a dc40953
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed May 19 07:54:55 2021 +0200

    Merged develop

commit 22d5e9a126e3c1237531407ec3e6d47fbfea55e8
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed May 12 11:48:25 2021 +0200

    Added new configuration to talk with local API
 2021-05-20 15:20:29 +02:00
Erik Tiekstra
dc40953aba feat(error-handling): Modified error-handling to show better types of errors 2021-05-19 07:35:00 +02:00
Erik Tiekstra
87bbc683ea Updated test for releases component 2021-05-19 07:34:10 +02:00
Erik Tiekstra
4825ccc759 chore(changelog): Updated CHANGELOG.md inside assets directory 2021-05-18 11:27:08 +02:00
semantic-release-bot
e9be25480e chore(release): 1.1.0 [skip ci] 
## [1.1.0](https://bitbucket.arbetsformedlingen.se/projects/tea/repos/dafa-web-monorepo/compare/diff?targetBranch=refs%2Ftags%2Fv1.0.0&sourceBranch=refs%2Ftags%2Fv1.1.0) (2021-05-18)

### Features

* **releases-page:** Added releases page with information located inside current changelog ([9dd04ca](9dd04ca565))
 2021-05-18 11:27:06 +02:00
Erik Tiekstra
9dd04ca565 feat(releases-page): Added releases page with information located inside current changelog 2021-05-18 11:26:39 +02:00
Erik Tiekstra
482357b118 docs(readme): Updated documentation on how to run and release the application 2021-05-18 10:59:56 +02:00
Erik Tiekstra
2b4dc1a38c Activated merge to next branch for semantic-release 2021-05-18 10:22:36 +02:00
Erik Tiekstra
f32cce7691 Updated changelog 2021-05-18 10:21:40 +02:00
semantic-release-bot
1ab45bd057 chore(release): 1.0.0 [skip ci] 
## 1.0.0 (2021-05-18)

### Features

* **changelog:** Added changelog ([ce06329](ce063293de))
* **release:** Added semantic-release ([510bd77](510bd7759c))
 2021-05-18 10:19:37 +02:00
Erik Tiekstra
54967d81fe Testing without pushing to repo 2021-05-18 10:19:24 +02:00
Erik Tiekstra
510bd7759c feat(release): Added semantic-release 2021-05-18 10:16:13 +02:00
Erik Tiekstra
ce063293de feat(changelog): Added changelog 2021-05-18 10:14:45 +02:00
Erik Tiekstra
1e06fe735c Added more packages for semantic-release 2021-05-18 10:10:46 +02:00
Erik Tiekstra
fe80cceb84 Fixed tests to release can go through 2021-05-18 10:08:57 +02:00
Erik Tiekstra
e1634dc221 Added semantic-release 2021-05-18 09:48:21 +02:00
Erik Tiekstra
a0039e7e0e Added Jenkinsfile for next branch 2021-05-17 14:11:51 +02:00
Erik Tiekstra
0c567395a6 Updated Jenkinsfiles 2021-05-17 10:07:55 +02:00
Erik Tiekstra
e21757b8e8 Added error handling and now possible to post employees 2021-05-12 10:34:10 +02:00
Erik Tiekstra
eb18ea03a2 Updated api for employee 2021-05-11 15:19:53 +02:00
Erik Tiekstra
178b15fcc5 Updated nginx 2021-05-11 14:54:03 +02:00
Erik Tiekstra
2b84413ba0 Updated nginx version inside nginx.conf 2021-05-11 14:41:32 +02:00
Erik Tiekstra
2c54c58e2e Copy nginx.conf inside Jenkinsfile instead of angular.json 2021-05-11 14:10:34 +02:00
Erik Tiekstra
91d30bd9bd Updated angular.json 2021-05-11 09:19:49 +02:00
Erik Tiekstra
6f8bf890ba Added fetch for single employee and prepared data for access-groups 2021-05-06 15:33:21 +02:00
Gustav Ek
923cc737ae Merge pull request #11 in TEA/dafa-web-monorepo from ekegu/Jenkinsfile-npm-cache-fix to develop 
* commit '1c18b46fa22b4b64487414a760a05600056c4958':
  Jenkinsfile edited online with Bitbucket
 2021-05-06 10:17:50 +02:00
Gustav Ek
1c18b46fa2 Jenkinsfile edited online with Bitbucket 2021-05-06 10:17:37 +02:00
Erik Tiekstra
6a573d0e87 Moved back node_modules cache 2021-05-06 10:06:20 +02:00
Erik Tiekstra
b208d24af6 Test just running npm install 2021-05-06 10:03:38 +02:00
Erik Tiekstra
7fa4b4ce63 Testing to add nginx.conf inside application source 2021-05-06 09:47:55 +02:00
Erik Tiekstra
f24ab48943 Updated some models and changed to custom api 2021-05-06 07:23:09 +02:00
Erik Tiekstra
cd60e9383a Added user service 2021-05-05 10:12:47 +02:00
Erik Tiekstra
1c0f77b506 Merge branch 'develop' into feature/pega-api 2021-05-05 09:19:11 +02:00
Erik Tiekstra
4525953a78 Fixed some tests 2021-05-05 07:53:33 +02:00
Erik Tiekstra
788b49ca3e Changed node-engine to 15 2021-05-04 15:55:21 +02:00
Erik Tiekstra
9f5570ca6a Added Pega API 2021-05-04 15:47:03 +02:00
Erik Tiekstra
067b25c3aa Renamed staff to employees 2021-05-04 14:44:48 +02:00
Erik Tiekstra
e56b92c0d9 Now using more digi-core components 2021-05-04 14:28:47 +02:00
Erik Tiekstra
3debdc6ecc Merge pull request #4 in TEA/dafa-web-monorepo from TV-107 to develop 
* commit '5f10baae0c438b079f2620ea9b9c0088194561c3':
  more changes
  more changes according to PR comments
  changed code according to comments from pull request
  updated startpage from flex to grid, and other minor changes
  startpage added and employee, administration page updated
 2021-05-04 11:21:36 +02:00
Erik Tiekstra
5f10baae0c Merged develop and fixed conflicts 2021-05-04 11:19:14 +02:00
Erik Tiekstra
6ac295c8b2 updated to new @digi/core and @af/digi-ng 2021-05-04 11:14:49 +02:00