diff --git a/.gitignore b/.gitignore index b15d4cf..33ba5c9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ log.txt build/ TODO backend/src/config.js +notes.txt diff --git a/src/eventButton.js b/src/eventButton.js index e7a6bca..21d882a 100644 --- a/src/eventButton.js +++ b/src/eventButton.js @@ -33,14 +33,10 @@ const EventButton = (obj) => { } return ( -
- - - -
+ + + {eventSpecificInfo} + ) } diff --git a/src/eventViewer.js b/src/eventViewer.js index 63e0e1e..42b94d5 100644 --- a/src/eventViewer.js +++ b/src/eventViewer.js @@ -1,9 +1,10 @@ import React from "react"; import EventButton from "./eventButton"; +import ScrollContainer from 'react-indiana-drag-scroll'; const EventViewer = (obj) => { return ( -
+
{obj.events.map((eventObj, idx) => { console.log(eventObj); // TODO: make something that groups shit as long as the eventObj.transactionUrl is the same diff --git a/src/livepeer.js b/src/livepeer.js index f57cd1c..d8a3963 100644 --- a/src/livepeer.js +++ b/src/livepeer.js @@ -120,85 +120,65 @@ class Livepeer extends React.Component { } return ( -
-
-
-
- +
+
+
+ +
+
+
+
+

Price Info

+
+
+ +

${lptPrice}

+

({lptPriceChange24h}%)

+
+
+ +

${ethPrice}

+

({ethPriceChange24h}%)

+
-
-
-
-
- -
-
-
-

Price Info

-
-
- -

${lptPrice}

-

({lptPriceChange24h}%)

-
-
- -

${ethPrice}

-

({ethPriceChange24h}%)

-
-
-
-

Smart contract prices L2

-
-

Reward Call:

-

${redeemRewardCostL2USD}

-
-
-

Claim Ticket:

-

${claimTicketCostL2USD}

-
-
-

Withdraw Fees:

-

${withdrawFeeCostL2USD}

-
-
-
-

Smart contract prices L1

-
-

Reward Call:

-

${redeemRewardCostL1USD}

-
-
-

Claim Ticket:

-

${claimTicketCostL1USD}

-
-
-

Withdraw Fees:

-

${withdrawFeeCostL1USD}

-
-
-
-
+
+

Smart contract prices L2

+
+

Reward Call:

+

${redeemRewardCostL2USD}

+
+
+

Claim Ticket:

+

${claimTicketCostL2USD}

+
+
+

Withdraw Fees:

+

${withdrawFeeCostL2USD}

+
+
+
+

Smart contract prices L1

+
+

Reward Call:

+

${redeemRewardCostL1USD}

+
+
+

Claim Ticket:

+

${claimTicketCostL1USD}

+
+
+

Withdraw Fees:

+

${withdrawFeeCostL1USD}

-
-
-
- -
-
- -
-
- -
-
-
+
+ +
); } } diff --git a/src/style.css b/src/style.css index c3a176a..ad4cff6 100644 --- a/src/style.css +++ b/src/style.css @@ -80,7 +80,7 @@ p { #dvdlogo { display: block; position: absolute; - z-index: 1; + z-index: -1; -webkit-animation: moveX 10s linear 0s infinite alternate, moveY 17s linear 0s infinite alternate, changeColour 30s, linear, 0s, infinite, normal, none, infinite; -moz-animation: moveX 10s linear 0s infinite alternate, moveY 17s linear 0s infinite alternate, changeColour 30s, linear, 0s, infinite, normal, none, infinite; -o-animation: moveX 10s linear 0s infinite alternate, moveY 17s linear 0s infinite alternate, changeColour 30s, linear, 0s, infinite, normal, none, infinite; @@ -145,6 +145,11 @@ svg { flex-direction: row; } +.rowContainer { + height: 100%; + display: block; +} + .serviceButton { width: 100%; margin: 0.4em;