From b8803e1af8f07188111e6c73a3dda91d41139a52 Mon Sep 17 00:00:00 2001 From: hans Date: Wed, 5 Jan 2022 11:42:28 -0800 Subject: [PATCH 1/6] updated env vars --- packages/react-app/src/constants.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/react-app/src/constants.js b/packages/react-app/src/constants.js index 4572bc0c..654f6331 100644 --- a/packages/react-app/src/constants.js +++ b/packages/react-app/src/constants.js @@ -1,11 +1,8 @@ -// MY INFURA_ID, SWAP IN YOURS FROM https://infura.io/dashboard/ethereum -export const INFURA_ID = "bd19f29ceeb04aeb83009866f836474b"; //"460f40a260564ac4a4f4b3fffb032dad"; +require("dotenv").config(); -// MY ETHERSCAN_ID, SWAP IN YOURS FROM https://etherscan.io/myapikey -export const ETHERSCAN_KEY = "PSW8C433Q667DVEX5BCRMGNAH9FSGFZ7Q8"; - -// BLOCKNATIVE ID FOR Notify.js: -export const BLOCKNATIVE_DAPPID = "0b58206a-f3c0-4701-a62f-73c7243e8c77"; +export const INFURA_ID = process.env.REACT_APP_INFURA_ID; +export const ETHERSCAN_KEY = process.env.REACT_APP_ETHERSCAN_KEY; +export const BLOCKNATIVE_DAPPID = process.env.REACT_APP_BLOCKNATIVE_DAPPID; export const NETWORKS = { localhost: { From c1ec6c9c4ca9c7d16f7f8d182a77611c9933c95a Mon Sep 17 00:00:00 2001 From: hans Date: Wed, 5 Jan 2022 11:44:08 -0800 Subject: [PATCH 2/6] updated sample env --- packages/react-app/.sample.env | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/react-app/.sample.env b/packages/react-app/.sample.env index 1f1f58ea..310ccd69 100644 --- a/packages/react-app/.sample.env +++ b/packages/react-app/.sample.env @@ -1,4 +1,7 @@ -REACT_APP_NETWORK_NAME= -REACT_APP_PROVIDER= -REACT_APP_API_URL= -REACT_APP_ETHERSCAN_KEY= +REACT_APP_NETWORK_NAME= +REACT_APP_PROVIDER= +REACT_APP_API_URL= +REACT_APP_ETHERSCAN_KEY= +REACT_APP_VERSION= +REACT_APP_INFURA_ID= +REACT_APP_BLOCKNATIVE_DAPPID= \ No newline at end of file From d90f9600b5a2ba4053499649204968afcc2110cb Mon Sep 17 00:00:00 2001 From: hans Date: Wed, 5 Jan 2022 13:53:44 -0800 Subject: [PATCH 3/6] updated: home party cards --- packages/react-app/src/routes/home/Home.jsx | 31 +++++++------------ .../src/routes/home/components/EmptyCard.jsx | 20 ++++++++++++ .../src/routes/home/components/PartyCard.jsx | 24 ++++++++++++++ .../src/routes/home/components/index.js | 2 ++ 4 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 packages/react-app/src/routes/home/components/EmptyCard.jsx create mode 100644 packages/react-app/src/routes/home/components/PartyCard.jsx create mode 100644 packages/react-app/src/routes/home/components/index.js diff --git a/packages/react-app/src/routes/home/Home.jsx b/packages/react-app/src/routes/home/Home.jsx index 98c6168b..2b429045 100644 --- a/packages/react-app/src/routes/home/Home.jsx +++ b/packages/react-app/src/routes/home/Home.jsx @@ -5,6 +5,7 @@ import { useColorModeValue } from "@chakra-ui/color-mode"; import React, { useEffect, useState, useMemo } from "react"; import { useHistory, Link } from "react-router-dom"; import MongoDbController from "../../controllers/mongodbController"; +import { PartyCard, EmptyCard } from "./components"; function Home({ address, mainnetProvider, tx, readContracts, writeContracts, targetNetwork }) { /***** Load Data from db *****/ @@ -27,25 +28,7 @@ function Home({ address, mainnetProvider, tx, readContracts, writeContracts, tar const headingColor = useColorModeValue("gray.800", "whiteAlpha.900"); const cards = useMemo(() => { - return ( - data && - data.map(d => ( - -

{`Id: ${d.id}`}

-

{d.name}

-

{d.desc}

- - - )) - ); + return data && data.map(d => ); }, [data]); const createElection = () => { @@ -63,7 +46,15 @@ function Home({ address, mainnetProvider, tx, readContracts, writeContracts, tar Create Party - {cards} + + { + cards && cards.length > 0 + ? + cards + : + + } + ); } diff --git a/packages/react-app/src/routes/home/components/EmptyCard.jsx b/packages/react-app/src/routes/home/components/EmptyCard.jsx new file mode 100644 index 00000000..f86d83a5 --- /dev/null +++ b/packages/react-app/src/routes/home/components/EmptyCard.jsx @@ -0,0 +1,20 @@ +import {Box, Button} from "@chakra-ui/react"; +import { useHistory, Link } from "react-router-dom"; + +export const EmptyCard = ({}) => { +const routeHistory = useHistory(); + return ( + +

No Parties.

+ + + ) +} \ No newline at end of file diff --git a/packages/react-app/src/routes/home/components/PartyCard.jsx b/packages/react-app/src/routes/home/components/PartyCard.jsx new file mode 100644 index 00000000..7efbd774 --- /dev/null +++ b/packages/react-app/src/routes/home/components/PartyCard.jsx @@ -0,0 +1,24 @@ +import { Box, Button, Text } from "@chakra-ui/react"; +import { useHistory, Link } from "react-router-dom"; + +export const PartyCard = ({ name, desc, id }) => { + const routeHistory = useHistory(); + return ( + + + {name} + + {`Id: ${id}`} + {desc} + + + ); +}; diff --git a/packages/react-app/src/routes/home/components/index.js b/packages/react-app/src/routes/home/components/index.js new file mode 100644 index 00000000..61883fc7 --- /dev/null +++ b/packages/react-app/src/routes/home/components/index.js @@ -0,0 +1,2 @@ +export { EmptyCard } from "./EmptyCard"; +export { PartyCard } from "./PartyCard"; From 525772ba2d0d5ff166ec85e1f2ed3f094d597976 Mon Sep 17 00:00:00 2001 From: hans Date: Wed, 5 Jan 2022 15:07:25 -0800 Subject: [PATCH 4/6] updated: ui refresh, mobile wrap support --- packages/react-app/src/App.jsx | 16 ++- .../react-app/src/routes/create/Create.jsx | 98 +++++++------- packages/react-app/src/routes/home/Home.jsx | 9 +- .../src/routes/home/components/PartyCard.jsx | 4 +- packages/react-app/src/routes/party/Party.jsx | 123 +++++++++--------- .../routes/party/components/Distribute.jsx | 40 +++--- .../src/routes/party/components/View.jsx | 5 +- .../src/routes/party/components/Vote.jsx | 4 +- 8 files changed, 159 insertions(+), 140 deletions(-) diff --git a/packages/react-app/src/App.jsx b/packages/react-app/src/App.jsx index ad72b965..89b112ea 100644 --- a/packages/react-app/src/App.jsx +++ b/packages/react-app/src/App.jsx @@ -37,6 +37,8 @@ import { MenuItemOption, MenuOptionGroup, Divider, + Wrap, + WrapItem } from "@chakra-ui/react"; import NotConnectedCard from "./components/Cards/NotConnectedCard"; import CenteredFrame from "./components/layout/CenteredFrame"; @@ -506,14 +508,15 @@ function App(props) { return (
- - - + + {/* */} +
- + + {networkSelect} - - + + {/* */} + {address && address !== "" ? ( diff --git a/packages/react-app/src/routes/create/Create.jsx b/packages/react-app/src/routes/create/Create.jsx index 3a9bccdb..2fe0b89f 100644 --- a/packages/react-app/src/routes/create/Create.jsx +++ b/packages/react-app/src/routes/create/Create.jsx @@ -135,54 +135,56 @@ const Create = ({ address, mainnetProvider, userSigner, tx, readContracts, write > Back - -
- Create -
-
- - Name - (partyObj.name = e.currentTarget.value)} /> - - Description -