rm extraneous components, mv ListingCard comp.

Ardandxb · Aug 8, 2018 · 5db23c1 · 5db23c1
1 parent 7f68308
commit 5db23c1
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 356 deletions.
diff --git a/src/containers/Listings/Pagination.js b/src/containers/Listings/Pagination.js
diff --git a/src/containers/Listings/VisibleListings.js b/src/containers/Listings/VisibleListings.js
diff --git a/src/containers/Listings/ListingCard.js → ...ainers/Listings/components/ListingCard.js b/src/containers/Listings/ListingCard.js → ...ainers/Listings/components/ListingCard.js
@@ -1,4 +1,5 @@
 import React from 'react'
+import styled from 'styled-components'
 import { withStyles } from '@material-ui/core/styles'
 import Typography from '@material-ui/core/Typography'
 import Card from '@material-ui/core/Card'
@@ -7,8 +8,7 @@ import Button from 'components/Button'
 import Img from 'components/Img'
 import Countdown from 'components/Countdown'
 
-import styled from 'styled-components'
-import { tsToMonthDate } from '../../utils/_datetime'
+import { tsToMonthDate } from 'utils/_datetime'
 
 const CardContent = styled.div`
   padding: 1em;
@@ -49,7 +49,7 @@ function ListingCard(props) {
     listingType,
     updateTrigger,
     revealTrigger,
-    openSidePanel,
+    openTxPanel,
     claimRewardTrigger,
   } = props
 
@@ -85,7 +85,7 @@ function ListingCard(props) {
                   <Countdown end={one.commitExpiry.date} />
                   <Button
                     methodName="commitVote"
-                    onClick={e => openSidePanel(one, 'commitVote')}
+                    onClick={e => openTxPanel(one, 'commitVote')}
                     color="primary"
                   >
                     {'Commit Vote'}
@@ -97,7 +97,7 @@ function ListingCard(props) {
                   <div>
                     <Countdown end={one.revealExpiry.date} />
                     <Button
-                      onClick={e => openSidePanel(one, 'revealVote')}
+                      onClick={e => openTxPanel(one, 'revealVote')}
                       color="primary"
                       methodName="revealVote"
                     >
@@ -112,7 +112,7 @@ function ListingCard(props) {
               <Countdown end={one.appExpiry.date} />
               <Button
                 wide
-                onClick={e => openSidePanel(one, 'challenge')}
+                onClick={e => openTxPanel(one, 'challenge')}
                 color="secondary"
                 methodName="challenge"
               >
@@ -123,7 +123,7 @@ function ListingCard(props) {
           {claimRewardTrigger && (
             <Button
               methodName="claimReward"
-              onClick={e => openSidePanel(one, 'claimReward')}
+              onClick={e => openTxPanel(one, 'claimReward')}
               color="primary"
             >
               {'Claim Reward'}
@@ -132,7 +132,7 @@ function ListingCard(props) {
           {updateTrigger && (
             <Button
               methodName="updateStatus"
-              onClick={e => openSidePanel(one, 'updateStatus')}
+              onClick={e => openTxPanel(one, 'updateStatus')}
               color="primary"
               wide
             >

diff --git a/src/containers/Listings/index.js b/src/containers/Listings/index.js
@@ -7,11 +7,11 @@ import styled from 'styled-components'
 import { withStyles } from '@material-ui/core/styles'
 
 import { colors } from 'global-styles'
-import { selectSidePanelListing, selectSidePanelMethod } from 'modules/listings/selectors'
+import { selectTxPanelListing, selectTxPanelMethod } from 'modules/transactions/selectors'
 import * as actions from 'modules/transactions/actions'
 
 import toJS from 'components/toJS'
-import ListingCard from './ListingCard'
+import ListingCard from './components/ListingCard'
 
 const ListingsContainer = styled.div`
   display: flex;
@@ -28,7 +28,7 @@ const styles = theme => ({
   },
   tableWrapper: {
     // overflowX: 'auto',
-    padding: '0',
+    // padding: '0',
   },
   appBar: {
     boxShadow: '0 0 0 0',
@@ -49,7 +49,7 @@ const styles = theme => ({
 
 class Listings extends Component {
   render() {
-    const { listingType, visibleListings, onOpenSidePanel } = this.props
+    const { listingType, visibleListings, onOpenTxPanel } = this.props
 
     return (
       <ListingsContainer>
@@ -58,7 +58,7 @@ class Listings extends Component {
             <ListingCard
               one={visibleListings[li]}
               listingType={listingType}
-              openSidePanel={onOpenSidePanel}
+              openTxPanel={onOpenTxPanel}
               updateTrigger={
                 listingType === 'faceoffs'
                   ? visibleListings[li].revealExpiry.expired
@@ -81,14 +81,14 @@ class Listings extends Component {
 }
 
 const mapStateToProps = createStructuredSelector({
-  sidePanelListing: selectSidePanelListing,
-  sidePanelMethod: selectSidePanelMethod,
+  txPanelListing: selectTxPanelListing,
+  txPanelMethod: selectTxPanelMethod,
 })
 
 const withConnect = connect(
   mapStateToProps,
   {
-    onOpenSidePanel: actions.openSidePanel,
+    onOpenTxPanel: actions.openTxPanel,
   }
 )