Commit Graph
100 Commits
Author SHA1 Message Date
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 8c3f8c74db Merged in feature/SW-3365-blurry-images (pull request #2746)
Feature/SW-3365 reduce upscaling of images (fix blurry images)

* fix: handle when images are wider than 3:2 but rendered in a 3:2 container

* use dimensions everywhere applicable

* fall back to using <img sizes='auto' /> if possible

* imageLoader: never nest

* remove empty test file


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-09-02 17:52:31 +00:00
Joakim Jäderberg f77520cd04 Merged in chore/remove-unused-useRoomContext (pull request #2747)
chore: delete unused useRoomContext

* chore: delete unused useRoomContext

* merge


Approved-by: Matilda Landström
2025-09-02 11:58:37 +00:00
Joakim Jäderberg a0fa238b27 Merged in fix/left-align-ameneties (pull request #2734)
* left align sho all ameneties
2025-08-29 11:48:40 +00:00
Joakim Jäderberg 2a9313362f Merged in feature/SW-3327-move-hotel-info-card-to-design-system (pull request #2730)
Feature/SW-3327 move hotel info card to design system

* wip

* wip

* wip

* wip moving hotelinfocard

* add controls for HotelInfoCard in storybook

* merge


Approved-by: Anton Gunnarsson
2025-08-29 10:09:48 +00:00
Joakim Jäderberg a0580de52f Merged in redirect-update-2025-08-29 (pull request #2733)
* rerun update


Approved-by: Anton Gunnarsson
2025-08-29 09:47:05 +00:00
Joakim Jäderberg 784c353b1e Merged in update-redirects-2025-08-28 (pull request #2723)
* update redirects
* format redirect-json to allow new lines

Approved-by: Bianca Widstam
2025-08-28 11:52:32 +00:00
Joakim Jäderberg 13e1594b2a Merged in fix/SW-3308-hotelcard-disappears-to-early (pull request #2704)
revert: delay marking a hotel card as non-hovered

* fix: delay marking a hotel card as non-hovered


Approved-by: Hrishikesh Vaipurkar
2025-08-28 08:27:11 +00:00
Joakim Jäderberg 4ed1cd1843 Merged in fix/storybook-static-folder (pull request #2718)
Storybook Avatar: Use images from public folder

* make sure we import files from the correct folder


Approved-by: Chuma Mcphoy (We Ahead)
2025-08-27 14:09:10 +00:00
Joakim Jäderberg 72f4f72a17 Merged in SW-3317-move-toast-to-design-system (pull request #2716)
SW-3317 move toast to design system

* chore: Move toast to design-system and add interaction tests

* Move toast to design-system and add storybook tests

* Merge branch 'master' of bitbucket.org:scandic-swap/web into SW-3317-move-toast-to-design-system

* merge

* move sonner dependency to @scandic-hotels/design-system


Approved-by: Anton Gunnarsson
2025-08-27 13:03:17 +00:00
Joakim Jäderberg 45a8fd8c43 Merged in fix/linting-booking-flow (pull request #2709)
Fix/linting booking flow

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

Approved-by: Anton Gunnarsson
2025-08-27 12:02:37 +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 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 f8a4b88170 Merged in fix/skip-flaky-date-test (pull request #2653)
chore: skip date.test.tsx due to flakyness

* chore: skip date.test.tsx due to flakyness


Approved-by: Erik Tiekstra
Approved-by: Anton Gunnarsson
2025-08-18 07:46:34 +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 af391a568a Merged in fix/design-system-format-after-generate (pull request #2662)
design-system: format files after they have been generated

* design-system: format files after they have been generated


Approved-by: Anton Gunnarsson
2025-08-15 11:37:35 +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 e3067331c6 Merged in fix/remove-old-select-rate (pull request #2647)
Fix/remove old select rate

* remove old select-rate

* Fix imports

* renamed SelectRate2 -> SelectRate
2025-08-13 13:43:48 +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
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
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
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
Joakim Jäderberg 3169bd892b Merged in fix/datepicker-select-first-of-month (pull request #2497)
fix: able to select 1st of month on the 1st of each month

* fix: able to select 1st of month on the 1st of each month


Approved-by: Anton Gunnarsson
2025-07-01 13:33:11 +00:00
Joakim Jäderberg 9b491c5364 Merged in fix/resolve-entry-clearing-cache (pull request #2445)
fix: use shared cache key when revalidating urls

* fix: use shared cache key when revalidating urls


Approved-by: Linus Flood
2025-06-26 06:23:03 +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
Joakim Jäderberg 3af994b0a9 Merged in feat/redis-api-send-logs (pull request #2290)
feature: send logs to Sentry for Redis-Api

* feature: send logs to Sentry for Redis-Api


Approved-by: Linus Flood
2025-06-19 08:28:53 +00:00
Joakim Jäderberg bb98c2652e Merged in fix/missing-batchsize-bicep-config (pull request #2385)
add missing bicep setup for deleteBatchSize

* add missing bicep setup for deleteBatchSize
2025-06-18 07:47:25 +00:00
Joakim Jäderberg d5f49ccaa1 Merged in fix/batch-size-in-env (pull request #2384)
fix: able to set batch delete size via env

* fix: able to set batch delete size via env


Approved-by: Linus Flood
2025-06-18 06:38:48 +00:00
Joakim Jäderberg de6117f7f7 Merged in fix/redis-adjust-batch-settings (pull request #2374)
fix: adjust batch size and remove timeout between delete-calls

* fix: adjust batch size and remove timeout between delete-calls

* chore: adjust scaling


Approved-by: Linus Flood
2025-06-17 07:12:44 +00: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
Joakim Jäderberg a95ef65d02 Merged in feat/use-hash-for-graphql-cache (pull request #2251)
Feature: Use hash of query+variables for graphql cache instead of gitsha

* feature: use a hash of query+variables as part of the cache key instead of gitsha

* .

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/use-hash-for-graphql-cache

* use correct json stringify

* merge

* remove edgeRequest in favor of request

* add more indicative logging


Approved-by: Linus Flood
2025-06-03 06:39:04 +00:00
Joakim Jäderberg ef3b29b9f1 Merged in fix/SW-2945-cache-timings-for-resolve-entry (pull request #2264)
Fix/SW-2945 cache timings for resolve entry

* fix: cache resolveentry() harder and revalidate on publish instead

* logging: use debug logging for requests and add logging when tll is invalid


Approved-by: Linus Flood
2025-06-02 08:35:55 +00:00
Joakim JäderbergandLinus Flood 26b005d72a Merged in fix/cache-graphql-data (pull request #2248)
fix: add missing cache for cms data

* fix: cache cms data


Approved-by: Linus Flood
2025-05-28 08:28:21 +00:00
Joakim Jäderberg b20c8ce42b Merged in fix/warmup-autocomplete-data-2 (pull request #2218)
fix: chunked data overwrote it self

* fix: chunked data overwrote it self


Approved-by: Linus Flood
2025-05-26 09:39:48 +00:00
Joakim Jäderberg 196ea2994f Merged in fix/warmup-autocomplete-data (pull request #2212)
warmup autocomplete data

* warmup autocomplete data


Approved-by: Anton Gunnarsson
2025-05-26 08:23:20 +00:00
Joakim Jäderberg 231ea05348 Merged in fix/refetching-availability-on-select (pull request #2204)
don't use rateCode to determine if bookingCode should come from the room or the 'big' input

* don't use rateCode to determine if bookingCode should come from the room or the 'big' input


Approved-by: Linus Flood
2025-05-23 09:55:35 +00:00
Joakim JäderbergandLinus Flood cc34cdcf74 Merged in fix/SW-2848-RTE-with-copied-divs (pull request #2173)
fix: handle when content has copied divs from episervers RTE

* fix: handle when content has copied divs from episervers RTE


Approved-by: Matilda Landström
2025-05-22 11:03:29 +00:00
Joakim Jäderberg 39b89c5d51 Merged in fix/SW-2890-select-rate-not-updating (pull request #2190)
fix: select-rate didn't update results when switching back to a recent search SW-2890

* fix: select-rate didn't update results when switching back to a recent search


Approved-by: Linus Flood
2025-05-22 09:21:46 +00:00
Joakim Jäderberg 5272af2ab1 Merged in fix/SW-2839-prevent-fetching-hotel-availability-with-invalid-input (pull request #2166)
Prevent calling availability for cities if input model is invalid

* fix: make sure that input data is valid


Approved-by: Linus Flood
2025-05-21 04:47:05 +00:00
Joakim Jäderberg 6634bfa93f Merged in fix/SW-2827-wrong-key (pull request #2162)
fix: error key was wrong for hotel availability input object

* fix: error key was wrong


Approved-by: Linus Flood
2025-05-20 12:54:16 +00:00
Joakim Jäderberg 3de4f9e406 Merged in fix/SW-2827-availability-for-old-dates (pull request #2158)
fix: add error handling for hotel room availability

* fix: add error handling for hotel room availability

* fix: update error codes

* fix: have one error message to rule them all. them as in permutations of invalid dates


Approved-by: Linus Flood
2025-05-20 12:25:36 +00:00
Joakim Jäderberg 3e50132bc9 Merged in fix/SW-2822-missing-meetingroom-images (pull request #2151)
fix: meeting rooms with missing images

* fix: meeting rooms with missing images


Approved-by: Linus Flood
2025-05-20 05:43:43 +00:00
Joakim Jäderberg b486fd1ad0 Merged in fix/SW-2804-missing-meeting-rooms (pull request #2138)
fix: return [] when we get a 404 for meeting rooms for a hotel

* fix: return [] when we get a 404 for meeting rooms for a hotel


Approved-by: Linus Flood
2025-05-19 08:35:47 +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 ec29664a60 Merged in fix/capture-errors-in-trpc (pull request #2103)
Fix/capture errors in trpc

* fix: import @sentry/nextjs, not @sentry/node

* add sentry logging for errors in trpc


Approved-by: Linus Flood
2025-05-16 11:44:25 +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
Joakim Jäderberg 31d75ffa74 Merged in fix/default-page-settings (pull request #2076)
fix: default page settings when invalid or missing

* fix: default page settings when invalid or missing since most pages don't have pageSettings


Approved-by: Anton Gunnarsson
2025-05-15 10:41:16 +00:00
Joakim Jäderberg a71ccbdf22 Merged in feature/hardcode-release-branch-warming (pull request #2052)
fix: hardcode release branch warmup

* fix: hardcode release branch warmup

* .


Approved-by: Anton Gunnarsson
2025-05-13 13:19:09 +00:00
Joakim JäderbergandLinus Flood aceb88cb1a Merged in fix/seo-whitelist-scandic-friends (pull request #2071)
fix: SEO whitelist /scandic-friends

* fix: SEO whitelist /scandic-friends

* fix: SEO whitelist /scandic-friends


Approved-by: Linus Flood
2025-05-13 09:35:28 +00:00
Joakim JäderbergandLinus Flood 45d474385c Merged in fix/noindex-contentpages (pull request #2066)
fix: add noindex+nofollow to contentpages

* fix: add noindex+nofollow to contentpages

* fix: move no-index/no-follow to the shared generateMetadata function instead

* remove comment


Approved-by: Erik Tiekstra
2025-05-13 08:29:49 +00:00
Joakim JäderbergandLinus Flood 40570c356a Merged in fix/current-languageswitcher-nofollow (pull request #2064)
fix: add no-follow to links in language switcher

* fix: add no-follow to links in language switcher


Approved-by: Linus Flood
2025-05-13 07:47:47 +00:00
Joakim Jäderberg 7031ad3fae Merged in fix/bump-redis-prod-sku (pull request #2061)
fix: bump redis SKU in prod

* fix: bump redis SKU in prod


Approved-by: Linus Flood
2025-05-13 06:26:41 +00:00
Joakim Jäderberg cbbde963dc Merged in fix/my-pages-menu-not-translated (pull request #2045)
fix: my pages menu not translated

* fix: my pages menu not translated
fix: able to pass lang to getIntl()


Approved-by: Michael Zetterberg
2025-05-12 07:57:11 +00:00
Joakim Jäderberg e23f8694e3 Merged in fix/open-up-hotelreservation-pages (pull request #2020)
fix: open up hotelreservation

* fix: open up hotelreservation


Approved-by: Michael Zetterberg
2025-05-09 09:31:22 +00:00
Joakim Jäderberg 3ea26259df Merged in fix/redis-api-model-validation (pull request #2000)
* fix: model response validation for 204
* log: add more logging when deleting keys
* add version to health endpoint


Approved-by: Anton Gunnarsson
2025-05-07 13:45:35 +00:00
Joakim Jäderberg 33ef22ae23 Merged in fix/redis-api-set-socket-timeout (pull request #1991)
fix: redis - set timeout for calls and sockets

Approved-by: Michael Zetterberg
2025-05-07 09:16:25 +00:00
Joakim Jäderberg b977877e93 Merged in fix/limit-time-to-response-for-cache-calls (pull request #1990)
fix: add timeout for redis-api calls SW-2635

Approved-by: Michael Zetterberg
2025-05-07 09:15:58 +00:00
Joakim Jäderberg 814a1c534b Merged in fix/redis-api-set-sentry-environment-via-bicep (pull request #1981)
fix: set sentry environment through bicep deploys

* fix: set sentry environment through bicep deploys


Approved-by: Anton Gunnarsson
2025-05-06 13:06:28 +00:00
Joakim Jäderberg 0506d5847e Merged in fix/redis-shutdown-graceful (pull request #1969)
Fix/redis shutdown graceful

* fix: shutdown redis gracefully when container restarts
* throttle scans to redis to avoid overwhelming it

Approved-by: Anton Gunnarsson
2025-05-06 11:38:41 +00:00
Joakim Jäderberg 2acc17219a Merged in feature/SW-2538-redis-api-sentry (pull request #1973)
Feature/SW-2538 redis api sentry

* Add fingerprint to be able to differentiate JSON.parse errors
* update deploy script
* use status over deprecated error function in elysia
* use t3-env createFinalSchema for extra validation

Approved-by: Anton Gunnarsson
2025-05-06 11:29:37 +00:00
Joakim Jäderberg 5784822a1e Merged in feature/SW-2320-languagebased-hide-for-next-release (pull request #1937)
Language based alternative to HIDE_FOR_NEXT_RELEASE

Approved-by: Anton Gunnarsson
2025-05-05 10:53:28 +00:00
Joakim Jäderberg 4ab58cf330 Merged in feature/SW-2531-redis-api-scaling (pull request #1895)
Redis-Api: increase max replica count and cpu/memory

Approved-by: Linus Flood
2025-04-29 08:36:51 +00:00
Joakim Jäderberg 52c99e8767 Merged in fix/SW-2457-destination-page-search-for-countries (pull request #1873)
* fix: able to search for countries on destinationpage
* fix: filter out only desired types when using autocomplete

Approved-by: Linus Flood
2025-04-29 06:19:25 +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
Joakim Jäderberg d66a3aabdf Merged in fix/SW-2478-search-label-inverted-colors (pull request #1850)
fix: colors of the search field on <JumpTo/> had inverted behaviour

* fix: colors of the search field on <JumpTo/> had inverted behaviour


Approved-by: Linus Flood
2025-04-24 06:52:00 +00:00
Joakim Jäderberg a56290edc7 Merged in fix/SW-2401-share-cache-in-prod (pull request #1815)
Fix/SW-2401 share cache in prod

* fix: reuse cache between prod and pre-prod

* tests: add tests for generating cachePrefix

* tests: remove unnecessary reset of process.env

* tests: add tests for generateCacheKey

* fix: make sure that we don't get invalid cacheKeys

* fix: make sure that we don't get invalid cacheKeys


Approved-by: Linus Flood
2025-04-17 08:57:21 +00:00
Joakim Jäderberg 213bd2c561 Merged in fix/SW-2427-floating-booking-widget-fullwidth (pull request #1826)
fix: when floating booking widget is sticky let it have white background all the way out. SW-2427

* fix: when floating booking widget is sticky let it have white background all the way out.
Resolves SW-2427

* pr: move styling variants to it's own file


Approved-by: Christian Andolf
2025-04-17 08:56:24 +00:00
Joakim Jäderberg 4e17bf1391 Merged in fix/SW-2314-search-modal-shifting (pull request #1831)
fix: search modal shifted to the right on mobile

Approved-by: Linus Flood
2025-04-17 08:56:02 +00:00
Joakim Jäderberg b98d6c10c0 Merged in fix/SW-2253-consolidate-autocomplete-search (pull request #1795)
Consolidate autocomplete search SW-2253 SW-2338

* use fuse.js for fuzzy search
* Handle weird behaviour when search field loses focus on destinationPage
* Add error logging for JumpTo when no URL was provided
* Switch to use <Typography /> over <Caption />
* fix: bookingWidget search label should always be red
* fix: searchHistory can no longer add invalid items
* fix: list more hits when searching
* fix: issue when searchField value was undefined
* fix: don't show searchHistory label if no searchHistory items
* simplify skeleton for listitems in search

Approved-by: Linus Flood
2025-04-17 06:39:42 +00:00
Joakim JäderbergandLinus Flood eb46f08ef1 Merged in fix/sitemap-use-dt-over-dayjs-directly (pull request #1773)
fix: use dt() over dayjs when creating sitemap

* fix: use dt() over dayjs when creating sitemap


Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-04-10 07:42:16 +00:00
Joakim Jäderberg da07e8a458 Merged in feature/autocomplete-search (pull request #1725)
Feature/autocomplete search

* wip autocomplete search

* add skeletons to loading

* Using aumlauts/accents when searching will still give results
remove unused reducer
sort autocomplete results

* remove testcode

* Add tests for autocomplete

* cleanup tests

* use node@20

* use node 22

* use node22

* merge
fix: search button outside of viewport

* merge

* remove more unused code

* fix: error message when empty search field in booking widget

* fix: don't display empty white box when search field is empty and no searchHistory is present

* merge

* fix: set height of shimmer for search skeleton

* rename autocomplete trpc -> destinationsAutocomplete

* more accute cache key naming

* fix: able to control wether bookingwidget is visible on startPage
fix: sticky booking widget under alert

* remove unused code

* fix: skeletons
fix: error overlay on search startpage

* remove extra .nvmrc

* merge


Approved-by: Linus Flood
2025-04-09 10:43:08 +00:00
Joakim Jäderberg 275a2b48a6 Merged in feature/node22 (pull request #1734)
Upgrade to node@22

* Upgrade to node@22

* Upgrade to node@22

* update required node engine in scandic-web


Approved-by: Michael Zetterberg
Approved-by: Linus Flood
2025-04-04 09:58:44 +00:00
Joakim Jäderberg 3c810d67a2 Merged in feature/SW-1736-foating-booking-widget (pull request #1696)
Feature/SW-1736 floating booking widget

* feature: Add floating booking widget on start page SW-1736

* fix: Make sure we don't try to use IntersectionObserver on the server

* fix: make sure that we disconnect the intersectionobserver when dismounting

* fix: pass searchparams to floating bookingwidget


Approved-by: Michael Zetterberg
2025-04-04 06:52:37 +00:00
Joakim Jäderberg 87d97db324 Merged in fix/pageview-tracking (pull request #1687)
Fix/pageview tracking

* Restructure pageview tracking

* Update trpc version and turn off batching

* Remove unused state and remove logs

* cleanup

* remove unused code and console.logs


Approved-by: Linus Flood
2025-04-01 06:43:54 +00:00
Joakim JäderbergandLinus Flood fa63b20ed0 Merged in feature/redis (pull request #1478)
Distributed cache

* cache deleteKey now uses an options object instead of a lonely argument variable fuzzy

* merge

* remove debug logs and cleanup

* cleanup

* add fault handling

* add fault handling

* add pid when logging redis client creation

* add identifier when logging redis client creation

* cleanup

* feat: add redis-api as it's own app

* feature: use http wrapper for redis

* feat: add the possibility to fallback to unstable_cache

* Add error handling if redis cache is unresponsive

* add logging for unstable_cache

* merge

* don't cache errors

* fix: metadatabase on branchdeploys

* Handle when /en/destinations throws
add ErrorBoundary

* Add sentry-logging when ErrorBoundary catches exception

* Fix error handling for distributed cache

* cleanup code

* Added Application Insights back

* Update generateApiKeys script and remove duplicate

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

* merge


Approved-by: Linus Flood
2025-03-14 07:54:21 +00:00
Joakim JäderbergandLinus Flood b472854243 Merged in fix/branch-deploy-metadata (pull request #1522)
fix: fallback to undefined when no PUBLIC_URL

* fix: fallback to undefined when no PUBLIC_URL


Approved-by: Linus Flood
2025-03-12 13:58:29 +00:00
Joakim Jäderberg 2c7d72c540 Merged in fix/switch-to-useQuery-over-useSuspenseQuery (pull request #1495)
fix: switch to using useQuery over useSuspenseQuery for booking widget

* fix: switch to using useQuery over useSuspenseQuery for booking widget


Approved-by: Linus Flood
2025-03-07 13:37:15 +00:00
Joakim Jäderberg f36b90e474 Merged in feature/bookingwidget-client-side (pull request #1481)
Move more of BookingWidget to client SW-1639

* feat: move getLocations in booking widget to client side so that it's also cached on the client reducing the blinking when switching urls (and reducing duplicate calls)


Approved-by: Linus Flood
2025-03-05 13:37:33 +00:00
Joakim Jäderberg 92b81ab8e7 Merged in fix/ci-build (pull request #1434)
Fix/ci build

* fix: use explicit ci:build command since pre-scripts don't work in yarn

* fix: don't remove .next-folder on dev

* revert change to netlify.toml


Approved-by: Anton Gunnarsson
2025-02-27 11:55:51 +00:00
Joakim Jäderberg f885760608 Merged in fix/lint-staged (pull request #1432)
fix: lint staged

* fix: lint staged


Approved-by: Christian Andolf
Approved-by: Anton Gunnarsson
2025-02-27 09:42:26 +00:00
Joakim Jäderberg 082a162257 Merged in fix/pinned-yarn-version (pull request #1428)
fix: different packageManager versions in different package.json's caused issues when installing

* fix: different packageManager versions in different package.json's caused issues when installing

* fix: build error


Approved-by: Anton Gunnarsson
2025-02-27 08:41:34 +00:00
Joakim JäderbergandLinus Flood 00b94976b7 Merged in fix/hotel-subpage-unable-to-fetch (pull request #1381)
fix: was unable to fetch hotel subpage data, now uses the same function as when fetching a 'normal' hotel page

* fix: was unable to fetch hotel subpage data, now uses the same function as when fetching a 'normal' hotel page


Approved-by: Linus Flood
2025-02-20 10:05:26 +00:00
Joakim Jäderberg 0d6bbf7b78 Merged in fix/get-from-contentstack (pull request #1378)
* fix: include lang when fetching from contentstack


Approved-by: Matilda Landström
2025-02-19 14:28:10 +00:00
Joakim Jäderberg 873183ec2f * move setLang() to a root layout
* fix: findLang only returns acceptable languages
* fix: fallback to use header x-lang if we haven't setLang yet
* fix: languageSchema, allow uppercase

Approved-by: Linus Flood
2025-02-19 09:06:37 +00:00
Joakim JäderbergandLinus Flood 2791f07f67 Merged in fix/mypages-clientside-menu (pull request #1344)
Fix/mypages clientside menu

* feat: move mypages menu to client side

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/mypages-clientside-menu

* wip

* wip

* wip

* refactor: reorganize MyPages navigation logic and improve type definitions

* refactor: enhance MyPagesMobileDropdown with loading states and skeletons

* refactor: clean up header component and improve myPagesNavigation query structure

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/mypages-clientside-menu


Approved-by: Linus Flood
2025-02-17 07:47:33 +00:00
Joakim Jäderberg 6f51130e48 Merged in feature/hardcoded-mypages-links (pull request #1325)
Feature/hardcoded mypages links

* feat: wip use hardcoded links

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/hardcoded-mypages-links

* feat: use hardcoded links for my pages to support dynamic links

* cleanup

* code fixes

* refactor: restructure MyPagesMobileDropdown component for improved readability

* use util timeout function


Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-02-13 09:28:30 +00:00
Joakim Jäderberg 38da263cb3 Merged in fix/sas-link (pull request #1317)
SAS Handle redirects from server actions on the client

* fix: return values instead of doing redirect in server action

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/sas-link

* fix: SAS use client side redirects since netlify doesn't seem to support redirects inside server actions


Approved-by: Linus Flood
2025-02-12 09:42:15 +00:00
Joakim Jäderberg 3d11cfb50a Merged in feature/sas-mypages (pull request #1302)
Feature/sas mypages

* feat: Add SAS partner page under my pages
* fix: feature toggle SAS Partner page in my pages
* add translations for SAS account page
* use 'flex-start' instead of 'start'
* fix: flatten css
* fix: don't use <SectionContainer /> on linkedAccounts page
2025-02-11 12:55:00 +00:00
Joakim Jäderberg c21d7bec62 fix: netlify doesn't seem to handle redirects in a server action therefor we do the redirect on the client instead 2025-02-06 09:54:52 +00:00
Joakim Jäderberg 46ebbbba8f Merged in feature/sas-login (pull request #1256)
First steps towards the SAS partnership

* otp flow now pretends to do the linking

* Update LinkAccountForm header

* Update redirect times

* Clean up comments

* Set maxAge on sas cookies

* make all SAS routes protected

* Merge remote-tracking branch 'refs/remotes/origin/feature/sas-login' into feature/sas-login

* Require auth for sas link flow

* Fix resend otp

* Add error support to OneTimePasswordForm

* Add Sentry to SAS error boundary

* Move SAS_REQUEST_OTP_STATE_STORAGE_COOKIE_NAME

* Add missing translations

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

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* Add TooManyCodesError component

* Refactor GenericError to support new errors

* Add FailedAttemptsError

* remove removed component <VWOScript/>

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* remove local cookie-bot reference

* Fix sas campaign logo scaling

* feature toggle the SAS stuff

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* fix: use env vars for SAS endpoints


Approved-by: Linus Flood
2025-02-05 14:43:14 +00:00
Joakim JäderbergandLinus Flood 691c493522 Merged in fix/seamless-auth (pull request #1255)
fix: reduce the need for multiple SEAMLESS_LOGIN/SEAMLESS_LOGOUT

* fix: reduce the need for multiple SEAMLESS_LOGIN/SEAMLESS_LOGOUT

* fix: reduce the need for multiple SEAMLESS_LOGIN/SEAMLESS_LOGOUT

* fix: defaulted values that are the same in each environment


Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-02-05 10:01:38 +00:00
Joakim Jäderberg e3f0c1ceb8 fix: remove invalid zero-width-space unicode char 2025-01-14 13:29:35 +01:00
Joakim Jäderberg 1f61bdc060 chore: Update sentry config 2024-12-20 11:04:46 +01:00
Joakim Jäderberg 0a35243d88 fix: remove test-data 2024-11-22 13:17:33 +01:00
Joakim Jäderberg 81c4a91563 Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/loading-rooms-separately 2024-11-22 13:16:40 +01:00
Joakim Jäderberg ed1f97f24e fix: tests failed due to timezone issues 2024-11-22 13:07:49 +01:00
Joakim Jäderberg a1c5ae95be fix: skeletons wasn't center aligned 2024-11-22 11:19:17 +01:00
Joakim Jäderberg 2ba25a70ba fix: filtering rooms should remove them instead of displaying as not available 2024-11-22 10:46:30 +01:00
Joakim Jäderberg 74b634021a Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/loading-rooms-separately 2024-11-22 10:30:53 +01:00
Joakim Jäderberg c8c0a41ed8 fix: move date logic to its own file with tests 2024-11-22 10:30:33 +01:00