scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,179 Commits 1 Branch 0 Tags
c6da0fb8cbb1e397b0331b22b60bc0cad8f8c10e
Commit Graph

143 Commits

Author SHA1 Message Date
Chuma Mcphoy (We Ahead)
c6da0fb8cb Merged in feat/LOY-316-Level-Progress-Card (pull request #2739) 
Feat/LOY-316 Level Progress Card

* feat(LOY-315): Add MembershipOverviewCard

* refactor(LOY-315): abstract sasbooststatus

* feat(LOY-316): build out LevelProgressCard skeleton & variant styling

* feat(LOY-316): Add HighesMembershipCard

* feat(LOY-316): ProgressBarCard base

* refactor(LOY-315): highest level card misc fixes

* feat(LOY-316): Add progress component to design system

* fix(LOY-316): type check

* refactor(LOY-316): calculate currentEarnings correctly

* fix(LOY-316): sas icon showing when not boosted

* fix(LOY-316): css module

* refactor(LOY-316): Restructure components

* feat(LOY-316): Add marker pin 📍

* fix(LOY-316): strict equality checks

* fix(LOY-316): code review fixes

* chore(LOY-316): conditionally hide old section under flag

* feat(LOY-316): Add level progress card to my points page

* chore(LOY-316): marker label container height


Approved-by: Matilda Landström
 2025-09-10 06:53:22 +00:00
Anton Gunnarsson
65c6bc4c59 Merged in feat/sw-3369-move-loadingspinner (pull request #2742) 
feat(SW-3369): Move LoadingSpinner to design-system

* Move LoadingSpinner to design-system


Approved-by: Joakim Jäderberg
 2025-09-02 06:46:58 +00:00
Chuma Mcphoy (We Ahead)
914871607d Merged in feat/LOY-315-Membership-Status-Card (pull request #2712) 
Feat(LOY-315): Membership Overview Card

* fix(LOY-315): new divider variants

* feat(LOY-315): Add MembershipOverviewCard

* refactor(LOY-315): abstract sasbooststatus

* fix(LOY-315): correct space vars

* fix(LOY-315): date formatting fixes


Approved-by: Erik Tiekstra
 2025-09-01 13:42:50 +00:00
Matilda Landström
fbfd62b239 Merged in fix/SW-3328-campaign-page-fix (pull request #2726) 
Fix/SW-3328 campaign page design fix

* fix(SW-3328): align essentials text

* fix(SW-3328): campaign page design fix

* fix(SW-3328): update hero width

* fix(SW-3328): change burgundy code text


Approved-by: Erik Tiekstra
 2025-08-29 13:55:15 +00:00
Erik Tiekstra
fd48f86c90 feat/SW-3108 external links 
* feat(SW-3108): Added external link options to shortcuts
* feat(SW-3108): Added external link options to header

Approved-by: Matilda Landström
 2025-08-28 07:25:17 +00:00
Erik Tiekstra
1a10afdbad fix(SW-3305): Added preamble to carousel cards block 
Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
 2025-08-28 07:22:07 +00:00
Joakim Jäderberg
72f4f72a17 Merged in SW-3317-move-toast-to-design-system (pull request #2716) 
SW-3317 move toast to design system

* chore: Move toast to design-system and add interaction tests

* Move toast to design-system and add storybook tests

* Merge branch 'master' of bitbucket.org:scandic-swap/web into SW-3317-move-toast-to-design-system

* merge

* move sonner dependency to @scandic-hotels/design-system


Approved-by: Anton Gunnarsson
 2025-08-27 13:03:17 +00:00
Chuma Mcphoy (We Ahead)
7561e996c6 Merged in feat/LOY-311-New-Avatar-Component (pull request #2694) 
Feat(LOY-311) Create avatar design system component

* feat(LOY-311): Creat & use New Avatar Design System Component

* refactor(LOY-311): replace avatar used in app header with design system component

* fix(LOY-311): use correct space vars


Approved-by: Erik Tiekstra
 2025-08-25 14:41:50 +00:00
Joakim Jäderberg
c54c1ec540 Merged in SW-3270-move-interactive-map-to-design-system-or-booking-flow (pull request #2681) 
SW-3270 move interactive map to design system or booking flow

* wip

* wip

* merge

* wip

* add support for locales in design-system

* add story for HotelCard

* setup alias

* .

* remove tracking from design-system for hotelcard

* pass isUserLoggedIn

* export design-system-new-deprecated.css from design-system

* Add HotelMarkerByType to Storybook

* Add interactive map to Storybook

* fix reactintl in vitest

* rename env variables

* .

* fix background colors

* add storybook stories for <Link />

* merge

* fix tracking for when clicking 'See rooms' in InteractiveMap

* Merge branch 'master' of bitbucket.org:scandic-swap/web into SW-3270-move-interactive-map-to-design-system-or-booking-flow

* remove deprecated comment


Approved-by: Anton Gunnarsson
 2025-08-25 11:26:16 +00:00
Matilda Landström
fe376c63f7 Merged in feat/SW-2847-table (pull request #2665) 
fix(SW-2847): move ScrollWrapper to design system and Table component

* fix(SW-2847): move ScrollWrapper to design system and Table component


Approved-by: Erik Tiekstra
 2025-08-20 09:41:54 +00:00
Chuma Mcphoy (We Ahead)
720a1c2734 Merged in feat/LOY-264-My-Pages-Overview-Shortcuts (pull request #2672) 
Feat(LOY-264): My Pages Overview Shortcuts

* feat(LOY-264): Add My Pages Shortcuts Overview Dynamic Content Component

* fix(LOY-264): more semantic naming + remove comments

* fix(LOY-264): new space variables

* fix(LOY-264): remove unused prop


Approved-by: Matilda Landström
 2025-08-20 09:06:25 +00:00
Chuma Mcphoy (We Ahead)
b644d5591a Merged in fix/account-banner-z-index (pull request #2673) 
fix: remove z-index from linkaccount banner

* fix: remove z-index from linkaccount banner


Approved-by: Matilda Landström
 2025-08-20 07:52:58 +00:00
Anton Gunnarsson
67a7a0d571 Merged in feat/sw-3271-move-chip-to-design-system (pull request #2659) 
feat(SW-3271): Move Chip to design-system

* Move Chip to design-system


Approved-by: Joakim Jäderberg
 2025-08-19 07:04:01 +00:00
Joakim Jäderberg
1bd6ce81b8 Merged in feature/SW-3245-move-jsontohtml (pull request #2661) 
Feature/SW-3245 move jsontohtml

* wip

* Move JsonToHtml -> design-system

* Fix semantic issues within Stories

* replace imports of 'storybook/react-vite' with 'storybook/nextjs-vite'

* merge


Approved-by: Anton Gunnarsson
 2025-08-18 07:46:21 +00:00
Erik Tiekstra
47e5a55d13 fix(SW-3186): Replaced hash functionality for filters with query parameters 
Approved-by: Linus Flood
Approved-by: Matilda Landström
 2025-08-15 09:00:32 +00:00
Matilda Landström
57c6f59449 Merged in feat/SW-1532-startpage-cardgrid-optional-link (pull request #2635) 
feat(SW-1532): add optional link to start page card grid

* feat(SW-1532): add optional link to start page card grid


Approved-by: Erik Tiekstra
 2025-08-15 07:25:00 +00:00
Anton Gunnarsson
04aebb372c Merged in feat/sw-3238-move-modal-to-design-system (pull request #2628) 
feat(SW-3238): Move modal to design system

* Move Modal to design-system

* Remove temp modal from booking-flow


Approved-by: Joakim Jäderberg
 2025-08-14 07:14:51 +00:00
Erik Tiekstra
dc483fe599 feat(SW-3061): Added block for all campaigns 
Approved-by: Matilda Landström
 2025-08-14 07:07:54 +00:00
Anton Gunnarsson
d10fc5ed74 Merged in feat/sw-3247-move-table-to-design-system (pull request #2636) 
feat(SW-3247): Move Table component to design-system

* Move Table component to design-system


Approved-by: Bianca Widstam
 2025-08-13 14:52:56 +00:00
Anton Gunnarsson
08159d326a Merged in feat/sw-3239-move-imagegallery-to-design-system (pull request #2633) 
feat(SW-3239): Move imagegallery to design system

* Inline types

* Move ImageGallery to design-system


Approved-by: Matilda Landström
 2025-08-13 12:16:59 +00:00
Anton Gunnarsson
a2213d0169 Merged in feat/sw-3228-move-image-to-design-system (pull request #2616) 
feat(SW-3228): Move Image to design-system

* Move Image to design-system

* Merge branch 'master' into feat/sw-3228-move-image-to-design-system


Approved-by: Linus Flood
 2025-08-12 12:58:05 +00:00
Anton Gunnarsson
800dc5c3c1 Merged in feat/sw-3225-move-parking-information-to-booking-flow (pull request #2614) 
feat(SW-3225): Move ParkingInformation to design-system

* Inline ParkingInformation types to remove trpc dependency

* Move ParkingInformation to design-system

* Move numberFormatting to common package

* Add deps to external

* Fix imports and i18n script

* Add common as dependency

* Merge branch 'master' into feat/sw-3225-move-parking-information-to-booking-flow


Approved-by: Linus Flood
 2025-08-12 12:36:31 +00:00
Anton Gunnarsson
8518d018f8 Merged in feat/sw-3230-move-link-to-design-system (pull request #2618) 
feat(SW-3230): Move Link to design-system

* Move Link to design-system

* Remove comments


Approved-by: Linus Flood
 2025-08-12 12:35:20 +00:00
Anton Gunnarsson
00b124d15a Merged in feat/sw-3226-move-buttonlink-to-design-system (pull request #2613) 
feat(SW-3226): Move ButtonLink to design-system

* Move ButtonLink to design-system

* Fix Button import


Approved-by: Linus Flood
 2025-08-11 10:53:00 +00:00
Chuma Mcphoy (We Ahead)
3cca4ff394 Merged in chore/LOY-293-table-header-updates (pull request #2611) 
chore(LOY-293): earn and burn table header update

* chore(LOY-293): earn and burn table header update


Approved-by: Anton Gunnarsson
 2025-08-11 09:40:15 +00:00
Anton Gunnarsson
8824af240b Merged in feat/sw-3219-move-accordion-to-design-system (pull request #2601) 
feat(SW-3219): Move accordion to design-system

* Inline types

* Move Accordion to design-system


Approved-by: Bianca Widstam
 2025-08-07 14:30:36 +00:00
Anton Gunnarsson
b52a3f5847 Merged in feat/sw-3145-move-iconbyiconname-to-design-system (pull request #2589) 
Move icon components to design-system

* Move icon components to design-system


Approved-by: Hrishikesh Vaipurkar
 2025-08-04 11:32:00 +00:00
Matilda Landström
b7f2afb5e4 Merged in feat/SW-882-usp-card-icons (pull request #2586) 
feat(SW-882): add icons to USP card

* feat(SW-882): add icons to USP card


Approved-by: Anton Gunnarsson
 2025-08-01 14:48:25 +00:00
Matilda Landström
ed3df92aca Merged in fix/SW-1048-table-ampersand (pull request #2579) 
fix(SW-1048): handle & in table

* fix(SW-1048): handle & in table


Approved-by: Hrishikesh Vaipurkar
 2025-07-30 12:44:58 +00:00
Chuma Mcphoy (We Ahead)
1d785a40a5 Merged in feat/update-earn-burn-description-for-non-transactional-types (pull request #2555) 
feat(LOY-294): Empty Stay description if 0 nights and and non-transactional confirmationNumber

* feat(LOY-294): Empty Stay description if 0 nights and and non-transactional confirmationNumber


Approved-by: Matilda Landström
 2025-07-11 13:00:13 +00:00
Chuma Mcphoy (We Ahead)
a7689405da Merged in LOY-293-earn-burn-table-headings (pull request #2553) 
fix(LOY-293): update earn and burn table column headings

* fix(LOY-293): update earn and burn table column headings


Approved-by: Matilda Landström
 2025-07-11 12:20:48 +00:00
Chuma Mcphoy (We Ahead)
960787f82c Merged in feat/LOY-285-SAS-marketing-banner-my-pages (pull request #2544) 
feat(LOY-285): SAS Link Account Banner for My Pages (Part 1)

* feat(LOY-285): SAS Link Account Banner for My Pages

* fix(LOY-285): )use new space variable

* fix(LOY-285): add alt to images


Approved-by: Matilda Landström
 2025-07-11 08:37:25 +00:00
Anton Gunnarsson
8f11bff6e9 Merged in feat/sw-3185-update-transfer-points-copy (pull request #2547) 
Update SAS point transfer copy

* Update copy


Approved-by: Matilda Landström
 2025-07-11 07:11:29 +00:00
Matilda Landström
2fee29f3f9 Merged in fix/SW-1561-hotelpage-ui (pull request #2542) 
Fix(SW-1561): Hotelpage design and token update

* fix(SW-1561): fix sidepeek subtitle

* fix(SW-1561): update mapCard to new tokens and update styling

* fix(SW-1561): correct Typography lowcase titles


Approved-by: Anton Gunnarsson
 2025-07-10 14:13:47 +00:00
Hrishikesh Vaipurkar
71c6f4cab3 Merged in chore/SW-3145-move-button (pull request #2527) 
chore: SW-3145 Moved tempdesign button to design-system

* chore: SW-3145 Moved tempdesign button to design-system


Approved-by: Anton Gunnarsson
 2025-07-07 07:11:18 +00:00
Erik Tiekstra
270249c6c4 feat(SW-2973): Added bookingCode if available to links inside campaign pages 
* feat(SW-2973): Moved block types to trpc lib

Approved-by: Matilda Landström
 2025-07-04 10:15:01 +00:00
Erik Tiekstra
fa7214cb58 Feat/SW-2271 hotel list filtering 
* feat(SW-2271): Changes to hotel data types in preperation for filtering
* feat(SW-2271): Added filter and sort functionality

Approved-by: Matilda Landström
 2025-07-04 09:27:20 +00:00
Anton Gunnarsson
9e1cc66f95 Merged in chore/sw-3145-move-deprecated-select (pull request #2518) 
chore(SW-3145): Move DeprecatedSelect to design-system

* Move DeprecatedSelect to design-system


Approved-by: Linus Flood
 2025-07-04 06:34:18 +00:00
Anton Gunnarsson
923206ee4c Merged in chore/sw-3145-move-subtitle (pull request #2516) 
chore(SW-3145): Move Title and Subtitle to design-system

* Move Title and Subtitle to design-system

* Fix export


Approved-by: Linus Flood
 2025-07-04 06:22:28 +00:00
Anton Gunnarsson
80057264d9 Merged in chore/sw-3145-move-preamble (pull request #2519) 
chore(SW-3145): Move Preamble to design-system

* Move Preamble to design-system


Approved-by: Linus Flood
 2025-07-04 06:11:25 +00:00
Anton Gunnarsson
7ff8fee20e Merged in chore/sw-3145-move-skeleton-shimmer (pull request #2509) 
chore(SW-3145): Move SkeletonShimmer to design-system

* Move SkeletonShimmer to design-system


Approved-by: Joakim Jäderberg
 2025-07-03 13:10:23 +00:00
Joakim Jäderberg
daf765f3d5 Merged in feature/wrap-logging (pull request #2511) 
Feature/wrap logging

* feat: change all logging to go through our own logger function so that we can control log levels

* move packages/trpc to using our own logger

* merge


Approved-by: Linus Flood
 2025-07-03 12:37:04 +00:00
Anton Gunnarsson
75a377b59e Merged in chore/sw-3145-move-body (pull request #2505) 
chore(SW-3145): Move Body component to design-system

* Move Body component to design-system


Approved-by: Joakim Jäderberg
 2025-07-03 08:04:36 +00:00
Anton Gunnarsson
a7ac79e429 Merged in chore/sw-3145-move-caption (pull request #2503) 
chore(SW-3145): Move Caption to design-system

* Move Caption to design-system

* Mark Caption as deprecated


Approved-by: Linus Flood
Approved-by: Joakim Jäderberg
 2025-07-03 07:48:24 +00:00
Chuma Mcphoy (We Ahead)
a9868dac9c Merged in feat/LOY-203-connected-state-employee-benefits (pull request #2496) 
feat(LOY-203): Enable Opening Team Member Card from Employee Benefits Page When Connected

* feat(LOY-203): add support for opening team member card modal from employee benefits page when connected

* fix(LOY-203): add id_card to  material symbol icons

* fix(LOY-203): remove uneeded dtmc btb style


Approved-by: Erik Tiekstra
Approved-by: Linus Flood
 2025-07-02 11:50:27 +00:00
Anton Gunnarsson
be25be7bb5 Merged in feat/sw-3125-move-client-trpc-setup (pull request #2493) 
feat(SW-3125): Move client trpc setup

* Move client trpc to package

* Client setup in partner-sas

* Add todo


Approved-by: Linus Flood
 2025-07-01 12:41:28 +00:00
Erik Tiekstra
0393f7b7b9 feat(SW-2270): Added hotel listing block to campaign overview page 
Approved-by: Matilda Landström
 2025-06-30 09:29:20 +00:00
Anton Gunnarsson
f0def99425 Merged in chore/remove-unused-env-vars (pull request #2463) 
chore: Remove unused env vars and feature toggles

* Remove unused env vars and feature toggles


Approved-by: Joakim Jäderberg
 2025-06-30 07:48:05 +00:00
Christian Andolf
471b1b6409 feat(LOY-284): add accordion support to account pages 2025-06-30 09:06:34 +02:00
Anton Gunnarsson
01ca2b4897 Merged in feat/sw-2867-move-user-router-to-trpc-package (pull request #2428) 
Move user router to trpc package

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Move booking router to trpc package

* Move partners router to trpc package

* Move autocomplete router to trpc package

* Move booking router to trpc package

* Remove translations from My Pages navigation trpc procedure

* Move navigation router to trpc package

* Move user router to trpc package

* Merge branch 'master' into feat/sw-2862-move-booking-router-to-trpc-package

* Merge branch 'feat/sw-2862-move-booking-router-to-trpc-package' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'feat/sw-2865-move-navigation-router-to-trpc-package' into feat/sw-2867-move-user-router-to-trpc-package

* Merge branch 'master' into feat/sw-2867-move-user-router-to-trpc-package


Approved-by: Linus Flood
 2025-06-27 07:07:49 +00:00