scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,192 Commits 1 Branch 0 Tags
4893eb8b25b47f344939a05ec47656b809b3e7ae
Commit Graph

54 Commits

Author SHA1 Message Date
Joakim Jäderberg
4893eb8b25 Merged in SW-3459-setup-booking-confirmation-page-in-sas (pull request #2794) 
Setup booking-confirmation page in SAS

* Setup booking-confirmation page in SAS
move booking-confirmation tracking to booking-flow

* remove unused param

* Add test cards to documentation

* Fix payment callback page to use correct status


Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
 2025-09-11 12:19:26 +00:00
Anton Gunnarsson
3e5263bf72 Merged in feat/sw-2877-move-payment-callback (pull request #2755) 
feat(SW-2877): Move payment callback page

* WIP move

* Add payment callback page to partner-sas


Approved-by: Joakim Jäderberg
 2025-09-11 09:06:11 +00:00
Joakim Jäderberg
c3e78fcadd Merged in feature/SW-3457-enter-details-on-sas (pull request #2792) 
Add enter-details page to SAS

* Add enter-details page to SAS


Approved-by: Anton Gunnarsson
 2025-09-11 09:05:47 +00:00
Joakim Jäderberg
7dee6d5083 Merged in chore/move-enter-details (pull request #2778) 
Chore/move enter details

Approved-by: Anton Gunnarsson
 2025-09-11 07:16:24 +00:00
Anton Gunnarsson
4550ddec53 Merged in feat/sw-3416-add-sitewidealert-to-partner-sas (pull request #2773) 
feat(SW-3416): Add SiteWideAlert to partner-sas

* Add SiteWideAlert to partner-sas

* Remove log


Approved-by: Joakim Jäderberg
 2025-09-09 10:00:25 +00:00
Anton Gunnarsson
e68b029078 Merged in feat/sw-3414-add-fontpreload-to-partner-sas (pull request #2774) 
feat(SW-3414): Add FontPreload to partner-sas

* Add FontPreload


Approved-by: Joakim Jäderberg
 2025-09-09 08:47:11 +00:00
Anton Gunnarsson
261eeef3e2 Merged in feat/sw-3417-add-toasthandler-to-partner-sas (pull request #2775) 
feat(SW-3417): Add ToastHandler to partner-sas

* Add ToastHandler to partner-sas


Approved-by: Joakim Jäderberg
 2025-09-09 08:27:24 +00:00
Anton Gunnarsson
69268d88fb Merged in feat/sw-3418-add-routerprovider-to-partner-sas (pull request #2777) 
feat(SW-3418): Add RouterProvider to partner-sas

* Add RouterProvider


Approved-by: Joakim Jäderberg
 2025-09-09 08:20:17 +00:00
Matilda Landström
70f3b8f016 Merged in feat/Lokalise-update-080925 (pull request #2771) 
feat: Update from Lokalise 080925

* feat: Update from Lokalise 080925


Approved-by: Anton Gunnarsson
 2025-09-09 06:41:29 +00:00
Anton Gunnarsson
c0ee968368 Merged in chore/partner-sas-header-footer-styling (pull request #2765) 
chore: partner-sas header and footer improvements

* improve header styling

* Add footer


Approved-by: Bianca Widstam
 2025-09-08 09:23:20 +00:00
Anton Gunnarsson
7e585b2d9a Merged in chore/more-partner-sas-boilerplate (pull request #2756) 
chore: Misc for partner-sas

* Add global-error to partner-sas

* Add redirect to lang in partner-sas

* Actually use language from param

* Increase test timeouts and use parsed lang to fix tests

* Remove need to import serverClient to setup trpc


Approved-by: Hrishikesh Vaipurkar
 2025-09-04 07:45:14 +00:00
Anton Gunnarsson
36b6685ad5 Merged in feat/partner-sas-netlify-branch-sync (pull request #2758) 
feat: Add netlify-plugin-sync to partner-sas

* Add netlify-plugin-sync to partner-sas


Approved-by: Joakim Jäderberg
 2025-09-03 13:50:45 +00:00
Anton Gunnarsson
f7ef58eafa Merged in feat/sw-2874-move-select-rate (pull request #2750) 
Approved-by: Joakim Jäderberg
 2025-09-03 08:30:05 +00:00
Anton Gunnarsson
9e3294b113 Merged in chore/move-bookingwidget-to-parallel-route (pull request #2738) 
chore: Render partner-sas BookingWidget in parallel route

* Render BookingWidget in parallel route


Approved-by: Joakim Jäderberg
 2025-09-01 12:46:42 +00:00
Anton Gunnarsson
1673006169 Merged in chore/set-branch-env-in-partner-sas (pull request #2737) 
chore: Add BRANCH and GIT_SHA to partner-sas

* Add BRANCH and GIT_SHA to next config env setup


Approved-by: Bianca Widstam
 2025-09-01 09:05:32 +00:00
Anton Gunnarsson
87402a2092 Merged in feat/sw-2873-move-selecthotel-to-booking-flow (pull request #2727) 
feat(SW-2873): Move select-hotel to booking flow

* crude setup of select-hotel in partner-sas

* wip

* Fix linting

* restructure tracking files

* Remove dependency on trpc in tracking hooks

* Move pageview tracking to common

* Fix some lint and import issues

* Add AlternativeHotelsPage

* Add SelectHotelMapPage

* Add AlternativeHotelsMapPage

* remove next dependency in tracking store

* Remove dependency on react in tracking hooks

* move isSameBooking to booking-flow

* Inject searchParamsComparator into tracking store

* Move useTrackHardNavigation to common

* Move useTrackSoftNavigation to common

* Add TrackingSDK to partner-sas

* call serverclient in layout

* Remove unused css

* Update types

* Move HotelPin type

* Fix todos

* Merge branch 'master' into feat/sw-2873-move-selecthotel-to-booking-flow

* Merge branch 'master' into feat/sw-2873-move-selecthotel-to-booking-flow

* Fix component


Approved-by: Joakim Jäderberg
 2025-09-01 08:37:00 +00:00
Bianca Widstam
c7f00aca4d Merged in fix/SW-2844-fix-gap-mobile-menu (pull request #2732) 
* fix(SW-2844): remove gap mobile safari


Approved-by: Joakim Jäderberg
Approved-by: Hrishikesh Vaipurkar
 2025-09-01 07:28:48 +00:00
Bianca Widstam
5af320eb92 Merged in localize/sync (pull request #2722) 
Localize/sync

* sync/localize

* localize


Approved-by: Anton Gunnarsson
 2025-08-28 09:15:04 +00:00
Joakim Jäderberg
80c3327419 Merged in fix/linting (pull request #2708) 
Fix/linting

* fix import issues and add lint check no-extraneous-dependencies
* fix use type HotelType instead of string

Approved-by: Anton Gunnarsson
 2025-08-27 09:22:37 +00:00
Bianca Widstam
5f8d77e54a Merged in fix/SW-1655-tripadvisor-icon-map (pull request #2695) 
fix(SW-1655): update design tripadvisor on hotel map card

* fix(SW-1655): update design tripadvisor on hotel map card

* fix(SW-1655): update radius

* fix(SW-1655): use tripadvisor chip, create different variants

* fix(SW-1655): update variants, storybook, and global css


Approved-by: Joakim Jäderberg
 2025-08-26 13:08:28 +00:00
Joakim Jäderberg
c54c1ec540 Merged in SW-3270-move-interactive-map-to-design-system-or-booking-flow (pull request #2681) 
SW-3270 move interactive map to design system or booking flow

* wip

* wip

* merge

* wip

* add support for locales in design-system

* add story for HotelCard

* setup alias

* .

* remove tracking from design-system for hotelcard

* pass isUserLoggedIn

* export design-system-new-deprecated.css from design-system

* Add HotelMarkerByType to Storybook

* Add interactive map to Storybook

* fix reactintl in vitest

* rename env variables

* .

* fix background colors

* add storybook stories for <Link />

* merge

* fix tracking for when clicking 'See rooms' in InteractiveMap

* Merge branch 'master' of bitbucket.org:scandic-swap/web into SW-3270-move-interactive-map-to-design-system-or-booking-flow

* remove deprecated comment


Approved-by: Anton Gunnarsson
 2025-08-25 11:26:16 +00:00
Anton Gunnarsson
4f8c51298f Merged in chore/improve-e2e-tests-in-sas (pull request #2663) 
chore: Increase expect timeout in SAS e2e tests

* Increase expect timeout


Approved-by: Joakim Jäderberg
 2025-08-25 07:51:26 +00:00
Linus Flood
d16c6b8082 Merged in feat/lokalise-sync-220825 (pull request #2690) 
Lokalise sync

* Lokalise sync


Approved-by: Joakim Jäderberg
 2025-08-22 13:10:47 +00:00
Anton Gunnarsson
deaba8b5c4 Merged in feat/sw-3241-move-readme-to-booking-flow (pull request #2660) 
feat(SW-3241): Move ReadMe to booking-flow and rename to OpenSidePeekButton

* Move ReadMe to booking-flow

* Rename ReadMore to OpenSidePeekButton

* Fix self-referencing import


Approved-by: Joakim Jäderberg
 2025-08-19 07:20:44 +00:00
Anton Gunnarsson
322268595d Merged in feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow (pull request #2600) 
feat(SW-2873): Move HotelReservationSidePeek to booking-flow

* Move sidepeek store to booking-flow

* Begin move of HotelReservationSidePeek to booking-flow

* Copy Link

* Update AccessibilityAccordionItem

* Split AccessibilityAccordionItem into two components

* Fix tracking for Accordion

* Duplicate ButtonLink to booking-flow TEMP

* AdditionalAmeneties

* wip

* Move sidepeek accordion items

* Remove temp ButtonLink

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow

* Fix accordion tracking

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow

* Update exports

* Fix self-referencing import

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow

* Add 'use client' to tracking function

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow

* Fix TEMP folder

* Refactor sidepeek tracking

* Merge branch 'master' into feat/sw-3218-move-hotelreservationsidepeek-to-booking-flow


Approved-by: Joakim Jäderberg
 2025-08-14 12:25:40 +00:00
Linus Flood
985d47d7b3 Merged in feat/lokalise-sync-140825 (pull request #2652) 
Lokalise sync 14-08-25

* Lokalise sync 14-08-25


Approved-by: Joakim Jäderberg
 2025-08-14 06:27:35 +00:00
Joakim Jäderberg
f531c7a49f Merged in feature/storybook-tests (pull request #2623) 
Feature/storybook tests

* feature: add interaction tests for storybook and upgrade storybook@9

* add a11y testing for storybook

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

* Test and build only required packages

* .

* .

* .

* .

* .

* .

* .

* disable playwright tests in netlify ci

* .

* debug out process.env

* don't run playwright on CI

* remove unused netlify-plugin-playwright-cache

* .

* .

* .

* .

* .

* .

* remove turbo dependancy to design-system#test

* merge

* merge


Approved-by: Anton Gunnarsson
 2025-08-14 06:25:08 +00:00
Linus Flood
b2148cd12e Merged in fix/branch-sync-4 (pull request #2650) 
Fix/branch sync 4

* Test ignore script

* Test

* Fixed ignore script
 2025-08-14 05:53:32 +00:00
Linus Flood
ddaa2a0e20 Merged in fix/branch-sync-2 (pull request #2643) 
Fix/branch sync 2

* feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script

* merge master

* Merge branch 'master' into fix/branch-sync-2

* Revert branch sync

* Ignore ignore script

* Merge branch 'master' into fix/branch-sync-2
 2025-08-13 12:31:28 +00:00
Linus Flood
2bf1d8e22b Merged in fix/branch-sync-2 (pull request #2642) 
Fix/branch sync 2

* feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script

* merge master

* Merge branch 'master' into fix/branch-sync-2

* Revert branch sync
 2025-08-13 12:19:56 +00:00
Linus Flood
83256695db Merged in fix/branch-sync-2 (pull request #2640) 
Fix/branch sync 2

* feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script

* merge master
 2025-08-13 11:59:28 +00:00
Linus Flood
cf4a9bfa84 Merged in fix/branch-sync-2 (pull request #2639) 
feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script
 2025-08-13 11:42:54 +00:00
Linus Flood
9362d09730 Merged in fix/branch-sync (pull request #2625) 
fix(branch sync): check if cached commit ref exists before ignoring builds

* fix(branch sync): check if cached commit ref exists before ignoring builds


Approved-by: Joakim Jäderberg
 2025-08-12 11:56:17 +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
Linus Flood
011f191c65 Merged in feat/lokalise-sync-120825 (pull request #2620) 
Lokalise sync 12-08-25

* Lokalise sync 12-08-25


Approved-by: Anton Gunnarsson
 2025-08-12 08:37:42 +00:00
Matilda Landström
37c311d826 Merged in feat/SW-2528-restaurant-icons-sidepeek (pull request #2610) 
feat(SW-2528): add restaurant type icon to sidepeek

* feat(SW-2528): add restaurant type icon to sidepeek


Approved-by: Anton Gunnarsson
 2025-08-11 11:45:20 +00:00
Anton Gunnarsson
e8abcdf58b Merged in chore/hardcode-lang-in-sas (pull request #2612) 
temp: Hardcode lang param

* Hardcode lang param


Approved-by: Linus Flood
 2025-08-11 09:02:26 +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
3922ade199 Merged in chore/update-translations-2025-07-31 (pull request #2585) 
Update translations

* Update translations


Approved-by: Matilda Landström
 2025-07-31 11:59:08 +00:00
Matilda Landström
e323ca9914 Merged in feat/SW-2511-hotel-page-map (pull request #2582) 
feat(SW-2511): hotel page map and marker improvements

* feat(SW-2511): update hotel page map

* fix(SW-2511): fix issue with identical id's for POIs


Approved-by: Anton Gunnarsson
 2025-07-31 09:06:48 +00:00
Anton Gunnarsson
ace44d00dc Merged in feat/prepare-hotelreservation-routes-in-sas (pull request #2581) 
Prepare hotelreservation routes

* Prepare hotelreservation routes


Approved-by: Matilda Landström
 2025-07-30 13:22:36 +00:00
Anton Gunnarsson
9bbea3f16f Merged in feat/sw-3197-add-url-to-path (pull request #2577) 
feat(SW-3197): Add required middleware and url to path in partner-sas

* Add url to path and required middleware


Approved-by: Matilda Landström
 2025-07-30 08:31:58 +00:00
Joakim Jäderberg
ef6235cf43 Merged in fix/stylus-failing-builds (pull request #2568) 
Remove stylus deps and replace with extension

* fix: remove stylus deps and replace with extension

* chore: update yarn.lock
 2025-07-23 09:16:49 +00:00
Anton Gunnarsson
ab233fb1c0 Merged in chore/synk-lokalise-25-07-11 (pull request #2551) 
chore: Sync with Lokalise

* Run i18n:sync


Approved-by: Matilda Landström
 2025-07-11 07:55:11 +00:00
Anton Gunnarsson
e1d85ae8b3 Merged in fix/update-icons-script-for-partner-sas (pull request #2548) 
fix: Update material-symbols-update script to also update partner-sas

* Update material-symbols-update script to also update partner-sas


Approved-by: Matilda Landström
 2025-07-11 07:07:53 +00:00
Anton Gunnarsson
233c685e52 Merged in feat/sw-2333-package-and-sas-i18n (pull request #2538) 
feat(SW-2333): I18n for multiple apps and packages

* Set upp i18n in partner-sas

* Adapt lokalise workflow to monorepo

* Fix layout props


Approved-by: Linus Flood
 2025-07-10 07:00:03 +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
Anton Gunnarsson
a3702d0ecc Merged in chore/partner-sas-test-setup (pull request #2484) 
chore: Test setup in partner-web

* Add playwright

* Add vitest setup


Approved-by: Linus Flood
 2025-07-01 08:27:59 +00:00
Anton Gunnarsson
c41b2314bf Merged in fix/update-build-scripts (pull request #2488) 
Update build scripts for apps

* Update build scripts for apps


Approved-by: Joakim Jäderberg
 2025-07-01 07:20:06 +00:00