Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new-dao.tsx refactor, configure next/previous to handle final step #12

Merged
merged 11 commits into from
Oct 5, 2023
Merged

new-dao.tsx refactor, configure next/previous to handle final step #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a82d81c
Refactor new-dao
jorvixsky Oct 3, 2023
cfe997f
Improved steps handling
jorvixsky Oct 3, 2023
b9eaaf1
Step prev/next now showing accordingly
jorvixsky Oct 3, 2023
018563b
removed unused variables and imports
pinglu-pingu Oct 3, 2023
64c5bea
Removed console.log
jorvixsky Oct 4, 2023
c23c2e0
Summary copy updated and handling completion
jorvixsky Oct 4, 2023
86fad2f
Updated copy
jorvixsky Oct 4, 2023
c9a3e23
Updated border radius
jorvixsky Oct 4, 2023
62535c5
Added space to avoid slider over input
jorvixsky Oct 4, 2023
e42129b
Updated header
jorvixsky Oct 4, 2023
dd67a40
WIP connect Summary to contract
jorvixsky Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions apps/web/public/ABCLaunchpadLogo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion apps/web/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import App from './App.tsx'
import Launchpad from './presentation/pages/launchpad';
import Swap from './presentation/pages/swap';
import { createHashRouter, RouterProvider, createRoutesFromElements, Route } from "react-router-dom";
import NewDao from './presentation/pages/new-dao.tsx';
import NewDao from './presentation/pages/new-dao/new-dao.tsx';
import { TransactionProvider } from './presentation/providers/TransactionProvider.tsx';
import { DAOCreationWagmiLSRepository } from './data/DAOCreationWagmiLSRepository.ts';

Expand Down
28 changes: 22 additions & 6 deletions apps/web/src/presentation/components/launchpad/DAOLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
import { Box, Button, HStack, VStack, Flex, Image, Text } from "@chakra-ui/react";
import { Box, Button, HStack, VStack, Flex, Image, Text, Step } from "@chakra-ui/react";

type Step = {
title: string;
content: JSX.Element;
index: number;
completed: boolean;
nextStepText?: string;
previousStepText?: string;
lastStepAction?: () => void;
}

interface DAOLayoutProps {
onNextStep: () => void,
onPreviousStep: () => void,
steps: Step[];
currentStep: number;
onStepChanged: (data: number) => void;
}

export default function DAOLayout({ steps, currentStep, onStepChanged }: DAOLayoutProps) {
export default function DAOLayout({ steps, currentStep, onNextStep, onPreviousStep }: DAOLayoutProps) {
console.log(steps[currentStep].lastStepAction);

return (
<Flex justify="center" align="center" height="auto" bg="brand.100" pb="100px">
<VStack
Expand Down Expand Up @@ -96,11 +102,21 @@ export default function DAOLayout({ steps, currentStep, onStepChanged }: DAOLayo
{steps[currentStep].content}

<HStack spacing={4} pb="50px" pt="40px">
<Button onClick={() => onStepChanged(currentStep - 1)} variant="outline">Back</Button>
<Button onClick={() => onPreviousStep()} variant="outline">
{steps[currentStep].previousStepText ? steps[currentStep].previousStepText : 'Previous'}
</Button>
<Button
onClick={() => onStepChanged(currentStep + 1)}
onClick={() => {
console.log(steps[currentStep + 1]);
const action = steps[currentStep + 1].lastStepAction;
if (typeof action === "function") {
action();
} else {
onNextStep();
}
}}
isDisabled={!steps[currentStep].completed}>
Next
{steps[currentStep].nextStepText ? steps[currentStep].nextStepText : 'Next'}
</Button>
</HStack>
</VStack>
Expand Down
1 change: 0 additions & 1 deletion apps/web/src/presentation/components/launchpad/abc/ABCSettingsModelController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ export function useABCSettingsModelController(daoCreationRepository: DAOCreation
} else {
setEnoughBalance(false);
}
console.log(enoughBalance);
}
checkBalance();
}, [
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/presentation/components/launchpad/abc/AugmentedBondingCurveSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export default function AugmentedBondingCurveSettings({ onStepCompletionChanged,
</FormLabel>
<Box>
<Flex>
<Select placeholder="Select option" borderRight="1px solid" borderColor="brand.900" borderRadius="0" borderTopLeftRadius="15px" borderBottomLeftRadius="15px" value={augmentedBondingCurveSettings.getCollateralToken()?.getTokenSymbol() || ''} onChange={handleCollateralTokenChange}>
<Select placeholder="Select option" borderRight="1px solid" borderColor="brand.900" borderRadius="0" borderTopLeftRadius="8px" borderBottomLeftRadius="8px" value={augmentedBondingCurveSettings.getCollateralToken()?.getTokenSymbol() || ''} onChange={handleCollateralTokenChange}>
{collateralTokenList.map((token) => (
<option key={token.tokenAddress} value={token.tokenSymbol}>
<HStack>
Expand All @@ -109,7 +109,7 @@ export default function AugmentedBondingCurveSettings({ onStepCompletionChanged,
</option>
))}
</Select>
<CustomInput placeholder="Enter value" borderRadius="15px" borderLeft="0" borderTopLeftRadius="0" borderBottomLeftRadius="0" borderColor="brand.900" value={augmentedBondingCurveSettings.getReserveInitialBalance() ?? 0} onChange={(e: React.ChangeEvent<HTMLInputElement>) => handleInitialReserveChange(Number(e.target.value))} type="number" />
<CustomInput placeholder="Enter value" borderRadius="8px" borderLeft="0" borderTopLeftRadius="0" borderBottomLeftRadius="0" borderColor="brand.900" value={augmentedBondingCurveSettings.getReserveInitialBalance() ?? 0} onChange={(e: React.ChangeEvent<HTMLInputElement>) => handleInitialReserveChange(Number(e.target.value))} type="number" />
</Flex>
</Box>
</FormControl>
Expand Down
Loading