Commit Graph
42 Commits
Author SHA1 Message Date
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
Joakim Jäderberg 079ad45ded fix: move date logic to its own file with tests
fix: missing packages should not prevent render
fix: display nothing if roomavailability returns nothing
2024-11-22 10:29:59 +01:00
Joakim Jäderberg 10bd915217 merge 2024-11-21 12:43:25 +01:00
Joakim Jäderberg dbb08960a5 Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/loading-rooms-separately 2024-11-20 14:33:05 +01:00
Joakim Jäderberg 0d739ff81d fix: remove console.log and unused variable 2024-11-20 14:31:53 +01:00
Joakim Jäderberg 2a7dc3ac51 Merged master into fix/add-missing-cache 2024-11-20 12:52:37 +00:00
Joakim Jäderberg 3d2f9e4a7e fix: rename misnamed component 2024-11-20 13:09:37 +01:00
Joakim Jäderberg 90184b8662 Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/syncblocking-parallel-routes 2024-11-20 12:43:41 +01:00
Joakim Jäderberg 847ee5521e fix: use suspense over loading.tsx 2024-11-20 12:14:56 +01:00
Joakim Jäderberg d32a595e2e feat: contain logic for selecting price at the top level instead of on individual room card 2024-11-20 11:25:11 +01:00
Joakim Jäderberg dfdbdb7621 feat: break apart loading of room availability and hotel card
feat: add skeletons
2024-11-20 10:17:55 +01:00
Joakim Jäderberg b533167044 fix: optimize reward query by fetching loyalty levels concurrently 2024-11-20 08:44:23 +01:00
Joakim Jäderberg 84f2bc4c07 fix: enable force-cache for CurrentFooter and booking widget toggle query 2024-11-20 08:43:55 +01:00
Joakim Jäderberg c4caccae5a WIP 2024-11-19 13:40:51 +01:00
Joakim Jäderberg 75c5c97841 chore: upgrade nextjs@14.2.18 2024-11-19 12:03:49 +01:00
Joakim Jäderberg e1a2532b3f fix: use suspense over loading.tsx 2024-11-19 10:57:52 +01:00
Joakim Jäderberg 0c6371d805 wip 2024-11-19 10:52:35 +01:00
Joakim Jäderberg d0c4a376ce Merge remote-tracking branch 'refs/remotes/origin/fix/loading-rooms-separately' into fix/loading-rooms-separately 2024-11-19 09:44:55 +01:00