Commit Graph

57 Commits

Author SHA1 Message Date
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
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
fe80cceb84 Fixed tests to release can go through 2021-05-18 10:08:57 +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
2b84413ba0 Updated nginx version inside nginx.conf 2021-05-11 14:41:32 +02:00
Erik Tiekstra
6f8bf890ba Added fetch for single employee and prepared data for access-groups 2021-05-06 15:33:21 +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
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
5f10baae0c Merged develop and fixed conflicts 2021-05-04 11:19:14 +02:00
Zaid Abed Jaser
f0ae33c05e more changes 2021-05-03 10:26:03 +02:00
Zaid Abed Jaser
2dc620c723 more changes according to PR comments 2021-04-30 13:12:28 +02:00
Zaid Abed Jaser
b6c9219818 changed code according to comments from pull request 2021-04-29 16:47:53 +02:00
Zaid Abed Jaser
9a947d65c7 updated startpage from flex to grid, and other minor changes 2021-04-28 16:59:03 +02:00
Zaid Abed Jaser
0d848d9ef2 startpage added and employee, administration page updated 2021-04-28 13:02:52 +02:00
Erik Tiekstra
ff4e26a852 Downgraded node version 2021-04-28 08:33:07 +02:00
Erik Tiekstra
0583d7e82d Added language data 2021-04-16 15:52:39 +02:00
Erik Tiekstra
258d7fbc67 Now able to post to mock-api 2021-04-15 15:17:24 +02:00
Erik Tiekstra
50e499540d Added more fields inside create-account form 2021-04-15 13:10:44 +02:00
Erik Tiekstra
9fe6e0f91f Added some form elements and validation 2021-04-15 11:32:19 +02:00
Erik Tiekstra
acfe221bab Added more staff data 2021-04-14 08:46:35 +02:00
Erik Tiekstra
0b0dd8e107 Added more staff data and staff-card page 2021-04-12 13:52:20 +02:00
Erik Tiekstra
1ee6ca9251 Added better staff mock data and updated several pages 2021-04-09 08:48:22 +02:00
Erik Tiekstra
cee9168c3c Updated some pages 2021-04-07 14:04:58 +02:00
Erik Tiekstra
cb5cb8b486 Added more data to mock-api and multiple sub-pages 2021-03-31 15:31:27 +02:00
Erik Tiekstra
9d82c91348 Replaced @af/digi-core with @digi/core and @digi/styles 2021-03-31 08:56:29 +02:00
Erik Tiekstra
0a5448ff4f Added simple pagination to participants-list 2021-03-30 07:40:43 +02:00
Erik Tiekstra
8a9b0049d4 Added some filtering to participant component 2021-03-29 12:54:09 +02:00
Erik Tiekstra
c03b66c6bc Added some functionality and some new data to mock-api 2021-03-29 10:17:00 +02:00
Erik Tiekstra
e1b8979b99 Added foundation of a simple mock-api 2021-03-24 15:27:02 +01:00
Erik Tiekstra
81ac40ef31 Refactored handling of form values inside participants component 2021-03-24 11:04:09 +01:00
Erik Tiekstra
184853b10c Added some digi-core components 2021-03-24 10:52:50 +01:00
Erik Tiekstra
f7537671f3 Added some digi-core components and removed some old/unused css 2021-03-23 15:49:10 +01:00
Erik Tiekstra
226f291bd3 Added multiple pages 2021-03-23 10:03:13 +01:00