From 3e01e023a564346f48afce91d1de8cf233ed088e Mon Sep 17 00:00:00 2001 From: "habacuc.eth" Date: Fri, 9 Aug 2024 20:49:45 -0600 Subject: [PATCH 1/9] Header update --- packages/nextjs/components/Header.tsx | 10 ++---- packages/nextjs/public/logo.svg | 47 ++++++++++++++++++++++----- packages/nextjs/tailwind.config.js | 36 ++++++++++++++++++++ 3 files changed, 77 insertions(+), 16 deletions(-) diff --git a/packages/nextjs/components/Header.tsx b/packages/nextjs/components/Header.tsx index 8025050..5eb6306 100644 --- a/packages/nextjs/components/Header.tsx +++ b/packages/nextjs/components/Header.tsx @@ -59,15 +59,11 @@ export const HeaderMenuLinks = () => { */ export const Header = () => { return ( -
+
-
- SE2 logo -
-
- AttestDeFi - Distribute rewards with ease +
+ SE2 logo
diff --git a/packages/nextjs/public/logo.svg b/packages/nextjs/public/logo.svg index 93e4b40..9ea5ae4 100644 --- a/packages/nextjs/public/logo.svg +++ b/packages/nextjs/public/logo.svg @@ -1,10 +1,39 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/nextjs/tailwind.config.js b/packages/nextjs/tailwind.config.js index ea11b08..1bb55c5 100644 --- a/packages/nextjs/tailwind.config.js +++ b/packages/nextjs/tailwind.config.js @@ -81,11 +81,47 @@ module.exports = { }, theme: { extend: { + colors: { + display: ["group-hover"], + zen: "#F3A754", + bit: "#4682B4", + }, + fontFamily: { + ral: ["Raleway"], + oxy: ["Oxygen"], + rob: ["Roboto"], + }, + screens: { + "2xl": "1601px", + "h-sm": { raw: "(min-height: 500px)" }, + "h-md": { raw: "(min-height: 850px)" }, + "h-lg": { raw: "(min-height: 1000px)" }, + }, + borderRadius: { + md: "32px", + in: "20px", + }, boxShadow: { center: "0 0 12px -2px rgb(0 0 0 / 0.05)", }, + keyframes: { + grow: { + "0%": { + width: "0%", + }, + "100%": { + width: "100%", + }, + }, + zoom: { + "0%, 100%": { transform: "scale(1, 1)" }, + "50%": { transform: "scale(1.1, 1.1)" }, + }, + }, animation: { + grow: "grow 5s linear infinite", "pulse-fast": "pulse 1s cubic-bezier(0.4, 0, 0.6, 1) infinite", + zoom: "zoom 1s ease infinite", }, }, }, From 4a361d4b481629e9157517ba2d48d42d5d560c5c Mon Sep 17 00:00:00 2001 From: "habacuc.eth" Date: Fri, 9 Aug 2024 20:53:05 -0600 Subject: [PATCH 2/9] Fonts and titles --- packages/nextjs/components/StepperPanel.tsx | 16 +++++++++------- packages/nextjs/components/StepperPaneltem.tsx | 9 ++++----- packages/nextjs/components/Title.tsx | 4 ++-- packages/nextjs/styles/globals.css | 6 ++++++ 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/packages/nextjs/components/StepperPanel.tsx b/packages/nextjs/components/StepperPanel.tsx index 7ed6e2e..ee8aada 100644 --- a/packages/nextjs/components/StepperPanel.tsx +++ b/packages/nextjs/components/StepperPanel.tsx @@ -19,14 +19,16 @@ export default function StepperPanel({ step }: { step: number }) { variants={navVariant} initial="initial" animate="animate" - className="flex w-full pt-5 h-[170px] md:z-50 space-x-[17px] text-[16px] justify-center md:flex-col md:space-x-0 md:space-y-8 md:h-[720px] md:w-[290px] md:justify-start md:rounded-xl text-white" + className="font-oxy flex w-full pt-5 h-[170px] md:z-50 space-x-[17px] text-[16px] justify-center md:flex-col md:space-x-0 md:space-y-8 md:h-[720px] md:w-[290px] md:justify-start md:rounded-xl text-white" > - - - - - - + + + + + + + + ); } diff --git a/packages/nextjs/components/StepperPaneltem.tsx b/packages/nextjs/components/StepperPaneltem.tsx index 9910824..234c9a8 100644 --- a/packages/nextjs/components/StepperPaneltem.tsx +++ b/packages/nextjs/components/StepperPaneltem.tsx @@ -19,15 +19,14 @@ const navItemVariant: Variants = { export const StepperPaneltem = ({ step, type, on }: NavItemType) => { return ( - +
{step}
-
-

STEP {step}

-

{type}

+
+ {type}
); diff --git a/packages/nextjs/components/Title.tsx b/packages/nextjs/components/Title.tsx index d3b43e2..17587e8 100644 --- a/packages/nextjs/components/Title.tsx +++ b/packages/nextjs/components/Title.tsx @@ -6,8 +6,8 @@ type TitleProp = { export const Title = ({ children, title }: TitleProp) => { return (
-

{title}

-

{children}

+

{title}

+

{children}

); }; diff --git a/packages/nextjs/styles/globals.css b/packages/nextjs/styles/globals.css index 8d0e00c..44fee14 100644 --- a/packages/nextjs/styles/globals.css +++ b/packages/nextjs/styles/globals.css @@ -1,3 +1,5 @@ +@import url('https://fonts.googleapis.com/css2?family=Oxygen:wght@300;400;700&family=Raleway:ital,wght@0,100..900;1,100..900&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap'); + @import "tailwindcss/base"; @import "tailwindcss/components"; @import "tailwindcss/utilities"; @@ -7,6 +9,10 @@ background: oklch(var(--b2)); } +input, select { + @apply font-rob text-lg placeholder:italic px-6 py-3 text-black w-full border-zen mx-auto rounded-md bg-white; +} + body { min-height: 100vh; } From f0e9cf0d4477a1f9602dcd8e59cd4ea444e15dc1 Mon Sep 17 00:00:00 2001 From: "habacuc.eth" Date: Fri, 9 Aug 2024 20:53:41 -0600 Subject: [PATCH 3/9] Clearing space --- packages/nextjs/app/page.tsx | 42 +++++++++++++--------------- packages/nextjs/components/Step1.tsx | 4 +-- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/packages/nextjs/app/page.tsx b/packages/nextjs/app/page.tsx index 1e53439..a882c75 100644 --- a/packages/nextjs/app/page.tsx +++ b/packages/nextjs/app/page.tsx @@ -39,37 +39,35 @@ const Home: NextPage = () => { return (
-
+
-
- - {steps.map(step => ( -
-
- {step.index === 1 && } + + {steps.map(step => ( +
+
+ {step.index === 1 && } - {step.index === 2 && } + {step.index === 2 && } - {step.index === 3 && } + {step.index === 3 && } - {step.index === 4 && } + {step.index === 4 && } - {step.index === 5 && } + {step.index === 5 && } - {step.index === 6 && } -
+ {step.index === 6 && }
- ))} - -
+
+ ))} + ); diff --git a/packages/nextjs/components/Step1.tsx b/packages/nextjs/components/Step1.tsx index b28ef4f..c951b2e 100644 --- a/packages/nextjs/components/Step1.tsx +++ b/packages/nextjs/components/Step1.tsx @@ -52,7 +52,7 @@ function Step1({ handleNext }: { handleNext: any }) { // initial={location.hasOwnProperty("state.name") ? "initial" : "initial2"} animate="animate" exit="exit" - className="flex flex-col mb-8 md:mb-0 bg-white w-[90%] rounded-2xl py-10 px-7 z-30 relative bottom-24 text-[14px] md:bottom-0 md:p-0 md:w-[70%]" + className="flex flex-col mb-8 md:mb-0 rounded-2xl py-10 px-7 z-30 relative bottom-24 text-[14px] md:bottom-0 md:p-0 md:w-[70%]" > Please, select the network you want to validate the attestations from. @@ -63,7 +63,7 @@ function Step1({ handleNext }: { handleNext: any }) { name="baseNetwork" value={disperseFormData.baseNetwork} onChange={event => setDisperseFormData("baseNetwork", event.target.value)} - className="mt-4 block w-full px-3 py-2 bg-white border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm" + className="mb-3" > <option value="">Select a network</option> <option value="Ethereum">Ethereum</option> From d633984118df78a2d4ce9ea0b652f94b0c01331f Mon Sep 17 00:00:00 2001 From: "habacuc.eth" <habacuc.vera@gmail.com> Date: Sat, 10 Aug 2024 12:39:17 -0600 Subject: [PATCH 4/9] Margins and styles --- packages/nextjs/app/page.tsx | 10 +++++----- packages/nextjs/components/Header.tsx | 2 +- packages/nextjs/styles/globals.css | 24 ++++++++++-------------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/packages/nextjs/app/page.tsx b/packages/nextjs/app/page.tsx index a882c75..4e312fd 100644 --- a/packages/nextjs/app/page.tsx +++ b/packages/nextjs/app/page.tsx @@ -39,20 +39,20 @@ const Home: NextPage = () => { return ( <main - className="grid place-items-center w-screen md:min-h-full box-border overflow-x-hidden" + className="grid place-items-center md:min-h-full box-border overflow-x-hidden " style={{ fontFamily: "Ubuntu" }} > - <main className=" flex flex-col items-center min-h-full md:min-h-full w-screen md:max-w-[1280px] md:flex-row md:rounded-xl md:p-5 relative md:h-fit md:overflow-x-hidden md:overflow-hidden"> - <Navbar step={currentStep} /> + <Navbar step={currentStep} /> + <main className=" absolute top-1/2 -translate-y-1/2 flex flex-col w-5/12 items-center h-full md:min-h-full md:flex-row md:rounded-xl md:h-fit md:overflow-x-hidden md:overflow-hidden"> <AnimatePresence mode="wait"> {steps.map(step => ( <div key={step.index} data-hs-stepper-content-item={`{ "index": ${step.index} }`} - className={`${currentStep === step.index ? "active w-full " : ""}`} + className={`${currentStep === step.index ? "active h-full w-full " : ""}`} style={{ display: currentStep === step.index ? "block" : "none" }} > - <div className="w-full p-4 flex justify-center items-center text-gray-500 dark:text-neutral-500 rounded-xl dark:bg-neutral-800 dark:border-neutral-700"> + <div className=" flex justify-center items-center text-gray-600 dark:text-neutral-600 rounded-md dark:bg-neutral-800 dark:border-neutral-700"> {step.index === 1 && <Step1 handleNext={handleNext} />} {step.index === 2 && <Step2 handleNext={handleNext} handleBack={handleBack} />} diff --git a/packages/nextjs/components/Header.tsx b/packages/nextjs/components/Header.tsx index 5eb6306..7650f66 100644 --- a/packages/nextjs/components/Header.tsx +++ b/packages/nextjs/components/Header.tsx @@ -59,7 +59,7 @@ export const HeaderMenuLinks = () => { */ export const Header = () => { return ( - <div className="sticky lg:static top-0 navbar bg-none min-h-0 flex-shrink-0 justify-between z-20 px-0 sm:px-2"> + <div className="fixed top-0 navbar bg-none min-h-0 flex-shrink-0 justify-between z-20 px-0 sm:px-2"> <div className="navbar-start w-auto lg:w-1/2"> <Link href="/" passHref className="hidden lg:flex items-center gap-2 ml-4 mr-6 shrink-0"> <div className="flex relative h-20 w-80"> diff --git a/packages/nextjs/styles/globals.css b/packages/nextjs/styles/globals.css index 44fee14..12c4231 100644 --- a/packages/nextjs/styles/globals.css +++ b/packages/nextjs/styles/globals.css @@ -10,7 +10,16 @@ } input, select { - @apply font-rob text-lg placeholder:italic px-6 py-3 text-black w-full border-zen mx-auto rounded-md bg-white; + @apply font-oxy text-lg placeholder:italic px-6 py-3 w-full border-zen mx-auto rounded-md bg-bit/80 text-white; +} + +Title { + @apply font-oxy +} + +button { + @apply + border-bit border text-black hover:text-white hover:bg-bit px-6 py-1 rounded-md font-ral xl:text-lg } body { @@ -37,17 +46,4 @@ p { @apply shadow-none; } -nav { - background-image: url(/zenbaner-mobile.png); - background-size: cover; - background-repeat: no-repeat; -} - -@media (min-width: 768px) { - nav { - background-image: url(/zenbaner-vertical.png); - background-size: contain; - background-repeat: no-repeat; - } -} From d67dd61ba912e2b034ddae02cc1b1617cc4002f5 Mon Sep 17 00:00:00 2001 From: "habacuc.eth" <habacuc.vera@gmail.com> Date: Sat, 10 Aug 2024 12:39:52 -0600 Subject: [PATCH 5/9] Panel and buttons --- packages/nextjs/components/Next.tsx | 18 +++--------------- packages/nextjs/components/StepperPanel.tsx | 5 +++-- packages/nextjs/components/StepperPaneltem.tsx | 6 ++---- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/packages/nextjs/components/Next.tsx b/packages/nextjs/components/Next.tsx index 5215daa..8587430 100644 --- a/packages/nextjs/components/Next.tsx +++ b/packages/nextjs/components/Next.tsx @@ -7,30 +7,18 @@ export default function Next({ goBack, next }: backType) { return ( <div className="box-border w-full flex justify-between md:mt-0 absolute bottom-0 bg-white p-[5%] md:py-0 md:self-end md:bg-[transparent] md:relative md:px-[15%] md:mb-5 "> {goBack && ( - <button - type="submit" - name="back" - className="text-[16px] text-Cool-gray transform duration-300 hover:text-Marine-blue font-[500]" - > + <button type="submit" name="back" className=""> Go Back </button> )} <div /> {next && ( - <button - type="submit" - name="next" - className="bg-Marine-blue hover:brightness-150 transform ease-in-out duration-300 font-[500] text-[16px] rounded-lg text-black py-3 px-4 md:py-4 md:px-8" - > + <button type="submit" name="next" className=""> Next Step </button> )} {!next && ( - <button - type="submit" - name="next" - className="bg-Purplish-blue hover:brightness-150 transform ease-in-out duration-300 font-[500] text-[16px] rounded-lg text-black py-3 px-6 md:py-4 md:px-10" - > + <button type="submit" name="next" className=""> Confirm </button> )} diff --git a/packages/nextjs/components/StepperPanel.tsx b/packages/nextjs/components/StepperPanel.tsx index ee8aada..19f8c2e 100644 --- a/packages/nextjs/components/StepperPanel.tsx +++ b/packages/nextjs/components/StepperPanel.tsx @@ -19,7 +19,8 @@ export default function StepperPanel({ step }: { step: number }) { variants={navVariant} initial="initial" animate="animate" - className="font-oxy flex w-full pt-5 h-[170px] md:z-50 space-x-[17px] text-[16px] justify-center md:flex-col md:space-x-0 md:space-y-8 md:h-[720px] md:w-[290px] md:justify-start md:rounded-xl text-white" + className="bg-gradient-to-t from-bit to-zen fixed left-48 top-1/2 -translate-y-1/2 font-oxy flex w-full md:z-50 justify-center + md:flex-col px-2 py-16 md:space-x-0 md:space-y-11 md:w-[290px] md:justify-start rounded-md text-white" > <StepperPaneltem step="1" type="Attest Network" on={step === 1} /> <StepperPaneltem step="2" type="Schema ID" on={step === 2} /> @@ -28,7 +29,7 @@ export default function StepperPanel({ step }: { step: number }) { <StepperPaneltem step="4" type="Distribution Network" on={step === 4} /> <StepperPaneltem step="5" type="Reward token" on={step === 5} /> - <StepperPaneltem step="6" type="Verify" on={step === 6} /> + <StepperPaneltem step="6" type="Verify & Send" on={step === 6} /> </motion.nav> ); } diff --git a/packages/nextjs/components/StepperPaneltem.tsx b/packages/nextjs/components/StepperPaneltem.tsx index 234c9a8..1cf7d8a 100644 --- a/packages/nextjs/components/StepperPaneltem.tsx +++ b/packages/nextjs/components/StepperPaneltem.tsx @@ -21,13 +21,11 @@ export const StepperPaneltem = ({ step, type, on }: NavItemType) => { return ( <motion.div variants={navItemVariant} className="flex md:p-3 md:items-center md:py-0 gap-3"> <div - className={`h-10 w-10 border font-bold border-white grid place-items-center rounded-full transition duration-500 ease-in-out ${on ? "bg-bit border-bit text-white" : ""}`} + className={`h-10 w-10 border font-bold border-white grid place-items-center rounded-full transition duration-500 ease-in-out ${on ? "bg-white border-white text-gray-600 animate-pulse" : ""}`} > {step} </div> - <div className={'hidden md:flex flex-col ${on ? "bg-bit border-bit text-white" : ""}'}> - <span className="font-oxy text-Light-gray">{type}</span> - </div> + <span className={`${on ? "animate-pulse text-gray-600 bg-white py-2 px-3 rounded-full" : ""}`}>{type}</span> </motion.div> ); }; From b13367012b7f6ed1e66e9cf8e1371f86c6801d9d Mon Sep 17 00:00:00 2001 From: "habacuc.eth" <habacuc.vera@gmail.com> Date: Sat, 10 Aug 2024 12:40:06 -0600 Subject: [PATCH 6/9] steps --- packages/nextjs/components/Step1.tsx | 37 ++++++++++++---------------- packages/nextjs/components/Step2.tsx | 6 ++--- packages/nextjs/components/Step3.tsx | 8 +++--- packages/nextjs/components/Step4.tsx | 18 ++++++-------- packages/nextjs/components/Step5.tsx | 16 ++++++------ packages/nextjs/components/Step6.tsx | 18 +++++++------- packages/nextjs/components/Title.tsx | 4 +-- 7 files changed, 48 insertions(+), 59 deletions(-) diff --git a/packages/nextjs/components/Step1.tsx b/packages/nextjs/components/Step1.tsx index c951b2e..62e239c 100644 --- a/packages/nextjs/components/Step1.tsx +++ b/packages/nextjs/components/Step1.tsx @@ -45,34 +45,29 @@ function Step1({ handleNext }: { handleNext: any }) { return ( <form onSubmit={handleSubmit} - className="w-full flex flex-col flex-1 md:min-h-fit items-center md:h-[580px] md:justify-between" + className=" flex flex-col flex-1 md:min-h-fit items-center md:h-[580px] md:justify-between md" > <motion.section variants={pageVariant} // initial={location.hasOwnProperty("state.name") ? "initial" : "initial2"} animate="animate" exit="exit" - className="flex flex-col mb-8 md:mb-0 rounded-2xl py-10 px-7 z-30 relative bottom-24 text-[14px] md:bottom-0 md:p-0 md:w-[70%]" + className=" " > - <Title title="Select attest network"> - Please, select the network you want to validate the attestations from. - - -
- -
+ In which network the attestations were granted? + diff --git a/packages/nextjs/components/Step2.tsx b/packages/nextjs/components/Step2.tsx index 24e6b2e..ea5ca28 100644 --- a/packages/nextjs/components/Step2.tsx +++ b/packages/nextjs/components/Step2.tsx @@ -69,9 +69,9 @@ function Step2({ handleNext, handleBack }: { handleNext: any; handleBack: any }) // initial={location.state.name === "step1" ? "initial" : "initial2"} animate="animate" exit={goback ? "exit2" : "exit"} - className="flex flex-col mb-8 md:mb-0 bg-white w-[90%] rounded-2xl p-10 z-30 relative bottom-24 text-[14px] md:bottom-0 md:p-0 md:w-[70%] h-full" + className="flex flex-col mb-8 md:mb-0 rounded-2xl p-10 z-30 relative bottom-24 text-[14px] md:bottom-0 md:p-0 md:w-[70%] h-full" > - Enter the Schema ID that granted the attestations. + Enter the Schema ID from which the attestations were granted.
setDisperseFormData("schemaID", event.target.value)} placeholder="Enter schema ID" - className="mt-4 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm" + className="bg-zen/50 text-gray-600 text-base" />
diff --git a/packages/nextjs/components/Step3.tsx b/packages/nextjs/components/Step3.tsx index 087e850..6d0f169 100644 --- a/packages/nextjs/components/Step3.tsx +++ b/packages/nextjs/components/Step3.tsx @@ -97,11 +97,9 @@ export default function Step3({ handleNext, handleBack }: { handleNext: any; han // initial={location.state.name === "step2" ? "initial" : "initial2"} animate="animate" exit={goback ? "exit2" : "exit"} - className="flex flex-col mb-8 md:mb-0 bg-white w-[90%] rounded-2xl py-10 px-7 z-30 relative bottom-24 text-[14px] md:bottom-0 md:p-0 md:w-[70%] h-full" + className="flex flex-col mb-8 md:mb-0 rounded-2xl py-10 px-7 z-30 relative bottom-24 text-[14px] md:bottom-0 md:p-0 md:w-[70%] h-full" > - - Enter the attester address or ENS you want to validate the attestations from. - + Which address granted the attestations?
diff --git a/packages/nextjs/components/Step4.tsx b/packages/nextjs/components/Step4.tsx index 5223809..902d8ae 100644 --- a/packages/nextjs/components/Step4.tsx +++ b/packages/nextjs/components/Step4.tsx @@ -63,23 +63,21 @@ export default function Step4({ handleNext, handleBack }: { handleNext: any; han initial="initial" animate="animate" exit={goback ? "exit2" : "exit"} - className="flex flex-col mb-8 md:mb-0 bg-white w-[90%] rounded-2xl py-10 px-7 z-30 relative bottom-24 text-[14px] md:bottom-0 md:p-0 md:w-[70%] h-full" + className="flex flex-col mb-8 md:mb-0 rounded-2xl py-10 px-7 z-30 relative bottom-24 text-[14px] md:bottom-0 md:p-0 md:w-[70%] h-full" > - - Select the network where you want to disperse your rewards on. - -
+ In which network do you want to distribute funds? +
diff --git a/packages/nextjs/components/Step5.tsx b/packages/nextjs/components/Step5.tsx index ae403be..8b497f2 100644 --- a/packages/nextjs/components/Step5.tsx +++ b/packages/nextjs/components/Step5.tsx @@ -73,21 +73,19 @@ export default function Step5({ handleNext, handleBack }: { handleNext: any; han initial="initial" animate="animate" exit={goback ? "exit2" : "exit"} - className="flex flex-col mb-8 md:mb-0 bg-white w-[90%] rounded-2xl py-10 px-7 z-30 relative bottom-24 text-[14px] md:bottom-0 md:p-0 md:w-[70%] h-full" + className="flex flex-col mb-8 md:mb-0 rounded-2xl py-10 px-7 z-30 relative bottom-24 text-[14px] md:bottom-0 md:p-0 md:w-[70%] h-full" > - - Select the type of rewards you want to disperse, it can be any ERC20 token. - -
+ Select the type of rewards you want to disperse. +
{disperseFormData.typeOfReward === "custom" ? ( setDisperseFormData("erc20address", event.target.value)} - className="mt-4 block w-full px-3 py-2 bg-white border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm" + className="placeholder:text-white/60" /> ) : null}
diff --git a/packages/nextjs/components/Step6.tsx b/packages/nextjs/components/Step6.tsx index 074c034..6c2c889 100644 --- a/packages/nextjs/components/Step6.tsx +++ b/packages/nextjs/components/Step6.tsx @@ -143,19 +143,19 @@ export default function Step6() { }; return ( -
+ - Transfer funds to multiple receivers. -
+ Check the addresses and define the reward amount before send it. +
- + @@ -164,7 +164,7 @@ export default function Step6() { {attestations.map((attestation: any, idx: number) => ( - +
Recipient Address Reward Amount
{idx + 1}
@@ -176,7 +176,7 @@ export default function Step6() { name={`ammount-${idx + 1}`} // id input value={inputs[`ammount-${idx + 1}`] || ""} // valor del input onChange={handleInput} // funciรณn de cambio - className="mt-4 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm" + className="" />
@@ -194,8 +194,8 @@ export default function Step6() { ))}
-
Total tokens: {sum}
-
diff --git a/packages/nextjs/components/Title.tsx b/packages/nextjs/components/Title.tsx index 17587e8..0b4da0e 100644 --- a/packages/nextjs/components/Title.tsx +++ b/packages/nextjs/components/Title.tsx @@ -6,8 +6,8 @@ type TitleProp = { export const Title = ({ children, title }: TitleProp) => { return (
-

{title}

-

{children}

+

{title}

+

{children}

); }; From e162de87cf784b803d5dd6d02758bc25687c35b8 Mon Sep 17 00:00:00 2001 From: "habacuc.eth" Date: Sat, 10 Aug 2024 14:05:42 -0600 Subject: [PATCH 7/9] minor changes --- packages/nextjs/components/Title.tsx | 2 +- packages/nextjs/public/logo.svg | 40 +++++++++++++++------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/packages/nextjs/components/Title.tsx b/packages/nextjs/components/Title.tsx index 0b4da0e..e4f33c2 100644 --- a/packages/nextjs/components/Title.tsx +++ b/packages/nextjs/components/Title.tsx @@ -6,7 +6,7 @@ type TitleProp = { export const Title = ({ children, title }: TitleProp) => { return (
-

{title}

+

{title}

{children}

); diff --git a/packages/nextjs/public/logo.svg b/packages/nextjs/public/logo.svg index 9ea5ae4..833caff 100644 --- a/packages/nextjs/public/logo.svg +++ b/packages/nextjs/public/logo.svg @@ -1,39 +1,43 @@ - - - - - - - + - - + + - - + + - - - - - - + + + + + + + + + + + + - + + + + + From dc193e9097fa8429b231ed6461822cea555c3908 Mon Sep 17 00:00:00 2001 From: "habacuc.eth" Date: Sat, 10 Aug 2024 14:43:13 -0600 Subject: [PATCH 8/9] vercel deploy test --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f9abe0b..4870b23 100644 --- a/README.md +++ b/README.md @@ -1 +1,5 @@ -# AttestDeFi \ No newline at end of file +# AttestDeFi + +AttestDeFi is a dapp designed to simplify how EAS users distribute ERC 20 tokens or ether within the Superchain ecosystem based on the attestations granted in a Schema by a specific attestor. + +## How it's made \ No newline at end of file From 93efd1ed6242aabfde5aa68b2f46c61407c3c8c4 Mon Sep 17 00:00:00 2001 From: "habacuc.eth" Date: Sat, 10 Aug 2024 15:19:28 -0600 Subject: [PATCH 9/9] dark mode --- packages/nextjs/app/page.tsx | 4 +++- packages/nextjs/components/Step1.tsx | 2 +- packages/nextjs/components/Step2.tsx | 2 +- packages/nextjs/components/Step3.tsx | 2 +- packages/nextjs/components/Step6.tsx | 10 +++++----- packages/nextjs/components/SwitchTheme.tsx | 2 +- packages/nextjs/components/Title.tsx | 4 ++-- packages/nextjs/styles/globals.css | 2 +- packages/nextjs/tailwind.config.js | 2 +- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/packages/nextjs/app/page.tsx b/packages/nextjs/app/page.tsx index 4e312fd..f3e614c 100644 --- a/packages/nextjs/app/page.tsx +++ b/packages/nextjs/app/page.tsx @@ -10,6 +10,7 @@ import Step4 from "~~/components/Step4"; import Step5 from "~~/components/Step5"; import Step6 from "~~/components/Step6"; import Navbar from "~~/components/StepperPanel"; +import { SwitchTheme } from "~~/components/SwitchTheme"; const Home: NextPage = () => { const [currentStep, setCurrentStep] = useState(1); @@ -52,7 +53,7 @@ const Home: NextPage = () => { className={`${currentStep === step.index ? "active h-full w-full " : ""}`} style={{ display: currentStep === step.index ? "block" : "none" }} > -
+
{step.index === 1 && } {step.index === 2 && } @@ -69,6 +70,7 @@ const Home: NextPage = () => { ))} + ); }; diff --git a/packages/nextjs/components/Step1.tsx b/packages/nextjs/components/Step1.tsx index 62e239c..53b812e 100644 --- a/packages/nextjs/components/Step1.tsx +++ b/packages/nextjs/components/Step1.tsx @@ -59,7 +59,7 @@ function Step1({ handleNext }: { handleNext: any }) { name="baseNetwork" value={disperseFormData.baseNetwork} onChange={event => setDisperseFormData("baseNetwork", event.target.value)} - className="mb-3 bg-zen/50 text-gray-600" + className="mb-3 bg-zen/50 text-gray-600 dark:text-white" > diff --git a/packages/nextjs/components/Step2.tsx b/packages/nextjs/components/Step2.tsx index ea5ca28..a97020a 100644 --- a/packages/nextjs/components/Step2.tsx +++ b/packages/nextjs/components/Step2.tsx @@ -79,7 +79,7 @@ function Step2({ handleNext, handleBack }: { handleNext: any; handleBack: any }) value={disperseFormData.schemaID} onChange={event => setDisperseFormData("schemaID", event.target.value)} placeholder="Enter schema ID" - className="bg-zen/50 text-gray-600 text-base" + className="bg-zen/50 text-gray-600 dark:text-white text-base" />
diff --git a/packages/nextjs/components/Step3.tsx b/packages/nextjs/components/Step3.tsx index 6d0f169..81c70ae 100644 --- a/packages/nextjs/components/Step3.tsx +++ b/packages/nextjs/components/Step3.tsx @@ -107,7 +107,7 @@ export default function Step3({ handleNext, handleBack }: { handleNext: any; han value={!showAttesterENS ? disperseFormData.attesterAddress : disperseFormData.attesterENS} onChange={handleInputChange} placeholder="Enter attester address" - className="bg-zen/50 text-gray-600" + className="bg-zen/50 text-gray-600 dark:text-white" />
diff --git a/packages/nextjs/components/Step6.tsx b/packages/nextjs/components/Step6.tsx index 3768c65..85d8192 100644 --- a/packages/nextjs/components/Step6.tsx +++ b/packages/nextjs/components/Step6.tsx @@ -167,7 +167,7 @@ export default function Step6() {
- + @@ -176,7 +176,7 @@ export default function Step6() { {attestations.map((attestation: any, idx: number) => ( - +
Recipient Address Reward Amount
{idx + 1}
@@ -195,7 +195,7 @@ export default function Step6() {
-
Total tokens: {sum}
+
Total tokens: {sum}
diff --git a/packages/nextjs/components/SwitchTheme.tsx b/packages/nextjs/components/SwitchTheme.tsx index 4dc20af..f2b5372 100644 --- a/packages/nextjs/components/SwitchTheme.tsx +++ b/packages/nextjs/components/SwitchTheme.tsx @@ -25,7 +25,7 @@ export const SwitchTheme = ({ className }: { className?: string }) => { if (!mounted) return null; return ( -
+
{ return (
-

{title}

-

{children}

+

{title}

+

{children}

); }; diff --git a/packages/nextjs/styles/globals.css b/packages/nextjs/styles/globals.css index 12c4231..4c693a1 100644 --- a/packages/nextjs/styles/globals.css +++ b/packages/nextjs/styles/globals.css @@ -19,7 +19,7 @@ Title { button { @apply - border-bit border text-black hover:text-white hover:bg-bit px-6 py-1 rounded-md font-ral xl:text-lg + border-bit border-2 dark:text-white text-black hover:text-white hover:bg-bit px-6 py-1 rounded-md font-ral xl:text-lg } body { diff --git a/packages/nextjs/tailwind.config.js b/packages/nextjs/tailwind.config.js index 1bb55c5..60304bd 100644 --- a/packages/nextjs/tailwind.config.js +++ b/packages/nextjs/tailwind.config.js @@ -55,7 +55,7 @@ module.exports = { neutral: "#F9FBFF", "neutral-content": "#385183", "base-100": "#385183", - "base-200": "#2A3655", + "base-200": "#263238", "base-300": "#212638", "base-content": "#F9FBFF", info: "#385183",