Commit Graph

302 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
Arvid Norlin
bd456ea92e fix: correct typo 2024-06-14 13:26:10 +02:00
Arvid Norlin
04dfad95ec fix: make membershipLevel since not present on all membership types 2024-06-14 11:43:00 +02:00
Christel Westerberg
b4f57d5ae3 refactor: breakout section header 2024-06-14 08:29:36 +02:00
Christel Westerberg
16ee1bf493 fix: return baseUrls if no uid is given to language switcher query 2024-06-14 07:57:35 +02:00
Christel Westerberg
e622be7c86 fix: make header a parallel route 2024-06-14 07:52:16 +02:00
Christel Westerberg
d8f25925df fix: error page for language switcher 2024-06-14 07:52:16 +02:00
Christel Westerberg
b8982dacf4 fix: handle case with no lang/uid for langswitcher and footer 2024-06-14 07:52:16 +02:00
Christel Westerberg
e4992f1111 fix: remove devider on card component 2024-06-14 07:52:16 +02:00
Christel Westerberg
d84c27b73c fix: add keys on mapped components 2024-06-14 07:52:16 +02:00
Christel Westerberg
d5b08e3a36 fix: localize 404 and ensure header when no lang 2024-06-14 07:52:16 +02:00
Christel Westerberg
74b05ed6a0 feat: add edge request function 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
e9e9568d23 feat: remove CardGrid 2024-06-13 14:46:26 +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
680e9ec209 feat: change import 2024-06-13 13:02:24 +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
603d100b5b fix: check for session on LoyaltyPage DynamicContent 2024-06-12 14:04:49 +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
99c1822021 chore: move user fetch 2024-06-10 12:53:26 +02:00
Arvid Norlin
85aab88aec chore: improve typings 2024-06-10 11:51:22 +02:00
Arvid Norlin
af205451e6 refactor: improve level selection logic 2024-06-10 10:49:57 +02:00
Arvid Norlin
24810eaee6 implement logic to select compared levels based on membershipLevel 2024-06-10 10:49:57 +02:00
Arvid Norlin
79af3dba65 chore: replace css variable 2024-06-10 10:42:26 +02:00
Arvid Norlin
9352aa5a6c fix: readjust some styles 2024-06-05 13:54:23 +02:00
Arvid Norlin
aef029f9d9 fix: add max-width 2024-06-05 13:42:25 +02:00
Arvid Norlin
af33f18a6a fix: adjust LargeTable styling 2024-06-05 13:42:25 +02:00
Arvid Norlin
349c95fbc4 fix: add table styling 2024-06-05 13:42:25 +02:00