Rework frontend.

HM2021-BC · Jul 2, 2021 · cb2e013 · cb2e013
1 parent b8fc007
commit cb2e013
Show file tree

Hide file tree

Showing 35 changed files with 13,063 additions and 17,282 deletions.
diff --git a/build/contracts/Artwork.json b/build/contracts/Artwork.json
diff --git a/build/contracts/Marketplace.json b/build/contracts/Marketplace.json
diff --git a/build/contracts/MarketplaceCreator.json b/build/contracts/MarketplaceCreator.json
diff --git a/build/contracts/Migrations.json b/build/contracts/Migrations.json
diff --git a/build/contracts/Ownable.json b/build/contracts/Ownable.json
diff --git a/components/ContributeForm.js b/components/ContributeForm.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Form, Input, Message, Button } from 'semantic-ui-react';
-import Campaign from '../ethereum/campaign';
+import Marketplace from '../ethereum/marketplace';
 import web3 from '../ethereum/web3';
 import { Router } from '../routes';
 
@@ -14,18 +14,18 @@ class ContributeForm extends Component {
   onSubmit = async event => {
     event.preventDefault();
 
-    const campaign = Campaign(this.props.address);
+    const marketplace = Marketplace(this.props.address);
 
     this.setState({ loading: true, errorMessage: '' });
 
     try {
       const accounts = await web3.eth.getAccounts();
-      await campaign.methods.contribute().send({
+      await marketplace.methods.contribute().send({
         from: accounts[0],
         value: web3.utils.toWei(this.state.value, 'ether')
       });
 
-      Router.replaceRoute(`/campaigns/${this.props.address}`);
+      Router.replaceRoute(`/marketplaces/${this.props.address}`);
     } catch (err) {
       this.setState({ errorMessage: err.message });
     }

diff --git a/components/Header.js b/components/Header.js
@@ -6,18 +6,8 @@ export default () => {
   return (
     <Menu style={{ marginTop: '10px' }}>
       <Link route="/">
-        <a className="item">This is fuckin awesome!</a>
+        <a className="item">Bazinga!</a>
       </Link>
-
-      <Menu.Menu position="right">
-        <Link route="/">
-          <a className="item">Artwork</a>
-        </Link>
-
-        <Link route="/campaigns/new">
-          <a className="item">+</a>
-        </Link>
-      </Menu.Menu>
     </Menu>
   );
 };
diff --git a/components/Layout.js b/components/Layout.js
@@ -3,7 +3,7 @@ import { Container } from 'semantic-ui-react';
 import Head from 'next/head';
 import Header from './Header';
 
-const props = () => {
+export default props => {
   return (
     <Container>
       <Head>
@@ -17,6 +17,4 @@ const props = () => {
       {props.children}
     </Container>
   );
-};
-
-export default props;
+};
diff --git a/components/RequestRow.js b/components/RequestRow.js
@@ -1,24 +1,23 @@
-
 import React, { Component } from 'react';
 import { Table, Button } from 'semantic-ui-react';
 import web3 from '../ethereum/web3';
-import Campaign from '../ethereum/campaign';
+import Marketplace from '../ethereum/marketplace';
 
 class RequestRow extends Component {
   onApprove = async () => {
-    const campaign = Campaign(this.props.address);
+    const marketplace = Marketplace(this.props.address);
 
     const accounts = await web3.eth.getAccounts();
-    await campaign.methods.approveRequest(this.props.id).send({
+    await marketplace.methods.approveRequest(this.props.id).send({
       from: accounts[0]
     });
   };
 
   onFinalize = async () => {
-    const campaign = Campaign(this.props.address);
+    const marketplace = Marketplace(this.props.address);
 
     const accounts = await web3.eth.getAccounts();
-    await campaign.methods.finalizeRequest(this.props.id).send({
+    await marketplace.methods.finalizeRequest(this.props.id).send({
       from: accounts[0]
     });
   };

diff --git a/ethereum/build/contracts/Artwork.json b/ethereum/build/contracts/Artwork.json
diff --git a/ethereum/build/contracts/Marketplace.json b/ethereum/build/contracts/Marketplace.json
diff --git a/ethereum/build/contracts/MarketplaceCreator.json b/ethereum/build/contracts/MarketplaceCreator.json