Merge a0387f4 into 09aaed5

protofire · Feb 12, 2019 · df45a84 · df45a84
2 parents 09aaed5 + a0387f4
commit df45a84
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/src/App.js b/src/App.js
@@ -11,7 +11,6 @@ import Web3Provider, {
 import Footer from './Components/Common/Footer/Footer.js'
 import PagesHeader from './Components/Common/Header/PagesHeader.js'
 import PropTypes from 'prop-types'
-import TermsAndConditionsComponent from './Components/TermsAndConditions/TermsAndConditions'
 import bgImage from './assets/img/bg/5.jpg'
 import pagesStyle from './assets/jss/dashboard/layouts/pagesStyle.js'
 import withStyles from '@material-ui/core/styles/withStyles'
@@ -72,11 +71,6 @@ export class App extends Component {
                 <HomeComponent {...this.state} {...this.props} {...routeProps} />
               )}
             />
-            <Route
-              exact
-              path="/terms"
-              render={routeProps => <TermsAndConditionsComponent {...routeProps} />}
-            />
             <Web3Provider>
               <Web3ContextConsumer>
                 {({ web3, userData, authenticated, error, displayMsg }) => {

diff --git a/src/Components/Common/Footer/Footer.js b/src/Components/Common/Footer/Footer.js
@@ -7,19 +7,13 @@ import GridContainer from '../../Common/UI/Grid/GridContainer.js'
 import GridItem from '../../Common/UI/Grid/GridItem.js'
 
 import footerStyle from '../../../assets/jss/dashboard/components/footerStyle'
-import { Link } from 'react-router-dom'
-
 function Footer({ ...props }) {
   const { classes, white } = props
   let anchor =
     classes.a +
     cx({
       [' ' + classes.whiteColor]: white
     })
-  let block = cx({
-    [classes.block]: true,
-    [classes.whiteColor]: white
-  })
 
   return (
     <footer className={`${classes.footer} ${classes.container}`}>
@@ -31,11 +25,7 @@ function Footer({ ...props }) {
           md={6}
           sm={6}
           xs={12}
-        >
-          <Link to="/" className={`${block} ${classes.a}`}>
-            Terms and conditions
-          </Link>
-        </GridItem>
+        />
         <GridItem
           alignItems="center"
           className={`${classes.responsiveFooterElements} ${classes.responsiveFooterElementsRight}`}

diff --git a/src/Tests/Common/Footer/__snapshots__/Footer.test.js.snap b/src/Tests/Common/Footer/__snapshots__/Footer.test.js.snap
@@ -9,15 +9,7 @@ exports[`Footer test  Should render footer and check snapshot 1`] = `
   >
     <div
       className="MuiGrid-container-15 MuiGrid-item-16 MuiGrid-align-items-xs-center-23 MuiGrid-grid-xs-12-55 MuiGrid-grid-sm-6-63 MuiGrid-grid-md-6-77 GridItem-grid-112 Footer-responsiveFooterElements-11 Footer-responsiveFooterElementsLeft-12"
-    >
-      <a
-        className="Footer-block-1 Footer-a-7"
-        href="/"
-        onClick={[Function]}
-      >
-        Terms and conditions
-      </a>
-    </div>
+    />
     <div
       className="MuiGrid-container-15 MuiGrid-item-16 MuiGrid-align-items-xs-center-23 MuiGrid-grid-xs-12-55 MuiGrid-grid-sm-6-63 MuiGrid-grid-md-6-77 GridItem-grid-112 Footer-responsiveFooterElements-11 Footer-responsiveFooterElementsRight-13"
     >