Skip to content
Open

Ht2 #13

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
5 changes: 5 additions & 0 deletions admin/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ class App extends Component {
auth
</NavLink>
</div>
<div>
<NavLink to="/admin/events" activeStyle={{ color: 'red' }}>
events
</NavLink>
</div>
<Route path="/auth" component={AuthPage} />
<ProtectedRoute path="/admin" component={AdminPage} />
</div>
Expand Down
28 changes: 28 additions & 0 deletions admin/src/components/events/events-list.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import React, { Component } from 'react'
import { connect } from 'react-redux'
import { eventsSelector } from '../../ducks/events'

class EventsList extends Component {
static propTypes = {}

render() {
const { events } = this.props
return (
<ol>
{Object.keys(events).map((key) => (
<li key={key}>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Я б для Event сразу отдельный компонент заводил

{events[key].title}
<br />
<b>Where:</b> {events[key].where}
<br />
<b>When:</b> {events[key].when}
</li>
))}
</ol>
)
}
}

export default connect((state) => ({
events: eventsSelector(state)
}))(EventsList)
6 changes: 3 additions & 3 deletions admin/src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import firebase from 'firebase/app'
import 'firebase/auth'
import 'firebase/database'

export const appName = 'advreact-10-05'
export const appName = 'advreact-js'

export const config = {
apiKey: 'AIzaSyCbMQM0eQUSQ0SuLVAu9ZNPUcm4rdbiB8U',
apiKey: 'AIzaSyBCNW1bUz_eZtgesn-XnyzowL6Iy-6YOsQ',
authDomain: `${appName}.firebaseapp.com`,
databaseURL: `https://${appName}.firebaseio.com`,
projectId: appName,
storageBucket: '',
messagingSenderId: '1094825197832'
messagingSenderId: '203115896556'
}

firebase.initializeApp(config)
10 changes: 0 additions & 10 deletions admin/src/ducks/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,6 @@ export function signIn(email, password) {
payload: { email, password }
}
}
/*
export function signIn(email, password) {
return (dispatch) => {
firebase
.auth()
.signInWithEmailAndPassword(email, password)
.then((user) => dispatch({ type: SIGN_IN_SUCCESS, payload: { user } }))
}
}
*/

/**
* Sagas
Expand Down
126 changes: 126 additions & 0 deletions admin/src/ducks/auth.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
import {
signUpSaga,
SIGN_UP_REQUEST,
SIGN_UP_SUCCESS,
SIGN_UP_ERROR,
signInSaga,
SIGN_IN_REQUEST,
SIGN_IN_REQUESTS_LIMIT,
SIGN_IN_SUCCESS,
SIGN_IN_ERROR
} from './auth'
import { call, put, take, apply } from 'redux-saga/effects'
import firebase from 'firebase/app'

describe('auth duck', () => {
it('should sign up', () => {
const user = {
email: 'test@test.com',
password: 'something_secret'
}

const saga = signUpSaga({
type: SIGN_UP_REQUEST,
payload: user
})

const auth = firebase.auth()

expect(saga.next().value).toEqual(
call(
[auth, auth.createUserWithEmailAndPassword],
user.email,
user.password
)
)

expect(saga.next(user).value).toEqual(
put({ type: SIGN_UP_SUCCESS, payload: { user } })
)
})

it('should handle failed sign up', () => {
const user = {
email: '',
password: ''
}

const saga = signUpSaga({
type: SIGN_UP_REQUEST,
payload: user
})

const auth = firebase.auth()

expect(saga.next().value).toEqual(
call(
[auth, auth.createUserWithEmailAndPassword],
user.email,
user.password
)
)

expect(saga.throw('error').value).toEqual(
put({ type: SIGN_UP_ERROR, error: 'error' })
)
})

it('should sign in', () => {
const user = {
email: 'test@test.com',
password: 'something_secret'
}

const saga = signInSaga()

expect(saga.next().value).toEqual(take(SIGN_IN_REQUEST))

const auth = firebase.auth()

expect(
saga.next({
type: SIGN_IN_REQUEST,
payload: user
}).value
).toEqual(
apply(auth, auth.signInWithEmailAndPassword, [user.email, user.password])
)

expect(saga.next(user).value).toEqual(
put({ type: SIGN_IN_SUCCESS, payload: { user } })
)
})

it('should handle failed sign in', () => {
const user = {
email: '',
password: ''
}

const saga = signInSaga()

for (let i = 0; i < 3; i++) {
expect(saga.next().value).toEqual(take(SIGN_IN_REQUEST))

const auth = firebase.auth()

expect(
saga.next({
type: SIGN_IN_REQUEST,
payload: user
}).value
).toEqual(
apply(auth, auth.signInWithEmailAndPassword, [
user.email,
user.password
])
)

expect(saga.throw('error').value).toEqual(
put({ type: SIGN_IN_ERROR, error: 'error' })
)
}

expect(saga.next().value).toEqual(put({ type: SIGN_IN_REQUESTS_LIMIT }))
})
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ок, но можно бы и reducer потестить

})
94 changes: 94 additions & 0 deletions admin/src/ducks/events.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import { appName } from '../config'
import { Record, Map } from 'immutable'
import { createSelector } from 'reselect'
import { takeEvery, all, put, call } from 'redux-saga/effects'
import firebase from 'firebase/app'

/**
* Constants
* */
export const moduleName = 'events'
const prefix = `${appName}/${moduleName}`
export const FETCH_EVENTS_REQUEST = `${prefix}/FETCH_EVENTS_REQUEST`
export const FETCH_EVENTS_SUCCESS = `${prefix}/FETCH_EVENTS_SUCCESS`
export const FETCH_EVENTS_FAIL = `${prefix}/FETCH_EVENTS_FAIL`

/**
* Reducer
* */
const ReducerState = Record({
loading: false,
loaded: false,
entities: new Map({})
})

const EventRecord = Record({
title: null,
url: null,
where: null,
when: null,
month: null,
submissionDeadline: null
})

export default function reducer(state = new ReducerState(), action) {
const { type, payload } = action

switch (type) {
case FETCH_EVENTS_REQUEST:
return state.set('loading', true)

case FETCH_EVENTS_SUCCESS:
return state
.set('loading', false)
.set('loaded', true)
.update('entities', (entities) =>
Object.entries(payload).reduce(
(map, [key, value]) => map.set(key, new EventRecord(value)),
new Map({})
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

возможно лучше OrederedMap

)
)

case FETCH_EVENTS_FAIL:
return state.set('loading', false).set('loaded', false)

default:
return state
}
}
/**
* Selectors
* */

export const stateSelector = (state) => state[moduleName]
export const eventsSelector = createSelector(stateSelector, (state) =>
state.entities.toObject()
)

/**
* Action Creators
* */

export function fetchEvents() {
return { type: FETCH_EVENTS_REQUEST }
}

/**
* Sagas
* */

export function* fetchEventsSaga() {
const database = firebase.database().ref('/events')

try {
const data = yield call([database, database.once], 'value')

yield put({ type: FETCH_EVENTS_SUCCESS, payload: data.val() })
} catch (error) {
yield put({ type: FETCH_EVENTS_FAIL, payload: error })
}
}

export function* saga() {
yield all([takeEvery(FETCH_EVENTS_REQUEST, fetchEventsSaga)])
}
4 changes: 3 additions & 1 deletion admin/src/redux/reducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ import { routerReducer as router } from 'react-router-redux'
import { reducer as form } from 'redux-form'
import authReducer, { moduleName as authModule } from '../ducks/auth'
import peopleReducer, { moduleName as peopleModule } from '../ducks/people'
import eventsReducer, { moduleName as eventsModule } from '../ducks/events'

export default combineReducers({
router,
form,
[authModule]: authReducer,
[peopleModule]: peopleReducer
[peopleModule]: peopleReducer,
[eventsModule]: eventsReducer
})
3 changes: 2 additions & 1 deletion admin/src/redux/saga.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { all } from 'redux-saga/effects'
import { saga as authSaga } from '../ducks/auth'
import { saga as peopleSaga } from '../ducks/people'
import { saga as eventsSaga } from '../ducks/events'

export default function*() {
yield all([authSaga(), peopleSaga()])
yield all([authSaga(), peopleSaga(), eventsSaga()])
}
2 changes: 2 additions & 0 deletions admin/src/routes/admin.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { Component } from 'react'
import { Route } from 'react-router-dom'
import PersonPage from './person-page'
import EventsPage from './events-page'

class AdminPage extends Component {
static propTypes = {}
Expand All @@ -10,6 +11,7 @@ class AdminPage extends Component {
<div>
<h1>Admin Page</h1>
<Route path="/admin/people" component={PersonPage} />
<Route path="/admin/events" component={EventsPage} />
</div>
)
}
Expand Down
35 changes: 35 additions & 0 deletions admin/src/routes/events-page.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import React, { Component } from 'react'
import { connect } from 'react-redux'
import EventsList from '../components/events/events-list'
import { fetchEvents, stateSelector } from '../ducks/events'

class EventsPage extends Component {
static propTypes = {}

componentWillMount = () => {
if (this.props.loading || this.props.loaded) return

this.props.fetchEvents()
}

render() {
const { loading, loaded } = this.props

const body = loading && !loaded ? <b>Loading...</b> : <EventsList />

return (
<div>
<h2>Events</h2>
{body}
</div>
)
}
}

export default connect(
(state) => {
const { loading, loaded } = stateSelector(state)
return { loading, loaded }
},
{ fetchEvents }
)(EventsPage)