Commit Graph
50 Commits
Author SHA1 Message Date
Anton Gunnarsson 67905198c6 Merged in fix/sas-english-copy (pull request #1695)
Update english copy for SAS related flows

* Update english copy for SAS related flows

* Add new copy to all languages

* Add use client directive to loading to use translations


Approved-by: Joakim Jäderberg
2025-04-02 11:49:12 +00:00
Anton Gunnarsson 30c01a6000 Merged in feat/feature-flag-sas-point-transfer (pull request #1686)
Add feature flag for SAS point transfer

* Add feature flag for specifically SAS point transfer


Approved-by: Linus Flood
2025-04-01 07:55:46 +00:00
Anton Gunnarsson 93aafe5525 Merged in fix/lint-issues (pull request #1678)
Fix lint issues in design-system and scandic-web

* Remove unused color prop from LogoAndIllustrationProps to fix lint issues

* Fix lint issues in web

* Fix logos type


Approved-by: Joakim Jäderberg
2025-03-31 12:27:32 +00:00
Anton Gunnarsson 650dd79c26 Merged in fix/sw-2032-sas-flow-styling-issues (pull request #1669)
Fix styling issues in SAS flow

* Fix styling issues in SAS flow


Approved-by: Linus Flood
2025-03-28 14:30:04 +00:00
Anton Gunnarsson f417599e12 Merged in fix/sas-partner-pages-icons (pull request #1667)
Add missing react-material-symbols import to partner layout

* Add missing react-material-symbols to partner layout


Approved-by: Linus Flood
2025-03-28 13:49:29 +00:00
Anton Gunnarsson b535b53901 Merged in feat/shared-ts-config (pull request #1610)
Add typescript-config package with shared configs

* Move web config to shared

* Move design-system ts config to typescript-config package

* Move redis-api tsconfig to typescript-config package

* Sort tsconfig keys

* Update react-library tsconfig

Move declaration and declarationMap from base
Add sourceMap

This fixes Go-to-Definition, debugging and similar in packages/apps where it is consumed

* Update base config module and moduleResolution


Approved-by: Michael Zetterberg
Approved-by: Christian Andolf
2025-03-28 07:07:24 +00:00
Anton Gunnarsson df2fb49d1e Merged in fix/sw-1980-sas-comparison-block-link (pull request #1641)
Update link in SASTierComparison to use pageLink reference

* Update link in SASTierComparison to use pageLink reference


Approved-by: Linus Flood
2025-03-27 15:27:12 +00:00
Anton GunnarssonandLinus Flood 4ab7117244 Merged in fix/latest-next-14 (pull request #1606)
Bump next to latest 14

* Bump next to latest 14


Approved-by: Linus Flood
2025-03-24 08:35:05 +00:00
Anton Gunnarsson c58815ec06 Merged in fix/sas-flow-design-updates (pull request #1567)
Fix typography in SAS flow

* Add missing translation

* Update SAS login page typography

* Update LinkAccountFormTypography

* Update typography in OneTimePasswordForm

* Update typography of SAS link success page

* Update typography of SAS flow errors

* Update typography of SAS unlink success page

* Update typography of SAS error boundary


Approved-by: Linus Flood
2025-03-21 09:05:47 +00:00
Anton Gunnarsson e0b7c3be7b Merged in fix/preload-my-pages-menu-data (pull request #1582)
Fix/preload my pages menu data

* Preload my pages navigation data

* Remove unused suspense boundary


Approved-by: Linus Flood
2025-03-20 09:42:33 +00:00
Anton Gunnarsson 8d1e9954d4 Merged in fix/sas-unlink-missing-intl (pull request #1534)
Add missing intl keys for SAS unlink flow

Approved-by: Linus Flood
2025-03-19 09:12:36 +00:00
Anton Gunnarsson d0b6f3f8b3 Merged in feat/sw-1314-transfer-sas-points (pull request #1508)
SW-1314 Transfer SAS points

Approved-by: Linus Flood
2025-03-18 10:07:05 +00:00
Anton GunnarssonandLinus Flood d5b47be2f2 Merged in fix/handle-cache-delete-without-hit (pull request #1556)
Don't return from cache deleteKey

* Don't return from cache deleteKey


Approved-by: Linus Flood
2025-03-17 16:19:55 +00:00
Anton Gunnarsson dabfe0424b Merged in fix/update-my-pages-sas-url (pull request #1533)
Update My Pages SAS url

* Update My Pages SAS url


Approved-by: Linus Flood
2025-03-14 08:31:19 +00:00
Anton Gunnarsson 29f0eb4f21 Merged in feat/sw-1732-trigger-tier-match (pull request #1408)
SW-1732 Trigger SAS tier match

* Add endpoint for SAS tier match

* Add comment about future fix

* Move tier match to background request on my-pages/*

* Log result from tier match

* Clean up name etc

* Fix tier matched toast

Approved-by: Joakim Jäderberg
2025-03-13 14:12:31 +00:00
Anton Gunnarsson 01740e3300 Merged in feat/turborepo (pull request #1451)
Turborepo

Approved-by: Linus Flood
2025-03-12 08:18:38 +00:00
Anton Gunnarsson 393546d35d Merged in feat/sw-1291-show-sas-membership-data (pull request #1503)
Show SAS membership data in Linked Accounts

* Rip out old styling

* Desktop version of new linked accounts design

* Use new design system tokens

* Refactor SASLinkedAccount to handle all states

* Improve small screen styling

* Add intl etc

* Skeletons

* Tiny fixes

* Add i18n keys to all languages


Approved-by: Linus Flood
2025-03-10 10:13:18 +00:00
Anton Gunnarsson 202d84218c Merged in fix/sas-tier-comparison-center-button (pull request #1489)
Increase specificity of ctaButton class to ensure it applies

Approved-by: Joakim Jäderberg
2025-03-06 12:36:00 +00:00
Anton Gunnarsson 47785aa07a Merged in feat/sw-1825-my-pages-sas-link-visibility (pull request #1479)
* Use SAS membership for my pages sas link visibility

Approved-by: Joakim Jäderberg
2025-03-06 09:45:08 +00:00
Anton Gunnarsson c92529fcde Merged in fix/sw-1828-tier-comparison-title-fix (pull request #1485)
Fix styling issues in SASTierComparison

* Fix styling issues in SASTierComparison

- Center title
- Use props for tier title font styles


Approved-by: Matilda Landström
2025-03-06 08:38:58 +00:00
Anton Gunnarsson 916912a170 Merged in fix/sw-1826-tier-comparison-layout-bug (pull request #1482)
Fix tier comparison on very small screens

* Fix tier comparison on very small screens


Approved-by: Joakim Jäderberg
2025-03-05 13:26:19 +00:00
Anton Gunnarsson 43d3713f59 Merged in feat/SW-1810-prevent-starting-link-flow-when-linked (pull request #1469)
Prevent SAS link flow when already linked

* Implement check for checking sas_eb membership when starting link flow


Approved-by: Joakim Jäderberg
2025-03-05 08:17:02 +00:00
Anton Gunnarsson 00fa7819b4 Merged in feat/membership-schema-update (pull request #1459)
Update membership schema to adapt for API changes

Approved-by: Michael Zetterberg
2025-03-04 08:00:33 +00:00
Anton Gunnarsson 6804b52d31 Merged in fix/unpin-framer-motion-version (pull request #1444)
Unpin framer-motion version

Approved-by: Linus Flood
2025-02-28 13:54:29 +00:00
Anton Gunnarsson 15fa01cbb2 Merged in fix/unpin-zod-version (pull request #1419)
Unpin zod version

Approved-by: Linus Flood
2025-02-26 12:46:26 +00:00
Anton GunnarssonandLinus Flood 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
Anton Gunnarsson 204bbbbcd4 Merged in fix/sas-link-flow-links (pull request #1389)
Set correct links in SAS link flow

Approved-by: Joakim Jäderberg
2025-02-21 12:26:38 +00:00
Anton Gunnarsson 340f6d1714 Merged in feat/SW-1488-unlink-sas-account (pull request #1349)
Implement unlink SAS flow

Approved-by: Joakim Jäderberg
2025-02-20 15:09:06 +00:00
Anton Gunnarsson 7155165360 Merged in feat/SW-1266-implement-sas-link-account-endpoint (pull request #1332)
Implement API call to link SAS account

* Add endpoint to actually link SAS account linking

* add logging of error

* Refactor tocDate to getCurrentDateWithoutTime

Approved-by: Joakim Jäderberg
2025-02-20 08:55:10 +00:00
Anton Gunnarsson e75c714148 Merged in fix/SW-1695-clear-otp-password-on-error (pull request #1375)
Clear and focus OTP input on error

Approved-by: Joakim Jäderberg
2025-02-20 07:29:36 +00:00
Anton Gunnarsson 9b61417264 Merged in fix/sw-1664-sas-link-otp-error-handling (pull request #1354)
Update SAS OTP error handling

Approved-by: Joakim Jäderberg
2025-02-17 11:40:00 +00:00
Anton Gunnarsson 419d21b3d0 Merged in feat/remove-date-input-from-sas-link-flow (pull request #1328)
Remove date input from SAS link flow

Approved-by: Linus Flood
2025-02-13 13:30:46 +00:00
Anton Gunnarsson 6eb01750e8 Merged in fix/move-sas-comparison-to-dynamic-content (pull request #1279)
Move SASTierComparison block to DynamicContent

Approved-by: Erik Tiekstra
2025-02-11 09:36:41 +00:00
Anton Gunnarsson 18288cb849 Merged in feat/sas-otp-error-handling (pull request #1272)
Feat/sas otp error handling

* Improve error handling for SAS OTP
* Remove failing and deprecated test

Approved-by: Joakim Jäderberg
2025-02-07 14:18:00 +00:00
Anton Gunnarsson fc866c0e4d Merged in feat/sw-1493-revised-comparison-block (pull request #1236)
feat(SW-1493): Revised SAS comparison block

* Base of new TierDetails for SAS tier comparison

* Add backgrounds and content to TierDetails

* Implement new cms schema for SasTierComparison

* Override gap in jsontohtml styling to 0

* Add animations to comparison details

* Redesign again

* Update content model to new design

* Add border to bottom item in tier match list

* Wrap interpolate-size in @supports to be safe

* Merge branch 'master' into feat/sw-1493-revised-comparison-block


Approved-by: Joakim Jäderberg
2025-02-03 08:42:16 +00:00
Anton Gunnarsson eacca33847 Merged in feature/tier-matching-component (pull request #1175)
SAS Tier matching comparison block (SW-921)

Approved-by: Joakim Jäderberg
Approved-by: Matilda Landström
2025-01-22 08:15:31 +00:00
Anton Gunnarsson 684faaa4b0 Merged master into feat/SW-888-skeleton-loaders 2024-11-15 14:24:57 +00:00
Anton Gunnarsson eaf9aa7277 Fix BookingWidgetSkeleton after merge 2024-11-15 11:48:52 +01:00
Anton Gunnarsson d83a839ed6 Merged master into feat/SW-888-skeleton-loaders 2024-11-15 09:44:56 +00:00
Anton Gunnarsson fd141e6d2e Remove unneccesary suspense 2024-11-15 10:39:50 +01:00
Anton Gunnarsson 6496ec233e Add NavigationMenuListSkeleton 2024-11-15 10:39:27 +01:00
Anton Gunnarsson 8007fea61e Refactor MainMenu suspense boundary 2024-11-15 09:24:28 +01:00
Anton Gunnarsson 6fe929f840 Use cva for SkeletonShimmer class variants 2024-11-14 16:36:36 +01:00
Anton Gunnarsson d4afa54934 Add skeleton for TopMenu 2024-11-14 13:48:48 +01:00
Anton Gunnarsson ef825d85aa Add skeleton loader for MobileMenu 2024-11-14 13:44:58 +01:00
Anton Gunnarsson 4c6d72a402 Set min-height on layout loaders 2024-11-14 13:25:56 +01:00
Anton Gunnarsson 2bfe8df741 Refactor booking widget skeleton 2024-11-14 13:25:49 +01:00
Anton Gunnarsson 40df15d0e5 Fix skeleton for MyPagesMobileMenu 2024-11-14 13:25:44 +01:00
Anton Gunnarsson 16882fc20a Skeleton loader for footer 2024-11-14 13:25:33 +01:00
Anton Gunnarsson 1980ae4350 Skeleton loader for booking widget on desktop 2024-11-14 13:24:06 +01:00