scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,856 Commits 1 Branch 0 Tags
00bcdaaa28c74fae4eb0601812e8c964cc15316a
Commit Graph

93 Commits

Author SHA1 Message Date
Anton Gunnarsson
00bcdaaa28 Merged in feat/sw-2865-move-navigation-router-to-trpc-package (pull request #2427) 
feat(SW-2862): Move navigation router to trpc package

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Move booking router to trpc package

* Move partners router to trpc package

* Move autocomplete router to trpc package

* Move booking router to trpc package

* Remove translations from My Pages navigation trpc procedure

* Move navigation router to trpc package

* Merge branch 'master' into feat/sw-2862-move-booking-router-to-trpc-package

* Merge branch 'feat/sw-2862-move-booking-router-to-trpc-package' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package

* Merge branch 'master' into feat/sw-2865-move-navigation-router-to-trpc-package


Approved-by: Linus Flood
 2025-06-27 06:54:49 +00:00
Anton Gunnarsson
f9c719ff4b Merged in feat/sw-2866-move-partners-router-to-trpc-package (pull request #2414) 
feat(sw-2866): Move partners router to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* WIP first step

* update internal imports in trpc

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Move booking router to trpc package

* Move partners router to trpc package

* Merge branch 'master' into feat/sw-2866-move-partners-router-to-trpc-package


Approved-by: Linus Flood
 2025-06-26 09:44:13 +00:00
Anton Gunnarsson
395d466c51 Merged in fix/sw-3097-negative-point-transfer (pull request #2434) 
fix(SW-3097): Improve handling when trying to transfer negative SAS points

* Improve handling of trying to transfer negative points


Approved-by: Linus Flood
 2025-06-26 09:30:02 +00:00
Anton Gunnarsson
bbcabfa0ba Merged in feat/sw-2864-move-hotels-router-to-trpc-package (pull request #2410) 
feat (SW-2864): Move booking router to trpc package

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* WIP first step

* update internal imports in trpc

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Move booking router to trpc package

* Merge branch 'master' into feat/sw-2864-move-hotels-router-to-trpc-package


Approved-by: Linus Flood
 2025-06-26 09:02:59 +00:00
Anton Gunnarsson
002d093af4 Merged in feat/sw-2863-move-contentstack-router-to-trpc-package (pull request #2389) 
feat(SW-2863): Move contentstack router to trpc package

* Add exports to packages and lint rule to prevent relative imports

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* WIP first step

* update internal imports in trpc

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package


Approved-by: Linus Flood
 2025-06-26 07:53:01 +00:00
Christian Andolf
06802d57b8 Merged in feat/LOY-263-add-link-missing-points-form (pull request #2392) 
Feat/LOY-263 add link missing points form

Approved-by: Erik Tiekstra
 2025-06-25 09:51:59 +00:00
Christian Andolf
56df2cdb2a feat(LOY-263): add link to missing points form to earn and burn 2025-06-25 11:40:15 +02:00
Christian Andolf
acc77625c8 feat(LOY-263): added new link to missing points form 
removed soonest stays for redundancy
 2025-06-25 11:40:15 +02:00
Christian Andolf
3f6127b861 feat(LOY-276): add hero image to account page 2025-06-24 14:54:54 +02:00
Erik Tiekstra
11201e238d feat(SW-2975): Added top campaign to campaign overview page 
Approved-by: Matilda Landström
 2025-06-24 10:22:07 +00:00
Erik Tiekstra
af92f7183c feat(SW-2278): Added hotel listing to campaign page 
Approved-by: Matilda Landström
 2025-06-19 09:36:28 +00:00
Anton Gunnarsson
846fd904a6 Merged in feat/sw-2859-set-up-shared-trpc-package (pull request #2319) 
feat(SW-2859): Create trpc package

* Add isEdge, safeTry and dataCache to new common package

* Add eslint and move prettier config

* Clean up tests

* Create trpc package and move initialization

* Move errors and a few procedures

* Move telemetry to common package

* Move tokenManager to common package

* Add Sentry to procedures

* Clean up procedures

* Fix self-referencing imports

* Add exports to packages and lint rule to prevent relative imports

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* Fix lang imports


Approved-by: Linus Flood
 2025-06-18 12:14:20 +00:00
Christian Andolf
73884aa428 fix: restore old select selectors for label to still support the temp design select 
deprecated the temp design select in favor of the new one
 2025-06-13 13:07:38 +02:00
Christian Andolf
f6be4f275e refactor: move input and label to design system 
correct variables according to design system spec

various cleanup
 2025-06-13 13:07:38 +02:00
Christian Andolf
9551a629fa refactor: move divider to design system 
remove not used variants and duplicate colors
 2025-06-13 11:27:50 +02:00
Chuma Mcphoy (We Ahead)
144a33fa30 Merged in feat/LOY-233-success-banner-for-dtmc-linking (pull request #2328) 
feat(LOY-233): create success banner for successful DTMC linking

* feat(LOY-233): create success banner for successful DTMC linking

* fix(LOY-233): code cleanup

* fix(LOY-233): use new design vars for alert bg colors


Approved-by: Erik Tiekstra
 2025-06-11 08:52:28 +00:00
Erik Tiekstra
b4a05dae0b feat(SW-2285): Added campaign essentials block on campaign page 
Approved-by: Christian Andolf
Approved-by: Matilda Landström
 2025-06-11 08:14:00 +00:00
Erik Tiekstra
be98c2faf6 feat(SW-1409): Synced tabnavigation headings and section headings on hotel pages 
* feat(SW-2409): Added same headings to relevant sidepeeks


Approved-by: Christian Andolf
Approved-by: Matilda Landström
 2025-06-03 09:22:28 +00:00
Erik Tiekstra
6a639dfd7e feat(SW-2930): Aligned margins and spacing for RTE html with Figma 
Approved-by: Christian Andolf
 2025-06-03 05:45:14 +00:00
Christian Andolf
b3b3704c86 feat: update links default color to match design documents 2025-06-02 15:34:40 +02:00
Christian Andolf
d782b85329 chore: remove duplicate upcoming stays block 2025-06-02 15:12:35 +02:00
Anton Gunnarsson
cbf9e7b7c2 Merged in chore/next15 (pull request #1999) 
chore (SW-834): Upgrade to Next 15

* wip: apply codemod and upgrade swc plugin

* wip: design-system to react 19, fix issues from async (search)params

* wip: fix remaining issues from codemod

serverClient is now async because context use headers()
getLang is now async because it uses headers()

* Minor cleanup

* Inline react-material-symbols package

Package is seemingly not maintained any more and doesn't support
React 19. This copies the package source into `design-system`,
makes the necessary changes for 19 and export it for others to use.

* Fix missing awaits

* Disable modal exit animations

Enabling modal exit animations via isExiting prop is causing
modals to be rendered in "hidden" state and never unmount.
Seems to be an issue with react-aria-components,
see https://github.com/adobe/react-spectrum/issues/7563.
Can probably be fixed by rewriting to a solution similar to
https://react-spectrum.adobe.com/react-aria/examples/framer-modal-sheet.html

* Remove unstable cache implementation and use in memory cache locally

* Fix ref type in SelectFilter

* Use cloneElement to add key prop to element


Approved-by: Linus Flood
 2025-06-02 11:11:50 +00:00
Anton Gunnarsson
7e97b74c18 Merged in chore/remove-unused-code (pull request #2229) 
Remove unused code

* Remove unused scandic-web files

* Remove unused exports


Approved-by: Joakim Jäderberg
 2025-05-30 12:41:18 +00:00
Christian Andolf
6f585a2c1e fix(LOY-52): remove spinner on stay cards to prevent loading to spin indefinitely when opening link in a new tab 2025-05-26 17:19:03 +02:00
Erik Tiekstra
7e17e9cf4c fix(SW-2681): Fixed position of scripted text and using design system components 
Approved-by: Matilda Landström
 2025-05-26 12:32:53 +00:00
Erik Tiekstra
d73f8d844e feat(SW-1960): Improved scrolling and tabnavigation on hotel pages 
Approved-by: Matilda Landström
 2025-05-26 12:32:18 +00:00
Erik Tiekstra
a8e52c6c8a fix(SW-1608): Hotel listing synced with design 
Approved-by: Matilda Landström
 2025-05-26 11:49:51 +00:00
Matilda Landström
a790a52067 Merged in fix/SW-2725 (pull request #2217) 
fix(SW-2725): change to correct icon color (burgundy)

* fix(SW-2725): change to correct icon color (burgundy)


Approved-by: Erik Tiekstra
 2025-05-26 10:35:51 +00:00
Anton Gunnarsson
c27290717b Merged in fix/sw-2767-expire-text-align-right (pull request #2181) 
Align tier match expire date right

* Align tier match expire date right


Approved-by: Christian Andolf
 2025-05-23 08:15:39 +00:00
Anton Gunnarsson
9af93fecda Update framer-motion 2025-05-22 14:00:38 +02:00
Linus Flood
2ec309354e Merged in fix/my-stay-webview-2 (pull request #2191) 
fix: webview - mystay - check if we have webviewToken

* fix: webview - mystay - check if we have webviewToken

* Cleanup


Approved-by: Joakim Jäderberg
 2025-05-22 08:38:20 +00:00
Erik Tiekstra
e48e90dee4 fix(SW-2376): css specificity to fix carousel buttons position 
Approved-by: Chuma Mcphoy (We Ahead)
 2025-05-21 07:06:11 +00:00
Erik Tiekstra
7fe25f7eca fix(SW-2376): Vertically centered previous/next buttons inside carousel cards 
Approved-by: Matilda Landström
 2025-05-19 09:13:23 +00:00
Niclas Edenvin
6a5350d681 Merged in fix/no-my-stay-for-external-bookings (pull request #2126) 
fix: Only link web and app bookings to my stay

Approved-by: Joakim Jäderberg
 2025-05-16 13:35:15 +00:00
Anton Gunnarsson
60af31762b Merged in fix/make-user-loyalty-optional (pull request #2044) 
fix: Make loyalty optional on user

* Optional user loyalty

* merge


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
 2025-05-12 09:00:11 +00:00
Christian Andolf
7359ab4afd feat(LOY-195): digital team member card button on my pages overview 2025-05-06 14:46:12 +02:00
Christian Andolf
f681fa7675 Merged in chore/replace-corner-radius-variable-with-new (pull request #1943) 
chore: replace old border-radius variables with new tokens

Approved-by: Erik Tiekstra
 2025-05-05 11:24:48 +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
Christian Andolf
d6b70edfa3 chore: replace old border-radius variables with new tokens 2025-05-05 11:11:37 +02:00
Anton Gunnarsson
d8a48735a4 Merged in fix/sw-2557-sas-english-copy-fixes (pull request #1915) 
Fixes for English copy in SAS flow

* Update noBoost message

* Update unlink warning copy


Approved-by: Linus Flood
 2025-05-02 12:18:27 +00:00
Anton Gunnarsson
f4fe2e3a4a Merged in fix/sw-2548-invalid-tier-expiry-for-sas-eb-basic (pull request #1908) 
Handle invalid tier expiry 1900-01-01 from SAS

* Handle invalid tier expiry 1900-01-01 from SAS

* Set correct sasTierExpirationDate


Approved-by: Linus Flood
 2025-04-30 08:11:35 +00:00
Christian Andolf
5f836b0c82 Merged in fix/prevent-jump-when-hover-card (pull request #1889) 
fix: prevent jumping layout when hovering card

Approved-by: Erik Tiekstra
 2025-04-29 07:42:45 +00:00
Christian Andolf
ffafdd24d1 Merged in fix/reduce-amount-of-section-elements (pull request #1883) 
fix: reduce the amount of section elements being used since most have no headers connected to them

Approved-by: Chuma Mcphoy (We Ahead)
 2025-04-29 07:03:37 +00:00
Christian Andolf
8501a12f8f fix: prevent jumping layout when hovering card 2025-04-28 16:41:50 +02:00
Christian Andolf
8ed74f08a4 fix: make proper use of type predicates and minor cleanup to avoid double ternary and reduce computation 2025-04-28 15:00:38 +02:00
Christian Andolf
32e95fcbbd fix: reduce the amount of section elements being used since most have no headers connected to them 2025-04-28 14:56:02 +02:00
Christian Andolf
265cecc22a Merged in fix/points-color-bug (pull request #1881) 
fix: text color on points is now correct when revisiting the page

Approved-by: Chuma Mcphoy (We Ahead)
 2025-04-28 12:49:02 +00:00
Simon Emanuelsson
ec087a3d15 feat: refactor of my stay 2025-04-28 12:40:52 +00:00
Christian Andolf
05fab4d2f6 fix: text color on points is now correct when revisiting the page 2025-04-28 14:33:03 +02:00
Chuma Mcphoy (We Ahead)
27aef3982e Merged in fix/LOY-222-find-my-booking-urls-for-prod (pull request #1817) 
Fix(LOY-222): Find my booking url handling

* fix(LOY-222): adapt findMyBooking url based on HIDE_FOR_NEXT_RELEASE

* feat(LOY-222): add current web paths for findMyBooking in multiple languages

* refactor(LOY-222): better env and new url constructions

* refactor(LOY-222): decouple env var handling from getCurrentWebUrl

* fix(LOY-222): update findMyBooking URL construction to use baseUrl

* fix(LOY-222): simplify findMyBooking URL handling for new web urls

* fix(LOY-222): Update Finnish path for hotel reservation lookup

* refactor(LOY-222): rename PUBLIC_URL to NEXT_PUBLIC_PUBLIC_URL for consistency


Approved-by: Christian Andolf
Approved-by: Linus Flood
 2025-04-22 07:03:23 +00:00