diff --git a/public/manifest.json b/public/manifest.json deleted file mode 100644 index 0bcfdd4..0000000 --- a/public/manifest.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "short_name": "Apella", - "name": "Apella", - "icons": [ - { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - } - ], - "start_url": "./index.html", - "display": "standalone", - "theme_color": "#000000", - "background_color": "#ffffff" -} diff --git a/src/App.css b/src/App.css index d6e66c0..2346633 100644 --- a/src/App.css +++ b/src/App.css @@ -5,21 +5,26 @@ body, font-family: 'Open Sans', sans-serif; } +.header { + text-align: center; +} + h1, h2, h3 { font-family: 'Oswald', 'Arial Narrow', sans-serif; } code { - display: block; - margin: 20px 0 15px 0; - padding: 10px; + padding: .25rem; + margin: 0 .25rem; background: #eee; } .container { box-sizing: border-box; - width: 100%; + width: calc(100% - 60px); + max-width: 600px; padding: 45px 20px; + margin: 0 auto; } .pure-button-primary { @@ -34,6 +39,15 @@ code { border-color: #0c1a2b; } +ul { + list-style-type: none; + padding-left: 0; +} + +ul li:not(:last-child) { + margin-bottom: 15px; +} + /* NAVBAR */ .navbar { @@ -66,3 +80,31 @@ code { height: 16px; margin-right: 10px; } + +/* LOADING SCREEN */ + +.loading-screen { + opacity: 1; + visibility: visible; + transition: all .25s ease-in-out; +} + +.loading-screen.loaded { + opacity: 0; + visibility: hidden; +} + +/* FORMS */ + +.pure-form { + display: inline-block; +} + +/* ALERTS */ + +.alert { + padding: .5rem; + color: darkgreen; + background: darkseagreen; + border: 1px solid darkgreen; +} \ No newline at end of file diff --git a/src/App.js b/src/App.js index 41c5ef9..45d9e02 100644 --- a/src/App.js +++ b/src/App.js @@ -1,9 +1,4 @@ import React, { Component } from 'react' -import { Link } from 'react-router' -import { HiddenOnlyAuth, VisibleOnlyAuth } from './util/wrappers.js' - -// UI Components -import LoginButtonContainer from './user/ui/loginbutton/LoginButtonContainer' // Styles import './css/oswald.css' @@ -12,41 +7,13 @@ import './css/pure-min.css' import './App.css' class App extends Component { - render() { - const OnlyAuthLinks = VisibleOnlyAuth(() => - -
  • - Dashboard -
    • -
  • - Profile -
    • -     - ); - - const OnlyGuestLinks = HiddenOnlyAuth(() => - -
  • - Sign Up -
    • - -     - ); - - return ( -
    - - - {this.props.children} -
    - ); - } + render() { + return ( +
    + {this.props.children} +
    + ); + } } export default App diff --git a/src/App.test.js b/src/App.test.js index a754b20..b84af98 100644 --- a/src/App.test.js +++ b/src/App.test.js @@ -5,5 +5,4 @@ import App from './App'; it('renders without crashing', () => { const div = document.createElement('div'); ReactDOM.render(, div); - ReactDOM.unmountComponentAtNode(div); }); diff --git a/src/drizzleOptions.js b/src/drizzleOptions.js new file mode 100644 index 0000000..e6889d8 --- /dev/null +++ b/src/drizzleOptions.js @@ -0,0 +1,18 @@ +import Forum from './build/contracts/Forum.json' + +const drizzleOptions = { + web3: { + fallback: { + type: 'ws', + url: 'ws://127.0.0.1:8545' + } + }, + contracts: [ + Forum + ], + events: { + Forum: ['UserSignedUp'] + } +}; + +export default drizzleOptions \ No newline at end of file diff --git a/src/index.js b/src/index.js index c969cef..2ffbcc6 100644 --- a/src/index.js +++ b/src/index.js @@ -1,46 +1,30 @@ import React from 'react'; -import { render } from 'react-dom' +import { render } from 'react-dom'; import { Router, Route, IndexRoute, browserHistory } from 'react-router' -import { DrizzleProvider } from 'drizzle-react' import { syncHistoryWithStore } from 'react-router-redux' -import { UserIsAuthenticated, UserIsNotAuthenticated } from './util/wrappers.js' +import { DrizzleProvider } from 'drizzle-react' // Layouts import App from './App' import HomeContainer from './layouts/home/HomeContainer' -import Dashboard from './layouts/dashboard/Dashboard' -import SignUp from './user/layouts/signup/SignUp' -import Profile from './user/layouts/profile/Profile' -import {LoadingContainer} from 'drizzle-react-components' - -import './index.css'; //??? +import { LoadingContainer } from 'drizzle-react-components' -// Redux Store import store from './store' -import drizzleOptions from './util/drizzle/drizzleOptions' - -// ServiceWorker -import registerServiceWorker from './registerServiceWorker'; +import drizzleOptions from './drizzleOptions' // Initialize react-router-redux. const history = syncHistoryWithStore(browserHistory, store); render(( - - - - - - - - - - - - - ), - document.getElementById('root') + + + + + + + + + + ), + document.getElementById('root') ); - -registerServiceWorker(); - diff --git a/src/layouts/dashboard/Dashboard.js b/src/layouts/dashboard/Dashboard.js deleted file mode 100644 index b2ae92d..0000000 --- a/src/layouts/dashboard/Dashboard.js +++ /dev/null @@ -1,23 +0,0 @@ -import React, { Component } from 'react' - -class Dashboard extends Component { - constructor(props, { authData }) { - super(props); - authData = this.props - } - - render() { - return( -
    -
    -
    -

    Dashboard

    -

    Congratulations {this.props.authData.name}! If you're seeing this page, you've logged in with your own smart contract successfully.

    -
    -
    -
    - ) - } -} - -export default Dashboard diff --git a/src/layouts/home/Home.js b/src/layouts/home/Home.js index eb409e1..4ee67a7 100644 --- a/src/layouts/home/Home.js +++ b/src/layouts/home/Home.js @@ -1,13 +1,21 @@ import React, { Component } from 'react' +import { AccountData, ContractData, ContractForm } from 'drizzle-react-components' class Home extends Component { render() { - return( + return (
    +
    +

    Apella

    +

    +
    -

    Welcome!

    -

    Lorem ipsum dolor sit amet, tempor vitae vivamus senectus id risus, nulla in, urna sed vitae at ac. Parturient fringilla vestibulum, vitae metus tempus, augue sollicitudin, faucibus scelerisque suspendisse, consectetuer massa fermentum tellus interdum neque. Luctus euismod, nam sodales, non aliquam luctus lorem tellus, habitasse porttitor fusce sed mauris omnis massa, mauris felis pede sodales ligula semper. Amet ut id voluptatum. Nunc amet sem, fusce wisi interdum, et a. Fusce dolor augue in non aliquam, id vestibulum, lacinia diam ante sit felis et, viverra velit, nulla sociosqu autem.

    +

    Account

    + +

    Username:

    + +

    diff --git a/src/layouts/home/HomeContainer.js b/src/layouts/home/HomeContainer.js index ac699a5..1eb73eb 100644 --- a/src/layouts/home/HomeContainer.js +++ b/src/layouts/home/HomeContainer.js @@ -4,6 +4,7 @@ import { drizzleConnect } from 'drizzle-react' // May still need this even with data function to refresh component on updates for this contract. const mapStateToProps = state => { return { + accounts: state.accounts, Forum: state.contracts.Forum, drizzleStatus: state.drizzleStatus } diff --git a/src/reducer.js b/src/reducer.js index cdb38c4..9db9303 100644 --- a/src/reducer.js +++ b/src/reducer.js @@ -1,12 +1,10 @@ import { combineReducers } from 'redux' import { routerReducer } from 'react-router-redux' import { drizzleReducers } from 'drizzle' -import userReducer from './user/userReducer' const reducer = combineReducers({ routing: routerReducer, - ...drizzleReducers, - user: userReducer, + ...drizzleReducers }); export default reducer diff --git a/src/registerServiceWorker.js b/src/registerServiceWorker.js deleted file mode 100644 index a3e6c0c..0000000 --- a/src/registerServiceWorker.js +++ /dev/null @@ -1,117 +0,0 @@ -// In production, we register a service worker to serve assets from local cache. - -// This lets the app load faster on subsequent visits in production, and gives -// it offline capabilities. However, it also means that developers (and users) -// will only see deployed updates on the "N+1" visit to a page, since previously -// cached resources are updated in the background. - -// To learn more about the benefits of this model, read https://goo.gl/KwvDNy. -// This link also includes instructions on opting out of this behavior. - -const isLocalhost = Boolean( - window.location.hostname === 'localhost' || - // [::1] is the IPv6 localhost address. - window.location.hostname === '[::1]' || - // 127.0.0.1/8 is considered localhost for IPv4. - window.location.hostname.match( - /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ - ) -); - -export default function register() { - if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { - // The URL constructor is available in all browsers that support SW. - const publicUrl = new URL(process.env.PUBLIC_URL, window.location); - if (publicUrl.origin !== window.location.origin) { - // Our service worker won't work if PUBLIC_URL is on a different origin - // from what our page is served on. This might happen if a CDN is used to - // serve assets; see https://github.com/facebookincubator/create-react-app/issues/2374 - return; - } - - window.addEventListener('load', () => { - const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; - - if (isLocalhost) { - // This is running on localhost. Lets check if a service worker still exists or not. - checkValidServiceWorker(swUrl); - - // Add some additional logging to localhost, pointing developers to the - // service worker/PWA documentation. - navigator.serviceWorker.ready.then(() => { - console.log( - 'This web app is being served cache-first by a service ' + - 'worker. To learn more, visit https://goo.gl/SC7cgQ' - ); - }); - } else { - // Is not local host. Just register service worker - registerValidSW(swUrl); - } - }); - } -} - -function registerValidSW(swUrl) { - navigator.serviceWorker - .register(swUrl) - .then(registration => { - registration.onupdatefound = () => { - const installingWorker = registration.installing; - installingWorker.onstatechange = () => { - if (installingWorker.state === 'installed') { - if (navigator.serviceWorker.controller) { - // At this point, the old content will have been purged and - // the fresh content will have been added to the cache. - // It's the perfect time to display a "New content is - // available; please refresh." message in your web app. - console.log('New content is available; please refresh.'); - } else { - // At this point, everything has been precached. - // It's the perfect time to display a - // "Content is cached for offline use." message. - console.log('Content is cached for offline use.'); - } - } - }; - }; - }) - .catch(error => { - console.error('Error during service worker registration:', error); - }); -} - -function checkValidServiceWorker(swUrl) { - // Check if the service worker can be found. If it can't reload the page. - fetch(swUrl) - .then(response => { - // Ensure service worker exists, and that we really are getting a JS file. - if ( - response.status === 404 || - response.headers.get('content-type').indexOf('javascript') === -1 - ) { - // No service worker found. Probably a different app. Reload the page. - navigator.serviceWorker.ready.then(registration => { - registration.unregister().then(() => { - window.location.reload(); - }); - }); - } else { - // Service worker found. Proceed as normal. - registerValidSW(swUrl); - } - }) - .catch(() => { - console.log( - 'No internet connection found. App is running in offline mode.' - ); - }); -} - -export function unregister() { - if ('serviceWorker' in navigator) { - navigator.serviceWorker.ready.then(registration => { - registration.unregister(); - }); - } -} diff --git a/src/util/drizzle/rootSaga.js b/src/rootSaga.js similarity index 100% rename from src/util/drizzle/rootSaga.js rename to src/rootSaga.js diff --git a/src/store.js b/src/store.js index 5f73ee5..bb1080d 100644 --- a/src/store.js +++ b/src/store.js @@ -1,34 +1,35 @@ -import {browserHistory} from 'react-router' -import {createStore, applyMiddleware, compose} from 'redux' +import { browserHistory } from 'react-router' +import { createStore, applyMiddleware, compose } from 'redux' import thunkMiddleware from 'redux-thunk' -import {routerMiddleware} from 'react-router-redux' +import { routerMiddleware } from 'react-router-redux' import reducer from './reducer' -import rootSaga from './util/drizzle/rootSaga' +import rootSaga from './rootSaga' import createSagaMiddleware from 'redux-saga' -import {generateContractsInitialState} from 'drizzle' -import drizzleOptions from './util/drizzle/drizzleOptions' +import { generateContractsInitialState } from 'drizzle' +import drizzleOptions from './drizzleOptions' -// Redux DevTools (see also https://github.com/zalmoxisus/redux-devtools-extension#12-advanced-store-setup) +// Redux DevTools const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose; const routingMiddleware = routerMiddleware(browserHistory); const sagaMiddleware = createSagaMiddleware(); const initialState = { - contracts: generateContractsInitialState(drizzleOptions) + contracts: generateContractsInitialState(drizzleOptions) }; const store = createStore( - reducer, - initialState, - composeEnhancers( + reducer, + initialState, + composeEnhancers( applyMiddleware( - thunkMiddleware, - routingMiddleware, - sagaMiddleware + thunkMiddleware, + routingMiddleware, + sagaMiddleware ) ) ); sagaMiddleware.run(rootSaga); -export default store + +export default store \ No newline at end of file diff --git a/src/user/layouts/profile/Profile.js b/src/user/layouts/profile/Profile.js deleted file mode 100644 index 6dfb688..0000000 --- a/src/user/layouts/profile/Profile.js +++ /dev/null @@ -1,20 +0,0 @@ -import React, { Component } from 'react' -import ProfileFormContainer from '../../ui/profileform/ProfileFormContainer' - -class Profile extends Component { - render() { - return( -
    -
    -
    -

    Profile

    -

    Edit your account details here.

    - -
    -
    -
    - ) - } -} - -export default Profile diff --git a/src/user/layouts/signup/SignUp.js b/src/user/layouts/signup/SignUp.js deleted file mode 100644 index 069e379..0000000 --- a/src/user/layouts/signup/SignUp.js +++ /dev/null @@ -1,20 +0,0 @@ -import React, { Component } from 'react' -import SignUpFormContainer from '../../ui/signupform/SignUpFormContainer' - -class SignUp extends Component { - render() { - return( -
    -
    -
    -

    Sign Up

    -

    We've got your wallet information, simply input your name and your account is made!

    - -
    -
    -
    - ) - } -} - -export default SignUp diff --git a/src/user/ui/loginbutton/LoginButton.js b/src/user/ui/loginbutton/LoginButton.js deleted file mode 100644 index 6ba658b..0000000 --- a/src/user/ui/loginbutton/LoginButton.js +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react' - -const LoginButton = ({ onLoginUserClick }) => { - return( -
  • - onLoginUserClick(event)}>Login -
    • - ) -}; - -export default LoginButton diff --git a/src/user/ui/loginbutton/LoginButtonActions.js b/src/user/ui/loginbutton/LoginButtonActions.js deleted file mode 100644 index 994cedc..0000000 --- a/src/user/ui/loginbutton/LoginButtonActions.js +++ /dev/null @@ -1,69 +0,0 @@ -import ForumContract from '../../../build/contracts/Forum.json' -import { browserHistory } from 'react-router' -import store from '../../../store' - -const contract = require('truffle-contract'); - -export const USER_LOGGED_IN = 'USER_LOGGED_IN'; -function userLoggedIn(user) { - return { - type: USER_LOGGED_IN, - payload: user - } -} - -export function loginUser() { - let web3 = store.getState().web3.web3Instance; - - // Double-check web3's status. - if (typeof web3 !== 'undefined') { - - return function(dispatch) { - // Using truffle-contract we create the authentication object. - const authentication = contract(ForumContract); - authentication.setProvider(web3.currentProvider); - - // Declaring this for later so we can chain functions on Authentication. - let authenticationInstance; - - // Get current ethereum wallet. - web3.eth.getCoinbase((error, coinbase) => { - // Log errors, if any. - if (error) { - console.error(error); - } - - authentication.deployed().then(function(instance) { - authenticationInstance = instance; - - // Attempt to login user. - authenticationInstance.login({from: coinbase}) - .then(function(result) { - // If no error, login user. - console.log("Login successful: " + JSON.parse(result)); - dispatch(userLoggedIn({"name": JSON.parse(result)})); - - // Used a manual redirect here as opposed to a wrapper. - // This way, once logged in a user can still access the home page. - let currentLocation = browserHistory.getCurrentLocation(); - - if ('redirect' in currentLocation.query) - return browserHistory.push(decodeURIComponent(currentLocation.query.redirect)); - - - return browserHistory.push('/dashboard') - }) - .catch(function(result) { - // If error, go to signup page. - console.error('Wallet ' + coinbase + ' does not have an account!'); - console.error('Error: ' + result); - - return browserHistory.push('/signup') - }) - }) - }) - } - } else { - console.error('Web3 is not initialized.'); - } -} diff --git a/src/user/ui/loginbutton/LoginButtonContainer.js b/src/user/ui/loginbutton/LoginButtonContainer.js deleted file mode 100644 index 91a721a..0000000 --- a/src/user/ui/loginbutton/LoginButtonContainer.js +++ /dev/null @@ -1,20 +0,0 @@ -import { drizzleConnect } from 'drizzle-react' -import LoginButton from './LoginButton' -import { loginUser } from './LoginButtonActions' - -const mapStateToProps = (state, ownProps) => { - return {} -}; - -const mapDispatchToProps = (dispatch) => { - return { - onLoginUserClick: (event) => { - event.preventDefault(); - dispatch(loginUser()); - } - } -}; - -const LoginButtonContainer = drizzleConnect(LoginButton, mapStateToProps, mapDispatchToProps); - -export default LoginButtonContainer diff --git a/src/user/ui/profileform/ProfileForm.js b/src/user/ui/profileform/ProfileForm.js deleted file mode 100644 index 2ec114c..0000000 --- a/src/user/ui/profileform/ProfileForm.js +++ /dev/null @@ -1,42 +0,0 @@ -import React, { Component } from 'react' - -class ProfileForm extends Component { - constructor(props) { - super(props); - - this.state = { - name: this.props.name - } - } - - onInputChange(event) { - this.setState({ name: event.target.value }) - } - - handleSubmit(event) { - event.preventDefault(); - - if (this.state.name.length < 2) - return alert('Please fill in your name.'); - - this.props.onProfileFormSubmit(this.state.name, event) - } - - render() { - return( -
    -
    - - - This is a required field. - -
    - - -
    -
    - ) - } -} - -export default ProfileForm diff --git a/src/user/ui/profileform/ProfileFormActions.js b/src/user/ui/profileform/ProfileFormActions.js deleted file mode 100644 index a895303..0000000 --- a/src/user/ui/profileform/ProfileFormActions.js +++ /dev/null @@ -1,56 +0,0 @@ -import ForumContract from '../../../build/contracts/Forum.json' -import store from '../../../store' - -const contract = require('truffle-contract'); - -export const USER_UPDATED = 'USER_UPDATED'; -function userUpdated(user) { - return { - type: USER_UPDATED, - payload: user - } -} - -export function updateUser(name) { - let web3 = store.getState().web3.web3Instance; - - // Double-check web3's status. - if (typeof web3 !== 'undefined') { - - return function(dispatch) { - // Using truffle-contract we create the authentication object. - const authentication = contract(ForumContract); - authentication.setProvider(web3.currentProvider); - - // Declaring this for later so we can chain functions on Authentication. - let authenticationInstance; - - // Get current ethereum wallet. - web3.eth.getCoinbase((error, coinbase) => { - // Log errors, if any. - if (error) { - console.error(error); - } - - authentication.deployed().then(function(instance) { - authenticationInstance = instance; - - // Attempt to login user. - authenticationInstance.signUp(JSON.stringify(name), {from: coinbase}) - .then(function(result) { - console.log("SignUp/name update successful: " + name); - // If no error, update user. - dispatch(userUpdated({"name": name})); - - return alert('Name updated!') - }) - .catch(function(result) { - // If error... - }) - }) - }) - } - } else { - console.error('Web3 is not initialized.'); - } -} diff --git a/src/user/ui/profileform/ProfileFormContainer.js b/src/user/ui/profileform/ProfileFormContainer.js deleted file mode 100644 index 37dc860..0000000 --- a/src/user/ui/profileform/ProfileFormContainer.js +++ /dev/null @@ -1,23 +0,0 @@ -import { drizzleConnect } from 'drizzle-react' - -import ProfileForm from './ProfileForm' -import { updateUser } from './ProfileFormActions' - -const mapStateToProps = (state, ownProps) => { - return { - name: state.user.data.name - } -}; - -const mapDispatchToProps = (dispatch) => { - return { - onProfileFormSubmit: (name, event) => { - event.preventDefault(); - dispatch(updateUser(name)) - } - } -}; - -const ProfileFormContainer = drizzleConnect(ProfileForm, mapStateToProps, mapDispatchToProps); - -export default ProfileFormContainer diff --git a/src/user/ui/signupform/SignUpForm.js b/src/user/ui/signupform/SignUpForm.js deleted file mode 100644 index c5f6cc8..0000000 --- a/src/user/ui/signupform/SignUpForm.js +++ /dev/null @@ -1,44 +0,0 @@ -import React, { Component } from 'react' - -class SignUpForm extends Component { - constructor(props) { - super(props); - - this.state = { - name: '' - } - } - - onInputChange(event) { - this.setState({ name: event.target.value }) - } - - handleSubmit(event) { - event.preventDefault(); - - if (this.state.name.length < 2) - { - return alert('Please fill in your name.') - } - - this.props.onSignUpFormSubmit(this.state.name) - } - - render() { - return( -
    -
    - - - This is a required field. - -
    - - -
    -
    - ) - } -} - -export default SignUpForm diff --git a/src/user/ui/signupform/SignUpFormActions.js b/src/user/ui/signupform/SignUpFormActions.js deleted file mode 100644 index 3fcdb09..0000000 --- a/src/user/ui/signupform/SignUpFormActions.js +++ /dev/null @@ -1,45 +0,0 @@ -import ForumContract from '../../../build/contracts/Forum.json' -import { loginUser } from '../loginbutton/LoginButtonActions' -import store from '../../../store' - -const contract = require('truffle-contract'); - -export function signUpUser(name) { - let web3 = store.getState().web3.web3Instance; - - // Double-check web3's status. - if (typeof web3 !== 'undefined') { - - return function(dispatch) { - // Using truffle-contract we create the authentication object. - const authentication = contract(ForumContract); - authentication.setProvider(web3.currentProvider); - - // Declaring this for later so we can chain functions on Authentication. - let authenticationInstance; - - // Get current ethereum wallet. - web3.eth.getCoinbase((error, coinbase) => { - // Log errors, if any. - if (error) - console.error(error); - - authentication.deployed().then(function(instance) { - authenticationInstance = instance; - - // Attempt to sign up user. - authenticationInstance.signUp(JSON.stringify(name), {from: coinbase}) - .then(function(result) { - // If no error, login user. - return dispatch(loginUser()) - }) - .catch(function(result) { - console.log("SignUp error: " + result); - }) - }) - }) - } - } else { - console.error('Web3 is not initialized.'); - } -} diff --git a/src/user/ui/signupform/SignUpFormContainer.js b/src/user/ui/signupform/SignUpFormContainer.js deleted file mode 100644 index 0378cee..0000000 --- a/src/user/ui/signupform/SignUpFormContainer.js +++ /dev/null @@ -1,19 +0,0 @@ -import {drizzleConnect} from "drizzle-react"; -import SignUpForm from './SignUpForm' -import { signUpUser } from './SignUpFormActions' - -const mapStateToProps = (state, ownProps) => { - return {} -}; - -const mapDispatchToProps = (dispatch) => { - return { - onSignUpFormSubmit: (name) => { - dispatch(signUpUser(name)) - } - } -}; - -const SignUpFormContainer = drizzleConnect(SignUpForm, mapStateToProps, mapDispatchToProps); - -export default SignUpFormContainer diff --git a/src/user/userReducer.js b/src/user/userReducer.js deleted file mode 100644 index 0904126..0000000 --- a/src/user/userReducer.js +++ /dev/null @@ -1,22 +0,0 @@ -const initialState = { - data: null -}; - -const userReducer = (state = initialState, action) => { - if (action.type === 'USER_LOGGED_IN' || action.type === 'USER_UPDATED') - { - return Object.assign({}, state, { - data: action.payload - }) - } - - if (action.type === 'USER_LOGGED_OUT') - { - return Object.assign({}, state, { - data: null - }) - } - return state; -}; - -export default userReducer diff --git a/src/util/drizzle/drizzleOptions.js b/src/util/drizzle/drizzleOptions.js deleted file mode 100644 index 798ab7d..0000000 --- a/src/util/drizzle/drizzleOptions.js +++ /dev/null @@ -1,18 +0,0 @@ -import Forum from './../../build/contracts/Forum.json' - -const drizzleOptions = { - web3: { - fallback: { - type: 'ws', - url: 'ws://127.0.0.1:8545' - } - }, - contracts: [ - Forum - ], - events: { - Forum: ['UserSignedUp'] - } -}; - -export default drizzleOptions \ No newline at end of file diff --git a/src/util/wrappers.js b/src/util/wrappers.js deleted file mode 100644 index 04a1571..0000000 --- a/src/util/wrappers.js +++ /dev/null @@ -1,34 +0,0 @@ -import { UserAuthWrapper } from 'redux-auth-wrapper' -import { routerActions } from 'react-router-redux' - -// Layout Component Wrappers -export const UserIsAuthenticated = UserAuthWrapper({ - authSelector: state => state.user.data, - redirectAction: routerActions.replace, - failureRedirectPath: '/', // '/login' by default. - wrapperDisplayName: 'UserIsAuthenticated' -}); - -export const UserIsNotAuthenticated = UserAuthWrapper({ - authSelector: state => state.user, - redirectAction: routerActions.replace, - failureRedirectPath: (state, ownProps) => ownProps.location.query.redirect || '/dashboard', - wrapperDisplayName: 'UserIsNotAuthenticated', - predicate: user => user.data === null, - allowRedirectBack: false -}); - -// UI Component Wrappers -export const VisibleOnlyAuth = UserAuthWrapper({ - authSelector: state => state.user, - wrapperDisplayName: 'VisibleOnlyAuth', - predicate: user => user.data, - FailureComponent: null -}); - -export const HiddenOnlyAuth = UserAuthWrapper({ - authSelector: state => state.user, - wrapperDisplayName: 'HiddenOnlyAuth', - predicate: user => user.data === null, - FailureComponent: null -});