scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,040 Commits 2 Branches 0 Tags
706f2d8dfef9b38daff6ed287c2ebd0493e6248e
Commit Graph

226 Commits

Author SHA1 Message Date
Anton Gunnarsson
a2213d0169 Merged in feat/sw-3228-move-image-to-design-system (pull request #2616) 
feat(SW-3228): Move Image to design-system

* Move Image to design-system

* Merge branch 'master' into feat/sw-3228-move-image-to-design-system


Approved-by: Linus Flood
 2025-08-12 12:58:05 +00:00
Anton Gunnarsson
8518d018f8 Merged in feat/sw-3230-move-link-to-design-system (pull request #2618) 
feat(SW-3230): Move Link to design-system

* Move Link to design-system

* Remove comments


Approved-by: Linus Flood
 2025-08-12 12:35:20 +00:00
Joakim Jäderberg
855f795d50 Merged in feature/transpile-design-system (pull request #2621) 
Feature/transpile design system

* remove example, we should use storybook instead

* remove example, we should use storybook instead

* css-modules cannot have :root, moved affected css-variables to globals.css

* .

* scandic-web no longer depends on design-system#build

* * Update readme
* Remove test code


Approved-by: Anton Gunnarsson
 2025-08-12 09:07:33 +00:00
Anton Gunnarsson
00b124d15a Merged in feat/sw-3226-move-buttonlink-to-design-system (pull request #2613) 
feat(SW-3226): Move ButtonLink to design-system

* Move ButtonLink to design-system

* Fix Button import


Approved-by: Linus Flood
 2025-08-11 10:53:00 +00:00
Anton Gunnarsson
41efb3a7b3 Merged in feat/sw-3207-refactor-select-hotel-tracking (pull request #2587) 
feat(SW-3207): Refactor select-hotel tracking

* Refactor select-hotel tracking


Approved-by: Bianca Widstam
 2025-08-06 08:35:48 +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
Anton Gunnarsson
8f11bff6e9 Merged in feat/sw-3185-update-transfer-points-copy (pull request #2547) 
Update SAS point transfer copy

* Update copy


Approved-by: Matilda Landström
 2025-07-11 07:11:29 +00:00
Hrishikesh Vaipurkar
71c6f4cab3 Merged in chore/SW-3145-move-button (pull request #2527) 
chore: SW-3145 Moved tempdesign button to design-system

* chore: SW-3145 Moved tempdesign button to design-system


Approved-by: Anton Gunnarsson
 2025-07-07 07:11:18 +00:00
Erik Tiekstra
903f419729 fix(SW-3081): Removed color option from hotel logos to avoid wrong colors 
Approved-by: Matilda Landström
 2025-07-04 11:40:09 +00:00
Chuma Mcphoy (We Ahead)
df7b8ca7dd Merged in fix/use-image-component-for-dtmc-link-error (pull request #2515) 
Use component image for dtmc error page bg

* Use component image for dtmc error page bg


Approved-by: Joakim Jäderberg
Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
 2025-07-03 13:23:32 +00:00
Anton Gunnarsson
7ff8fee20e Merged in chore/sw-3145-move-skeleton-shimmer (pull request #2509) 
chore(SW-3145): Move SkeletonShimmer to design-system

* Move SkeletonShimmer to design-system


Approved-by: Joakim Jäderberg
 2025-07-03 13:10:23 +00:00
Joakim Jäderberg
daf765f3d5 Merged in feature/wrap-logging (pull request #2511) 
Feature/wrap logging

* feat: change all logging to go through our own logger function so that we can control log levels

* move packages/trpc to using our own logger

* merge


Approved-by: Linus Flood
 2025-07-03 12:37:04 +00:00
Anton Gunnarsson
e5f8394f50 Merged in chore/move-checkbox-component (pull request #2501) 
chore(SW-3145): Move checkbox component to design-system

* Inline type

* Remove error handling from Checkbox internals

* Move Form/Checkbox

* Fix self referencing imports


Approved-by: Joakim Jäderberg
 2025-07-03 08:37:01 +00:00
Anton Gunnarsson
0ffb40e94b Merged in chore/sw-3145-move-footnote (pull request #2506) 
chore(SW-3145): Move Footnote to design-system

* Move Footnote to design-system


Approved-by: Joakim Jäderberg
 2025-07-03 08:14:18 +00:00
Chuma Mcphoy (We Ahead)
d32b8c4333 Merged in chore/remove-show-signup-flag (pull request #2507) 
chore: Remove no longer needed SHOW_SIGNUP_FLOW flag

* chore: Remove no longer needed SHOW_SIGNUP_FLOW flag


Approved-by: Anton Gunnarsson
 2025-07-03 07:56:50 +00:00
Linus Flood
03b8d8eac6 Merged in fix/destination-city-page-cache-revalidate (pull request #2492) 
Fix: destination city page invalidate cache in webhook

* Fix: destination city page invalidate cache in webhook

* Use correct uid


Approved-by: Joakim Jäderberg
 2025-07-01 12:49:23 +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
Chuma Mcphoy (We Ahead)
7eb8deb208 Merged in feat/LOY-232-DTMC-API-INTEGRATION (pull request #2454) 
feat(LOY-232): DTMC API Integration

* feat(LOY-232): DTMC API Integration

* feat(LOY-232): use employment data in team member card

* refactor(LOY-232): remove static data, return employment details in parsed response & fix tests

* refactor(LOY-232): improve DTMC API Linking error control flow + make res type safe

* fix(LOY-232): remove unused utils

* fix(LOY-232): error vars


Approved-by: Christian Andolf
Approved-by: Erik Tiekstra
 2025-07-01 07:03: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
Christian Andolf
18cbd952b7 fix: fixed hydration errors by setting ids 
moved scripts to body since beforeInteractive strategy ones will be placed in the head regardless, avoiding double render
 2025-06-30 13:28:05 +02:00
Anton Gunnarsson
f0def99425 Merged in chore/remove-unused-env-vars (pull request #2463) 
chore: Remove unused env vars and feature toggles

* Remove unused env vars and feature toggles


Approved-by: Joakim Jäderberg
 2025-06-30 07:48:05 +00:00
Anton Gunnarsson
01ca2b4897 Merged in feat/sw-2867-move-user-router-to-trpc-package (pull request #2428) 
Move user router to trpc package

* 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

* Move user 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

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

* Merge branch 'master' into feat/sw-2867-move-user-router-to-trpc-package


Approved-by: Linus Flood
 2025-06-27 07:07:49 +00:00
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
Chuma Mcphoy (We Ahead)
6965effcc2 Merged in feat/LOY-261-Remove-Sidebar-From-MyPages (pull request #2380) 
Feat/LOY-261 Remove Sidebar From MyPages

* feat(LOY-261): remove sidebar from my pages

* refactor(LOY-261): move SASLevelUpgradeCheck to my-pages layout and remove unused code

* chore(LOY-261): remove console logs

* fix(LOY-261): remove sidebar and center content in Loyalty Pages when logged in

* fix(LOY-261): better class naming for content width


Approved-by: Christian Andolf
Approved-by: Erik Tiekstra
 2025-06-26 14:25:17 +00:00
Anton Gunnarsson
e572d9e7e9 Merged in feat/sw-2862-move-booking-router-to-trpc-package (pull request #2421) 
feat(SW-2861): Move booking router to trpc package

* 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

* Move autocomplete router to trpc package

* Move booking router to trpc package

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


Approved-by: Linus Flood
 2025-06-26 13:21:16 +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
Joakim Jäderberg
9b491c5364 Merged in fix/resolve-entry-clearing-cache (pull request #2445) 
fix: use shared cache key when revalidating urls

* fix: use shared cache key when revalidating urls


Approved-by: Linus Flood
 2025-06-26 06:23:03 +00:00
Bianca Widstam
ebc90a825d Merged in fix/SW-3020-tracking-card-type (pull request #2431) 
fix(SW-3020)-tracking-card-type

* fix(SW-3020): add card type for guarantee success

* fix(SW-3020): fix pr comment


Approved-by: Tobias Johansson
 2025-06-25 14:08:55 +00:00
Christian Andolf
372fcccbf1 Merged in feat/LOY-276-sas-hero-image (pull request #2411) 
feat(LOY-276): add hero image to account page

Approved-by: Erik Tiekstra
 2025-06-25 09:40:47 +00:00
Linus Flood
7a56d21a3e Merged in feat/SW-3050-webviews (pull request #2429) 
Feat/SW-3050 webviews

Approved-by: Anton Gunnarsson
 2025-06-25 07:44:33 +00:00
Christian Andolf
3f6127b861 feat(LOY-276): add hero image to account page 2025-06-24 14:54:54 +02:00
Erik Tiekstra
891108791c feat(SW-2264): Added campaign overview page 
Approved-by: Matilda Landström
 2025-06-19 15:19:56 +00:00
Bianca Widstam
46e7f33ab6 Merged in fix/SW-3083-alternative-hotels-page-not-found (pull request #2396) 
fix(SW-3083): alternative hotels compare locations with cityIdentifier

* fix(SW-3083): alternative hotels compare locations with cityIdentifier

* fix(SW-3083): rename cityName

* fix(SW-3083): rename to cityIdentifier


Approved-by: Anton Gunnarsson
 2025-06-19 08:08:33 +00:00
Hrishikesh Vaipurkar
64a56b7050 Merged in fix/SW-3026-prod---users-are-not-focused-on- (pull request #2379) 
fix: SW-3026 Fixed scroll issue

* fix: SW-3026 Fixed scroll issue

* fix: SW-3026 Moved to global solution for scroll to top after page navigation


Approved-by: Tobias Johansson
Approved-by: Linus Flood
 2025-06-18 12:27:58 +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
Chuma Mcphoy (We Ahead)
2101b79db1 Merged in feat/LOY-230-Microsoft-Entra-ID-Auth (pull request #2113) 
Feat(LOY-230): DTMC Routes with Entra ID Auth & Error Page Handling

* feat(LOY-230): Link Scandic Friends and Azure accounts

* fix(LOY-230): remove employee id param setting

* fix(LOY-230): return token in jwt callback for auth.dtmc.ts


Approved-by: Michael Zetterberg
Approved-by: Christian Andolf
 2025-06-18 10:22:04 +00:00
Erik Tiekstra
1e039febaf fix(SW-2933): Making the hotels/city listing render correctly with active filter on page load 
Approved-by: Christian Andolf
Approved-by: Matilda Landström
 2025-06-18 08:42:16 +00:00
Christian Andolf
6ca79d6bab chore: replace old primary background token with new one 2025-06-17 15:37:26 +02:00
Anton Gunnarsson
9f78dd69fe Merged in fix/sw-3035-secure-sas-cookie (pull request #2363) 
Add secure to SAS flow cookies

* Add secure to SAS flow cookies

* Reverse NODE_ENV check


Approved-by: Linus Flood
 2025-06-16 07:35:44 +00:00
Anton Gunnarsson
e6a15bd685 Merged in fix/3037-point-transfer-incorrect-result (pull request #2368) 
Calculate transfered SAS points with exchange rate

* Calculate transfered SAS points with exchange rate


Approved-by: Linus Flood
 2025-06-16 07:29:49 +00:00
Anton Gunnarsson
7a3ab92426 Merged in feat/sw-1948-point-transfer-endpoint (pull request #2353) 
feat(SW-1948):Add SAS point transfer endpoint

* Add SAS point transfer endpoint


Approved-by: Joakim Jäderberg
 2025-06-12 14:06:30 +00:00
Linus Flood
6bf7462ac7 Merged in fix/payment-error (pull request #2342) 
Fix/payment error

* fix: dont show not found page when payment fails

* Show error message when payment fails


Approved-by: Anton Gunnarsson
 2025-06-11 17:49:27 +00:00
Tobias Johansson
98983cb44a Merged in fix/SW-3018-payment-cancel-error (pull request #2339) 
Fix/SW-3018 payment cancel error

* fix(SW-3018): cancel payment error when get booking in callback

* fix: wrong status code


Approved-by: Linus Flood
 2025-06-11 15:22:39 +00:00
Anton Gunnarsson
048a477e52 Merged in feat/common-package (pull request #2333) 
feat: Add common package

* Add isEdge, safeTry and dataCache to new common package

* Add eslint and move prettier config

* Fix yarn lock

* Clean up tests

* Add lint-staged config to common

* Add missing dependencies


Approved-by: Joakim Jäderberg
 2025-06-11 13:08:39 +00:00
Linus Flood
3b9d01af9d Merged in feat/sw-3006-timeout-fetch (pull request #2335) 
feat(SW-3006): added default timeout to all requests

* feat(sw-3006): added default timeout to all requests

* Fixed spreading


Approved-by: Joakim Jäderberg
 2025-06-11 12:39:58 +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