Commit Graph

107 Commits

Author SHA1 Message Date
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
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
68cd061c6d Merged in feature/select-rate-vertical-data-flow (pull request #2535)
Feature/select rate vertical data flow

* add fix from SW-2666

* use translations for room packages

* move types to it's own file

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/select-rate-vertical-data-flow

* merge

* feature/select-rate: double rate for campaing rates

* revert NODE_ENV check in Cookiebot script

* revert testing values

* fix(SW-3171): fix all filter selected in price details

* fix(SW-3166): multiroom anchoring when changing filter

* fix(SW-3172): check hotelType, show correct breakfast message

* Merge branch 'feature/select-rate-vertical-data-flow' of bitbucket.org:scandic-swap/web into feature/select-rate-vertical-data-flow

* fix: show special needs icons for subsequent roomTypes SW-3167

* fix: Display strike through text when logged in SW-3168

* fix: Reinstate the scrollToView behaviour when selecting a rate SW-3169

* merge

* .

* PR fixes

* fix: don't return notFound()

* .

* always include defaults for room packages

* merge

* merge

* merge

* Remove floating h1 for new select-rate


Approved-by: Anton Gunnarsson
2025-08-13 12:45:40 +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
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
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
5ff4234552 Merged in chore/SW-3145-move-date-to-design-system (pull request #2556)
feat: SW-3145 Moved date component to design system

* chore: SW-3145 Moved date component to design system


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-07-28 09:05:25 +00:00
Hrishikesh Vaipurkar
42ab6e58b3 Merged in chore/SW-3145-move-phone (pull request #2549)
chore/SW-3145 Moved Phone to design system

* chore/SW-3145 Moved Phone to design system

* chore: SW-3145 Moved phone and removed intl direct dependency


Approved-by: Anton Gunnarsson
2025-07-28 08:28:07 +00:00
Joakim Jäderberg
ef6235cf43 Merged in fix/stylus-failing-builds (pull request #2568)
Remove stylus deps and replace with extension

* fix: remove stylus deps and replace with extension

* chore: update yarn.lock
2025-07-23 09:16:49 +00:00
Anton Gunnarsson
233c685e52 Merged in feat/sw-2333-package-and-sas-i18n (pull request #2538)
feat(SW-2333): I18n for multiple apps and packages

* Set upp i18n in partner-sas

* Adapt lokalise workflow to monorepo

* Fix layout props


Approved-by: Linus Flood
2025-07-10 07:00:03 +00:00
Anton Gunnarsson
aab4e5a0a1 Merged in fix/external-react-hook-form (pull request #2510)
Mark react-hook-form as external in design-system

* Mark react-hook-form as external in design-system


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-07-03 09:59:07 +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
6eeaa1cd40 Merged in feat/sw-2872-dependency-inject-app-context-in-trpc-package (pull request #2478)
feat(SW-2872) Dependency inject app context in trpc package

* Move appRouter to trpc package

* WIP Move serverClient to trpc package

Doesn't handle errors yet

* Don't use global

* Use trpc everywhere


Approved-by: Linus Flood
2025-07-01 08:49:33 +00:00
Anton Gunnarsson
a3702d0ecc Merged in chore/partner-sas-test-setup (pull request #2484)
chore: Test setup in partner-web

* Add playwright

* Add vitest setup


Approved-by: Linus Flood
2025-07-01 08:27:59 +00:00
Anton Gunnarsson
9426f4b1ac Merged in feat/sw-2871-booking-flow-envs (pull request #2483)
feat(SW-2871): Add env setup to booking-flow package

* Add env setup to booking-flow package

* Add missing dep

* Really fix it..


Approved-by: Linus Flood
2025-07-01 08:27:48 +00:00
Christian Andolf
733281240f chore: add vitest project config and yarn constraints 2025-06-30 14:17:49 +02:00
Anton Gunnarsson
4e1cb01b84 Merged in chore/cleanup-after-trpc-migration (pull request #2457)
Chore/cleanup after trpc migration

* Clean up TODOs

* Rename REDEMPTION constant to SEARCH_TYPE_REDEMPTION

* Update dependencies

Remove unused deps from scandic-web
Add missing deps to trpc package

* Update self-referencing imports

* Remove unused variables from scandic-web env

* Fix missing graphql-tag package

* Actually fix

* Remove unused env var


Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-06-30 12:08:19 +00:00
Christian Andolf
ff40ef72c4 chore: fix and migrate unit tests to vitest 2025-06-30 09:49:30 +02:00
Anton Gunnarsson
a91c28096d Merged in feat/sw-2880-prepare-booking-flow-package (pull request #2467)
feat(SW-2880) Prepare booking flow package

* Init booking-flow package

* Add gitignore

* Use booking-flow package

* Use design-system


Approved-by: Joakim Jäderberg
2025-06-30 07:48:28 +00:00
Anton Gunnarsson
133f7b3d75 Merged in feat/sw-2781-partner-sas-site-setup (pull request #2432)
feat(SW-2781): Setup SAS partner site

* Add boilerplate for SAS partner site

* Fonts

* netlify.toml


Approved-by: Linus Flood
2025-06-26 13:45:15 +00:00
Anton Gunnarsson
5f8ac8cdeb Merged in feat/sw-2861-move-autocomplete-router-to-trpc-package (pull request #2417)
feat(SW-2861): Move autocomplete router 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

* Move partners router to trpc package

* Move autocomplete router to trpc package

* Merge branch 'master' into feat/sw-2861-move-autocomplete-router-to-trpc-package


Approved-by: Linus Flood
2025-06-26 12:40:45 +00:00
Anton Gunnarsson
f9c719ff4b Merged in feat/sw-2866-move-partners-router-to-trpc-package (pull request #2414)
feat(sw-2866): Move partners router 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

* Move partners router to trpc package

* Merge branch 'master' into feat/sw-2866-move-partners-router-to-trpc-package


Approved-by: Linus Flood
2025-06-26 09:44:13 +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
Joakim Jäderberg
105c4d9cf3 Merged in feature/redis-queue-deletes (pull request #2397)
Feature/redis queue deletes

* feat: add queuing for deletes

* merge

* .

* .

* .


Approved-by: Linus Flood
2025-06-19 09:20:38 +00:00
Anton Gunnarsson
846fd904a6 Merged in feat/sw-2859-set-up-shared-trpc-package (pull request #2319)
feat(SW-2859): Create trpc package

* Add isEdge, safeTry and dataCache to new common package

* Add eslint and move prettier config

* Clean up tests

* Create trpc package and move initialization

* Move errors and a few procedures

* Move telemetry to common package

* Move tokenManager to common package

* Add Sentry to procedures

* Clean up procedures

* Fix self-referencing imports

* 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

* Fix lang imports


Approved-by: Linus Flood
2025-06-18 12:14:20 +00:00
Erik Tiekstra
d492b5ad6a feat(SW-2719): Added Dialogshift chat widget to certain hotel pages
Approved-by: Matilda Landström
2025-06-16 12:33:38 +00:00
Anton Gunnarsson
0788a57adc Merged in feat/add-no-relative-packages-rule (pull request #2356)
Add eslint rule no-relative-packages

* Add eslint rule no-relative-packages


Approved-by: Christian Andolf
2025-06-13 10:36:11 +00:00
Michael Zetterberg
c52da4bec6 feat: add redirect processing script 2025-06-12 07:03:07 +00:00
Anton Gunnarsson
048a477e52 Merged in feat/common-package (pull request #2333)
feat: Add common package

* Add isEdge, safeTry and dataCache to new common package

* Add eslint and move prettier config

* Fix yarn lock

* Clean up tests

* Add lint-staged config to common

* Add missing dependencies


Approved-by: Joakim Jäderberg
2025-06-11 13:08:39 +00:00
Linus Flood
93b76d405a Merged in feat/SW-2960-update-plugin (pull request #2283)
feat(#SW-2960): Update netlify/plugin-nextjs to latest

* feat(#SW-2960): Update netlify/plugin-nextjs to latest

* added lock file


Approved-by: Joakim Jäderberg
2025-06-04 06:26:32 +00:00
Linus Flood
8b57c72a7c Merged in chore/nextjs-15.3.3 (pull request #2284)
chore(next) - update Nextjs to 15.3.3 to fix rsc payload getting cached

* chore(next) - update Nextjs to 15.3.3 to fix rsc payload getting cached


Approved-by: Joakim Jäderberg
2025-06-04 06:18:50 +00:00
Anton Gunnarsson
dd4ef527df Merged in chore/eslint9 (pull request #2029)
chore: Update to ESLint 9

* wip: apply codemod and upgrade swc plugin

* Update eslint to 9 in scandic-web

apply code mod to config
fix existing lint issues

* Remove uneccessary fixupConfigRules

* Update eslint to 9 in design-system

* Add lint turbo dependency

* Move redis-api to eslint and prettier instead of biome

* Simplify eslint configs

* Clean up

* Apply linting


Approved-by: Linus Flood
2025-06-03 14:26:44 +00:00
Anton Gunnarsson
91278feb40 Merged in fix/popover-with-design-system-trigger-not-showing (pull request #2276)
Fix popovers using triggers from design-system not working

* Fix peer dependency in design-system package


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-06-03 12:53: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
48b6774675 Update framer-motion 2025-05-22 14:00:39 +02:00
Anton Gunnarsson
7e098d291c Remove material-symbols from design-system 2025-05-22 14:00:39 +02:00
Anton Gunnarsson
4f9c69628b Update minor versions in design-system 2025-05-22 14:00:39 +02:00
Anton Gunnarsson
a2e43844df Update patch versions in design-system 2025-05-22 14:00:39 +02:00
Anton Gunnarsson
ec08f83153 Update patch versions 2025-05-22 14:00:39 +02:00
Anton Gunnarsson
01355078a0 Update intl packages 2025-05-22 14:00:39 +02:00
Anton Gunnarsson
7378b18885 Update @internationalized/date 2025-05-22 14:00:39 +02:00
Anton Gunnarsson
ef90e878cf Update @contentstack/live-preview-utils 2025-05-22 14:00:39 +02:00
Anton Gunnarsson
d76b507ef4 Remove unused material-symbols package 2025-05-22 14:00:39 +02:00
Anton Gunnarsson
d1927fff09 Update graphql-request 2025-05-22 14:00:39 +02:00
Anton Gunnarsson
f46bc8f920 Update @hookform/resolvers
In v5 the zod resolver will automatically infer the type for `useForm`.
It's not recommended to manually specify types.
See https://github.com/react-hook-form/resolvers/releases/tag/v5.0.0
2025-05-22 14:00:39 +02:00
Anton Gunnarsson
83646d4d02 Update sonner 2025-05-22 14:00:39 +02:00
Anton Gunnarsson
11c1810249 Update @vercel/otel 2025-05-22 14:00:39 +02:00
Anton Gunnarsson
0a06d6d38c Update @vis.gl/react-google-maps 2025-05-22 14:00:39 +02:00