scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,493 Commits 1 Branch 0 Tags
9175331e4def23e54ae40f82e421fc8f9daedefa
Commit Graph

134 Commits

Author SHA1 Message Date
Joakim Jäderberg
de9b5d7686 Merged in fix/social-login-scopes (pull request #3126) 
Set profile_read scope for social login

* set profile_read scope


Approved-by: Anton Gunnarsson
 2025-11-11 12:35:27 +00:00
Joakim Jäderberg
bc5a606289 Merged in feature/turbopack (pull request #3117) 
Feature/turbopack

* .

* .

* pin import-in-the-middle

* update marker

* revert back to using *.graphql.ts


Approved-by: Linus Flood
 2025-11-11 09:51:40 +00:00
Anton Gunnarsson
0b569e28ce Merged in fix/add-missing-partner-data (pull request #3116) 
fix: Add param to getScandicUser for extended data

* Add param to getScandicUser for extended data


Approved-by: Linus Flood
 2025-11-10 15:23:07 +00:00
Linus Flood
5770dcdd9c Merged in revert-gql (pull request #3104) 
Revert gql

* Revert "Merged in fix/system-fragment (pull request #3102)"

This reverts commit 0d479eb337.

* Revert "Merged in chore/replace-graphql-tag/loader (pull request #3096)"

This reverts commit e9bd159e98.
 2025-11-07 13:13:28 +00:00
Joakim Jäderberg
e9bd159e98 Merged in chore/replace-graphql-tag/loader (pull request #3096) 
Use turbopack for dev builds.
Remove graphql-tag/loader, replaced by gql`` tag literals instead.



Approved-by: Linus Flood
 2025-11-07 12:33:17 +00:00
Joakim Jäderberg
61af689853 Merged in feature/SW-3506-refresh-tokens (pull request #3064) 
feature(SW-3506): refresh-tokens setup for SAS Eurobonus

* feature(SW-3506): refresh-tokens setup for SAS Eurobonus

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/SW-3506-refresh-tokens


Approved-by: Anton Gunnarsson
 2025-11-07 09:59:41 +00:00
Linus Flood
1a24eb68c7 Merged in feat/sw-3596-console (pull request #3100) 
feat(SW-3596): added lint rule for no console.log. Use logger instead.

* feat(SW-3596): added lint rule for no console.log. Use logger instead.


Approved-by: Joakim Jäderberg
 2025-11-07 08:14:16 +00:00
Joakim Jäderberg
07ef6d96d6 Merged in chore/remove-jsonsort-dictionaries (pull request #3084) 
chore: No need to sort dictionary files anymore now that we have man-made IDs

* No need to sort dictionary files anymore now that we have man-made IDs


Approved-by: Erik Tiekstra
Approved-by: Linus Flood
 2025-11-06 14:18:50 +00:00
Joakim Jäderberg
ec511e2c8b Merged in feature/tsgo (pull request #3069) 
Use tsgo for typechecking

* switch to tsgo for type-checking

* Merged in chore/remove-cypress (pull request #3066)

chore: remove unused dependencies

* chore: remove cypress

* remove unused deps

* update yarn.lock after removing unused deps


Approved-by: Anton Gunnarsson

* use tsgo for typechecking

* use tsgo for type-checking

* yarn install

* fix(BOOK-496): Slowed down the MarqueeText component animation

Approved-by: Matilda Landström

* switch to tsgo for type-checking

* use tsgo for typechecking

* use tsgo for type-checking

* yarn install

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

* switch to use yarn check-types in lint-staged

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


Approved-by: Linus Flood
 2025-11-06 12:34:23 +00:00
Linus Flood
ad85c5900b Merged in feat/lokalise-pull-051125 (pull request #3083) 
feat(lokalise): downloaded latest translations

* feat(lokalise): downloaded latest translations


Approved-by: Joakim Jäderberg
 2025-11-05 13:28:01 +00:00
Joakim Jäderberg
392db172c4 Merged in chore/remove-svgr/webpack (pull request #3071) 
remove unused @svgr/webpack

* remove unused @svgr/webpack

* merge


Approved-by: Linus Flood
 2025-11-05 09:31:09 +00:00
Anton Gunnarsson
83822fbc76 Merged in fix/sw-3581-incorrect-price-colors (pull request #3057) 
feat(SW-3581): Set price colors to scandic red

* Set price colors to scandic red

* Remove comment


Approved-by: Bianca Widstam
Approved-by: Joakim Jäderberg
 2025-11-03 13:14:57 +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
Anton Gunnarsson
1eb70766b4 Merged in feat/sw-3580-redemption-feature-flag (pull request #3045) 
feat(SW-3580): Add feature toggle enableRedemption to BookingFlowConfig

* Add feature toggle enableRedemption to BookingFlowConfig

* Update error message


Approved-by: Joakim Jäderberg
 2025-11-03 07:57:39 +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
Erik Tiekstra
6a342aaa9e chore: generated design system css variables from updated json file 
Approved-by: Matilda Landström
 2025-10-30 12:27:16 +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
Joakim Jäderberg
47210491c3 Merged in sync-lokalise-2025-10-30 (pull request #3038) 
* sync lokalise

* sync defaultMessage


Approved-by: Anton Gunnarsson
 2025-10-30 08:47:44 +00:00
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
Anton Gunnarsson
6b38d57197 Merged in chore/fix-broken-e2e-test (pull request #3031) 
chore: Fix broken e2e tests

* Update date picker selector


Approved-by: Joakim Jäderberg
 2025-10-29 15:24:09 +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
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
Bianca Widstam
bfe5c5f8bb Merged in lokalize/sync (pull request #3024) 
lokalise sync

* lokalise sync

* lokalise sync and remove duplicate id


Approved-by: Joakim Jäderberg
Approved-by: Anton Gunnarsson
 2025-10-28 10:26:47 +00:00
Joakim Jäderberg
a4f1a55e56 Merged in feat/SW-3549-handle-unlinked-account (pull request #3019) 
fix(SW-3549): update social session management functions for clarity and consistency

* refactor(SW-3549): rename session management functions for clarity and consistency

* merge


Approved-by: Hrishikesh Vaipurkar
 2025-10-28 09:51:30 +00:00
Anton Gunnarsson
642f032512 Merged in fix/update-sas-join-card-text (pull request #2998) 
fix: Update SAS join card text and size

* Update SAS join card text and size


Approved-by: Joakim Jäderberg
 2025-10-28 08:17:04 +00:00
Matilda Landström
649c85e6f5 Merged in feat/Lokalise-fetch (pull request #3021) 
Update from Lokalise 27/10-25

* Update from Lokalise 27/10-25


Approved-by: Chuma Mcphoy (We Ahead)
 2025-10-27 16:00:35 +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
3b3e7308cc Merged in feat/SW-3549-pass-scandic-token (pull request #2989) 
Feat/SW-3549 pass scandic token

* WIP pass scandic token

* pass scandic token when booking

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* pass user token when doing availability search

* undo changes

* merge

* Merged in fix/sw-3551-rsc-bookingflowconfig (pull request #2988)

fix(SW-3551): Fix issue with BookingConfigProvider in RSC

* wip move config to pages

* Move config providing to pages

* Merged in fix/update-promo-error-modal-text (pull request #2990)

fix: update promo error modal text

* fix: update promo error modal text


Approved-by: Emma Zettervall

* Merged in fix/sw-3514-missing-membership-input-for-multiroom (pull request #2991)

fix(SW-3514): Show join Scandic Friends card for SAS multiroom

* Show join card for room 2+


Approved-by: Hrishikesh Vaipurkar

* 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

* Merged in feat/SW-3552-logout-from-social-session-when- (pull request #2994)

feat(SW-3552): Removed scandic session on logout

Approved-by: Joakim Jäderberg

* merge

* replace getRedemptionTokenSafely() with context based instead

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* merge

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* add booking scope

remove unused getMembershipNumber()


Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
 2025-10-24 13:17:02 +00:00
Anton Gunnarsson
a00cf8d327 Merged in fix/sw-3568-sas-terms-and-conditions-link (pull request #3002) 
feat(SW-3568): Use dependency injected link for SF terms on enter details

* Use dependency injected link for sf terms


Approved-by: Linus Flood
 2025-10-23 11:14:51 +00:00
Hrishikesh Vaipurkar
7f2db6f3de Merged in feat/SW-3557-update-ui-colors-after-test- (pull request #2995) 
* feat(SW-3557): Updated colors

Approved-by: Anton Gunnarsson
 2025-10-23 06:54:14 +00:00
Hrishikesh Vaipurkar
d6941042de Merged in feat/SW-3552-logout-from-social-session-when- (pull request #2994) 
feat(SW-3552): Removed scandic session on logout

Approved-by: Joakim Jäderberg
 2025-10-22 11:26:09 +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
Anton Gunnarsson
c435cdba68 Merged in fix/sw-3551-rsc-bookingflowconfig (pull request #2988) 
fix(SW-3551): Fix issue with BookingConfigProvider in RSC

* wip move config to pages

* Move config providing to pages
 2025-10-22 07:04:21 +00:00
Anton Gunnarsson
710309b7eb Merged in feat/sw-3545-update-sas-userinfo-tracking (pull request #2982) 
feat(SW-3545): Update partner-sas userinfo tracking

* Update loginType to eurobonus

* Remove tracking booking code properties when disabled

* Add EB user data to tracking

* Fix type issue


Approved-by: Joakim Jäderberg
 2025-10-17 09:35:37 +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
Hrishikesh Vaipurkar
69a1b5f213 Merged in fix/SW-3526-show-sas-eb-points-rate- (pull request #2973) 
fix(SW-3526): Redirect user to login if points rate search and not logged in

Approved-by: Anton Gunnarsson
 2025-10-16 09:51:03 +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
Anton Gunnarsson
611d81222c Merged in feat/sw-3514-join-card-membership-id (pull request #2967) 
feat(SW-3514): Add variant of join friends card with membership id input

* Move membershipId input in enter details to join card

Add booking flow feature flag to move membershipId into join card and hide login button.
Currently only applies to first room.

* Add sas join card to multiroom


Approved-by: Hrishikesh Vaipurkar
 2025-10-16 08:24:20 +00:00
Linus Flood
d82bd7d804 Merged in feat/lokalise-sync-151025 (pull request #2966) 
feat(lokalise): sync 15 oct

* feat(lokalise): sync 15 oct
 2025-10-15 07:21:56 +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
Linus Flood
7b6c869f4e Merged in feat/lokalise-sync-131025 (pull request #2958) 
feat(lokalise): sync 13 oct

* feat(lokalise): sync 13 oct
 2025-10-13 11:53:17 +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
Linus Flood
040de50c0e Merged in feat/lokalise-sync-091025 (pull request #2935) 
feat(lokalise): sync lokalise

* feat(lokalise): sync lokalise


Approved-by: Matilda Landström
 2025-10-09 13:11:34 +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
Anton Gunnarsson
a5759205ec Merged in feat/sw-3525-sas-member-type-in-tracking (pull request #2931) 
feat(SW-3525): Set correct member type in tracking for partner-sas

* Set correct member type in tracking for partner-sas


Approved-by: Joakim Jäderberg
 2025-10-09 12:47:38 +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