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.

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

Refactor/separate launchpad swap #14

Merged
merged 5 commits into from
Oct 8, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/web/index.html → apps/launchpad/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title>
<title>Launchpad</title>
</head>
<body>
<div id="root"></div>
Expand Down
37 changes: 37 additions & 0 deletions apps/launchpad/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"name": "launchpad-web",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
},
"dependencies": {
"@chakra-ui/icons": "^2.1.1",
"@chakra-ui/react": "^2.8.1",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@fontsource/roboto": "^5.0.8",
"@rainbow-me/rainbowkit": "^1.0.11",
"@wagmi/core": "1.4.2",
"framer-motion": "^10.16.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.16.0",
"viem": "^1.10.13",
"wagmi": "^1.4.1"
},
"devDependencies": {
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react-swc": "^3.3.2",
"eslint": "^8.45.0",
"eslint-config-custom": "*",
"typescript": "^5.0.2",
"vite": "^4.4.5"
},
"license": "AGPL-3.0-or-later"
}
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
5 changes: 2 additions & 3 deletions apps/web/src/App.tsx → apps/launchpad/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Link, useLocation } from "react-router-dom";
import Footer from './presentation/components/shared/Footer';
import Footer from '../../shared/presentation/components/Footer';
import { Box } from "@chakra-ui/react";
import { Outlet } from "react-router-dom";
import Header from "./presentation/components/shared/Header";
import Header from "../../shared/presentation/components/Header";

export default function App() {

Expand All @@ -15,7 +15,6 @@ export default function App() {
<Header />
{isInitialRoute && (
<>
<Link to="/swap">Swap</Link>
<Link to="/launchpad">Launchpad</Link>
</>
)}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Abi } from "viem";
import { useContractWrite, usePrepareContractWrite, useWaitForTransaction } from "wagmi";
import { knownContracts } from '../../config.json';
import newDaoWithABCAbi from '../../utils/abi/augmented-bonding-curve.json';
import { knownContracts } from '../../../shared/config.json';
import newDaoWithABCAbi from '../../../shared/utils/abi/augmented-bonding-curve.json';
import { DAOInfoStatus } from "../domain/enum/DAOInfoStatus";
import { ABCConfig } from "../domain/model/ABCConfig";
import { DAOCreationResult, DAOCreationResultStatus } from "../domain/model/DAOCreationResult";
Expand Down
8 changes: 3 additions & 5 deletions apps/web/src/main.tsx → apps/launchpad/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
import './polyfills.ts'
import '../../shared/polyfills.ts'
import "@rainbow-me/rainbowkit/styles.css";
import { RainbowKitProvider } from "@rainbow-me/rainbowkit";
import React from 'react'
import ReactDOM from 'react-dom/client'
import { ChakraProvider } from '@chakra-ui/react'
import { WagmiConfig } from "wagmi";
import { chains, wagmiConfig } from "../wagmi";
import theme from './presentation/theme/index.ts';
import theme from '../../shared/presentation/theme/index.ts';
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/new-dao.tsx';
import { TransactionProvider } from './presentation/providers/TransactionProvider.tsx';
import { TransactionProvider } from '../../shared/presentation/providers/TransactionProvider.tsx';
import { DAOCreationWagmiLSRepository } from './data/DAOCreationWagmiLSRepository.ts';

const daoCreationRepository = new DAOCreationWagmiLSRepository();

const router = createHashRouter(
createRoutesFromElements(
<Route path="/" element={<App />}>
<Route path="swap" element={<Swap />} />
<Route path="launchpad" element={<Launchpad />} />
<Route path="launchpad/new-dao" element={<NewDao daoCreationRepository={daoCreationRepository} />} />
</Route>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useEffect, useState } from "react";
import { DAOCreationRepository } from "../../../../domain/repository/DAOCreationRepository";
import { setABCConfig } from "../../../../domain/use-case/DAOCreationUseCases";
import { ABCConfig } from "../../../../domain/model/ABCConfig";
import { TokenInfo } from "../../../../domain/model/TokenInfo";
import { DAOCreationRepository } from "../../../domain/repository/DAOCreationRepository";
import { setABCConfig } from "../../../domain/use-case/DAOCreationUseCases";
import { ABCConfig } from "../../../domain/model/ABCConfig";
import { TokenInfo } from "../../../domain/model/TokenInfo";
import { fetchBalance, getAccount } from "@wagmi/core";
import { parseEther } from "viem";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Divider, Box, Button, Flex, FormControl, FormLabel, HStack, Image, InputGroup, Select, Text, VStack, Tooltip } from "@chakra-ui/react";
import { useEffect } from "react";
import { DAOCreationRepository } from "../../../../domain/repository/DAOCreationRepository";
import CustomInput from "../../shared/CustomInput";
import CustomInputRightAddon from "../../shared/CustomInputRightAddon";
import { DAOCreationRepository } from "../../../domain/repository/DAOCreationRepository";
import CustomInput from "../../../../../shared/presentation/components/CustomInput";
import CustomInputRightAddon from "../../../../../shared/presentation/components/CustomInputRightAddon";
import { useABCSettingsModelController } from "./ABCSettingsModelController";

interface AugmentedBondingCurveSettingsProps {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect, useState } from "react";
import { DAOCreationRepository } from "../../../../domain/repository/DAOCreationRepository";
import { setDAOName } from "../../../../domain/use-case/DAOCreationUseCases";
import { DAOCreationRepository } from "../../../domain/repository/DAOCreationRepository";
import { setDAOName } from "../../../domain/use-case/DAOCreationUseCases";

export function useDAONameModelController(daoCreationRepository: DAOCreationRepository) {
const [organizationName, setOrganizationName] = useState<string>('');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Box, InputGroup, Text, VStack, Image } from "@chakra-ui/react";
import { useEffect } from "react";
import { DAOCreationRepository } from "../../../../domain/repository/DAOCreationRepository";
import CustomInput from "../../shared/CustomInput";
import CustomInputRightAddon from "../../shared/CustomInputRightAddon";
import { DAOCreationRepository } from "../../../domain/repository/DAOCreationRepository";
import CustomInput from "../../../../../shared/presentation/components/CustomInput";
import CustomInputRightAddon from "../../../../../shared/presentation/components/CustomInputRightAddon";
import { useDAONameModelController } from "./DAONameModelController";
import "../../../../styles.css";
import "../../../styles.css";

interface OrganizationNameProps {
onStepCompletionChanged: (completed: boolean) => void;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { useEffect, useState } from "react";
import { useTransaction } from 'wagmi';
import { VotingConfig } from "../../../../domain/model/VotingConfig";
import { DAOCreationRepository } from "../../../../domain/repository/DAOCreationRepository";
import { VotingConfig } from "../../../domain/model/VotingConfig";
import { DAOCreationRepository } from "../../../domain/repository/DAOCreationRepository";

import { ABCConfig } from "../../../../domain/model/ABCConfig";
import { DAOCreationResult, DAOCreationResultStatus } from "../../../../domain/model/DAOCreationResult";
import { TokenHolder } from "../../../../domain/model/TokenHolder";
import { TokenInfo } from "../../../../domain/model/TokenInfo";
import { launchDAO } from "../../../../domain/use-case/DAOCreationUseCases";
import { ABCConfig } from "../../../domain/model/ABCConfig";
import { DAOCreationResult, DAOCreationResultStatus } from "../../../domain/model/DAOCreationResult";
import { TokenHolder } from "../../../domain/model/TokenHolder";
import { TokenInfo } from "../../../domain/model/TokenInfo";
import { launchDAO } from "../../../domain/use-case/DAOCreationUseCases";

export function useDAOCreationSummaryModelController(daoCreationRepository: DAOCreationRepository) {
const [isSending, setIsSending] = useState(false);
Expand Down
157 changes: 157 additions & 0 deletions apps/launchpad/src/presentation/components/summary/Summary.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
import { Accordion, AccordionButton, AccordionIcon, AccordionItem, AccordionPanel, Box, Button, Checkbox, Spinner, Table, Tbody, Td, Text, Th, Thead, Tr, VStack } from "@chakra-ui/react";
import { useEffect, useState } from 'react';

import { DAOCreationRepository } from "../../../domain/repository/DAOCreationRepository";
import { useDAOCreationSummaryModelController } from "./DAOCreationSummaryModelController";

interface SummaryViewProps {
onStepCompletionChanged: (completed: boolean) => void;
daoCreationRepository: DAOCreationRepository;
};

export default function Summary({ onStepCompletionChanged, daoCreationRepository }: SummaryViewProps) {
// use cases
const {
isSending,
isLoading,
txData,
daoName,
votingSettings,
tokenInfo,
tokenHolders,
abcConfig,
} = useDAOCreationSummaryModelController(daoCreationRepository);

// Handle user confirmation of summary
const [_validated, setValidated] = useState(false)

useEffect(() => {
const isCompleted = _validated;
if (onStepCompletionChanged) {
onStepCompletionChanged(isCompleted);
}
}, [_validated]);

return (
<div>
{isSending || isLoading ? (
<Box borderWidth="1px" borderRadius="lg" padding="6" boxShadow="lg" width="50vw">
<VStack spacing={4}>
<Text fontSize="2xl" as="b" p="1rem" textAlign="center">Creating your DAO...</Text>
<Spinner size="xl" />
</VStack>
</Box>
) : txData && !!txData.hash ? (
<Box borderWidth="1px" borderRadius="lg" padding="6" boxShadow="lg" width="50vw">
<VStack spacing={4}>
<Text fontSize="2xl" as="b" p="1rem" textAlign="center">Your DAO has been successfully created!</Text>
<Button onClick={() => window.open("https://xdai.aragon.blossom.software/#/" + daoName, "_blank", "noreferrer")}>See DAO</Button>
</VStack>
</Box>
) : (
<Box pt="100px">
<VStack spacing={4}>
<Text fontFamily="VictorSerifTrial" fontSize="72px" color="brand.900">Launch your DAO</Text>
<Text fontSize="24px" color="brand.900" >Make sure your settings are correct</Text>
<Accordion width="80%">
<AccordionItem>
<AccordionButton borderBottom="1px solid" borderBottomColor="brand.900">
<Box flex='1' textAlign='left'>
<Text color="brand.900">Organization settings</Text>
</Box>
<AccordionIcon />
</AccordionButton>
<AccordionPanel pb={4}>
<Text>
<Text as="b">Organization domain: </Text>{daoName + '.aragonid.eth'}
</Text>
</AccordionPanel>
</AccordionItem>
<AccordionItem>
<AccordionButton borderBottom="1px solid" borderBottomColor="brand.900">
<Box flex='1' textAlign='left'>
<Text color="brand.900">Governance settings</Text>
</Box>
<AccordionIcon />
</AccordionButton>
<AccordionPanel pb={4}>
<Text>
Support: <Text as="b"> {votingSettings.getSupportRequiredValue() + '%'}</Text>
</Text>
<Text>
Minimum approval: <Text as="b"> {votingSettings.getMinimumAcceptanceQuorumValue() + '%'}</Text>
</Text>
<Text>
Vote duration: <Text as="b"> {votingSettings.getVoteDurationDays() + ' days ' + votingSettings.getVoteDurationHours() + ' hours ' + votingSettings.getVoteDurationMinutes() + ' minutes'}</Text>
</Text>
</AccordionPanel>
</AccordionItem>
<AccordionItem>
<AccordionButton borderBottom="1px solid" borderBottomColor="brand.900">
<Box flex='1' textAlign='left'>
<Text color="brand.900">Token settings</Text>
</Box>
<AccordionIcon />
</AccordionButton>
<AccordionPanel pb={4}>
<Text>
Token name: <Text as="b">{tokenInfo.tokenName}</Text>
</Text>
<Text>
Token symbol: <Text as="b">{tokenInfo.tokenSymbol}</Text>
</Text>
<Table variant="simple" mt="20px" backgroundColor="brand.200" borderRadius="15px">
<Thead>
<Tr>
<Th><Text color="brand.900" fontSize="12px" fontFamily="Roboto">HOLDER ACCOUNT</Text></Th>
<Th><Text color="brand.900" fontSize="12px" fontFamily="Roboto">BALANCE</Text></Th>
</Tr>
</Thead>
<Tbody>
{tokenHolders?.map((holder, index) => (
<Tr key={index}>
<Td>{holder.address || "-"}</Td>
<Td>{holder.balance !== null ? holder.balance : "-"}</Td>
</Tr>
))}
</Tbody>
</Table>
</AccordionPanel>
</AccordionItem>
<AccordionItem>
<AccordionButton borderBottom="1px solid" borderBottomColor="brand.900">
<Box flex='1' textAlign='left'>
<Text color="brand.900">Augmented bonding curve settings</Text>
</Box>
<AccordionIcon />
</AccordionButton>
<AccordionPanel pb={4}>
<Text>
Reserve ratio: <Text as="b">{abcConfig.getReserveRatio() + '%'}</Text>
</Text>
<Text>
Colateral token: <Text as="b">{abcConfig.collateralToken?.tokenSymbol}</Text>
</Text>
<Text>
Initial reserve token: <Text as="b">{abcConfig.getReserveInitialBalance() + ' ' + abcConfig.collateralToken?.tokenSymbol}</Text>
</Text>
<Text>
Entry tribute: <Text as="b">{abcConfig.entryTribute + '%'}</Text>
</Text>
<Text>
Exit tribute: <Text as="b">{abcConfig.entryTribute + '%'}</Text>
</Text>
</AccordionPanel>
</AccordionItem>
</Accordion>
<VStack spacing={-1}>
<Text fontSize="16px">Review all the settings.</Text>
<Text fontSize="16px">If there are any mistakes, fix them before proceeding.</Text>
</VStack>
<Checkbox onChange={(e) => setValidated(e.target.checked)} >Did you verify that all the information is correct?</Checkbox>
</VStack>
</Box>
)}
</div>
)
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Divider, Button, FormControl, FormLabel, HStack, InputGroup, Text, VStack, Image, Tooltip } from "@chakra-ui/react";
import React from 'react';
import { DAOCreationRepository } from "../../../../domain/repository/DAOCreationRepository";
import CustomInput from "../../shared/CustomInput";
import CustomInputRightAddon from "../../shared/CustomInputRightAddon";
import { DAOCreationRepository } from "../../../domain/repository/DAOCreationRepository";
import CustomInput from "../../../../../shared/presentation/components/CustomInput";
import CustomInputRightAddon from "../../../../../shared/presentation/components//CustomInputRightAddon";
import { useTokenSettingsModelController } from "./TokenSettingsModelController";
import "../../../../styles.css";
import "../../../styles.css";

interface TokenSettingProps {
onStepCompletionChanged: (completed: boolean) => void;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useEffect, useState } from "react";
import { DAOCreationRepository } from "../../../../domain/repository/DAOCreationRepository";
import { setTokenHolders, setTokenInfo } from "../../../../domain/use-case/DAOCreationUseCases";
import { TokenHolder } from "../../../../domain/model/TokenHolder";
import { TokenInfo } from "../../../../domain/model/TokenInfo";
import { DAOCreationRepository } from "../../../domain/repository/DAOCreationRepository";
import { setTokenHolders, setTokenInfo } from "../../../domain/use-case/DAOCreationUseCases";
import { TokenHolder } from "../../../domain/model/TokenHolder";
import { TokenInfo } from "../../../domain/model/TokenInfo";
import { tokenHolderIsValid } from "./TokenSettingsValidators";

export interface TokenSettings {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TokenHolder } from "../../../../domain/model/TokenHolder";
import { TokenHolder } from "../../../domain/model/TokenHolder";

export function tokenHolderIsValid(tokenHolder: TokenHolder) : boolean {
return tokenHolder.address !== "" && tokenHolder.balance !== "";
Expand Down
Loading