From b37cd9403eb5141372a34897f66cb53265eb844a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CKire?= Date: Fri, 14 Jul 2023 13:42:18 +0200 Subject: [PATCH 1/2] feat(project): profiles loading overlay --- .../LoadingOverlay/LoadingOverlay.module.scss | 9 +++++++++ src/components/LoadingOverlay/LoadingOverlay.tsx | 7 +++++-- src/components/Spinner/Spinner.module.scss | 14 ++++++++++++++ src/components/Spinner/Spinner.tsx | 4 ++-- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/components/LoadingOverlay/LoadingOverlay.module.scss b/src/components/LoadingOverlay/LoadingOverlay.module.scss index 7f45e7da9..9c62d0550 100644 --- a/src/components/LoadingOverlay/LoadingOverlay.module.scss +++ b/src/components/LoadingOverlay/LoadingOverlay.module.scss @@ -29,3 +29,12 @@ height: 100%; background-color: rgba(variables.$black, 0.3); } + +.profile { + img { + position: absolute; + width: calc(#{variables.$base-spacing} * 8); + height: calc(#{variables.$base-spacing} * 8); + border-radius: 50%; + } +} diff --git a/src/components/LoadingOverlay/LoadingOverlay.tsx b/src/components/LoadingOverlay/LoadingOverlay.tsx index 9df6dc182..ed2d309cd 100644 --- a/src/components/LoadingOverlay/LoadingOverlay.tsx +++ b/src/components/LoadingOverlay/LoadingOverlay.tsx @@ -8,18 +8,21 @@ import Spinner from '#components/Spinner/Spinner'; type Props = { transparentBackground?: boolean; inline?: boolean; + profileImageUrl?: string; }; -const LoadingOverlay = ({ transparentBackground = false, inline = false }: Props): JSX.Element => { +const LoadingOverlay = ({ transparentBackground = false, inline = false, profileImageUrl = '' }: Props): JSX.Element => { const className = classNames(styles.loadingOverlay, { [styles.transparent]: transparentBackground, [styles.fixed]: !inline, [styles.inline]: inline, + [styles.profile]: profileImageUrl, }); return (
- + {profileImageUrl && Profile Avatar} +
); }; diff --git a/src/components/Spinner/Spinner.module.scss b/src/components/Spinner/Spinner.module.scss index 8818e46e6..be6886c47 100644 --- a/src/components/Spinner/Spinner.module.scss +++ b/src/components/Spinner/Spinner.module.scss @@ -30,6 +30,20 @@ height: variables.$base-spacing; } +.large { + width: 142px; + height: 142px; +} + +.large div { + width: calc(#{variables.$base-spacing} * 8); + height: calc(#{variables.$base-spacing} * 8); +} + +.large.buffer div { + border-color: variables.$red-dark variables.$white variables.$white variables.$white; +} + .buffer div:nth-child(1) { animation-delay: -0.45s; } diff --git a/src/components/Spinner/Spinner.tsx b/src/components/Spinner/Spinner.tsx index 75a5fa18f..c716a5763 100644 --- a/src/components/Spinner/Spinner.tsx +++ b/src/components/Spinner/Spinner.tsx @@ -4,13 +4,13 @@ import React from 'react'; import styles from './Spinner.module.scss'; type Props = { - size?: 'small' | 'medium'; + size?: 'small' | 'medium' | 'large'; className?: string; }; const Spinner = ({ size = 'medium', className = '' }: Props): JSX.Element => { return ( -
+
From a0f85981743c539710f2593c510884f8ddd3ad56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CKire?= Date: Fri, 14 Jul 2023 14:10:29 +0200 Subject: [PATCH 2/2] chore: update tests --- src/components/Account/__snapshots__/Account.test.tsx.snap | 2 +- src/components/Alert/__snapshots__/Alert.test.tsx.snap | 2 +- src/components/Button/__snapshots__/Button.test.tsx.snap | 2 +- .../__snapshots__/CancelSubscriptionForm.test.tsx.snap | 2 +- src/components/CardGrid/__snapshots__/CardGrid.test.tsx.snap | 2 +- src/components/Checkbox/__snapshots__/Checkbox.test.tsx.snap | 2 +- .../CheckoutForm/__snapshots__/CheckoutForm.test.tsx.snap | 2 +- .../__snapshots__/ChooseOfferForm.test.tsx.snap | 2 +- .../__snapshots__/CollapsibleText.test.tsx.snap | 2 +- .../__snapshots__/ConfirmationDialog.test.tsx.snap | 2 +- .../__snapshots__/ConfirmationForm.test.tsx.snap | 2 +- .../__snapshots__/CreditCardCVCField.test.tsx.snap | 2 +- .../__snapshots__/CreditCardExpiryField.test.tsx.snap | 2 +- .../__snapshots__/CreditCardNumberField.test.tsx.snap | 2 +- .../__snapshots__/DemoConfigDialog.test.tsx.snap | 2 +- src/components/Dialog/__snapshots__/Dialog.test.tsx.snap | 2 +- .../__snapshots__/DialogBackButton.test.tsx.snap | 2 +- .../__snapshots__/EditPasswordForm.test.tsx.snap | 2 +- src/components/ErrorPage/__snapshots__/ErrorPage.test.tsx.snap | 2 +- src/components/Favorites/__snapshots__/Favorites.test.tsx.snap | 2 +- src/components/Filter/__snapshots__/Filter.test.tsx.snap | 2 +- .../__snapshots__/ForgotPasswordForm.test.tsx.snap | 2 +- src/components/Form/__snapshots__/Form.test.tsx.snap | 2 +- .../FormFeedback/__snapshots__/FormFeedback.test.tsx.snap | 2 +- src/components/Header/__snapshots__/Header.test.tsx.snap | 2 +- .../HelperText/__snapshots__/HelperText.test.tsx.snap | 2 +- .../IconButton/__snapshots__/IconButton.test.tsx.snap | 2 +- .../LanguageMenu/__snapshots__/LanguageMenu.test.tsx.snap | 2 +- src/components/Link/__snapshots__/Link.test.tsx.snap | 2 +- src/components/LoginForm/__snapshots__/LoginForm.test.tsx.snap | 2 +- src/components/Logo/__snapshots__/Logo.test.tsx.snap | 2 +- .../__snapshots__/MarkdownComponent.test.tsx.snap | 2 +- .../MenuButton/__snapshots__/MenuButton.test.tsx.snap | 2 +- src/components/Modal/__snapshots__/Modal.test.tsx.snap | 2 +- .../__snapshots__/ModalCloseButton.test.tsx.snap | 2 +- .../__snapshots__/NoPaymentRequired.test.tsx.snap | 2 +- .../PasswordField/__snapshots__/PasswordField.test.tsx.snap | 2 +- .../__snapshots__/PasswordStrength.test.tsx.snap | 2 +- src/components/PayPal/__snapshots__/PayPal.test.tsx.snap | 2 +- src/components/Payment/__snapshots__/Payment.test.tsx.snap | 2 +- .../PaymentFailed/__snapshots__/PaymentFailed.test.tsx.snap | 2 +- .../__snapshots__/PersonalDetailsForm.test.tsx.snap | 2 +- src/components/Player/__snapshots__/Player.test.tsx.snap | 2 +- src/components/Popover/__snapshots__/Popover.test.tsx.snap | 2 +- src/components/Radio/__snapshots__/Radio.test.tsx.snap | 2 +- .../__snapshots__/RegistrationForm.test.tsx.snap | 2 +- .../__snapshots__/RenewSubscriptionForm.test.tsx.snap | 2 +- .../__snapshots__/ResetPasswordForm.test.tsx.snap | 2 +- src/components/SearchBar/__snapshots__/SearchBar.test.tsx.snap | 2 +- .../ShareButton/__snapshots__/ShareButton.test.tsx.snap | 2 +- src/components/Shelf/__snapshots__/Shelf.test.tsx.snap | 2 +- src/components/Sidebar/__snapshots__/Sidebar.test.tsx.snap | 2 +- .../__snapshots__/SubscriptionCancelled.test.tsx.snap | 2 +- .../__snapshots__/SubscriptionRenewed.test.tsx.snap | 2 +- src/components/TextField/__snapshots__/TextField.test.tsx.snap | 2 +- src/components/UserMenu/__snapshots__/UserMenu.test.tsx.snap | 2 +- .../VideoDetails/__snapshots__/VideoDetails.test.tsx.snap | 2 +- src/components/Welcome/__snapshots__/Welcome.test.tsx.snap | 2 +- .../AccountModal/__snapshots__/AccountModal.test.tsx.snap | 2 +- src/containers/Cinema/__snapshots__/Cinema.test.tsx.snap | 3 ++- src/containers/Layout/__snapshots__/Layout.test.tsx.snap | 2 +- src/pages/About/__snapshots__/About.test.tsx.snap | 2 +- src/pages/Home/__snapshots__/Home.test.tsx.snap | 2 +- src/pages/User/__snapshots__/User.test.tsx.snap | 2 +- 64 files changed, 65 insertions(+), 64 deletions(-) diff --git a/src/components/Account/__snapshots__/Account.test.tsx.snap b/src/components/Account/__snapshots__/Account.test.tsx.snap index d8ece574c..e4395d604 100644 --- a/src/components/Account/__snapshots__/Account.test.tsx.snap +++ b/src/components/Account/__snapshots__/Account.test.tsx.snap @@ -1,4 +1,4 @@ -// Vitest Snapshot v1 +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[` > renders and matches snapshot 1`] = `
diff --git a/src/components/Alert/__snapshots__/Alert.test.tsx.snap b/src/components/Alert/__snapshots__/Alert.test.tsx.snap index b9fdf7f5d..d1a435c3b 100644 --- a/src/components/Alert/__snapshots__/Alert.test.tsx.snap +++ b/src/components/Alert/__snapshots__/Alert.test.tsx.snap @@ -1,3 +1,3 @@ -// Vitest Snapshot v1 +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[` > renders and matches snapshot 1`] = `
`; diff --git a/src/components/Button/__snapshots__/Button.test.tsx.snap b/src/components/Button/__snapshots__/Button.test.tsx.snap index 8642b5e18..766a87a85 100644 --- a/src/components/Button/__snapshots__/Button.test.tsx.snap +++ b/src/components/Button/__snapshots__/Button.test.tsx.snap @@ -1,4 +1,4 @@ -// Vitest Snapshot v1 +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`