From b1bb46616b6ade202eb6c092e512f5a74abe67b9 Mon Sep 17 00:00:00 2001 From: James Pacheco Date: Fri, 15 Sep 2023 12:18:18 -0600 Subject: [PATCH 01/11] Flips Dedicated/Universal order on wallet prompt --- core/create-app.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/create-app.tsx b/core/create-app.tsx index eee23dc..0245815 100644 --- a/core/create-app.tsx +++ b/core/create-app.tsx @@ -170,8 +170,8 @@ export async function createApp(config: CreateMagicAppConfig) { name: 'product', message: 'Choose your wallet type', choices: [ - { name: 'universal', message: 'Universal' }, { name: 'dedicated', message: 'Dedicated' }, + { name: 'universal', message: 'Universal' }, ], }).run(); From 9d77dc067632302be1dfc62b8ce933ea4c9df752 Mon Sep 17 00:00:00 2001 From: James Pacheco Date: Fri, 15 Sep 2023 12:21:00 -0600 Subject: [PATCH 02/11] Update changelog and version --- CHANGELOG.md | 18 +++++++++++++++++- package.json | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66cf900..431f663 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,21 @@ -# v4.2.2 (Tue Sep 12 2023) +# v4.3.1 (Fri Sep 15 2023) #### 🚀 Enhancement +- Enables anonymous usage tracking with a command to opt out +- Updates Quickstart to use Dedicated Wallet + +#### Authors: 2 + +- James ([@jamesrp13](https://github.com/jamesrp13)) +- Aditya Kulkarni ([@AdityaKulkarni](https://github.com/AdityaKulkarni)) + +--- + +# v4.2.2 (Tue Sep 12 2023) + +#### 🐛 Bug Fix + - Fix bug where network isn't always added into template configuration #### Authors: 2 @@ -9,6 +23,8 @@ - James ([@jamesrp13](https://github.com/jamesrp13)) - Aditya Kulkarni ([@AdityaKulkarni](https://github.com/AdityaKulkarni)) +--- + # v4.2.0 (Mon Sep 11 2023) #### 🚀 Enhancement diff --git a/package.json b/package.json index 014cbd3..7865c98 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "make-magic", - "version": "4.2.2", + "version": "4.3.1", "description": "A tool for quickly scaffolding an app with Magic authentication baked-in!", "repository": "magiclabs/create-magic-app", "license": "MIT", From 1662d0840ece7fb176614ef3dc4df95e87f3c038 Mon Sep 17 00:00:00 2001 From: James Pacheco Date: Fri, 15 Sep 2023 13:32:44 -0600 Subject: [PATCH 03/11] Update CSS for login button on Dedicated template --- .../template/src/styles/globals.css | 16 ++++++++-------- .../template/src/styles/globals.css | 18 +++++++++--------- .../template/src/styles/globals.css | 16 ++++++++-------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/styles/globals.css b/scaffolds/nextjs-dedicated-wallet/template/src/styles/globals.css index 83bde73..c731c48 100644 --- a/scaffolds/nextjs-dedicated-wallet/template/src/styles/globals.css +++ b/scaffolds/nextjs-dedicated-wallet/template/src/styles/globals.css @@ -47,7 +47,7 @@ ul { } .nft-name { - @apply text-black font-semibold; + @apply font-semibold text-black; font-family: 'Inter'; } @@ -70,7 +70,7 @@ ul { } .network-dropdown { - @apply w-fit m-auto rounded-xl; + @apply m-auto w-fit rounded-xl; } .active-network { @@ -125,7 +125,7 @@ ul { .login-button { @apply w-full h-12 text-white font-semibold text-base leading-6 transition-[0.1s] text-center transition-[0.1s] m-auto px-2 py-3 rounded-[300px] border-[none]; - background: #a799ff; + background: #6851ff; } .login-button:disabled { @@ -142,7 +142,7 @@ ul { } .links { - @apply flex justify-center text-white font-semibold mt-5 mb-3 mx-auto; + @apply flex justify-center mx-auto mt-5 mb-3 font-semibold text-white; } .link { @apply transition-[0.1s] px-[30px] py-0; @@ -163,7 +163,7 @@ ul { @apply cursor-pointer; } .link-divider { - @apply h-5 w-px; + @apply w-px h-5; } .footer-links { @@ -221,7 +221,7 @@ ul { @apply w-[50px] text-center flex items-center justify-center cursor-default; } .loading { - @apply animate-spin cursor-default; + @apply cursor-default animate-spin; } @keyframes rotation { @@ -241,11 +241,11 @@ ul { @apply text-xl font-semibold text-left mt-0 mb-[25px]; } .card-label-container { - @apply flex justify-between items-center mb-3; + @apply flex items-center justify-between mb-3; } .card-label { - @apply text-sm font-medium cursor-pointer; + @apply text-sm font-medium cursor-pointer; } .toast { @apply fixed w-fit text-white font-medium shadow-[4px_8px_20px_rgba(0,0,0,0.15)] mx-auto my-0 px-4 py-2 rounded-[10px] top-[30px] inset-x-0 bg-[#00875f]; diff --git a/scaffolds/nextjs-flow-dedicated-wallet/template/src/styles/globals.css b/scaffolds/nextjs-flow-dedicated-wallet/template/src/styles/globals.css index aba4039..ef20a04 100644 --- a/scaffolds/nextjs-flow-dedicated-wallet/template/src/styles/globals.css +++ b/scaffolds/nextjs-flow-dedicated-wallet/template/src/styles/globals.css @@ -47,7 +47,7 @@ ul { } .nft-name { - @apply text-black font-semibold; + @apply font-semibold text-black; font-family: 'Inter'; } @@ -70,7 +70,7 @@ ul { } .network-dropdown { - @apply w-fit m-auto rounded-xl; + @apply m-auto w-fit rounded-xl; } .active-network { @@ -109,7 +109,7 @@ ul { } .home-page { - @apply flex flex-col justify-center items-center min-h-screen relative; + @apply relative flex flex-col items-center justify-center min-h-screen; } .login-page { @@ -125,7 +125,7 @@ ul { .login-button { @apply w-full h-12 text-white font-semibold text-base leading-6 transition-[0.1s] text-center transition-[0.1s] m-auto px-2 py-3 rounded-[300px] border-[none]; - background: #a799ff; + background: #6851ff; } .login-button:disabled { @@ -143,7 +143,7 @@ ul { } .links { - @apply flex justify-center text-white font-semibold mt-5 mb-3 mx-auto; + @apply flex justify-center mx-auto mt-5 mb-3 font-semibold text-white; } .link { @apply transition-[0.1s] px-[30px] py-0; @@ -164,7 +164,7 @@ ul { @apply cursor-pointer; } .link-divider { - @apply h-5 w-px; + @apply w-px h-5; } .footer-links { @@ -226,7 +226,7 @@ ul { @apply w-[50px] text-center flex items-center justify-center cursor-default; } .loading { - @apply animate-spin cursor-default; + @apply cursor-default animate-spin; } @keyframes rotation { @@ -246,11 +246,11 @@ ul { @apply text-xl font-semibold text-left mt-0 mb-[25px]; } .card-label-container { - @apply flex justify-between items-center mb-3; + @apply flex items-center justify-between mb-3; } .card-label { - @apply text-sm font-medium cursor-pointer; + @apply text-sm font-medium cursor-pointer; } .toast { @apply fixed w-fit text-white font-medium shadow-[4px_8px_20px_rgba(0,0,0,0.15)] mx-auto my-0 px-4 py-2 rounded-[10px] top-[30px] inset-x-0 bg-[#00875f]; diff --git a/scaffolds/nextjs-solana-dedicated-wallet/template/src/styles/globals.css b/scaffolds/nextjs-solana-dedicated-wallet/template/src/styles/globals.css index 83bde73..c731c48 100644 --- a/scaffolds/nextjs-solana-dedicated-wallet/template/src/styles/globals.css +++ b/scaffolds/nextjs-solana-dedicated-wallet/template/src/styles/globals.css @@ -47,7 +47,7 @@ ul { } .nft-name { - @apply text-black font-semibold; + @apply font-semibold text-black; font-family: 'Inter'; } @@ -70,7 +70,7 @@ ul { } .network-dropdown { - @apply w-fit m-auto rounded-xl; + @apply m-auto w-fit rounded-xl; } .active-network { @@ -125,7 +125,7 @@ ul { .login-button { @apply w-full h-12 text-white font-semibold text-base leading-6 transition-[0.1s] text-center transition-[0.1s] m-auto px-2 py-3 rounded-[300px] border-[none]; - background: #a799ff; + background: #6851ff; } .login-button:disabled { @@ -142,7 +142,7 @@ ul { } .links { - @apply flex justify-center text-white font-semibold mt-5 mb-3 mx-auto; + @apply flex justify-center mx-auto mt-5 mb-3 font-semibold text-white; } .link { @apply transition-[0.1s] px-[30px] py-0; @@ -163,7 +163,7 @@ ul { @apply cursor-pointer; } .link-divider { - @apply h-5 w-px; + @apply w-px h-5; } .footer-links { @@ -221,7 +221,7 @@ ul { @apply w-[50px] text-center flex items-center justify-center cursor-default; } .loading { - @apply animate-spin cursor-default; + @apply cursor-default animate-spin; } @keyframes rotation { @@ -241,11 +241,11 @@ ul { @apply text-xl font-semibold text-left mt-0 mb-[25px]; } .card-label-container { - @apply flex justify-between items-center mb-3; + @apply flex items-center justify-between mb-3; } .card-label { - @apply text-sm font-medium cursor-pointer; + @apply text-sm font-medium cursor-pointer; } .toast { @apply fixed w-fit text-white font-medium shadow-[4px_8px_20px_rgba(0,0,0,0.15)] mx-auto my-0 px-4 py-2 rounded-[10px] top-[30px] inset-x-0 bg-[#00875f]; From 6d3d09df4fce10257fca923375fc9f220b1972ef Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Tue, 26 Sep 2023 14:45:33 -0700 Subject: [PATCH 04/11] UI Updates for dedicated template --- .../nextjs-dedicated-wallet/scaffold.tsx | 7 +++- .../template/public/background.svg | 32 -------------- .../template/public/info.svg | 3 ++ .../template/public/link_white.svg | 3 ++ .../template/public/login_bg.png | Bin 0 -> 93577 bytes .../template/public/logo.svg | 9 ++++ .../template/public/magic_color_white.svg | 34 --------------- .../template/public/redirect_bg.png | Bin 0 -> 1358274 bytes .../src/components/magic/Dashboard.tsx | 6 +-- .../template/src/components/magic/Header.tsx | 10 ++++- .../template/src/components/magic/Login.tsx | 2 +- .../magic/MagicDashboardRedirect.tsx | 36 ++++++++++------ .../src/components/magic/auth/Discord.tsx | 14 +++---- .../src/components/magic/auth/EmailOTP.tsx | 2 +- .../src/components/magic/auth/Facebook.tsx | 14 +++---- .../src/components/magic/auth/Github.tsx | 14 +++---- .../src/components/magic/auth/Google.tsx | 14 +++---- .../src/components/magic/auth/SMSOTP.tsx | 2 +- .../src/components/magic/auth/Twitch.tsx | 14 +++---- .../src/components/magic/auth/Twitter.tsx | 14 +++---- .../template/src/styles/globals.css | 39 ++++++++++++++---- .../template/tailwind.config.js | 32 +++++++------- 22 files changed, 140 insertions(+), 161 deletions(-) delete mode 100644 scaffolds/nextjs-dedicated-wallet/template/public/background.svg create mode 100644 scaffolds/nextjs-dedicated-wallet/template/public/info.svg create mode 100644 scaffolds/nextjs-dedicated-wallet/template/public/link_white.svg create mode 100644 scaffolds/nextjs-dedicated-wallet/template/public/login_bg.png create mode 100644 scaffolds/nextjs-dedicated-wallet/template/public/logo.svg delete mode 100644 scaffolds/nextjs-dedicated-wallet/template/public/magic_color_white.svg create mode 100644 scaffolds/nextjs-dedicated-wallet/template/public/redirect_bg.png diff --git a/scaffolds/nextjs-dedicated-wallet/scaffold.tsx b/scaffolds/nextjs-dedicated-wallet/scaffold.tsx index da3851c..118155a 100644 --- a/scaffolds/nextjs-dedicated-wallet/scaffold.tsx +++ b/scaffolds/nextjs-dedicated-wallet/scaffold.tsx @@ -26,9 +26,12 @@ export default createScaffold( > {(data) => ( <> -