Linus Flood
b35ceafc00
Merged in feat/SW-2903-tokens (pull request #2508 )
...
feat(SW-2358): Use personal token if logged in
* feat(SW-2903): Use personal token if logged in
* Avoid encoding values in cookie
* Fix tests
Approved-by: Anton Gunnarsson
2025-07-08 11:24:31 +00: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
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
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
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
Simon Emanuelsson
ec087a3d15
feat: refactor of my stay
2025-04-28 12:40:52 +00: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
Michael Zetterberg
440e1f92df
feat(SW-706): make eslint rule 'formatjs/no-literal-string-in-jsx' pass
2025-04-14 11:30:06 +00:00
Chuma Mcphoy (We Ahead)
c069b7cd9d
Merged in fix/SW-2222-next-stay-url-handling (pull request #1756 )
...
fix(SW-2222): update next stay url to use PUBLIC_URL and adapt based on release flag
* fix(SW-2222): update next stay url to use PUBLIC_URL and adapt based on release flag
* refactor(SW-2222): change promoUrl variable to const
Approved-by: Michael Zetterberg
Approved-by: Christian Andolf
2025-04-08 12:03:04 +00:00
Niclas Edenvin
fef3a785d0
Merged in feat/sw-1688-list-breakfast (pull request #1615 )
...
Feat/sw-1688 list breakfast
Approved-by: Pontus Dreij
2025-03-25 09:56:05 +00:00
Pontus Dreij
710e412414
Merged in feat(SW-1973)-mystay-multiroom-cancellation-scenarios (pull request #1613 )
...
My stay access denied
* feat(SW-1973) updated no access view
* feat(SW-1973) small fixes
* feat(SW-1973) Update copy
Approved-by: Niclas Edenvin
2025-03-24 14:52:00 +00:00
Pontus Dreij
74c5b47319
Merged in feat/SW-1737-design-mystay-multiroom (pull request #1565 )
...
Feat/SW-1737 design mystay multiroom
* feat(SW-1737) Fixed member view of guest details
* feat(SW-1737) fix merge issues
* feat(SW-1737) Fixed price details
* feat(SW-1737) removed unused imports
* feat(SW-1737) removed true as statement
* feat(SW-1737) updated store handling
* feat(SW-1737) fixed bug showing double numbers
* feat(SW-1737) small design fixed
* feat(SW-1737) fixed rebase errors
* feat(SW-1737) fixed create booking error with dates
* feat(SW-1737) fixed view multiroom as singleroom
* feat(SW-1737) fixes for multiroom
* feat(SW-1737) fixed bookingsummary
* feat(SW-1737) dont hide modify dates
* feat(SW-1737) updated breakfast to handle number
* feat(SW-1737) Added red color if member rate
* feat(SW-1737) fix PR comments
* feat(SW-1737) updated member tiers svg
* feat(SW-1737) updated how to handle paymentMethodDescription
* feat(SW-1737) fixes after testing mystay
* feat(SW-1737) updated Room type to just use whats used
* feat(SW-1737) fixed access
* feat(SW-1737) refactor my stay after PR comments
* feat(SW-1737) fix roomNumber translation
* feat(SW-1737) removed log
Approved-by: Arvid Norlin
2025-03-24 09:30:10 +00:00
Bianca Widstam
3c1eee88b1
Merged in feat/SW-1370/Guarantee-my-stay-ancillaries (pull request #1545 )
...
Feat/SW-1370/Guarantee my stay ancillaries
* feat(SW-1370): guarantee for ancillaries
* feat(SW-1370): remove console log
* feat(SW-1370): add translations
* feat(SW-1370): small fix
* feat(SW-1370): fix must be guaranteed
* feat(SW-1370): fix logic and comments pr
* feat(SW-1370): fix comments pr
* feat(SW-1370): fix comments pr
* feat(SW-1370): add translation
* feat(SW-1370): add translation and fix pr comment
* feat(SW-1370): fix pr comment
* feat(SW-1370): fix encoding path refId issue
* feat(SW-1370): refactor AddAncillaryStore usage and introduce context provider
* feat(SW-1370): refactor
* feat(SW-1370): refactor ancillaries
* feat(SW-1370): fix merge
Approved-by: Simon.Emanuelsson
2025-03-21 07:29:04 +00:00
Pontus Dreij
fb321cdb13
Merged in feat(SW-1274)-modify-date-my-stay (pull request #1528 )
...
Feat(SW-1274) modify date my stay
* feat(SW-1676): Modify guest details step 1
* feat(SW-1676) Integration to api to update guest details
* feat(SW-1676) Reuse of old modal
* feat(SW-1676) updated modify guest
* feat(SW-1676) cleanup
* feat(SW-1274) modify stay modal and datepicker
* feat(SW-1274) DatePicker from modify dates
* feat(SW-1274) Modify dates fixes and merge conflicts
* feat(SW-1274) handle modify for multiroom
* feat(SW-1274) update manage stay
* feat(SW-1274) fixed some comments
* feat(SW-1274) use Modal instead
* feat(SW-1274) fixed formatChildBedPreferences
* feat(SW-1274) removed any as prop
* feat(SW-1274) fix rebase conflicts
* feat(SW-1274) fix flicker on modify modal
* feat(SW-1274) CalendarButton
* feat(SW-1274) fixed gap variable
* feat(SW-1274) simplified code
* feat(SW-1274) Split up DatePicker on mode
* feat(SW-1274) Updated file structure for datepicker
Approved-by: Arvid Norlin
2025-03-19 13:11:03 +00:00
Erik Tiekstra
b2b197b1ef
Feat/SW-1519 remove deprecated hotel data from schema
...
* feat(SW-1519): Removed displayWebpage from hotel schema
* feat(SW-1519): Removed gallery from hotel schema
* feat(SW-1519): Removed conferencesAndMeetings from hotel schema
* feat(SW-1519): Removed healthAndWellness from hotel schema
* feat(SW-1519): Removed restaurantImages from hotel schema
* feat(SW-1519): Removed restaurantsOverviewPage from hotel schema
Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-03-19 06:28:13 +00:00
Bianca Widstam
abd401c4f4
Merged in feat/SW-1368-1369-Guarantee-late-arrival (pull request #1512 )
...
Feat/SW-1368 1369 Guarantee late arrival
* feat(SW-1368-SW-1369): guarantee late arrival for confirmation page and my stay
* feat(SW-1368-SW-1369): guarantee late arrival updated design
* feat(SW-1368-SW-1369): add translations
* feat(SW-1368-SW-1369): add translations
* feat(SW-1368-SW-1369): fix merge with master
* feat(SW-1368-SW-1369): add translations
* feat(SW-1368-SW-1369): add redirect with refId
* feat(SW-1368-SW-1369): if booking completed redirect to confirmation page
* feat(SW-1368-SW-1369): fix comments pr
* feat(SW-1368-SW-1369): fix comments pr
* feat(SW-1368-SW-1369): fix rebase master
* feat(SW-1368-SW-1369): fix duplicate flex rate check
* feat(SW-1368-SW-1369): if any room is flex, card must be used
* feat(SW-1368-SW-1369): move callback route
* feat(SW-1368-SW-1369): top align checkbox
* feat(SW-1368-SW-1369): top align checkbox
Approved-by: Tobias Johansson
Approved-by: Niclas Edenvin
2025-03-14 10:43:14 +00:00
Christian Andolf
af08b3277d
fix(SW-1710): use access object references instead
...
correct incorrect test that granted access incorrectly
2025-03-10 09:45:57 +01:00
Christian Andolf
b0df70e552
feat(SW-1710): add access checks to my stay page for viewing booking
2025-03-10 09:45:56 +01:00
Pontus Dreij
2509794d0c
Merged in feat/SW-1676-modify-contact-details-my-stay-anonymous (pull request #1468 )
...
Feat/SW-1676 modify contact details my stay anonymous
* feat(SW-1676): Modify guest details step 1
* feat(SW-1676) Integration to api to update guest details
* feat(SW-1676) Reuse of old modal
* feat(SW-1676) updated modify guest
* feat(SW-1676) cleanup
* feat(SW-1676) updated myStayReturnRoute to sessionStorage
Approved-by: Niclas Edenvin
2025-03-07 13:41:25 +00:00
Pontus Dreij
69139c5230
Merged in feat(SW-1279)-mystay-multirum-cancelling (pull request #1443 )
...
Feat(SW-1279) mystay multirum cancelling
* feat(SW-1279) Cancelation text if non-user on room 2-4
* feat(SW-1279) cancel mystay multiroom
* feat(SW-1279): Added cancellation for multiroom on mystay
Approved-by: Niclas Edenvin
2025-02-28 07:17:25 +00:00
Pontus Dreij
31a536b1f7
Merged in feat(SW-1722)-mystay-multiroom-view (pull request #1396 )
...
Feat(SW-1722) mystay multiroom view
* feat(SW-1722) View all rooms on my stay
* feat(sW-1722) Show linked reservation
* feat(SW-1722) merged monorepo
* feat(SW-1722) yarn install
* feat(SW-1722) removed unused data
* feat(SW-1722) Streaming data from the server to the client
Approved-by: Niclas Edenvin
2025-02-27 07:24:56 +00:00
Anton Gunnarsson
80100e7631
Merged in monorepo-step-1 (pull request #1080 )
...
Migrate to a monorepo setup - step 1
* Move web to subfolder /apps/scandic-web
* Yarn + transitive deps
- Move to yarn
- design-system package removed for now since yarn doesn't
support the parameter for token (ie project currently broken)
- Add missing transitive dependencies as Yarn otherwise
prevents these imports
- VS Code doesn't pick up TS path aliases unless you open
/apps/scandic-web instead of root (will be fixed with monorepo)
* Pin framer-motion to temporarily fix typing issue
https://github.com/adobe/react-spectrum/issues/7494
* Pin zod to avoid typ error
There seems to have been a breaking change in the types
returned by zod where error is now returned as undefined
instead of missing in the type. We should just handle this
but to avoid merge conflicts just pin the dependency for
now.
* Pin react-intl version
Pin version of react-intl to avoid tiny type issue where formatMessage
does not accept a generic any more. This will be fixed in a future
commit, but to avoid merge conflicts just pin for now.
* Pin typescript version
Temporarily pin version as newer versions as stricter and results in
a type error. Will be fixed in future commit after merge.
* Setup workspaces
* Add design-system as a monorepo package
* Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN
* Fix husky for monorepo setup
* Update netlify.toml
* Add lint script to root package.json
* Add stub readme
* Fix react-intl formatMessage types
* Test netlify.toml in root
* Remove root toml
* Update netlify.toml publish path
* Remove package-lock.json
* Update build for branch/preview builds
Approved-by: Linus Flood
2025-02-26 10:36:17 +00:00
