scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,006 Commits 2 Branches 0 Tags
6dd95d4a4a8ddbf592090752b1bb55bf48d67ca9
Commit Graph

84 Commits

Author SHA1 Message Date
Hrishikesh Vaipurkar
d391076125 Merged in fix/SW-3213-select-rate-page-public-prices (pull request #2596) 
fix(SW-3213): Fixed booking code rates shown after removing the booking code via chip close icon

* fix(SW-3213): Fixed booking code rates shown after removing the booking code via chip close icon

* fix(SW-3213): Fixed multiroom room scenario


Approved-by: Anton Gunnarsson
 2025-08-06 10:56:12 +00:00
Anton Gunnarsson
1bd8fe6821 Merged in feat/sw-2879-booking-widget-to-booking-flow-package (pull request #2532) 
feat(SW-2879): Move BookingWidget to booking-flow package

* Fix lockfile

* Fix styling

* a tiny little booking widget test

* Tiny fixes

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Remove unused scripts

* lint:fix

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Tiny lint fixes

* update test

* Update Input in booking-flow

* Clean up comments etc

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Setup tracking context for booking-flow

* Add missing use client

* Fix temp tracking function

* Pass booking to booking-widget

* Remove comment

* Add use client to booking widget tracking provider

* Add use client to tracking functions

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Move debug page

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package

* Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package


Approved-by: Bianca Widstam
 2025-08-05 09:20:20 +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
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
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
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
Anton Gunnarsson
bbcabfa0ba Merged in feat/sw-2864-move-hotels-router-to-trpc-package (pull request #2410) 
feat (SW-2864): Move booking router to trpc package

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* WIP first step

* update internal imports in trpc

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* 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

* Merge branch 'master' into feat/sw-2864-move-hotels-router-to-trpc-package


Approved-by: Linus Flood
 2025-06-26 09:02:59 +00:00
Anton Gunnarsson
002d093af4 Merged in feat/sw-2863-move-contentstack-router-to-trpc-package (pull request #2389) 
feat(SW-2863): Move contentstack router to trpc package

* Add exports to packages and lint rule to prevent relative imports

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* WIP first step

* update internal imports in trpc

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* 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

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


Approved-by: Linus Flood
 2025-06-26 07:53:01 +00:00
Bianca Widstam
f6cebcb269 Merged in fix/SW-2666-select-rate-campaign-terms-modal (pull request #2442) 
fix(SW-2666): correct default rate for campaign rates member

* fix(SW-2666): correct default rate for campaign rates member


Approved-by: Christian Andolf
 2025-06-25 14:43:26 +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
Bianca Widstam
3d4d66870d Merged in fix/SW-2706-label-room-features (pull request #2419) 
fix(SW-2706): use labels for localize instead of API for room features

* fix(SW-2706): use labels for localize instead of API for room features


Approved-by: Tobias Johansson
 2025-06-24 13:49:40 +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
Christian Andolf
c545ed2fe2 Merged in refactor/design-system-divider (pull request #2354) 
refactor: move divider to design system

Approved-by: Arvid Norlin
 2025-06-13 09:38:10 +00:00
Christian Andolf
9551a629fa refactor: move divider to design system 
remove not used variants and duplicate colors
 2025-06-13 11:27:50 +02:00
Joakim Jäderberg
180a100140 Merged in fix/SW-2964-hide-booking-code-switcher (pull request #2345) 
fix: as a temporary fix hide booking code switcher and add a way to do a search without bookingcode

* fix: as a temporary fix hide booking code switcher and add a way to do a search without bookingcode


Approved-by: Linus Flood
 2025-06-13 07:07:22 +00:00
Bianca Widstam
db5f79c1d3 Merged in fix/SW-2986-select-rate-breakfast-message (pull request #2315) 
fix(SW-2986): breakfast message on other languages break ui select rate

* fix(SW-2986): breakfast message on other languages break ui select rate

* fix(SW-2155

* fix(SW-2986): remove redundant css


Approved-by: Christian Andolf
 2025-06-09 12:25:13 +00:00
Anton Gunnarsson
bff34b034e Merged in feat/sw-2857-refactor-booking-flow-url-updates (pull request #2302) 
feat(SW-2857): Refactor booking flow url updates

* Add support for removing parameters when using initial values in serializeSearchParams

* Don't manually write search params in rate store

* Booking is already from live search params so no need

* Fix input type in serializeBookingSearchParams


Approved-by: Linus Flood
 2025-06-09 09:16:22 +00:00
Hrishikesh Vaipurkar
e3f4cfb738 Merged in fix/SW-2717-select-hotel-booking-codes- (pull request #2270) 
fix: SW-2717 Updated filter display rules

* fix: SW-2717 Updated filter display rules

* fix: SW-2717 Fixed chip button trigger popover after next upgrade

* SW-2717 Optimised code


Approved-by: Erik Tiekstra
 2025-06-05 07:14:49 +00:00
Bianca Widstam
984805ea8d Merged in feat/SW-1936-ui-room-card (pull request #2268) 
feat(SW-1936): update room card ui

* feat(SW-1936): update room card ui


Approved-by: Linus Flood
 2025-06-03 12:51:33 +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
7e97b74c18 Merged in chore/remove-unused-code (pull request #2229) 
Remove unused code

* Remove unused scandic-web files

* Remove unused exports


Approved-by: Joakim Jäderberg
 2025-05-30 12:41:18 +00:00
Christian Andolf
8e1a83ee7d fix(SW-2172): update sidepeek buttons to use new ones for accessibility 
updated enter details header overlay to match design

updated change room button to use new one for accessibility

other minor fixes to match design
 2025-05-27 12:05:04 +02:00
Niclas Edenvin
c55e28a2ac Merged in fix/SW-2651-scroll-multiroom (pull request #2174) 
fix(SW-2651): now scrolling after choosing the last room

* fix(SW-2651): now scrolling after choosing the last room


Approved-by: Bianca Widstam
 2025-05-21 08:43:49 +00:00
Michael Zetterberg
f3936f41d8 Merged in fix/label-sync (pull request #2163) 
fix: english label sync

* fix: english label sync

* fix: sync from Lokalise


Approved-by: Linus Flood
 2025-05-21 04:11:22 +00:00
Matilda Landström
ccaf705015 Merged in feat/SW-2505-alternative-hotels-link (pull request #2080) 
fix(SW-2505): alternative hotels link

* fix(SW-2505): handle no chosen room


Approved-by: Bianca Widstam
 2025-05-13 13:09:54 +00:00
Matilda Landström
ccda1d6cad Merged in feat/SW-2505-alternative-hotels-link (pull request #2065) 
fix(SW-2505): hide alternative hotels link when packages are added

* fix(SW-2505): hide alternative hotels link when packages are added


Approved-by: Bianca Widstam
 2025-05-13 12:16:35 +00:00
Hrishikesh Vaipurkar
74a5b5748a Merged in fix/SW-2642-select-hotel-corporate-ch (pull request #2003) 
fix: SW-2642 Fixed corporate chq and voucher rates city search

* fix: SW-2642 Fixed corporate chq and voucher rates city search

* fix: SW-2642 Fixed no availability alert for all hotels

* fix: SW-2642 Combined flags to suitable variable

* fix: SW-2642 Fixed map view to show prices


Approved-by: Arvid Norlin
 2025-05-08 10:46:05 +00:00
Simon Emanuelsson
a99e434d84 feat: move room charge to top in price details modal 2025-05-08 10:38:44 +00:00
Christian Andolf
d6b70edfa3 chore: replace old border-radius variables with new tokens 2025-05-05 11:11:37 +02:00
Arvid Norlin
0c7836fa59 Merged in fix/SW-2553-sidepeeks (pull request #1919) 
Fix/SW-2553 sidepeeks

* fix(SW-2553): apply sidepeek display logic

* chore: move convertToChildType and getPriceType utils

* fix: apply PR requested changes

* fix(SW-2553): fix roomNumber for multiroom

* fix(SW-2553): fix sidepeek for my-stay page


Approved-by: Michael Zetterberg
Approved-by: Bianca Widstam
Approved-by: Matilda Landström
 2025-05-02 15:10:34 +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
Michael Zetterberg
efb7219b6d fix: copy fixes for English labels 2025-04-30 09:37:54 +00:00
Michael Zetterberg
e5afdb3986 feat(SW-2470): render static rate titles 2025-04-29 08:08:21 +00:00
Michael Zetterberg
2366b4e785 feat(SW-2470): render correct terms on Select rate 2025-04-29 08:08:21 +00:00
Joakim Jäderberg
c1505ce50e Merged in feature/warmup (pull request #1887) 
* unified warmup function

Approved-by: Linus Flood
 2025-04-29 06:18:14 +00:00
Simon Emanuelsson
ec087a3d15 feat: refactor of my stay 2025-04-28 12:40:52 +00:00
Erik Tiekstra
7b76e351d9 fix(SW-2210): Removed isUserLoggedIn from RatesStore 2025-04-24 00:48:40 +02:00
Simon Emanuelsson
1f94c581ae fix: unite all price details modals to one and align on ui 2025-04-23 08:45:50 +00:00
Christian Andolf
b252c8be2d fix: booking code and reward night messages are now displayed correctly 
also fixed an incorrect css value
 2025-04-16 14:07:28 +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
af182b49d8 feat(SW-2227): Implemented new design for room package filters 
Approved-by: Arvid Norlin
 2025-04-16 07:07:49 +00:00
Simon Emanuelsson
d9db9f9d34 fix: public promotion with code did not make it through the check sometimes 2025-04-16 08:31:53 +02:00
Michael Zetterberg
5860377774 feat(SW-706): enable lint rules for intl 2025-04-14 11:30:07 +00:00
Michael Zetterberg
440e1f92df feat(SW-706): make eslint rule 'formatjs/no-literal-string-in-jsx' pass 2025-04-14 11:30:06 +00:00
Hrishikesh Vaipurkar
1c5b116ed8 Merged in feat/SW-1355-reward-night-booking-tracking (pull request #1758) 
feat: SW-1355 Tracking implementation reward night booking

* feat: SW-1355 Tracking implementation reward night booking

* feat: SW-1355 Updated checks and optional params

* feat: SW-1355 Typings updated

* feat: SW-1355 Removed undefined check

* feat: SW-1355 optimized code


Approved-by: Christian Andolf
 2025-04-14 11:10:03 +00:00
Simon Emanuelsson
d72c84d949 feat: filters work together 2025-04-14 06:51:44 +00:00