From 8d51861e12fcd95c561d577889c2a15d35d4e2f0 Mon Sep 17 00:00:00 2001 From: LautaroPetaccio Date: Thu, 10 Oct 2024 16:00:35 -0300 Subject: [PATCH 1/2] feat: Add Facebook Magic Provider --- src/assets/images/facebook.svg | 49 +++++++++++++++++++ .../Connection/Connection.module.css | 23 +++++++-- src/components/Connection/Connection.tsx | 1 + src/components/Connection/Connection.types.ts | 6 ++- .../ConnectionOption.module.css | 4 ++ src/components/Pages/LoginPage/LoginPage.tsx | 2 +- src/components/Pages/LoginPage/utils.ts | 2 + 7 files changed, 79 insertions(+), 8 deletions(-) create mode 100644 src/assets/images/facebook.svg diff --git a/src/assets/images/facebook.svg b/src/assets/images/facebook.svg new file mode 100644 index 0000000..c63c1ef --- /dev/null +++ b/src/assets/images/facebook.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Connection/Connection.module.css b/src/components/Connection/Connection.module.css index 662a5a0..668ea99 100644 --- a/src/components/Connection/Connection.module.css +++ b/src/components/Connection/Connection.module.css @@ -88,13 +88,21 @@ width: 100%; display: grid; grid-template-columns: repeat(3, 1fr); - gap: 24px + gap: 24px; } .showMoreSecondaryOptions + .showMoreSecondaryOptions { margin-top: 24px; } +.showMoreSecondaryOptions + .line { + margin-top: 14px; +} + +.line + .showMoreSecondaryOptions { + margin-top: 14px; +} + /* Not showing? */ .primaryOption { @@ -107,9 +115,14 @@ @media (max-width: 320px) { .showMoreSecondaryOptions { - grid-template-columns: repeat(1, 1fr); - } + grid-template-columns: repeat(1, 1fr); + } .secondaryOptionButton span :global(.ui.button.primary) { - margin: auto + margin: auto; } -} \ No newline at end of file +} + +.line { + border: 1px solid white; + width: 80%; +} diff --git a/src/components/Connection/Connection.tsx b/src/components/Connection/Connection.tsx index a9307be..67a2ae2 100644 --- a/src/components/Connection/Connection.tsx +++ b/src/components/Connection/Connection.tsx @@ -171,6 +171,7 @@ export const Connection = (props: ConnectionProps): JSX.Element => { loadingOption={loadingOption} /> )} + {/*
*/} {showMore && hasWeb3SecondaryOptions && ( { loadingOption={currentConnectionType} socialOptions={{ primary: ConnectionOptionType.GOOGLE, - secondary: [ConnectionOptionType.DISCORD, ConnectionOptionType.APPLE, ConnectionOptionType.X] + secondary: [ConnectionOptionType.DISCORD, ConnectionOptionType.APPLE, ConnectionOptionType.X, ConnectionOptionType.FACEBOOK] }} web3Options={ isMobile diff --git a/src/components/Pages/LoginPage/utils.ts b/src/components/Pages/LoginPage/utils.ts index f2445cd..0146399 100644 --- a/src/components/Pages/LoginPage/utils.ts +++ b/src/components/Pages/LoginPage/utils.ts @@ -16,6 +16,7 @@ export function fromConnectionOptionToProviderType(connectionType: ConnectionOpt case ConnectionOptionType.X: case ConnectionOptionType.GOOGLE: case ConnectionOptionType.APPLE: + case ConnectionOptionType.FACEBOOK: return ProviderType.MAGIC case ConnectionOptionType.WALLET_CONNECT: case ConnectionOptionType.METAMASK_MOBILE: @@ -64,6 +65,7 @@ export async function connectToProvider(connectionOption: ConnectionOptionType): const url = new URL(window.location.href) url.pathname = '/auth/callback' + console.log('Connecting to provider', connectionOption) await magic.oauth.loginWithRedirect({ provider: connectionOption === ConnectionOptionType.X ? 'twitter' : (connectionOption as OAuthProvider), From 8016fb8d4d5a5e65b3aeb418a00664816236b362 Mon Sep 17 00:00:00 2001 From: LautaroPetaccio Date: Thu, 10 Oct 2024 16:04:30 -0300 Subject: [PATCH 2/2] fix: Add background image transition --- src/components/Pages/LoginPage/LoginPage.module.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Pages/LoginPage/LoginPage.module.css b/src/components/Pages/LoginPage/LoginPage.module.css index 5c08a01..0814e98 100644 --- a/src/components/Pages/LoginPage/LoginPage.module.css +++ b/src/components/Pages/LoginPage/LoginPage.module.css @@ -15,6 +15,7 @@ background-size: cover; background-position: right; animation: move-background 10s linear infinite alternate; + transition: background-image 0.8s; z-index: -1; } @@ -116,7 +117,7 @@ from { transform: translateX(0); } - to { + to { transform: translateX(10%); } }