Commit Graph

139 Commits

Author SHA1 Message Date
Matilda Landström
9931d9edef Merged in feat/membership-information (pull request #233)
Feat(WEB-307) Display correct membership information

* fix: fix typo

* chore: update fetch of user membership

* chore: update components to use api data

* chore: remove lang as static value

* fix: adapt to dev updates

* fix: adapt to code from dev

* fix: break out MembershipLevel into its a React component

* fix: add enum to zod validation

* refactor: rename tier to level

* refactor: remove unnecessary casts

* refactor: change toString() to hideEmpty=false

* refactor: remove toString()

* refactor: remove hideEmpty from title and subtitle

* fix: update currentLevel with data

* fix: fix from rebase


Approved-by: Michael Zetterberg
2024-06-18 13:14:09 +00:00
Simon Emanuelsson
aca9221ea6 feat: loosen up the zod validations and return null instead of throwing 2024-06-18 12:28:05 +02:00
Christel Westerberg
5c50ac060d Merged in fix/header-parallel-route (pull request #238)
Static pages sync

Approved-by: Michael Zetterberg
2024-06-18 09:43:01 +00:00
Christel Westerberg
b4f57d5ae3 refactor: breakout section header 2024-06-14 08:29:36 +02:00
Christel Westerberg
d84c27b73c fix: add keys on mapped components 2024-06-14 07:52:16 +02:00
Fredrik Thorsson
f9acabce1f Merged in feat/WEB-315-handy-shortcuts (pull request #235)
feat/WEB-315-handy-shortcuts

Approved-by: Simon.Emanuelsson
2024-06-13 15:03:38 +00:00
Fredrik Thorsson
9ecfa96876 feat: remove link class 2024-06-13 17:00:57 +02:00
Fredrik Thorsson
d6a5980a9b feat: change border radius 2024-06-13 15:14:07 +02:00
Fredrik Thorsson
991ae0135f feat: resolve rebase 2024-06-13 15:08:30 +02:00
Fredrik Thorsson
6c0cbd1de7 feat: remove char in comment 2024-06-13 14:21:49 +02:00
Fredrik Thorsson
e677079cae feat: design changes 2024-06-13 14:21:49 +02:00
Fredrik Thorsson
c45a239005 feat: change grid logic 2024-06-13 14:13:51 +02:00
Fredrik Thorsson
8b25d1cbf4 feat: add biro script component 2024-06-13 14:12:50 +02:00
Fredrik Thorsson
9284d66975 feat: change css variables 2024-06-13 14:11:35 +02:00
Fredrik Thorsson
09797ceb22 feat: implement ui on benefits card 2024-06-13 14:11:35 +02:00
Fredrik Thorsson
bb64f8ab7a feat: syntax change 2024-06-13 13:09:03 +02:00
Fredrik Thorsson
4dc945a324 feat: use body wrapper 2024-06-13 12:16:52 +02:00
Fredrik Thorsson
df22c39909 feat: implement logic for icons 2024-06-13 12:16:52 +02:00
Fredrik Thorsson
bb22f5b292 feat: remove default values 2024-06-13 12:07:32 +02:00
Fredrik Thorsson
0b765c3454 feat: implement ui on handy shortcuts 2024-06-13 12:05:48 +02:00
Simon Emanuelsson
7c4b8401e9 feat(WEB-304): remaning UI from design system primitives 2024-06-13 10:00:16 +02:00
Arvid Norlin
8df577615a chore: remove margin 2024-06-10 15:11:40 +02:00
Chuma McPhoy
2e5f6885e0 fix(314): make scripted text bigger on desktop 2024-06-10 15:11:40 +02:00
Chuma McPhoy
3fb01237aa fix(WEB-314): Wrap title explanation output in ternary operator 2024-06-10 15:11:40 +02:00
Chuma McPhoy
766c86f522 fix(WEB-314): use correct css var naming 2024-06-10 15:11:40 +02:00
Chuma McPhoy
40b8ff9e6e fix: resolve more git conflicts after resbase 2024-06-10 15:11:33 +02:00
Chuma McPhoy
720ec213fe feat(WEB-314): render current benefit cards with carousel on mobile 2024-06-10 15:10:41 +02:00
Chuma McPhoy
952d254250 fix: resolve conflicts in current level cards 2024-06-10 15:10:20 +02:00
Chuma McPhoy
d6c6bbadc6 Resolve conflicts in next level cards 2024-06-10 15:05:04 +02:00
Arvid Norlin
85aab88aec chore: improve typings 2024-06-10 11:51:22 +02:00
Arvid Norlin
24810eaee6 implement logic to select compared levels based on membershipLevel 2024-06-10 10:49:57 +02:00
Arvid Norlin
92f5f7f7c0 add LargeTable component 2024-06-05 13:42:22 +02:00
Simon Emanuelsson
de79c2dc80 feat(WEB-220): label translations 2024-06-05 13:25:10 +02:00
Christel Westerberg
f4c58ec3ee fix: correct paths for loyalty levels 2024-05-31 09:27:56 +02:00
Simon Emanuelsson
00f99912fc feat(WEB-249): first iteration design system primitives (typography, grid) 2024-05-30 18:17:03 +02:00
Simon Emanuelsson
16b817f469 feat(WEB-250): overview hero final ui 2024-05-30 17:56:56 +02:00
Matilda Landström
c8247bb2e4 refactor: move contentype to header 2024-05-30 16:07:42 +02:00
Matilda Landström
b74c904b63 refactor: separate queries for loyalty and mypages 2024-05-30 16:07:18 +02:00
Matilda Landström
3b14b9fa48 fix: add typing 2024-05-30 16:07:17 +02:00
Matilda Landström
fb4fbb1cbd refactor: reuse query code for both loyalty and account pages 2024-05-30 16:07:17 +02:00
Matilda Landström
0b694f6a74 refactor: clean up an reuse code 2024-05-30 16:07:17 +02:00
Matilda Landström
b262ebdb7c chore: add breadcrumbs to loyalty page 2024-05-30 16:01:04 +02:00
Christel Westerberg
66da53925e fix: add correct blocks and routes for points 2024-05-29 17:49:01 +02:00
Christel Westerberg
158b5a5dbb fix: rebase issues 2024-05-28 08:30:20 +02:00
Christel Westerberg
e195f70d79 fix: enable benefits blocks 2024-05-28 08:30:08 +02:00
Christel Westerberg
9e4f41ee46 fix: redirect users to /refresh on unauth and mod webview links 2024-05-28 08:29:52 +02:00
Christel Westerberg
b58b5f368d fix: refactor navigation of webview pages and add redirect to refresh 2024-05-28 08:29:20 +02:00
Arvid Norlin
f2b8ddae8e debug: add prefetch=false to logout link 2024-05-24 10:48:45 +02:00
Arvid Norlin
470e308480 chore: css fixes 2024-05-23 15:42:52 +02:00
Arvid Norlin
6cb1ee5385 chore: remove mock data 2024-05-23 15:25:08 +02:00