Commit Graph

36 Commits

Author SHA1 Message Date
Anton Gunnarsson
e5149846e5 Merged in chore/upgrade-to-next16 (pull request #3305)
chore(SW-3665): Upgrade to Next 16

* Upgrade partner-sas

* Upgrade scandic-web to next 16

* Update peerDep versions

* Fix revalidateTag

* Remove comment

* Merge branch 'master' into chore/upgrade-to-next16

* Update netlify adapter

* Build with webpack instead of turbopack

* Revert from proxy to middleware

* Merge branch 'master' into chore/upgrade-to-next16

* Revert proxy type

* Fix react types versions

* 16.0.9

* Bump to 16.0.10


Approved-by: Linus Flood
2025-12-12 09:17:15 +00:00
Joakim Jäderberg
de4b3c1c3c Merged in chore/eslint-curly-braces (pull request #3304)
Chore/eslint curly braces

* Add eslint rule for curly braces

* run eslint --fix for all files


Approved-by: Linus Flood
2025-12-08 07:56:21 +00:00
Linus Flood
3bd23bf56e Merged in feat/book-595-gla-tracking-fix (pull request #3294)
feat(BOOK-595): fixed correct tracking values and enter details pageview tracking

* feat(BOOK-595): fixed correct tracking values and enter details pageview tracking

* Fixed on SAS as well


Approved-by: Joakim Jäderberg
2025-12-05 08:01:48 +00:00
Anton Gunnarsson
7c247d7100 Merged in fix/sw-3645-mobile-menu-overlap (pull request #3260)
fix(SW-3645): Use same close button for mobile menus

* Use same close button for mobile menus


Approved-by: Linus Flood
2025-12-02 12:27:57 +00:00
Anton Gunnarsson
be28982e73 Merged in fix/sw-3650-prevent-line-break-in-user-menu (pull request #3274)
fix(SW-3650): Prevent line break in user menu

* Add nowrap to points container


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-12-02 10:08:47 +00:00
Hrishikesh Vaipurkar
1c7f72e95d Merged in fix/SW-3578-user-is-forced-to-login- (pull request #3044)
fix(SW-3578): Fixed session issue when sas session expires

* fix(SW-3578): Fixed session issue when sas session expires

* base socialLogin auto-features on validSession and being linked

* remove unused object

* remove 'import server-only' for isValidSession() since it's only using passed data

* remove isValidClientSession()


Approved-by: Joakim Jäderberg
Approved-by: Anton Gunnarsson
2025-11-03 12:50:25 +00:00
Bianca Widstam
e2aeada23e Merged in fix/BOOK-486-hotjar (pull request #3046)
fix(BOOK-486): suppress hotjar firstname lastname and initials

* fix(BOOK-486): suppress hotjar firstname lastname and initials


Approved-by: Joakim Jäderberg
Approved-by: Anton Gunnarsson
2025-10-31 07:26:11 +00:00
Hrishikesh Vaipurkar
fd770ba6bb Merged in feat/SW-3577-ui-feedback-from-sas-call (pull request #3035)
feat(SW-3577): Updated UI after feedback

Approved-by: Anton Gunnarsson
2025-10-30 09:59:05 +00:00
Erik Tiekstra
4c10989e8e Feat/BOOK-424 campaign banner
Approved-by: Bianca Widstam
2025-10-29 12:47:40 +00:00
Erik Tiekstra
333636c81a Merged in feat/BOOK-61-refactor-hotel-page-css-variables (pull request #3014)
Feat/BOOK-61 refactor hotel page css variables

* feat(BOOK-61): Breadcrumbs

* feat(BOOK-61): intro section

* feat(BOOK-61): show more button

* feat(BOOK-61): rooms section

* feat(BOOK-61): sidepeeks

* feat(BOOK-61): deprecated old Link component

* feat(BOOK-61): added new TextLink component to the design-system

* feat(BOOK-61): replaced deprecated links with new TextLink component

* feat(BOOK-61): miscellaneous changes


Approved-by: Bianca Widstam
Approved-by: Christel Westerberg
2025-10-29 09:15:03 +00:00
Hrishikesh Vaipurkar
98e67f5eda Merged in fix/SW-3550-member-rates-should-only- (pull request #3005)
fix(SW-3550): Treat unlinked User as non-logged user within booking flow

Approved-by: Joakim Jäderberg
2025-10-27 14:34:19 +00:00
Joakim Jäderberg
aafad9781f Merged in feat/lokalise-rebuild (pull request #2993)
Feat/lokalise rebuild

* chore(lokalise): update translation ids

* chore(lokalise): easier to switch between projects

* chore(lokalise): update translation ids

* .

* .

* .

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* chore(lokalise): new translations

* merge

* switch to errors for missing id's

* merge

* sync translations


Approved-by: Linus Flood
2025-10-22 11:00:03 +00:00
Hrishikesh Vaipurkar
c01f440651 Merged in feat/SW-3542-update-color-variables-to- (pull request #2970)
feat(SW-3542): Updated the color variables for MVP

Approved-by: Joakim Jäderberg
2025-10-17 09:22:03 +00:00
Joakim Jäderberg
291310e841 Merged in feature/curity-social-login (pull request #2963)
feat(SW-3541): Do social login after login to SAS

* feat(auth): wip social login via curity

* Setup social login auth flow

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

* Added support for getting scandic tokens and refresh them

* feat: Enhance social login and session management with auto-refresh and improved error handling

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

* wrap layout in suspense

* revert app/layout.tsx

* fix import

* cleanup

* merge

* merge

* dont pass client_secret in the url to curity

* add state validation when doing social login through /authorize

* remove debug logging


Approved-by: Anton Gunnarsson
2025-10-16 12:47:12 +00:00
Joakim Jäderberg
bb3ac1f105 Merged in fix/rename-logout-button (pull request #2978)
Fix rename button logout -> log out

* rename button logout -> log out

* rename button login -> log in


Approved-by: Linus Flood
2025-10-16 08:39:49 +00:00
Hrishikesh Vaipurkar
01e9542ded Merged in fix/change-footer-partnerSas-link-to-public (pull request #2964)
fix(SW-3520): Updated sas eurobonus link in footer
Approved-by: Anton Gunnarsson
2025-10-14 09:33:06 +00:00
Hrishikesh Vaipurkar
36f44d1c0c Merged in fix/SW-3529-wl-site-logout-does-not-reload- (pull request #2947)
Fix/SW-3529 wl site logout does not reload
Approved-by: Anton Gunnarsson
2025-10-14 09:19:43 +00:00
Hrishikesh Vaipurkar
c2096ade2e Merged in fix/SW-3528-hamburger-menu-partially-shown- (pull request #2946)
feat(SW-3528): Fixed UI for close icon

Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-10-10 08:59:47 +00:00
Hrishikesh Vaipurkar
3d99c986dc Merged in fix/footer-copyright-msg-label (pull request #2941)
Fixed footer copyright label copy

Approved-by: Linus Flood
2025-10-09 13:11:11 +00:00
Hrishikesh Vaipurkar
77ee88c6ea Merged in fix/SW-3528-hamburger-menu-partially-shown- (pull request #2936)
fix(SW-3528): Fixed hamburger menu icon visibility and animation

Approved-by: Anton Gunnarsson
2025-10-09 12:40:15 +00:00
Hrishikesh Vaipurkar
566dd54087 Merged in feat/SW-3520-update-footer-ui-and-footer-link (pull request #2910)
feat(SW-3520): Updated the footer

* feat(SW-3520): Updated links to route to scandic web

* feat(SW-3520): Updated the footer with language switcher

* feat(SW-3520): Updated the Contact-us link and removed double slash


Approved-by: Anton Gunnarsson
2025-10-09 06:44:58 +00:00
Joakim Jäderberg
17df3ee71a Merged in feature/SW-3516-pass-eurobonus-number-on-booking (pull request #2902)
* feat(SW-3516): Include partnerLoyaltyNumber on bookings

- Added user context to BookingFlowProviders for user state management.
- Updated booking input and output schemas to accommodate new user data.
- Refactored booking mutation logic to include user-related information.
- Improved type definitions for better TypeScript support across booking components.


Approved-by: Anton Gunnarsson
2025-10-08 10:48:42 +00:00
Hrishikesh Vaipurkar
d3368e9b85 Merged in feat/SW-2782-create-sas-branded-header (pull request #2878)
feat(SW-2782): Updated header as per design, added language switcher and user menu

* feat(SW-2782): Updated header as per design, added language switcher and user menu

* feat(SW-2782): Updated UI as per design

* feat(SW-2782): Optimised code with use of Popover and modal from RAC


Approved-by: Anton Gunnarsson
2025-10-06 08:46:26 +00:00
Erik Tiekstra
57315baf97 Merged in fix/scroll-to-top-issue (pull request #2892)
fix: Update route info inside store before checking if path or lang has changed

* fix: Update route info inside store before checking if path or lang has changed


Approved-by: Linus Flood
2025-10-01 11:15:59 +00:00
Joakim Jäderberg
e4c5363fe9 Merged in fix/BOOK-399-default-language (pull request #2877)
fix(BOOK-399): Default language to 'en' when we've ended up in a invalid state

* fix(BOOK-399): Default language to 'en' when we've ended up in a invalid state

* PR fixes: reuse types and include local dev error message


Approved-by: Anton Gunnarsson
Approved-by: Linus Flood
2025-09-29 14:18:27 +00:00
Anton Gunnarsson
da55e37489 Merged in feat/sw-3489-route-change-component (pull request #2845)
feat(SW-3489): Add RouteChange component to partner-sas

* Add RouteChange component to partner-sas


Approved-by: Linus Flood
2025-09-24 06:20:20 +00:00
Joakim Jäderberg
c46e71d76e Merged in feature/SW-3505-fetch-eurobonus-points (pull request #2847)
feat(SW-3505): add endpoint for getting eurobonus profile

* feat(SW-3505): add endpoint for getting eurobonus profile

* make sure we add loginType to session

* no need to run zod parsing twice

* Make SAS environment variables mandatory


Approved-by: Anton Gunnarsson
2025-09-23 12:13:20 +00:00
Anton Gunnarsson
630e89c845 Merged in feat/sw-3473-remove-tracking-context (pull request #2843)
feat(SW-3473): Rework booking-flow tracking provider

* Remove tracking context and import instead

* Remove unused file


Approved-by: Joakim Jäderberg
2025-09-22 13:08:10 +00:00
Joakim Jäderberg
8ebc48b138 Merged in feat/SW-3461-setup-auth-with-sas-eurobonus (pull request #2825)
Feat/SW-3461 setup auth with sas eurobonus

* feat(SW-3461): Setup auth for sas eurobonus

* .

* feat: setup auth towards SAS

* Fix auth via SAS and add logout route

* .

* merge

* auth via SAS

* fix powered by scandic logo

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3461-setup-auth-with-sas-eurobonus

* Include access_token in jwt after successful login

* merge


Approved-by: Anton Gunnarsson
2025-09-22 09:30:36 +00:00
Anton Gunnarsson
65e4623b52 Merged in chore/fix-partner-sas-todos (pull request #2823)
chore: Fix partner-sas todos

* Add onError to TrpcProvider

* Add AdobeSDKScript

* Add GTMScript

* Add adobeDataLayer script

* Add ReactQueryDevtools

* Move components to correct folder


Approved-by: Joakim Jäderberg
2025-09-18 07:28:14 +00:00
Anton Gunnarsson
c6aebbd0b2 Merged in feat/sw-3415-set-up-cookiebot-in-partner-sas (pull request #2784)
feat(SW-3415): Add CookieBotConsent to partner-sas

* Add CookieBotConsent


Approved-by: Joakim Jäderberg
2025-09-11 12:29:52 +00:00
Joakim Jäderberg
7dee6d5083 Merged in chore/move-enter-details (pull request #2778)
Chore/move enter details

Approved-by: Anton Gunnarsson
2025-09-11 07:16:24 +00:00
Anton Gunnarsson
4550ddec53 Merged in feat/sw-3416-add-sitewidealert-to-partner-sas (pull request #2773)
feat(SW-3416): Add SiteWideAlert to partner-sas

* Add SiteWideAlert to partner-sas

* Remove log


Approved-by: Joakim Jäderberg
2025-09-09 10:00:25 +00:00
Anton Gunnarsson
69268d88fb Merged in feat/sw-3418-add-routerprovider-to-partner-sas (pull request #2777)
feat(SW-3418): Add RouterProvider to partner-sas

* Add RouterProvider


Approved-by: Joakim Jäderberg
2025-09-09 08:20:17 +00:00
Anton Gunnarsson
87402a2092 Merged in feat/sw-2873-move-selecthotel-to-booking-flow (pull request #2727)
feat(SW-2873): Move select-hotel to booking flow

* crude setup of select-hotel in partner-sas

* wip

* Fix linting

* restructure tracking files

* Remove dependency on trpc in tracking hooks

* Move pageview tracking to common

* Fix some lint and import issues

* Add AlternativeHotelsPage

* Add SelectHotelMapPage

* Add AlternativeHotelsMapPage

* remove next dependency in tracking store

* Remove dependency on react in tracking hooks

* move isSameBooking to booking-flow

* Inject searchParamsComparator into tracking store

* Move useTrackHardNavigation to common

* Move useTrackSoftNavigation to common

* Add TrackingSDK to partner-sas

* call serverclient in layout

* Remove unused css

* Update types

* Move HotelPin type

* Fix todos

* Merge branch 'master' into feat/sw-2873-move-selecthotel-to-booking-flow

* Merge branch 'master' into feat/sw-2873-move-selecthotel-to-booking-flow

* Fix component


Approved-by: Joakim Jäderberg
2025-09-01 08:37: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