Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backend
Submodule backend added at 1fc6e9
4 changes: 4 additions & 0 deletions frontend/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"presets": [ "es2015", "react"],
"plugins": ["transform-object-rest-spread"]
}
21 changes: 21 additions & 0 deletions frontend/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"rules": {
"no-console": "off",
"indent": [ "error", 2 ],
"quotes": [ "error", "single" ],
"semi": ["error", "always"],
"linebreak-style": [ "error", "unix" ]
},
"env": {
"es6": true,
"node": true,
"mocha": true,
"jasmine": true
},
"ecmaFeatures": {
"modules": true,
"experimentalObjectRestSpread": true,
"impliedStrict": true
},
"extends": "eslint:recommended"
}
1 change: 1 addition & 0 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
12 changes: 12 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "frontend",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC"
}
30 changes: 30 additions & 0 deletions frontend/src/__test__/auth-reducer.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import authReducer from '../reducer/auth.js';

describe('Auth Reducer', () => {
let state = {auth: '1234567890987654321'}

test('initial state should be null', () => {
let result = authReducer(undefined, {type: null});
expect(result).toEqual(null)
})

test('no action provided should return default state', () => {
let result = authReducer(state, {type: null});
expect(result).toEqual(state);
})

test('TOKEN_SET should return a token', () => {
let action = {
type: 'TOKEN_SET',
payload: 'sample token'
}

let result = authReducer({}, action);
expect(result).toBe(action.payload);
})

test('TOKEN_DELETE should return null', () => {
let result = authReducer(state, {type: 'TOKEN_DELETE'});
expect(result).toBe(null);
})
})
36 changes: 36 additions & 0 deletions frontend/src/action/auth-actions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import superagent from 'superagent';

export const tokenSet = (token) => ({
type: 'TOKEN_SET',
payload: token
})

export const tokenDelete = () => ({
type: 'TOKEN_DELETE'
})

export const signupRequest = (user) => (dispatch) => {
return superagent.post(`${__API_URL__}/signup`)
.withCredentials()
.send(user)
.then( res => {
dispatch(tokenSet(res.text));

try {
localStorage.token = res.token;
} catch (err) {
console.log(err);
}
return res;
})
}

export const loginRequest = (user) => (dispatch) => {
return superagent.get(`${__API_URL__}/login`)
.withCredentials()
.auth(user.username, user.password)
.then( res => {
dispatch(tokenSet(res.text))
return res;
})
}
34 changes: 34 additions & 0 deletions frontend/src/component/app/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import React from 'react';
import {Provider} from 'react-redux';
import {BrowserRouter, Route, Link} from 'react-router-dom';
import appStoreCreate from '../../lib/app-create-store';
import Landing from '../landing';

let store = appStoreCreate();

class App extends React.Component {
render() {
return (
<div className='slug'>
<Provider store={store}>
<BrowserRouter>
<section>
<header>
<h1>SLuGrAM</h1>
<nav>
<ul>
<li><Link to='/welcome/signup'>signup</Link></li>
<li><Link to='/welcome/login'>login</Link></li>
</ul>
</nav>
</header>
<Route path='/welcome/:auth' component={Landing} />
</section>
</BrowserRouter>
</Provider>
</div>
)
}
}

export default App;
95 changes: 95 additions & 0 deletions frontend/src/component/auth-form/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
import React from 'react';
import * as util from '../../lib/util.js';

class AuthForm extends React.Component {
constructor(props) {
super(props);

this.state ={
username: '',
password: '',
email: '',
usernameError: null,
passwordError: null,
emailError: null,
error: null
}

this.handleChange = this.handleChange.bind(this);
this.handleSubmit = this.handleSubmit.bind(this);
}

handleChange(e) {
let {name, value} = e.target;

this.setState({
[name]: value,
usernameError: name === 'username' && !value ? 'username required' : null,
emailError: name === 'email' && !value ? 'email required' : null,
passwordError: name === 'password' && !value ? 'password required' : null
})
}

handleSubmit(e) {
e.preventDefault();
this.props.onComplete(this.state)
.then(() => {
this.setState({ username: '', email: '', password: ''})
})
.catch(error => {
console.error(error);
this.setState({error})
})
}

render() {
return (
<form
onSubmit={this.handleSubmit}
className='auth-form'>

{util.renderIf(this.props.auth === 'signup',
<input
type='text'
name='email'
placeholder='email'
value={this.state.email}
onChange={this.handleChange}
/>
)}

{util.renderIf(this.state.usernameError,
<span className='tooltip'>
{this.state.usernameError}
</span>
)}

<input
type='text'
name='username'
placeholder='username'
value={this.state.username}
onChange={this.handleChange}
/>

{util.renderIf(this.state.passwordError,
<span className='tooltip'>
{this.state.passwordError}
</span>
)}

<input
type='password'
name='password'
placeholder='enter password'
value={this.state.password}
onChange={this.handleChange}
/>

<button type='submit'>{this.props.auth}</button>
</form>
)
}
}

export default AuthForm;
33 changes: 33 additions & 0 deletions frontend/src/component/landing/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import React from 'react';
import {connect} from 'react-redux';
import AuthForm from '../auth-form';
import * as util from '../../lib/util.js';
import {signupRequest, loginRequest} from '../../action/auth-actions.js';

class Landing extends React.Component {
render() {
let {params} = this.props.match;

let handleComplete = params.auth === 'login'
? this.props.login
: this.props.signup

return (
<div>
<AuthForm
auth={params.auth}
onComplete={handleComplete}
/>
</div>
)
}
}

let mapDispatchToProps = (dispatch) => {
return {
signup: (user) => dispatch(signupRequest(user)),
login: (user) => dispatch(loginRequest(user))
}
}

export default connect(undefined, mapDispatchToProps)(Landing)
10 changes: 10 additions & 0 deletions frontend/src/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>slugram</title>
</head>
<body>
<div id="root"></div>
</body>
</html>
9 changes: 9 additions & 0 deletions frontend/src/lib/app-create-store.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import reducer from '../reducer';
import thunk from './redux-thunk.js';
import reporter from './redux-reporter.js';
import {createStore, applyMiddleware} from 'redux';

let appStoreCreate = () =>
createStore(reducer, applyMiddleware(thunk, reporter))

export default appStoreCreate;
15 changes: 15 additions & 0 deletions frontend/src/lib/redux-reporter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
let reporter = store => next => action => {
console.log('__ACTION__', action);

try {
let result = next(action);
console.log('__STATE__', store.getState());
return result;
} catch (error) {
error.action = action;
console.error('__ERROR__', error);
return error;
}
}

export default reporter;
4 changes: 4 additions & 0 deletions frontend/src/lib/redux-thunk.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export default store => next => action
typeof action === 'function'
? action(store.dispatch, store.getState)
: next(action)
19 changes: 19 additions & 0 deletions frontend/src/lib/util.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export const log = (...args) =>
__DEBUG__ ? console.log(...args) : undefined;

export const logError = (...args) =>
__DEBUG__ ? console.error(...args) : undefined;

export const renderIf = (test, component) => test ? component : undefined;

export const classToggler = (options) =>
Object.keys(options).filter(key => options[key]).join(' ');

export const map = (list, ...args) =>
Array.prototype.map.apply(list, args);

export const filter = (list, ...args) =>
Array.prototype.filter.apply(list, args);

export const reduce = (list, ...args) =>
Array.prototype.reduce.apply(list, args);
5 changes: 5 additions & 0 deletions frontend/src/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import React from 'react';
import ReactDom from 'react-dom';
import App from './component/app';

ReactDom.render(<App />, document.getElementById('root'));
12 changes: 12 additions & 0 deletions frontend/src/reducer/auth.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export default (state=null, action) => {
let {type, payload} = action;

switch (type) {
case 'TOKEN_SET':
return payload;
case 'TOKEN_DELETE':
return null
default:
return state;
}
}
6 changes: 6 additions & 0 deletions frontend/src/reducer/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import {combineReducers} from 'redux';
import auth from './auth.js';

export default combineReducers({
auth,
})
Loading