Joakim Jäderberg
bf6ed7778e
Merged in feat/syncDefaultMessage (pull request #3022 )
...
Sync defaultMessage from lokalise
* Enhance translation sync functionality and tests
- Added logging for found component files during sync.
- Introduced tests for handling complex components with replacements.
- Updated regex in syncIntlFormatMessage to support optional second arguments.
- Removed unused test files.
* feat(syncDefaultMessage): add script for syncing default message with lokalise
* feat(syncDefaultMessage): add script for syncing default message with lokalise
Approved-by: Matilda Landström
2025-10-30 08:38:50 +00:00
Joakim Jäderberg
56b44c16d4
Merged in chore/upgrade-netlify-nextjs-plugin (pull request #3032 )
...
chore: upgrade @netlify/plugin-nextjs
* chore: upgrade @netlify/plugin-nextjs
Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
2025-10-29 13:36:27 +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
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
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
Joakim Jäderberg
ae7a62c88f
Merged in feature/SW-3149-send-logs-to-sentry (pull request #2802 )
...
Feature/SW-3149 send logs to sentry
* Use sentry for logging
* .
* fix(SW-3149) Send logs to Sentry
* remove experimental flag for logs
* add sentry settings for partner-sas
* feat(SW-3108): Added external link option to top primary button on content/collection page
Approved-by: Matilda Landström
* fix(BOOK-152): Removed old header references inside useStickyPosition hook to fix offset issue for the sitewide alert
Approved-by: Matilda Landström
* Merged in fix/LOY-360-team-member-text-for-retired-employees (pull request #2799 )
fix(LOY-360): improve text for retired employees
* fix(LOY-360): improve text for retired employees
Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
* Merged in fix/STAY-67-redirect-to-webview-after-gla (pull request #2795 )
fix(STAY-67): redirect to webview after guarantee on my stay
* fix(STAY-67): redirect to webview after guarantee on my stay
* fix(STAY-67): add callback page for guarantee on webview
Approved-by: Linus Flood
* feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox
* feat(SW-3152): Respecting image aspect ratio inside image gallery/lightbox
* feat(BOOK-144): Make image clickable instead of a button to avoid being able to click outside of the image area
Approved-by: Bianca Widstam
Approved-by: Chuma Mcphoy (We Ahead)
* Merged in fix/BOOK-127-translate-validation-text (pull request #2800 )
fix(BOOK-127): translate terms required message
* fix(BOOK-127): translate terms required message
Approved-by: Erik Tiekstra
* Merged in feat/LOY-354-L7-Progress-Card (pull request #2786 )
Feat/LOY-354 L7 Progress Card
* feat(LOY-354): Add Trophy icon
* fix(LOY-354): include new tierPoints value
* feat(LOY-354): L7 Progress Level Card support
* refactor(LOY-354): Refactoring of component structure
* fix(LOY-354): Remove intl prop drilling
* fix(LOY-354): cleanup progress section code
Approved-by: Erik Tiekstra
* Merged in fix/BOOK-132-tracking-breakfast (pull request #2803 )
fix(BOOK-132): add breakfastOption tracking
* fix(BOOK-132): add breakfastOption tracking
Approved-by: Joakim Jäderberg
* Merged in fix/enter-details-errors-missing (pull request #2806 )
fix: Add missing messages to BookingFlowInput errors
* Add missing messages to BookingFlowInput errors
* Fix errors
* zippy zip
* phoney
Approved-by: Bianca Widstam
Approved-by: Joakim Jäderberg
* Merged in feature/copy-static-files-via-build-scripts (pull request #2798 )
SW-3467 Copy static files via build scripts
* add file copy script and add all fonts to design-system
* add file copy script and add all fonts to design-system
* add file copy script and add all fonts to design-system
* remove fonts that will be copied via build scripts
* wip
* update paths to shared files
* update material-symbol script
* merge
* fix missing shared segment for path in fonts.css
Approved-by: Linus Flood
* Merged in feat/SW-2999-cleanup (pull request #2810 )
feat(SW-2999): cleanup current web
* feat(SW-2999): cleanup current web
* Merge master
* Removed unused fonts
Approved-by: Joakim Jäderberg
* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3149-send-logs-to-sentry
* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3149-send-logs-to-sentry
* merge
Approved-by: Linus Flood
2025-09-18 07:59:44 +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
Joakim Jäderberg
48324ef935
Merged in feature/copy-static-files-via-build-scripts (pull request #2798 )
...
SW-3467 Copy static files via build scripts
* add file copy script and add all fonts to design-system
* add file copy script and add all fonts to design-system
* add file copy script and add all fonts to design-system
* remove fonts that will be copied via build scripts
* wip
* update paths to shared files
* update material-symbol script
* merge
* fix missing shared segment for path in fonts.css
Approved-by: Linus Flood
2025-09-16 10:59:33 +00:00
Joakim Jäderberg
4893eb8b25
Merged in SW-3459-setup-booking-confirmation-page-in-sas (pull request #2794 )
...
Setup booking-confirmation page in SAS
* Setup booking-confirmation page in SAS
move booking-confirmation tracking to booking-flow
* remove unused param
* Add test cards to documentation
* Fix payment callback page to use correct status
Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
2025-09-11 12:19:26 +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
4f8c51298f
Merged in chore/improve-e2e-tests-in-sas (pull request #2663 )
...
chore: Increase expect timeout in SAS e2e tests
* Increase expect timeout
Approved-by: Joakim Jäderberg
2025-08-25 07:51:26 +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
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
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
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
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
