Commit Graph

42 Commits

Author SHA1 Message Date
Rasmus Langvad
d0546926a9 Merged in fix/3697-prettier-configs (pull request #3396)
fix(SW-3691): Setup one prettier config for whole repo

* Setup prettierrc in root and remove other configs


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2026-01-07 12:45:50 +00:00
Erik Tiekstra
3f632e6031 Merged in fix/BOOK-293-button-variants (pull request #3371)
fix(BOOK-293): changed variants and props on IconButton component

* fix(BOOK-293): changed variants and props on IconButton component

* fix(BOOK-293): inherit color for icon


Approved-by: Bianca Widstam
Approved-by: Christel Westerberg
2025-12-19 12:32:52 +00:00
Erik Tiekstra
4ec1e85d84 Feat/BOOK-293 button adjustments
* feat(BOOK-293): Adjusted padding of the buttons to match Figma design
* feat(BOOK-293): Updated variants for IconButton
* feat(BOOK-113): Updated focus indicators on buttons and added default focus ring color
* feat(BOOK-293): Replaced buttons inside booking widget

Approved-by: Christel Westerberg
2025-12-15 07:05:31 +00:00
Rasmus Langvad
ca6cc5ab6c Merged in feat/SW-3636-storybook-structure (pull request #3309)
feat(SW-3636): Storybook structure

* New sections in Storybook sidebar

* Group Storybook content files and add token files for spacing, border radius and shadows


Approved-by: Joakim Jäderberg
2025-12-08 12:35:14 +00:00
Joakim Jäderberg
de4b3c1c3c Merged in chore/eslint-curly-braces (pull request #3304)
Chore/eslint curly braces

* Add eslint rule for curly braces

* run eslint --fix for all files


Approved-by: Linus Flood
2025-12-08 07:56:21 +00:00
Rasmus Langvad
c65091b36a Merged in feat/SW-3644-storybook-v10 (pull request #3240)
feat(SW-3644): Storybook v10

* Auto update to Storybook v10

* Add scandic theme and logo

* Update yarn.lock

* Update formatting of package.json

* Update vitest config and playwright plugin

* Remove vitest 4 update

* Re-added comment

* Update the Typography component to explicitly return React.ReactNode

* Add an explicit type assertion to the export

* Add an explicit type assertion to the export for Checkbox

* Explicit return type assertion

* Add an explicit type assertion to the export

* Update @types/react and fix ts warnings

* Updated typings


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-11-28 08:05:40 +00:00
Bianca Widstam
ebd6e1dc2c Merged in fix/BOOK-119-accessibility-redemption-radiogroup (pull request #3172)
fix(BOOK-119): reward nights accessible radiogroup

* fix(BOOK-119): reward nights accessible radiogroup

* fix(BOOK-119): pr comment focus

* fix(BOOK-119): added roomtype name to the radiogroup for accessibility improvment


Approved-by: Matilda Haneling
Approved-by: Erik Tiekstra
2025-11-20 13:28:21 +00:00
Bianca Widstam
873174dcc3 Merged in feat/BOOK-119-accessibility-replace-radiogroup (pull request #3081)
feat(BOOK-119): replace radio group on select rate with buttons and make them accessible

* feat(BOOK-119): replace radio group on select rate with buttons and make them accessible

* feat(BOOK-119): update roomNR

* feat(BOOK-119): update onpress and buttonOverlay name change


Approved-by: Erik Tiekstra
2025-11-06 11:46:59 +00:00
Matilda Haneling
f502621576 Merged in fix/book-425-update-tokens (pull request #3063)
fix(BOOK-425): updated to the new color tokens (again)

* fix(BOOK-425): updated to the new color tokens (again)


Approved-by: Erik Tiekstra
2025-11-06 09:54:57 +00:00
Anton Gunnarsson
83822fbc76 Merged in fix/sw-3581-incorrect-price-colors (pull request #3057)
feat(SW-3581): Set price colors to scandic red

* Set price colors to scandic red

* Remove comment


Approved-by: Bianca Widstam
Approved-by: Joakim Jäderberg
2025-11-03 13:14:57 +00:00
Matilda Haneling
c3a82598af Merged in fix/book-425-color-fix (pull request #3056)
Fix/book 425 color fix

* fix(BOOK-425): fixed color on campaign banner and pprice alignment issue

* fix(BOOK-425): fixed release branch colors on booking code chip

* removed new css class which wasn't needed


Approved-by: Joakim Jäderberg
2025-11-03 08:56:34 +00:00
Matilda Haneling
742fcbe588 Merged in fix/book-425-update-color-token (pull request #3048)
fix(BOOK-425): removed fallback and updated to correct color tokens

* fix(BOOK-425): removed fallback and updated to correct color tokens


Approved-by: Bianca Widstam
2025-10-31 07:52:17 +00:00
Matilda Haneling
02012175ba Merged in fix/book-425-color-change-campaign-rate-card (pull request #3040)
fix(BOOK-425): fixed the color on campaign member rate name

* fix(BOOK-425): fixed the color on standard rate name

* listening to api resonse displayPriceRed again

* updated the conditional css class syntax


Approved-by: Bianca Widstam
Approved-by: Erik Tiekstra
2025-10-31 07:34:45 +00:00
Erik Tiekstra
6a342aaa9e chore: generated design system css variables from updated json file
Approved-by: Matilda Landström
2025-10-30 12:27:16 +00:00
Matilda Haneling
2c6d9860e1 Merged in feat/book-425-optimize-campaign-rate-card (pull request #3015)
Feat/book 425 optimize campaign rate card

* feat(BOOK-425): design updates to RateCard

* feat(BOOK-425): design updates to campaign BookingCodeChip

* feat(BOOK-425): fixed breakfast message & booking code chips on select rate and enter detailss

* feat(BOOK-425): fixed booking code chip on Booking Confirmation page

* fixed draft comments

* fixed more comments

* feat(BOOK-425): removed fixed height from RateCard banner

* fixed another variable comment

* fixed more pr comments

* fixed more pr comments

* updated ratecard campaign standard rate title color

* removed deconstructed props


Approved-by: Bianca Widstam
Approved-by: Erik Tiekstra
2025-10-29 13:54:29 +00:00
Joakim Jäderberg
80c3327419 Merged in fix/linting (pull request #2708)
Fix/linting

* fix import issues and add lint check no-extraneous-dependencies
* fix use type HotelType instead of string

Approved-by: Anton Gunnarsson
2025-08-27 09:22:37 +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
Joakim Jäderberg
f531c7a49f Merged in feature/storybook-tests (pull request #2623)
Feature/storybook tests

* feature: add interaction tests for storybook and upgrade storybook@9

* add a11y testing for storybook

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/storybook-tests

* Test and build only required packages

* .

* .

* .

* .

* .

* .

* .

* disable playwright tests in netlify ci

* .

* debug out process.env

* don't run playwright on CI

* remove unused netlify-plugin-playwright-cache

* .

* .

* .

* .

* .

* .

* remove turbo dependancy to design-system#test

* merge

* merge


Approved-by: Anton Gunnarsson
2025-08-14 06:25:08 +00:00
Joakim Jäderberg
855f795d50 Merged in feature/transpile-design-system (pull request #2621)
Feature/transpile design system

* remove example, we should use storybook instead

* remove example, we should use storybook instead

* css-modules cannot have :root, moved affected css-variables to globals.css

* .

* scandic-web no longer depends on design-system#build

* * Update readme
* Remove test code


Approved-by: Anton Gunnarsson
2025-08-12 09:07:33 +00:00
Hrishikesh Vaipurkar
6dd95d4a4a Merged in fix/SW-2367-mobile-ui-correction- (pull request #2603)
Fix/SW-2367 mobile ui correction

* fix(SW-2367): UI updates

* fix(SW-2367): Optimised code


Approved-by: Bianca Widstam
2025-08-07 13:00:11 +00:00
Bianca Widstam
169d7fa7ea Merged in fix/SW-2991-logged-in-ui-campaign-rate-card (pull request #2394)
fix(SW-2991): new rate card for logged in users

* fix(SW-2991): new rate card for logged in users


Approved-by: Simon.Emanuelsson
2025-06-25 14:18:39 +00:00
Simon.Emanuelsson
85acd3453d Merged in feat/SW-1719-strikethrough-rates (pull request #2266)
Feat/SW-1719 strikethrough rates

* feat(SW-1719): Strikethrough rate if logged in on regular rate cards

* feat(SW-1719): Strikethrough rate if logged in on rate summary

* feat(SW-1719): Strikethrough rate if logged in on mobile rate summary

* feat(SW-1719): Strikethrough rate if logged in on enter details

* feat(SW-1719): Strikethrough rate support for multiple rooms

* feat(SW-1719): booking receipt fixes on confirmation page

* feat(SW-1719): improve initial total price calculation

* feat: harmonize enter details total price to use one and the same function


Approved-by: Michael Zetterberg
2025-06-13 12:01:16 +00:00
Anton Gunnarsson
cbf9e7b7c2 Merged in chore/next15 (pull request #1999)
chore (SW-834): Upgrade to Next 15

* wip: apply codemod and upgrade swc plugin

* wip: design-system to react 19, fix issues from async (search)params

* wip: fix remaining issues from codemod

serverClient is now async because context use headers()
getLang is now async because it uses headers()

* Minor cleanup

* Inline react-material-symbols package

Package is seemingly not maintained any more and doesn't support
React 19. This copies the package source into `design-system`,
makes the necessary changes for 19 and export it for others to use.

* Fix missing awaits

* Disable modal exit animations

Enabling modal exit animations via isExiting prop is causing
modals to be rendered in "hidden" state and never unmount.
Seems to be an issue with react-aria-components,
see https://github.com/adobe/react-spectrum/issues/7563.
Can probably be fixed by rewriting to a solution similar to
https://react-spectrum.adobe.com/react-aria/examples/framer-modal-sheet.html

* Remove unstable cache implementation and use in memory cache locally

* Fix ref type in SelectFilter

* Use cloneElement to add key prop to element


Approved-by: Linus Flood
2025-06-02 11:11:50 +00:00
Anton Gunnarsson
48b6774675 Update framer-motion 2025-05-22 14:00:39 +02:00
Arvid Norlin
623495a176 fix(SW-2757): add AnimatePresence to rate card modals to avoid page freeze 2025-05-15 07:09:31 +00:00
Hrishikesh Vaipurkar
e6a3e5dbd8 Merged in feat/SW-2398-ui-update-for-booking-codes (pull request #1862)
feat: SW-2398 UI updates booking codes

* feat: SW-2398 UI updates booking codes

* feat: SW-2398 Rate cards UI changes

* feat: SW-2398 Optimized css with vars and chip code

* feat: SW-2398 Optimized code as review comments

* feat: SW-2398 Optimized code

* feat: SW-2398 Optimized code and mobile UX

* feat: SW-2398 Optimized code

* feat: SW-2398 Fixed UI

* feat: SW-2398 Updated animation


Approved-by: Erik Tiekstra
2025-05-02 12:36:22 +00:00
Erik Tiekstra
8b32abbefc Fix/SW-1563 accessibility
* fix(SW-1563): Added new IconButton component to the design system and removed Icon variant inside the Button component
* fix(SW-1563): Added buttons around clickable images and changed to design system components
* fix(SW-1563): Renamed variants to match Figma
* fix(SW-1563): Renamed AriaButton to ButtonRAC

Approved-by: Michael Zetterberg
Approved-by: Matilda Landström
2025-05-02 06:27:30 +00:00
Simon Emanuelsson
ec087a3d15 feat: refactor of my stay 2025-04-28 12:40:52 +00:00
Christian Andolf
8a9107cdf2 fix: now using the correct method to instantiate motion since its constructor is deprecated in favor of the create method 2025-04-16 14:11:24 +02:00
Erik Tiekstra
8b65f63d60 fix(SW-2171): Added focus state on rate cards and image-gallery
Approved-by: Arvid Norlin
2025-04-16 10:24:51 +00:00
Erik Tiekstra
f62723c6e5 feat(SW-2178): Changed to new buttons for summary inside enter details
Approved-by: Michael Zetterberg
Approved-by: Matilda Landström
2025-04-11 15:13:37 +00:00
Chuma Mcphoy (We Ahead)
e6a7e921bb Merged in fix/SW-2243-RateCard-Icon-UI (pull request #1770)
fix(SW-2243): update RateCard checkIcon UI

* fix(SW-2243): update RateCard checkIcon UI


Approved-by: Christian Andolf
2025-04-09 12:38:19 +00:00
Matilda Landström
1239f0c662 Merged in feat/SW-1711-SW-2077-icons (pull request #1709)
Fix(SW-1711)/(SW-2077): Export icons individually

* fix(SW-1711): export icons individually


Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-04-07 07:25:25 +00:00
Arvid Norlin
540a3bb36f Merged in fix/SW-2135-rate-checkmark (pull request #1724)
fix(SW-2135): add missing checkmark for selected campaign and bookin code rates

* fix(SW-2135): add missing checkmark for selected campaign and bookin code rates


Approved-by: Simon.Emanuelsson
2025-04-03 11:56:18 +00:00
Simon Emanuelsson
a222ecfc5c fix: make sure calculations in booking flow are correct 2025-04-02 15:00:39 +00:00
Arvid Norlin
961e8aea91 Merged in fix/SW-1631-rate-terms-modal (pull request #1699)
fix(SW-1631): add rate terms modal

* fix(SW-1631): add rate terms modal


Approved-by: Simon.Emanuelsson
2025-04-02 09:36:53 +00:00
Hrishikesh Vaipurkar
4e9ee82efa feat: SW-2028 Fix after rebase 2025-04-01 08:18:22 +00:00
Matilda Landström
5de2a993a7 Merged in feat/SW-1711-switch-icons (pull request #1558)
Switches out all the old icons to new ones, and moves them to the design system. The new icons are of three different types: Materialise Symbol, Nucleo, and Customized. Also adds further mapping between facilities/amenities and icons.

Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-03-27 09:42:52 +00:00
Arvid Norlin
d5d00bea7a fix: rename omnibusRate prop and enable for regular RateCard 2025-03-26 13:50:52 +01:00
Arvid Norlin
c065101b7c Merged in fix/ratecard-adjustments (pull request #1638)
add transparent border to rateCard and make appoximateRate optional

* add transparent border to rateCard and make appoximateRate optional


Approved-by: Simon.Emanuelsson
2025-03-26 09:38:03 +00:00
Tobias Johansson
310a5a7a68 fixes 2025-03-25 20:35:57 +01:00
Tobias Johansson
0e2192be0f Merged in feat/new-rate-cards (pull request #1600)
feat(SW-1435): Added RateCard component to design system

* feat(SW-1435): Added new component: RateCard to design system

* feat: added reward night points rate card

* fix: set svg icon color to "currentColor" to make them more reusable

* fix: added click handler for info icon

* fix: added selectedRate


Approved-by: Arvid Norlin
2025-03-25 10:41:43 +00:00