scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,950 Commits 1 Branch 0 Tags
233c685e520569c8b9bb418f422c0490d97e9e8f
Commit Graph

227 Commits

Author SHA1 Message Date
Matilda Landström
acbca570d3 Merged in fix/SW-3161-meeting-room-N/A (pull request #2536) 
fix(SW-3161): fix correct meeting room type mapping

* fix(SW-3161): fix correct room type mapping


Approved-by: Chuma Mcphoy (We Ahead)
 2025-07-09 09:22:29 +00:00
Erik Tiekstra
270249c6c4 feat(SW-2973): Added bookingCode if available to links inside campaign pages 
* feat(SW-2973): Moved block types to trpc lib

Approved-by: Matilda Landström
 2025-07-04 10:15:01 +00:00
Erik Tiekstra
fa7214cb58 Feat/SW-2271 hotel list filtering 
* feat(SW-2271): Changes to hotel data types in preperation for filtering
* feat(SW-2271): Added filter and sort functionality

Approved-by: Matilda Landström
 2025-07-04 09:27:20 +00:00
Anton Gunnarsson
d7981eae42 Merged in chore/sw-3145-move-switch (pull request #2521) 
Move Switch to design-system

* Move Switch to design-system

* Fix Icon import

* Fix Caption import...


Approved-by: Joakim Jäderberg
 2025-07-04 08:33:04 +00:00
Anton Gunnarsson
0ee6e8800d Merged in chore/sw-3145-move-tooltip (pull request #2514) 
chore(SW-3145): Move Tooltip to design-system

* Move Tooltip to design-system


Approved-by: Joakim Jäderberg
 2025-07-03 13:00:12 +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
Bianca Widstam
7f1b5f7505 Merged in fix/SW-2565-tracking-guarantee-status (pull request #2502) 
fix(SW-2565): change status to paymentStatus

* fix(SW-2565): change status to paymentStatus


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
 2025-07-02 13:39:57 +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
Bianca Widstam
86bd3fcea3 Merged in fix/SW-3117-filter-select-hotel (pull request #2475) 
Fix/SW-3117 filter select hotel

* fix(SW-3117): default hotel count fix

* fix(SW-3117): default hotel count for mobile


Approved-by: Tobias Johansson
Approved-by: Matilda Landström
 2025-07-01 06:33:04 +00:00
Erik Tiekstra
4229e9b11b feat(SW-2283): Added carousel cards block to campaign overview page 
Approved-by: Christian Andolf
Approved-by: Matilda Landström
 2025-06-30 09:08:22 +00:00
Hrishikesh Vaipurkar
edca03decf Merged in fix/SW-2884-select-hotel-page-users-are-di (pull request #2438) 
fix: SW-2884 Fixed Alternative hotels map navigation issues

* fix: SW-2884 Fixed Alternative hotels map navigation issues

* fix: SW-2884 Optmized code


Approved-by: Arvid Norlin
 2025-06-27 08:05:26 +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
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
5f8ac8cdeb Merged in feat/sw-2861-move-autocomplete-router-to-trpc-package (pull request #2417) 
feat(SW-2861): Move autocomplete router 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

* Move autocomplete router to trpc package

* Merge branch 'master' into feat/sw-2861-move-autocomplete-router-to-trpc-package


Approved-by: Linus Flood
 2025-06-26 12:40:45 +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
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
Bianca Widstam
9e3d82b62c Merged in fix/SW-2739-map-reward-night-not-enough-points (pull request #2435) 
fix(SW-2739): remove tooltip and add correct CTA on map for reward nights

* fix(SW-2739): remove tooltip and add correct CTA on map for reward nights

* fix(SW-2739): fix pr comment


Approved-by: Arvid Norlin
 2025-06-25 13:30:43 +00:00
Simon Emanuelsson
145a6d2365 feat: only show alerts when booking dates are affected 2025-06-25 11:16:20 +00:00
Tobias Johansson
8c4715dd24 Merged in feat/SW-2680-tracking-fixes (pull request #2373) 
fix(SW-2680): Added new properties used for tracking

* fix(SW-2680): Added new properties used for tracking


Approved-by: Michael Zetterberg
 2025-06-25 08:56:37 +00:00
Bianca Widstam
a112173663 Merged in fix/Sw-2849-update-sidepeek-select-rate (pull request #2406) 
fix(SW-2849): use same sidepeek on select rate as on select hotel

* fix(SW-2849): use same sidepeek on select rate as on select hotel

* fix(SW-2849): remove ameneties sidepeek enum


Approved-by: Erik Tiekstra
 2025-06-24 11:37:25 +00:00
Hrishikesh Vaipurkar
e77ed2407b Merged in feat/SW-3002-new-hotel-move-tripadvisor (pull request #2375) 
feat: SW-3002 Changed tripadvisor review subpage to Sidepeek

* feat: SW-3002 Changed tripadvisor review subpage to Sidepeek

* feat: SW-3002 Optimised styles


Approved-by: Erik Tiekstra
 2025-06-24 07:39:18 +00:00
Erik Tiekstra
891108791c feat(SW-2264): Added campaign overview page 
Approved-by: Matilda Landström
 2025-06-19 15:19:56 +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
Matilda Landström
61317e0c94 Merged in feat/SW-2266-campaign-hero (pull request #2344) 
Feat/SW-2266 campaign hero

Approved-by: Erik Tiekstra
 2025-06-18 13:35:38 +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
Erik Tiekstra
2f38bdf0b1 fix(SW-3075): Fixed issue where URLs rendered differently in source HTML in compared to client 
Approved-by: Matilda Landström
 2025-06-18 12:07:32 +00:00
Erik Tiekstra
c783f3a764 feat(SW-3015): Added pagelinks for campaign page on all connections 
Approved-by: Matilda Landström
 2025-06-18 12:06:48 +00:00
Tobias Johansson
002d5f9c68 Merged in fix/SW-3078-wrong-dates-time-zones (pull request #2388) 
fix(SW-3078): change to string instead of Date in Zod schema

* fix(SW-3078): change to string instead of Date in Zod schema


Approved-by: Michael Zetterberg
Approved-by: Linus Flood
 2025-06-18 10:55:05 +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
Simon.Emanuelsson
85acd3453d Merged in feat/SW-1719-strikethrough-rates (pull request #2266) 
Feat/SW-1719 strikethrough rates

* feat(SW-1719): Strikethrough rate if logged in on regular rate cards

* feat(SW-1719): Strikethrough rate if logged in on rate summary

* feat(SW-1719): Strikethrough rate if logged in on mobile rate summary

* feat(SW-1719): Strikethrough rate if logged in on enter details

* feat(SW-1719): Strikethrough rate support for multiple rooms

* feat(SW-1719): booking receipt fixes on confirmation page

* feat(SW-1719): improve initial total price calculation

* feat: harmonize enter details total price to use one and the same function


Approved-by: Michael Zetterberg
 2025-06-13 12:01:16 +00:00
Christian Andolf
9da986f554 fix: extrapolate phone number parsing for re-usage in edit profile 
move error messages to message handler
 2025-06-13 10:46:15 +02:00
Tobias Johansson
e645b15c6e Merged in fix/SW-2841-filter-popup-closing-on-select (pull request #2289) 
Fix/SW-2841 filter popup closing on select

* fix(SW-2841): refactored so that filter modal is not closed when selecting filters

* fix(SW-2841): rename component

* fix: review feedback

* fix: move font-family

* fix: change init value of filteredHotelIds

* fix

* fix: add Typography tag


Approved-by: Michael Zetterberg
Approved-by: Christian Andolf
 2025-06-13 07:41:31 +00:00
Erik Tiekstra
2342fd1bfc Feat/SW-2273 campaign page accordion block 
Approved-by: Matilda Landström
 2025-06-12 09:24:18 +00:00
Erik Tiekstra
e2a4fa6c07 Feat/SW-2272 campaign cards block 
Approved-by: Matilda Landström
 2025-06-12 06:01:23 +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
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
Matilda Landström
be643e68a7 Merged in fix/SW-2980-alert (pull request #2312) 
Fix/SW-2980: Only filter out child alert on hotel page

Approved-by: Erik Tiekstra
 2025-06-10 07:35:12 +00:00
Erik Tiekstra
ace5519869 feat(SW-2265): Added campaign-page 
Approved-by: Matilda Landström
 2025-06-10 06:35:43 +00:00
Anton Gunnarsson
bff34b034e Merged in feat/sw-2857-refactor-booking-flow-url-updates (pull request #2302) 
feat(SW-2857): Refactor booking flow url updates

* Add support for removing parameters when using initial values in serializeSearchParams

* Don't manually write search params in rate store

* Booking is already from live search params so no need

* Fix input type in serializeBookingSearchParams


Approved-by: Linus Flood
 2025-06-09 09:16:22 +00:00
Hrishikesh Vaipurkar
d626e0f7ae Merged in feat/SW-2653-aa-tracking-click-tracking-on-se (pull request #2301) 
feat: SW-2653 Implemented click tracking on Search btn and lang switch

* feat: SW-2653 Implemented click tracking on Search btn and lang switch


Approved-by: Erik Tiekstra
 2025-06-09 08:49:39 +00:00
Matilda Landström
0383a332ad Merged in feat/SW-2888-facilities (pull request #2267) 
Feat/SW-2888 facilities

* chore(SW-2944): change order of content

* chore(SW-2944): add openinghourstype from api


Approved-by: Erik Tiekstra
 2025-06-05 07:29:49 +00:00
Matilda Landström
f45782f423 Merged in feat/SW-2851-the-doc-logo (pull request #2293) 
Feat/SW-2851: Add The Dock Signature hotel logo and marker

* feat(SW-2851): Add The Doc as signature hotel

* chore(SW-2851): add logo

* chore(SW-2851): add marker


Approved-by: Erik Tiekstra
 2025-06-05 07:20:17 +00:00
Erik Tiekstra
a8f167025d fix(SW-2933): Making the hotels/city listing render correct for SEO purposes 
Approved-by: Matilda Landström
 2025-06-04 09:05:05 +00:00
Anton Gunnarsson
dd4ef527df Merged in chore/eslint9 (pull request #2029) 
chore: Update to ESLint 9

* wip: apply codemod and upgrade swc plugin

* Update eslint to 9 in scandic-web

apply code mod to config
fix existing lint issues

* Remove uneccessary fixupConfigRules

* Update eslint to 9 in design-system

* Add lint turbo dependency

* Move redis-api to eslint and prettier instead of biome

* Simplify eslint configs

* Clean up

* Apply linting


Approved-by: Linus Flood
 2025-06-03 14:26:44 +00:00
Bianca Widstam
984805ea8d Merged in feat/SW-1936-ui-room-card (pull request #2268) 
feat(SW-1936): update room card ui

* feat(SW-1936): update room card ui


Approved-by: Linus Flood
 2025-06-03 12:51:33 +00:00
Simon Emanuelsson
9580281421 fix: allow any type of phone number 2025-06-03 11:54:05 +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