Commit Graph

29 Commits

Author SHA1 Message Date
Anton Gunnarsson
289adfe98b Merged in fix/sw-3606-move-heart-icon-to-shared (pull request #3155)
fix(SW-3606): Move heart icon to shared

* Move heart icon to shared


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-11-14 08:32:45 +00:00
Erik Tiekstra
3a38e99a71 Feat/BOOK-63 hotel subpages branding
* feat(BOOK-63): Replaced css variables and components to apply hotel branding on subpages
* feat(BOOK-63): Replaced css variables and components to apply hotel branding on hotel page map view

Approved-by: Christel Westerberg
Approved-by: Matilda Landström
2025-11-05 08:30:55 +00:00
Anton Gunnarsson
24847bbc1c Merged in fix/sw-3561-swan-eco-icon-broken (pull request #3004)
fix(SW-3561): Fix broken swan eco icon on partner-sas

* Move swan-eco icons to shared

* Delete unused icons


Approved-by: Linus Flood
2025-10-23 12:42:46 +00:00
Matilda Landström
00689607bc Merged in feat/SW-2241-country-map (pull request #2808)
Feat/SW-2241 country map

Approved-by: Erik Tiekstra
Approved-by: Chuma Mcphoy (We Ahead)
2025-09-24 12:04:01 +00:00
Joakim Jäderberg
8661e5c348 Merged in chore/icon-readme-update (pull request #2817)
Update icon generation script and remove unused font file

* Update icon generation script and remove unused font file


Approved-by: Matilda Landström
2025-09-17 12:58:23 +00:00
Linus Flood
fd0198f57b Merged in feat/SW-2999-cleanup (pull request #2810)
feat(SW-2999): cleanup current web

* feat(SW-2999): cleanup current web

* Merge master

* Removed unused fonts


Approved-by: Joakim Jäderberg
2025-09-16 11:28:57 +00:00
Joakim Jäderberg
48324ef935 Merged in feature/copy-static-files-via-build-scripts (pull request #2798)
SW-3467 Copy static files via build scripts

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* remove fonts that will be copied via build scripts

* wip

* update paths to shared files

* update material-symbol script

* merge

* fix missing shared segment for path in fonts.css


Approved-by: Linus Flood
2025-09-16 10:59:33 +00:00
Chuma Mcphoy (We Ahead)
0737f4fb78 Merged in feat/LOY-354-L7-Progress-Card (pull request #2786)
Feat/LOY-354 L7 Progress Card

* feat(LOY-354): Add Trophy icon

* fix(LOY-354): include new tierPoints value

* feat(LOY-354): L7 Progress Level Card support

* refactor(LOY-354): Refactoring of component structure

* fix(LOY-354): Remove intl prop drilling

* fix(LOY-354): cleanup progress section code


Approved-by: Erik Tiekstra
2025-09-15 11:48:18 +00:00
Joakim Jäderberg
6fa301f8e7 Merged in SW-3396-move-my-saved-cards-to-design-system (pull request #2762)
SW-3396 move my saved cards to design system

* Move PaymentOption, PaymentOptionsGroup, PaymentIcons and MySavedCards (renamed SelectPaymentMethod) to design-system

* Remove unused svg payment icons

* cleanu

* cleanup

* trackUpdatePaymentMethod: remove hotelId argument that was never passed


Approved-by: Anton Gunnarsson
2025-09-04 13:01:36 +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
37c311d826 Merged in feat/SW-2528-restaurant-icons-sidepeek (pull request #2610)
feat(SW-2528): add restaurant type icon to sidepeek

* feat(SW-2528): add restaurant type icon to sidepeek


Approved-by: Anton Gunnarsson
2025-08-11 11:45:20 +00:00
Matilda Landström
e323ca9914 Merged in feat/SW-2511-hotel-page-map (pull request #2582)
feat(SW-2511): hotel page map and marker improvements

* feat(SW-2511): update hotel page map

* fix(SW-2511): fix issue with identical id's for POIs


Approved-by: Anton Gunnarsson
2025-07-31 09:06: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
Matilda Landström
04a495b536 Merged in fix/SW-2753-icon-header (pull request #2546)
fix(SW-2753): update icon in top navigation

* fix(SW-2753): update icon in top navigation


Approved-by: Anton Gunnarsson
2025-07-10 12:53:26 +00:00
Matilda Landström
3a7249484a Merged in fix/SW-2753-header-icon (pull request #2541)
fix(SW-2753): change chevron in top navigation header

* fix(SW-2753): change chevron in top navigation header


Approved-by: Anton Gunnarsson
2025-07-09 11:23:36 +00:00
Bianca Widstam
cfeb505e36 Merged in fix/SW-3095-states-booking-widget (pull request #2534)
fix(SW-3095): update design for hover, focus etc for the booking widget

* fix(SW-3095): update design for hover, focus etc for the booking widget


Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
2025-07-08 09:22:52 +00:00
Chuma Mcphoy (We Ahead)
9ac5e43f0f Merged in feat/link-employment-route (pull request #2012)
feat(LOY-229): New Link Employment page

* feat(LOY-229): Ship Link Employment page

* fix(LOY-229): review fixes

* fix(LOY-229): update Button component props for better styling consistency

* fix(LOY-229): update ButtonLink href to use linkEmployment route


Approved-by: Christian Andolf
2025-05-09 07:51:27 +00:00
Christian Andolf
7359ab4afd feat(LOY-195): digital team member card button on my pages overview 2025-05-06 14:46:12 +02:00
Simon Emanuelsson
ec087a3d15 feat: refactor of my stay 2025-04-28 12:40:52 +00:00
Tobias Johansson
9a9789e736 Merged in feat/SW-1549-map-improvements (pull request #1783)
Feat/SW-1549 map improvements

* fix: imported new icon

* refactor: rename component and set map handling to 'greedy'

* fix: show cards for 3s after hover

* refactor: update styles and added HotelPin component

* fix: change from close to back icon

* refactor: update to only use 1 state value for active pin and card

* fix: add click handler when dialog is opened

* fix: performance fixes for the dialog carousel

* fix: added border

* fix: clear timeout on mouseenter

* fix: changed to absolute import

* fix: moved hover state into the store

* fix: renamed store actions


Approved-by: Michael Zetterberg
2025-04-15 13:23:23 +00:00
Michael Zetterberg
d8133fcfb8 fix: clean up svgs 2025-04-09 08:06:14 +00:00
Michael Zetterberg
36f1406deb fix: update Material Symbols 2025-04-09 08:06:14 +00:00
Michael Zetterberg
f31b374370 feat: optimize Material Symbols 2025-04-07 12:17:35 +02:00
Pontus Dreij
74c5b47319 Merged in feat/SW-1737-design-mystay-multiroom (pull request #1565)
Feat/SW-1737 design mystay multiroom

* feat(SW-1737) Fixed member view of guest details

* feat(SW-1737) fix merge issues

* feat(SW-1737) Fixed price details

* feat(SW-1737) removed unused imports

* feat(SW-1737) removed true as statement

* feat(SW-1737) updated store handling

* feat(SW-1737) fixed bug showing double numbers

* feat(SW-1737) small design fixed

* feat(SW-1737) fixed rebase errors

* feat(SW-1737) fixed create booking error with dates

* feat(SW-1737) fixed view multiroom as singleroom

* feat(SW-1737) fixes for multiroom

* feat(SW-1737) fixed bookingsummary

* feat(SW-1737) dont hide modify dates

* feat(SW-1737) updated breakfast to handle number

* feat(SW-1737) Added red color if member rate

* feat(SW-1737) fix PR comments

* feat(SW-1737) updated member tiers svg

* feat(SW-1737) updated how to handle paymentMethodDescription

* feat(SW-1737) fixes after testing mystay

* feat(SW-1737) updated Room type to just use whats used

* feat(SW-1737) fixed access

* feat(SW-1737) refactor my stay after PR comments

* feat(SW-1737) fix roomNumber translation

* feat(SW-1737) removed log


Approved-by: Arvid Norlin
2025-03-24 09:30:10 +00:00
Linus Flood
91a9f68be0 Merged in fix/image-caching (pull request #1586)
fix/images: changed default cache time from 1 minute to 31 days. Reduced size of swan icons

* fix/images: changed default cache time from 1 minute to 31 days. Reduced size of swan icons

* More performance improvements

* Priority on hero image on startpage


Approved-by: Anton Gunnarsson
2025-03-21 07:58:44 +00:00
Erik Tiekstra
200ed55a2c fix(SW-1954): Renamed app download icons to correct lang
Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-03-19 13:27:32 +00:00
Anton Gunnarsson
d0b6f3f8b3 Merged in feat/sw-1314-transfer-sas-points (pull request #1508)
SW-1314 Transfer SAS points

Approved-by: Linus Flood
2025-03-18 10:07:05 +00:00
Michael Zetterberg
6232ded991 feat(SW-375): consume new tokens in scandic-web 2025-03-07 07:24:38 +00:00
Anton Gunnarsson
80100e7631 Merged in monorepo-step-1 (pull request #1080)
Migrate to a monorepo setup - step 1

* Move web to subfolder /apps/scandic-web

* Yarn + transitive deps

- Move to yarn
- design-system package removed for now since yarn doesn't
support the parameter for token (ie project currently broken)
- Add missing transitive dependencies as Yarn otherwise
prevents these imports
- VS Code doesn't pick up TS path aliases unless you open
/apps/scandic-web instead of root (will be fixed with monorepo)

* Pin framer-motion to temporarily fix typing issue

https://github.com/adobe/react-spectrum/issues/7494

* Pin zod to avoid typ error

There seems to have been a breaking change in the types
returned by zod where error is now returned as undefined
instead of missing in the type. We should just handle this
but to avoid merge conflicts just pin the dependency for
now.

* Pin react-intl version

Pin version of react-intl to avoid tiny type issue where formatMessage
does not accept a generic any more. This will be fixed in a future
commit, but to avoid merge conflicts just pin for now.

* Pin typescript version

Temporarily pin version as newer versions as stricter and results in
a type error. Will be fixed in future commit after merge.

* Setup workspaces

* Add design-system as a monorepo package

* Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN

* Fix husky for monorepo setup

* Update netlify.toml

* Add lint script to root package.json

* Add stub readme

* Fix react-intl formatMessage types

* Test netlify.toml in root

* Remove root toml

* Update netlify.toml publish path

* Remove package-lock.json

* Update build for branch/preview builds


Approved-by: Linus Flood
2025-02-26 10:36:17 +00:00