Browse Source

Simplified/ Overhauled

develop
Ezerous 7 years ago
parent
commit
30e3c1e03f
  1. 15
      public/manifest.json
  2. 50
      src/App.css
  3. 47
      src/App.js
  4. 1
      src/App.test.js
  5. 18
      src/drizzleOptions.js
  6. 46
      src/index.js
  7. 23
      src/layouts/dashboard/Dashboard.js
  8. 14
      src/layouts/home/Home.js
  9. 1
      src/layouts/home/HomeContainer.js
  10. 4
      src/reducer.js
  11. 117
      src/registerServiceWorker.js
  12. 0
      src/rootSaga.js
  13. 29
      src/store.js
  14. 20
      src/user/layouts/profile/Profile.js
  15. 20
      src/user/layouts/signup/SignUp.js
  16. 11
      src/user/ui/loginbutton/LoginButton.js
  17. 69
      src/user/ui/loginbutton/LoginButtonActions.js
  18. 20
      src/user/ui/loginbutton/LoginButtonContainer.js
  19. 42
      src/user/ui/profileform/ProfileForm.js
  20. 56
      src/user/ui/profileform/ProfileFormActions.js
  21. 23
      src/user/ui/profileform/ProfileFormContainer.js
  22. 44
      src/user/ui/signupform/SignUpForm.js
  23. 45
      src/user/ui/signupform/SignUpFormActions.js
  24. 19
      src/user/ui/signupform/SignUpFormContainer.js
  25. 22
      src/user/userReducer.js
  26. 18
      src/util/drizzle/drizzleOptions.js
  27. 34
      src/util/wrappers.js

15
public/manifest.json

@ -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"
}

50
src/App.css

@ -5,21 +5,26 @@ body,
font-family: 'Open Sans', sans-serif; font-family: 'Open Sans', sans-serif;
} }
.header {
text-align: center;
}
h1, h2, h3 { h1, h2, h3 {
font-family: 'Oswald', 'Arial Narrow', sans-serif; font-family: 'Oswald', 'Arial Narrow', sans-serif;
} }
code { code {
display: block; padding: .25rem;
margin: 20px 0 15px 0; margin: 0 .25rem;
padding: 10px;
background: #eee; background: #eee;
} }
.container { .container {
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: calc(100% - 60px);
max-width: 600px;
padding: 45px 20px; padding: 45px 20px;
margin: 0 auto;
} }
.pure-button-primary { .pure-button-primary {
@ -34,6 +39,15 @@ code {
border-color: #0c1a2b; border-color: #0c1a2b;
} }
ul {
list-style-type: none;
padding-left: 0;
}
ul li:not(:last-child) {
margin-bottom: 15px;
}
/* NAVBAR */ /* NAVBAR */
.navbar { .navbar {
@ -66,3 +80,31 @@ code {
height: 16px; height: 16px;
margin-right: 10px; 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;
}

47
src/App.js

@ -1,9 +1,4 @@
import React, { Component } from 'react' 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 // Styles
import './css/oswald.css' import './css/oswald.css'
@ -12,41 +7,13 @@ import './css/pure-min.css'
import './App.css' import './App.css'
class App extends Component { class App extends Component {
render() { render() {
const OnlyAuthLinks = VisibleOnlyAuth(() => return (
<span> <div className="App">
<li className="pure-menu-item"> {this.props.children}
<Link to="/dashboard" className="pure-menu-link">Dashboard</Link> </div>
</li> );
<li className="pure-menu-item"> }
<Link to="/profile" className="pure-menu-link">Profile</Link>
</li>
</span>
);
const OnlyGuestLinks = HiddenOnlyAuth(() =>
<span>
<li className="pure-menu-item">
<Link to="/signup" className="pure-menu-link">Sign Up</Link>
</li>
<LoginButtonContainer />
</span>
);
return (
<div className="App">
<nav className="navbar pure-menu pure-menu-horizontal">
<ul className="pure-menu-list navbar-right">
<OnlyGuestLinks />
<OnlyAuthLinks />
</ul>
<Link to="/" className="pure-menu-heading pure-menu-link">Apella</Link>
</nav>
{this.props.children}
</div>
);
}
} }
export default App export default App

1
src/App.test.js

@ -5,5 +5,4 @@ import App from './App';
it('renders without crashing', () => { it('renders without crashing', () => {
const div = document.createElement('div'); const div = document.createElement('div');
ReactDOM.render(<App />, div); ReactDOM.render(<App />, div);
ReactDOM.unmountComponentAtNode(div);
}); });

18
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

46
src/index.js

@ -1,46 +1,30 @@
import React from 'react'; import React from 'react';
import { render } from 'react-dom' import { render } from 'react-dom';
import { Router, Route, IndexRoute, browserHistory } from 'react-router' import { Router, Route, IndexRoute, browserHistory } from 'react-router'
import { DrizzleProvider } from 'drizzle-react'
import { syncHistoryWithStore } from 'react-router-redux' import { syncHistoryWithStore } from 'react-router-redux'
import { UserIsAuthenticated, UserIsNotAuthenticated } from './util/wrappers.js' import { DrizzleProvider } from 'drizzle-react'
// Layouts // Layouts
import App from './App' import App from './App'
import HomeContainer from './layouts/home/HomeContainer' import HomeContainer from './layouts/home/HomeContainer'
import Dashboard from './layouts/dashboard/Dashboard' import { LoadingContainer } from 'drizzle-react-components'
import SignUp from './user/layouts/signup/SignUp'
import Profile from './user/layouts/profile/Profile'
import {LoadingContainer} from 'drizzle-react-components'
import './index.css'; //???
// Redux Store
import store from './store' import store from './store'
import drizzleOptions from './util/drizzle/drizzleOptions' import drizzleOptions from './drizzleOptions'
// ServiceWorker
import registerServiceWorker from './registerServiceWorker';
// Initialize react-router-redux. // Initialize react-router-redux.
const history = syncHistoryWithStore(browserHistory, store); const history = syncHistoryWithStore(browserHistory, store);
render(( render((
<DrizzleProvider options={drizzleOptions} store={store}> <DrizzleProvider options={drizzleOptions} store={store}>
<LoadingContainer> <LoadingContainer>
<Router history={history}> <Router history={history}>
<Route path="/" component={App}> <Route path="/" component={App}>
<IndexRoute component={HomeContainer} /> <IndexRoute component={HomeContainer} />
<Route path="dashboard" component={UserIsAuthenticated(Dashboard)} /> </Route>
<Route path="signup" component={UserIsNotAuthenticated(SignUp)} /> </Router>
<Route path="profile" component={UserIsAuthenticated(Profile)} /> </LoadingContainer>
</Route> </DrizzleProvider>
</Router> ),
</LoadingContainer> document.getElementById('root')
</DrizzleProvider>
),
document.getElementById('root')
); );
registerServiceWorker();

23
src/layouts/dashboard/Dashboard.js

@ -1,23 +0,0 @@
import React, { Component } from 'react'
class Dashboard extends Component {
constructor(props, { authData }) {
super(props);
authData = this.props
}
render() {
return(
<main className="container">
<div className="pure-g">
<div className="pure-u-1-1">
<h1>Dashboard</h1>
<p><strong>Congratulations {this.props.authData.name}!</strong> If you're seeing this page, you've logged in with your own smart contract successfully.</p>
</div>
</div>
</main>
)
}
}
export default Dashboard

14
src/layouts/home/Home.js

@ -1,13 +1,21 @@
import React, { Component } from 'react' import React, { Component } from 'react'
import { AccountData, ContractData, ContractForm } from 'drizzle-react-components'
class Home extends Component { class Home extends Component {
render() { render() {
return( return (
<main className="container"> <main className="container">
<div className="pure-g"> <div className="pure-g">
<div className="pure-u-1-1 header">
<h1>Apella</h1>
<br/><br/>
</div>
<div className="pure-u-1-1"> <div className="pure-u-1-1">
<h1>Welcome!</h1> <h2>Account</h2>
<p>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.</p> <AccountData accountIndex="0" units="ether" precision="3" />
<p><strong>Username</strong>: <ContractData contract="Forum" method="getUsername" methodArgs={[this.props.accounts[0]]}/></p>
<ContractForm contract="Forum" method="signUp" />
<br/><br/>
</div> </div>
</div> </div>
</main> </main>

1
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. // May still need this even with data function to refresh component on updates for this contract.
const mapStateToProps = state => { const mapStateToProps = state => {
return { return {
accounts: state.accounts,
Forum: state.contracts.Forum, Forum: state.contracts.Forum,
drizzleStatus: state.drizzleStatus drizzleStatus: state.drizzleStatus
} }

4
src/reducer.js

@ -1,12 +1,10 @@
import { combineReducers } from 'redux' import { combineReducers } from 'redux'
import { routerReducer } from 'react-router-redux' import { routerReducer } from 'react-router-redux'
import { drizzleReducers } from 'drizzle' import { drizzleReducers } from 'drizzle'
import userReducer from './user/userReducer'
const reducer = combineReducers({ const reducer = combineReducers({
routing: routerReducer, routing: routerReducer,
...drizzleReducers, ...drizzleReducers
user: userReducer,
}); });
export default reducer export default reducer

117
src/registerServiceWorker.js

@ -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();
});
}
}

0
src/util/drizzle/rootSaga.js → src/rootSaga.js

29
src/store.js

@ -1,34 +1,35 @@
import {browserHistory} from 'react-router' import { browserHistory } from 'react-router'
import {createStore, applyMiddleware, compose} from 'redux' import { createStore, applyMiddleware, compose } from 'redux'
import thunkMiddleware from 'redux-thunk' import thunkMiddleware from 'redux-thunk'
import {routerMiddleware} from 'react-router-redux' import { routerMiddleware } from 'react-router-redux'
import reducer from './reducer' import reducer from './reducer'
import rootSaga from './util/drizzle/rootSaga' import rootSaga from './rootSaga'
import createSagaMiddleware from 'redux-saga' import createSagaMiddleware from 'redux-saga'
import {generateContractsInitialState} from 'drizzle' import { generateContractsInitialState } from 'drizzle'
import drizzleOptions from './util/drizzle/drizzleOptions' 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 composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
const routingMiddleware = routerMiddleware(browserHistory); const routingMiddleware = routerMiddleware(browserHistory);
const sagaMiddleware = createSagaMiddleware(); const sagaMiddleware = createSagaMiddleware();
const initialState = { const initialState = {
contracts: generateContractsInitialState(drizzleOptions) contracts: generateContractsInitialState(drizzleOptions)
}; };
const store = createStore( const store = createStore(
reducer, reducer,
initialState, initialState,
composeEnhancers( composeEnhancers(
applyMiddleware( applyMiddleware(
thunkMiddleware, thunkMiddleware,
routingMiddleware, routingMiddleware,
sagaMiddleware sagaMiddleware
) )
) )
); );
sagaMiddleware.run(rootSaga); sagaMiddleware.run(rootSaga);
export default store export default store

20
src/user/layouts/profile/Profile.js

@ -1,20 +0,0 @@
import React, { Component } from 'react'
import ProfileFormContainer from '../../ui/profileform/ProfileFormContainer'
class Profile extends Component {
render() {
return(
<main className="container">
<div className="pure-g">
<div className="pure-u-1-1">
<h1>Profile</h1>
<p>Edit your account details here.</p>
<ProfileFormContainer />
</div>
</div>
</main>
)
}
}
export default Profile

20
src/user/layouts/signup/SignUp.js

@ -1,20 +0,0 @@
import React, { Component } from 'react'
import SignUpFormContainer from '../../ui/signupform/SignUpFormContainer'
class SignUp extends Component {
render() {
return(
<main className="container">
<div className="pure-g">
<div className="pure-u-1-1">
<h1>Sign Up</h1>
<p>We've got your wallet information, simply input your name and your account is made!</p>
<SignUpFormContainer />
</div>
</div>
</main>
)
}
}
export default SignUp

11
src/user/ui/loginbutton/LoginButton.js

@ -1,11 +0,0 @@
import React from 'react'
const LoginButton = ({ onLoginUserClick }) => {
return(
<li className="pure-menu-item">
<a href="" className="pure-menu-link" onClick={(event) => onLoginUserClick(event)}>Login</a>
</li>
)
};
export default LoginButton

69
src/user/ui/loginbutton/LoginButtonActions.js

@ -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.');
}
}

20
src/user/ui/loginbutton/LoginButtonContainer.js

@ -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

42
src/user/ui/profileform/ProfileForm.js

@ -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(
<form className="pure-form pure-form-stacked" onSubmit={this.handleSubmit.bind(this)}>
<fieldset>
<label htmlFor="name">Name</label>
<input id="name" type="text" value={this.state.name} onChange={this.onInputChange.bind(this)} placeholder="Name" />
<span className="pure-form-message">This is a required field.</span>
<br />
<button type="submit" className="pure-button pure-button-primary">Update</button>
</fieldset>
</form>
)
}
}
export default ProfileForm

56
src/user/ui/profileform/ProfileFormActions.js

@ -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.');
}
}

23
src/user/ui/profileform/ProfileFormContainer.js

@ -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

44
src/user/ui/signupform/SignUpForm.js

@ -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(
<form className="pure-form pure-form-stacked" onSubmit={this.handleSubmit.bind(this)}>
<fieldset>
<label htmlFor="name">Name</label>
<input id="name" type="text" value={this.state.name} onChange={this.onInputChange.bind(this)} placeholder="Name" />
<span className="pure-form-message">This is a required field.</span>
<br />
<button type="submit" className="pure-button pure-button-primary">Sign Up</button>
</fieldset>
</form>
)
}
}
export default SignUpForm

45
src/user/ui/signupform/SignUpFormActions.js

@ -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.');
}
}

19
src/user/ui/signupform/SignUpFormContainer.js

@ -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

22
src/user/userReducer.js

@ -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

18
src/util/drizzle/drizzleOptions.js

@ -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

34
src/util/wrappers.js

@ -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
});
Loading…
Cancel
Save