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

59 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
e5f8394f50 Merged in chore/move-checkbox-component (pull request #2501) 
chore(SW-3145): Move checkbox component to design-system

* Inline type

* Remove error handling from Checkbox internals

* Move Form/Checkbox

* Fix self referencing imports


Approved-by: Joakim Jäderberg
 2025-07-03 08:37:01 +00:00
Anton Gunnarsson
0ffb40e94b Merged in chore/sw-3145-move-footnote (pull request #2506) 
chore(SW-3145): Move Footnote to design-system

* Move Footnote to design-system


Approved-by: Joakim Jäderberg
 2025-07-03 08:14:18 +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
Christian Andolf
18cbd952b7 fix: fixed hydration errors by setting ids 
moved scripts to body since beforeInteractive strategy ones will be placed in the head regardless, avoiding double render
 2025-06-30 13:28:05 +02: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
Anton Gunnarsson
00bcdaaa28 Merged in feat/sw-2865-move-navigation-router-to-trpc-package (pull request #2427) 
feat(SW-2862): Move navigation router to trpc package

* 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

* Move booking router to trpc package

* Remove translations from My Pages navigation trpc procedure

* Move navigation 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


Approved-by: Linus Flood
 2025-06-27 06:54:49 +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
395d466c51 Merged in fix/sw-3097-negative-point-transfer (pull request #2434) 
fix(SW-3097): Improve handling when trying to transfer negative SAS points

* Improve handling of trying to transfer negative points


Approved-by: Linus Flood
 2025-06-26 09:30:02 +00:00
Hrishikesh Vaipurkar
64a56b7050 Merged in fix/SW-3026-prod---users-are-not-focused-on- (pull request #2379) 
fix: SW-3026 Fixed scroll issue

* fix: SW-3026 Fixed scroll issue

* fix: SW-3026 Moved to global solution for scroll to top after page navigation


Approved-by: Tobias Johansson
Approved-by: Linus Flood
 2025-06-18 12:27:58 +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
Anton Gunnarsson
9f78dd69fe Merged in fix/sw-3035-secure-sas-cookie (pull request #2363) 
Add secure to SAS flow cookies

* Add secure to SAS flow cookies

* Reverse NODE_ENV check


Approved-by: Linus Flood
 2025-06-16 07:35:44 +00:00
Anton Gunnarsson
e6a15bd685 Merged in fix/3037-point-transfer-incorrect-result (pull request #2368) 
Calculate transfered SAS points with exchange rate

* Calculate transfered SAS points with exchange rate


Approved-by: Linus Flood
 2025-06-16 07:29:49 +00:00
Anton Gunnarsson
7a3ab92426 Merged in feat/sw-1948-point-transfer-endpoint (pull request #2353) 
feat(SW-1948):Add SAS point transfer endpoint

* Add SAS point transfer endpoint


Approved-by: Joakim Jäderberg
 2025-06-12 14:06:30 +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
3b9d01af9d Merged in feat/sw-3006-timeout-fetch (pull request #2335) 
feat(SW-3006): added default timeout to all requests

* feat(sw-3006): added default timeout to all requests

* Fixed spreading


Approved-by: Joakim Jäderberg
 2025-06-11 12:39:58 +00:00
Linus Flood
9eb15e232b Merged in feat/sw-2998-font-optimization (pull request #2323) 
feat(SW-2998) - Optimize font loading

* feat(SW-2998) - Optimize font loading

* display swap on fonts


Approved-by: Anton Gunnarsson
 2025-06-10 12:21:55 +00:00
Christian Andolf
b3b3704c86 feat: update links default color to match design documents 2025-06-02 15:34:40 +02: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
Linus Flood
ad5ec80645 Merged in feat/sw-2855-urls (pull request #2177) 
feat: sw-2855 urls

* feat: sw-2855 urls


Approved-by: Joakim Jäderberg
 2025-05-21 09:11:02 +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
Joakim Jäderberg
4f0c61f68f Merged in revert-version (pull request #2128) 
revert including version in layouts and api responses

* revert including version in layouts and api responses


Approved-by: Linus Flood
 2025-05-16 12:57:17 +00:00
Joakim Jäderberg
f40a666170 Merged in feat/add-version-to-responses (pull request #2118) 
feature: add a version tag to responses SW-2792

* feature: add a version tag to responses


Approved-by: Linus Flood
 2025-05-16 11:38:41 +00:00
Michael Zetterberg
f36ad39cc6 fix: cookiebot language 2025-05-16 07:12:02 +00:00
Anton Gunnarsson
94a00d40b7 Merged in feat/sw-2526-update-sas-error-handling-after-api-changes (pull request #1886) 
SW-2526 - Update error handling for link SAS account

* Update error handling for link SAS account

* Capture schema validation error and send to Sentry

* Add cases for unhandled otp errors


Approved-by: Joakim Jäderberg
 2025-05-12 11:48:31 +00:00
Anton Gunnarsson
60af31762b Merged in fix/make-user-loyalty-optional (pull request #2044) 
fix: Make loyalty optional on user

* Optional user loyalty

* merge


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
 2025-05-12 09:00:11 +00:00
Christian Andolf
d6b70edfa3 chore: replace old border-radius variables with new tokens 2025-05-05 11:11:37 +02:00
Anton Gunnarsson
aa43d7d059 Merged in fix/sw-2563-pass-lang-to-sas-auth (pull request #1938) 
Set ui_locales on SAS auth link

* Set ui_locales on SAS auth link


Approved-by: Joakim Jäderberg
 2025-05-05 09:00:05 +00:00
Anton Gunnarsson
284e6bce3a Merged in fix/sw-2550-sas-callback-language (pull request #1910) 
Use dynamic language in SAS callback url

* Use dynamic language in callback url


Approved-by: Linus Flood
 2025-04-30 07:42:30 +00:00
Anton Gunnarsson
7c191aa875 Merged in fix/tiny-translation-fixes (pull request #1874) 
Tiny updates to copy in SAS flow

* Tiny translation fixes


Approved-by: Joakim Jäderberg
 2025-04-28 07:35:34 +00:00
Anton Gunnarsson
b354398c69 Merged in fix/improve-sas-error-logging (pull request #1854) 
Improve SAS flow logging

* Improve logging


Approved-by: Joakim Jäderberg
 2025-04-24 12:30:34 +00:00
Anton Gunnarsson
009d46ebac Merged in fix/too-many-codes-error (pull request #1814) 
Fix SAS OTP rate limited error

* Fix error for too many codes not showing up


Approved-by: Joakim Jäderberg
 2025-04-16 11:20:20 +00:00
Anton Gunnarsson
0ab5dc1c9d Merged in fix/sw-2132-unlink-error (pull request #1816) 
Add UnlinkError for when SAS account unlinking fails

* Add UnlinkError for when unlinking fails


Approved-by: Joakim Jäderberg
 2025-04-16 11:19: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
Anton Gunnarsson
8dee7b0243 Merged in feat/sw-2260-update-sas-toc-links (pull request #1763) 
Update terms and conditions link for sas

* Update terms and conditions link for sas


Approved-by: Joakim Jäderberg
 2025-04-09 07:50:58 +00:00
Anton Gunnarsson
c56a0b8ce9 Merged in feat/sw-1975-get-profile-v2 (pull request #1651) 
Use get Profile V2 endpoint

Approved-by: Linus Flood
 2025-04-08 06:26:00 +00:00
Michael Zetterberg
7c82a565ae feat: improve instantiation of intl 2025-04-07 10:25:37 +00:00
Michael Zetterberg
f31b374370 feat: optimize Material Symbols 2025-04-07 12:17:35 +02: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
Anton Gunnarsson
67905198c6 Merged in fix/sas-english-copy (pull request #1695) 
Update english copy for SAS related flows

* Update english copy for SAS related flows

* Add new copy to all languages

* Add use client directive to loading to use translations


Approved-by: Joakim Jäderberg
 2025-04-02 11:49:12 +00:00
Simon Emanuelsson
d513184be4 fix: there can only ever be one root layout, and it should always contains html and body tags 2025-04-01 14:38:30 +02:00
Anton Gunnarsson
650dd79c26 Merged in fix/sw-2032-sas-flow-styling-issues (pull request #1669) 
Fix styling issues in SAS flow

* Fix styling issues in SAS flow


Approved-by: Linus Flood
 2025-03-28 14:30:04 +00:00