diff --git a/client/src/actions/index.js b/client/src/actions/index.js index a56a812..b9ec4a2 100644 --- a/client/src/actions/index.js +++ b/client/src/actions/index.js @@ -141,7 +141,7 @@ export const getEvents = events => ({ events, }); -export const getCurrentEvent = event => ({ +export const getEventDetail = event => ({ type: FETCH_EVENT_DETAIL, event, }); @@ -184,12 +184,12 @@ export const fetchUserProfile = userId => async (dispatch, getState) => { dispatch(triggerFailure(FETCH_USER, e.message)); } }; -export const fetchCurrentEvent = eventId => async (dispatch, getState) => { +export const fetchEventDetail = eventId => async (dispatch, getState) => { dispatch(triggerRequest(FETCH_EVENT_DETAIL)); try { - const event = await EventService.getCurrentEvent(eventId); + const event = await EventService.getEventDetail(eventId); const camelCaseKeys = humps.camelizeKeys(event); - dispatch(getCurrentEvent(normalize(camelCaseKeys, eventSchema))); + dispatch(getEventDetail(normalize(camelCaseKeys, eventSchema))); dispatch(endRequest(FETCH_EVENT_DETAIL)); } catch (e) { dispatch(triggerFailure(FETCH_EVENT_DETAIL, e)); @@ -258,7 +258,7 @@ export const addComment = (comment, eventID) => (dispatch, getState) => { return EventService.addComment(comment, eventID) .then(comment => { dispatch(postComment(comment)); - dispatch(fetchCurrentEvent(eventID)); + dispatch(fetchEventDetail(eventID)); dispatch(endRequest(POST_COMMENT)); }) .catch(err => { diff --git a/client/src/containers/App/routes/index.js b/client/src/containers/App/routes/index.js index 8430980..6a6cd47 100644 --- a/client/src/containers/App/routes/index.js +++ b/client/src/containers/App/routes/index.js @@ -8,7 +8,7 @@ import Events from '../../Events/Events'; import ForgotPassword from '../../ForgotPassword/ForgotPassword'; import Organisation from '../../Organisation/Organisation'; import EMNavbar from '../../../components/EMNavbar'; -import CurrentEvent from '../../CurrentEvent/CurrentEvent'; +import EventDetail from '../../EventDetail/EventDetail'; import UserProfile from '../../UserProfile/UserProfile'; // private routes @@ -22,7 +22,7 @@ const Routes = () => ( - + diff --git a/client/src/containers/CurrentEvent/CurrentEvent.css b/client/src/containers/EventDetail/EventDetail.css similarity index 100% rename from client/src/containers/CurrentEvent/CurrentEvent.css rename to client/src/containers/EventDetail/EventDetail.css diff --git a/client/src/containers/CurrentEvent/CurrentEvent.js b/client/src/containers/EventDetail/EventDetail.js similarity index 87% rename from client/src/containers/CurrentEvent/CurrentEvent.js rename to client/src/containers/EventDetail/EventDetail.js index ce8a226..6df2ef0 100644 --- a/client/src/containers/CurrentEvent/CurrentEvent.js +++ b/client/src/containers/EventDetail/EventDetail.js @@ -13,29 +13,29 @@ import { import MetaTagsComponent from '../../components/SocialShare/MetaTagsComponent'; import SummaryContainer from '../../components/SummaryContainer/SummaryContainer'; import { connect } from 'react-redux'; -import { fetchCurrentEvent } from '../../actions'; +import { fetchEventDetail } from '../../actions'; import ContentHeader from '../../components/ContentHeader/ContentHeader'; import moment from 'moment'; import DescriptionContainer from '../../components/DescriptionContainer/DescriptionContainer'; import { Link } from 'react-router-dom'; import { AttendeeType } from '../../types/attendee-types'; -import './CurrentEvent.css'; +import './EventDetail.css'; import GoogleMap from '../../components/GoogleMap/GoogleMap'; import CommentsBlock from '../../components/Comments/CommentsBlock'; const DATE_FORMAT = 'LLLL'; -class CurrentEvent extends Component { +class EventDetail extends Component { eventId; componentDidMount() { - this.getCurrentEvent(); + this.getEventDetail(); } - getCurrentEvent = () => { + getEventDetail = () => { const eventId = this.props.match.params.event_id; this.eventId = eventId; const { dispatch } = this.props; - dispatch(fetchCurrentEvent(eventId)); + dispatch(fetchEventDetail(eventId)); }; getAttendeesProfiles = (attendees: Array) => { @@ -68,7 +68,7 @@ class CurrentEvent extends Component { }; render() { - const { event } = this.props.currentEvent; + const { event } = this.props.eventDetail; return (
@@ -107,9 +107,19 @@ class CurrentEvent extends Component { logo={event.organisation.logo} /> - + + + {event.sponsers.map((sponser, index) => ( + + ))} + - {event.attendees && event.attendees.length ? (
@@ -173,11 +183,11 @@ class CurrentEvent extends Component { } const mapStateToProps = state => { - const { currentEvent } = state; - return { currentEvent }; + const { eventDetail } = state; + return { eventDetail }; }; export default connect( mapStateToProps, null -)(CurrentEvent); +)(EventDetail); diff --git a/client/src/reducers/index.js b/client/src/reducers/index.js index 3a4eb27..c9dd8bf 100644 --- a/client/src/reducers/index.js +++ b/client/src/reducers/index.js @@ -112,7 +112,7 @@ const events = (state = defaultEventState, action) => { return state; }; -const currentEvent = (state = defaultEventState, action) => { +const eventDetail = (state = defaultEventState, action) => { if (action.event) { return { event: { ...Object.values(action.event.entities.events)[0] }, @@ -220,7 +220,7 @@ const reducer = combineReducers({ userState, resetPasswordState, events, - currentEvent, + eventDetail, currentOrganisation, userProfile, organisations: organisationsState, diff --git a/client/src/services/events.js b/client/src/services/events.js index 1982ac3..087df5b 100644 --- a/client/src/services/events.js +++ b/client/src/services/events.js @@ -25,7 +25,7 @@ export default { }); }, - getCurrentEvent: eventId => { + getEventDetail: eventId => { return makeRequest(`${baseUri}${eventId}/`); },