Browse Source

admin-results

Marina Yakovenko 5 years ago
parent
commit
f8b3a421a5

+ 6 - 1
src/actionTypes/actionTypes.js

@@ -62,5 +62,10 @@ export const POST_REQUEST_REVIEW = "POST_REQUEST_REVIEW";
 export const POST_REQUEST_SUCCESS_REVIEW = "POST_REQUEST_SUCCESS_REVIEW";
 export const POST_REQUEST_ERROR_REVIEW = "POST_REQUEST_ERROR_REVIEW";
 
+export const GET_EVENT_BY_TITLE = "GET_EVENT_BY_TITLE";
+export const GET_EVENT_BY_TITLE_SUCCESS = "GET_EVENT_BY_TITLE_SUCCESS";
+export const GET_EVENT_BY_TITLE_FAIL = "GET_EVENT_BY_TITLE_FAIL";
 
-// export const PHOTOGALARY_ONCHAGE = "PHOTOGALARY_ONCHAGE";
+export const GET_REGISTRED_USERS = "GET_REGISTRED_USERS";
+export const GET_REGISTRED_USERS_SUCCESS = "GET_REGISTRED_USERS_SUCCESS";
+export const GET_REGISTRED_USERS_FAIL = "GET_REGISTRED_USERS_FAIL";

+ 25 - 0
src/actions/adminMainPageActions.js

@@ -89,6 +89,31 @@ export const getEvents = (type = 'Select Event Type') => dispatch => {
 		.catch(err => dispatch(getEventsRequestFail(err)));
 };
 
+//GET BY TITLE 
+
+const getEventByTitleRequest = payload => ({
+	type: types.GET_EVENT_BY_TITLE,
+	payload
+});
+
+const getEventByTitleRequestSuccess = payload => ({
+	type: types.GET_EVENT_BY_TITLE_SUCCESS,
+	payload
+});
+
+const getEventByTitleRequestFail = payload => ({
+	type: types.GET_EVENT_BY_TITLE_FAIL,
+	payload
+});
+
+export const getEventByTitle = (title) => dispatch => {
+	dispatch(getEventByTitleRequest());
+	return axios
+		.get( title && `${eventURL}/?title=${title}`)
+		.then(res => dispatch(getEventByTitleRequestSuccess(res)))
+		.catch(err => dispatch(getEventByTitleRequestFail(err)));
+};
+
 // REMOVE
 const removeEventRequest = payload => ({
 	type: types.REMOVE_EVENT_REQUEST,

+ 29 - 0
src/actions/adminResultsActions.js

@@ -0,0 +1,29 @@
+import axios from "axios";
+import * as types from "../actionTypes/actionTypes"
+
+const eventUserURL = 'https://api-marathon.herokuapp.com/api/v1/eventUsers'
+
+//GET REGISTRED USERS
+const getRegistredUsersRequest = payload => ({
+	type: types.GET_REGISTRED_USERS,
+	payload
+});
+
+const getRegistredUsersRequestSuccess = payload => ({
+	type: types.GET_EVENTS_REQUEST_SUCCESS,
+	payload
+});
+
+const getRegistredUsersRequestFail = payload => ({
+	type: types.GET_EVENTS_REQUEST_FAIL,
+	payload
+});
+
+export const getRegistredUsers = (_id) => dispatch => {
+	dispatch(getRegistredUsersRequest());
+	return axios
+		.get( `${eventUserURL}/?event[0]=${_id} `)
+		.then(res => {dispatch(getRegistredUsersRequestSuccess(res))
+        })
+		.catch(err => dispatch(getRegistredUsersRequestFail(err)));
+};

+ 16 - 11
src/components/adminMenu/adminMenu.scss

@@ -27,7 +27,7 @@
     &:first-child {
       clip-path: polygon(0 0,100% 0,80% 100%,0% 100%);
        background-image: 
-    url(https://i2-prod.mirror.co.uk/incoming/article12948642.ece/ALTERNATES/s615/0_xxxxxxx.jpg);
+    url(https://cdn.pixabay.com/photo/2018/08/09/02/50/person-3593664_1280.jpg);
     }
 
      &:nth-child(2) {
@@ -35,7 +35,7 @@
       clip-path: polygon(12% 0,100% 0,100% 100%,0% 100%);
       margin-left: -7%;
       flex-grow: 2;
-      background-image: url(https://cdn.pixabay.com/photo/2014/01/24/13/32/marathon-250987_1280.jpg);
+      background-image: url(https://cdn.pixabay.com/photo/2018/08/12/11/02/swim-3600519_1280.jpg);
     } 
     
      &:nth-child(3){
@@ -53,18 +53,18 @@
     }
 
     &:nth-child(5) {
-      clip-path: polygon(0 0,100% 0,80% 100%,0% 100%);
+       width: 100%;
        background-image: 
-    url(https://cdn.pixabay.com/photo/2018/08/09/02/50/person-3593664_1280.jpg);
+    url(https://cdn.pixabay.com/photo/2014/01/24/13/32/marathon-250987_1280.jpg);
     }
 
-     &:nth-child(6) {
-      right: -100px;
-      clip-path: polygon(12% 0,100% 0,100% 100%,0% 100%);
-      margin-left: -7%;
-      flex-grow: 2;
-      background-image: url(https://cdn.pixabay.com/photo/2018/08/12/11/02/swim-3600519_1280.jpg);
-    } 
+    //  &:nth-child(6) {
+    //   right: -100px;
+    //   clip-path: polygon(12% 0,100% 0,100% 100%,0% 100%);
+    //   margin-left: -7%;
+    //   flex-grow: 2;
+    //   background-image: url(https://cdn.pixabay.com/photo/2018/08/12/11/02/swim-3600519_1280.jpg);
+    // } 
     
     .menu-text{
       color: $color-white;
@@ -128,6 +128,11 @@
         font-weight: 600;
         text-shadow: 2px 2px 2px #000;
       }
+      &:hover {
+        .menu-text{
+          font-size: 2.5rem;
+        }
+      }
     }
   }
 }

+ 13 - 20
src/components/adminPhotogalary/adminPhotogalary.scss

@@ -1,22 +1,19 @@
 @import "../../styles/variables";
 
-.photogalary-form {
+.photogalary-form{
 	width: 100%;
 	min-height: 100vh;
 	margin: auto;
 
-	background: -webkit-linear-gradient(top, #fff, $color-blue); /* Safari 5.1, iOS 5.0-6.1, Chrome 10-25, Android 4.0-4.3 */
-	background: -moz-linear-gradient(top, #fff, $color-blue); /* Firefox 3.6-15 */
-	background: -o-linear-gradient(top,  #fff, $color-blue); /* Opera 11.1-12 */
+	background: -webkit-linear-gradient(top, #fff, $color-blue);
+	background: -moz-linear-gradient(top, #fff, $color-blue); 
+	background: -o-linear-gradient(top,  #fff, $color-blue); 
 	background: linear-gradient(to bottom,  #fff, $color-blue);
 
 	&__content {
 		max-width: 1000px;
         height: 100%;
 		position: relative;
-		// top: 40%;
-		// left: 20%;
-		// transform: translate(-50%, -50%);
 		margin: auto;
 		padding: 2rem;
 		border-left: 1px solid $color-mint;
@@ -38,14 +35,10 @@
     }
     
     &__form-title{
-        // font-size: 2rem;
-        // margin-bottom: 1rem;
-		// color: #5acec2;
 		color: $color-blue;
 		font-size: 3rem;
 		letter-spacing: 0.2;
 		font-weight: 600;
-		// text-shadow: 3px 3px 3px #000;
 		margin-bottom: 3%;
     }
 
@@ -128,13 +121,12 @@
 
 	&__submit-btn {
 		width: 100%;
-		border: 1px solid #5acec2;
 		border-radius: 3px;
 		display: block;
-
-		color: #fff;
-		background-color: #5acec2;
 		border: none;
+
+		color: $color-white;
+		background-color: $color-mint;
 		cursor: pointer;
 		font-weight: 600;
 		font-size: 1.2rem;
@@ -145,6 +137,9 @@
 			outline: none;
 		}
 		&:hover {
+			background-color: $color-blue;
+			color: $color-white;
+
 			outline: none;
 			transform: translateY(-1px);
 			box-shadow: 0 1rem 2rem rgba(0, 0, 0, 0.2);
@@ -153,13 +148,11 @@
 				opacity: 0;
 			}
 		}
-
 		&:disabled {
-			color: #5acec2;
-			border: 1px solid #5acec2;
+			color: $color-mint;
+			border: 1px solid $color-mint;
 			background-color: #eee;
-        }
-        
+		}
 	}
 
 }

+ 3 - 3
src/components/adminPhotogalary/adminPhotogalaryReduxForm.js

@@ -19,9 +19,9 @@ class PhotogalaryReduxForm extends Component {
             return prev.concat(elem.value);
         }, []);
 
-        const eventId = this.props.eventList.find(
-            event => event.title === this.state.addPhotogalaryInitialValue.eventTitle
-        )._id
+        // const eventId = this.props.eventList.find(
+        //     event => event.title === this.state.addPhotogalaryInitialValue.eventTitle
+        // )._id
 
         const submitValues = {
             ...this.state.addPhotogalaryInitialValue,

+ 95 - 0
src/components/adminResults/adminResultsForm.js

@@ -0,0 +1,95 @@
+import React, { Component } from "react";
+import { reduxForm, Field } from "redux-form";
+import "./adminResultsForm.scss";
+import { customInput } from "../customFields/customInput/customInput";
+import { customSelect } from "../customFields/customSelect/customSelect";
+
+class AdminResultsForm extends Component {
+
+    // state = {
+        // addPhotogalaryInitialValue,
+        // filteredEventList: []
+    // }
+
+    submit = values => {
+        console.log('submit props', this.props)
+        // console.log('submit state', this.state)
+        // const pictures = this.state.addPhotogalaryInitialValue.pictures.reduce((prev, elem) => {
+        //     return prev.concat(elem.value);
+        // }, []);
+    }
+
+    render() {
+        // const { filteredEventList, addPhotogalaryInitialValue } = this.state;
+        // console.log(this.state )
+
+        const {
+            handleSubmit,
+            eventTypes,
+            eventList,
+            // eventByTitle,
+            eventusers,
+            onChangeTypeHandler,
+            onChangeTitleHandler
+        } = this.props;
+
+        return (
+            <form className="results-form__results-form__main" onSubmit={handleSubmit(this.submit)}>
+
+                <Field
+                    name="eventType"
+                    label="Event Type"
+                    required
+                    component={customSelect}
+                    onChange={onChangeTypeHandler}
+                    className="form-block__select -wide"
+                >
+                    {eventTypes.map(elem => <option key={elem.id} value={elem.optionName}>{elem.optionName}</option>)}
+                </Field>
+
+                <Field
+                    name="eventTitle"
+                    label="Event Title"
+                    required
+                    component={customSelect}
+                    onChange={onChangeTitleHandler}
+                    className="form-block__select -wide"
+                >   
+                    {console.log('event list', eventList)}
+                    {eventList && eventList.map(elem => <option key={elem._id} id={elem._id} value={elem.title}>{elem.title}</option>)}
+                </Field>
+
+                <div className = 'results-form__table'>  
+                    <div className = 'results-form__header'>
+                        <div className = 'results-form__header_name'>Name</div>
+                        <div className = 'results-form__header_email'>Email</div>
+                        <div className = 'results-form__header_country'>Country</div>
+                        <div className = 'results-form__header_distance'>Distance</div>
+                        <div className = 'results-form__header_time'>Time</div>
+
+                    </div>              
+                {eventusers && eventusers.map( elem => 
+                    <div key={elem._id} className='results-form__user-data'>
+                        <div className = "results-form__user-data_name">{elem.name}</div>
+                        <div className = "results-form__user-data_email">{elem.email}</div>
+                        <div className = "results-form__user-data_country">{elem.userCountry}</div>
+                        <div className = "results-form__user-data_distance">{elem.distance}</div>
+                        <Field
+                            name="time"
+                            component={customInput}
+                            className="input-box -wide"
+                        />
+                    </div>
+                )}
+                </div>
+
+                <div className="results-form__control-box">
+                    <button className="results-form__submit-btn" >Add Results</button>
+                </div>
+            </form>
+
+        );
+    }
+}
+
+export default reduxForm({ form: "resultsForm", enableReinitialize: true })(AdminResultsForm);

+ 108 - 0
src/components/adminResults/adminResultsForm.scss

@@ -0,0 +1,108 @@
+@import "../../styles/variables";
+
+.results-form {
+	width: 100%;
+	min-height: 100vh;
+	margin: auto;
+
+	background: -webkit-linear-gradient(top, #fff, $color-blue); /* Safari 5.1, iOS 5.0-6.1, Chrome 10-25, Android 4.0-4.3 */
+	background: -moz-linear-gradient(top, #fff, $color-blue); /* Firefox 3.6-15 */
+	background: -o-linear-gradient(top,  #fff, $color-blue); /* Opera 11.1-12 */
+	background: linear-gradient(to bottom,  #fff, $color-blue);
+
+	&__content {
+		max-width: 1000px;
+        height: 100%;
+		position: relative;
+		margin: auto;
+		padding: 2rem;
+		border-left: 1px solid $color-mint;
+        border-right: 1px solid $color-mint;
+        border-bottom: 1px solid $color-mint;
+		background-color: #eee;
+		padding-bottom: 3%;
+	}
+
+	&__text {
+		font-size: 1.6rem;
+    }
+    
+    &__form-title{
+		color: $color-blue;
+		font-size: 3rem;
+		letter-spacing: 0.2;
+		font-weight: 600;
+		margin-bottom: 3%;
+    }
+
+	&__toggle-span {
+		font-size: 1.6rem;
+		font-weight: bold;
+		color: rgb(102, 104, 223);
+	}
+
+	&__header{
+		// display: flex;
+		// flex-direction: row;
+		// justify-content: space-between;
+		display: grid;
+		grid-template-columns: repeat(5, 1fr);
+		grid-gap: 1rem;
+		align-items: start;
+		font-size: 2rem;
+		color: $color-blue;
+		font-weight: 600;
+		border-bottom: 2px solid $color-mint;
+		margin-left: 0;
+		margin-top: 3%;
+		margin-bottom: 1%;
+
+	}	
+
+	&__user-data{
+		// display: flex;
+		// justify-content: space-between;
+		display: grid;
+		grid-template-columns: repeat(5, 1fr);
+		align-items: start;
+		grid-gap: 1rem;
+		font-size: 1.4rem;
+	}
+
+	&__submit-btn {
+		width: 100%;
+		border: 1px solid #5acec2;
+		border-radius: 3px;
+		display: block;
+
+		color: #fff;
+		background-color: #5acec2;
+		border: none;
+		cursor: pointer;
+		font-weight: 600;
+		font-size: 1.2rem;
+		transition: 0.2s;
+		padding: 1.3rem 1rem;
+
+		&:focus {
+			outline: none;
+		}
+		&:hover {
+			outline: none;
+			transform: translateY(-1px);
+			box-shadow: 0 1rem 2rem rgba(0, 0, 0, 0.2);
+			&:after {
+				transform: scaleX(1.4) scaleY(1.6);
+				opacity: 0;
+			}
+		}
+
+		&:disabled {
+			color: #5acec2;
+			border: 1px solid #5acec2;
+			background-color: #eee;
+        }
+        
+	}
+
+}

+ 3 - 15
src/conteiners/adminMyEventsPage/adminMyEventsPage.js

@@ -6,12 +6,7 @@ import "./adminMyEventsPage.scss";
 import { Redirect } from 'react-router-dom'
 import * as actions from "../../actions/adminMainPageActions";
 import AdminHeader from "../../components/adminHeader/adminHeader";
-// import Form from "../../components/eventForm/eventReduxForm";
-// import AdminEventElement from "../../components/adminEventElement/adminEventElement";
-import ConfirmationMessage from "../../components/confirmationMessage/confirmationMessage";
-// import {customSelect} from "../../components/customFields/customSelect/customSelect";
 import EventInfoShort from "../../components/eventInfoShort/EventInfoShort";
-import { customSelect as CustomSelect } from "../../components/customFields/customSelect/customSelect";
 
 class AdminAddEventPage extends Component {
 
@@ -20,22 +15,15 @@ class AdminAddEventPage extends Component {
         // confirmationMessageFlag: false,
         // editFormFlag: false
     };
-    //?eventType=''
+
     componentDidMount() {
         this.props.getEvents();
     }
 
     onChangeTypeHandler = e => {
-        const { name, value } = e.target;
+        const { value } = e.target;
         this.props.getEvents(value)
-        console.log('eventInput', value)
-        // this.setState(prevState => {
-        //     console.log('prevStateInput', prevState)
-        //     return {
-        //         ...prevState,
-        //         filteredEventList: this.props.eventList.filter(el => el.eventType === value)
-        //     };
-        // });
+        // console.log('eventInput', value)
     };
 
     render() {

+ 3 - 11
src/conteiners/adminPhotogalaryPage/adminPhotogalaryPage.js

@@ -1,8 +1,6 @@
 import React, { Component } from "react";
 import { connect } from "react-redux";
 import * as actions from "../../actions/photogalaryActions";
-// import {getEvents} from "../../actions/adminMainPageActions";
-// import {photogalaryOnchange} from "../../actions/photogalaryActions";
 import AdminHeader from "../../components/adminHeader/adminHeader";
 import PhotogalaryForm from "../../components/adminPhotogalary/adminPhotogalaryReduxForm";
 import ConfirmationMessage from "../../components/confirmationMessage/confirmationMessage";
@@ -29,16 +27,12 @@ class AdminAddPhotogalarytPage extends Component {
         const {
             eventTypes,
             eventList,
-            // photogalaryOnchange,
-            // addPhotogalaryInitialValue,
-            // putPhotogalary,
             postPhotogalary,
-            // eventFormInitialValue
         } = this.props
 
-        console.log('page props', this.props)
-        console.log('eventList', eventList)
-        console.log('gallery', this.props.gallery)
+        // console.log('page props', this.props)
+        // console.log('eventList', eventList)
+        // console.log('gallery', this.props.gallery)
 
 		// console.log("eventTypes", this.state.eventTypes );
 		return (
@@ -51,8 +45,6 @@ class AdminAddPhotogalarytPage extends Component {
                             eventTypes={eventTypes} 
                             eventList={eventList} 
                             submitHandler = {postPhotogalary}
-                            // photogalaryOnchange = {photogalaryOnchange}
-                            // initialValues = {addPhotogalaryInitialValue}
                         />
                     </div>
                     {this.state.confirmationMessageFlag && 

+ 102 - 0
src/conteiners/adminResultsPage/adminResultsPage.js

@@ -0,0 +1,102 @@
+import React, { Component } from "react";
+import { connect } from "react-redux";
+// import * as actions from "../../actions/photogalaryActions";
+import {getEvents, getEventByTitle} from "../../actions/adminMainPageActions";
+import {getRegistredUsers} from "../../actions/adminResultsActions";
+import AdminHeader from "../../components/adminHeader/adminHeader";
+import ResultsForm from "../../components/adminResults/adminResultsForm";
+import ConfirmationMessage from "../../components/confirmationMessage/confirmationMessage";
+
+class AdminResultstPage extends Component {
+    state = { 
+        confirmationMessageFlag: false
+     };
+
+     componentDidMount() {
+        this.props.getEvents();
+        // this.props.getRegistredUsers()
+    }
+
+    // showConfirmationMessage = () => {
+    //     this.setState({confirmationMessageFlag: true })
+    //     document.location.reload(true);
+    // };
+    // closeConfirmationMessage = () => {
+    //     this.setState({confirmationMessageFlag: false })
+    // };
+
+    onChangeTypeHandler = e => {
+        const { value } = e.target;
+        this.props.getEvents(value)
+        console.log('onChangeTypeHandler', value)
+    };
+
+    onChangeTitleHandler = e => {
+        const { value } = e.target;
+        this.props.getEventByTitle(value).then((res) => {
+            this.props.getRegistredUsers(res.payload.data.events[0]._id)
+        })
+        // console.log('titile eventList', this.props.eventList)
+        // this.props.getRegistredUsers(this.props.eventList_)
+        // console.log('onChangeTitleHandler', value)
+    };
+
+    render() {
+        const {
+            eventTypes,
+            eventList,
+            // eventByTitle,
+            eventusers,
+            // postPhotogalary,
+        } = this.props
+
+        console.log('page props', this.props)
+        // console.log('eventList', eventList)
+        // console.log('gallery', this.props.gallery)
+
+		// console.log("eventTypes", this.state.eventTypes );
+		return (
+            <>
+                <AdminHeader />
+                <div className="results-form">
+                    <div className="results-form__content">
+                        <h2 className="results-form__form-title">RESULTS</h2>
+                        {/* <PhotogalaryForm 
+                            eventTypes={eventTypes} 
+                            eventList={eventList} 
+                            submitHandler = {postPhotogalary}
+                        /> */}
+                        <ResultsForm 
+                            eventTypes={eventTypes}
+                            eventList={eventList}
+                            // eventByTitle ={eventByTitle}
+                            eventusers={eventusers}
+                            onChangeTypeHandler = {this.onChangeTypeHandler}
+                            onChangeTitleHandler = {this.onChangeTitleHandler}
+                        />
+                    </div>
+                    
+                    {this.state.confirmationMessageFlag && 
+                        <ConfirmationMessage closeMessage = {this.closeConfirmationMessage}>
+                            <div className = "text">Results have beed added.</div>
+                        </ConfirmationMessage >}
+                </div>
+            </>
+		);
+	}
+}
+
+const mapStateToProps = state => ({
+    eventList: state.adminMainPageReducer.eventList,
+    eventByTitle: state.adminMainPageReducer.eventByTitle,
+    eventTypes: state.adminMainPageReducer.eventTypes,
+    eventusers: state.adminResultsReduser.eventusers,
+    // eventFormInitialValue: state.adminMainPageReducer.eventFormInitialValue,
+    addPhotogalaryInitialValue: state.photogalaryReducer.addPhotogalaryInitialValue,
+    // gallery: state.photogalaryReducer.gallery
+});
+
+export default connect(
+    mapStateToProps,
+    {getEvents, getEventByTitle, getRegistredUsers}
+)(AdminResultstPage);

+ 14 - 0
src/reducers/adminMainPageReducer.js

@@ -57,6 +57,20 @@ export default (state = initialState, action) => {
 			return state;
 		}
 
+		// GET EVENT BY TITLE 
+		case types.GET_EVENT_BY_TITLE: {
+			return state;
+		}
+		case types.GET_EVENT_BY_TITLE_SUCCESS: {
+			const { data } = action.payload;
+			console.log('reducer data eventByTitle', data)
+			const eventByTitle = data
+			return { ...state, eventByTitle };
+		}
+		case types.GET_EVENT_BY_TITLE_FAIL: {
+			return state;
+		}
+
 		// REMOVE
 		case types.REMOVE_EVENT_REQUEST: {
 			return state;

+ 26 - 0
src/reducers/adminResultsReduser.js

@@ -0,0 +1,26 @@
+import * as types from "../actionTypes/actionTypes"
+import initialState from "../state/addEventInitialValue";
+
+export default (state = initialState, action) => {
+
+    switch (action.type) {
+
+		//GET REGISTRED USERS
+		case types.GET_REGISTRED_USERS: {
+			return state;
+		}
+		case types.GET_EVENTS_REQUEST_SUCCESS: {
+			const { data } = action.payload;
+            const eventusers = data.eventusers
+            console.log('state', state)
+            console.log('result reduser users', eventusers)
+			return { ...state, eventusers };
+		}
+		case types.GET_EVENTS_REQUEST_FAIL: {
+			return state;
+		}
+
+        default:
+			return state; 
+    }
+}

+ 3 - 1
src/reducers/combineReducers.js

@@ -10,6 +10,7 @@ import getEventCard from "./getRequestEvent";
 import photogalaryReducer from "./photogalaryReducer"
 import logout from "./logout";
 import allReviews from "./reviews";
+import adminResultsReduser from "./adminResultsReduser"
 
 export default combineReducers({
 	form: formReducer,
@@ -21,5 +22,6 @@ export default combineReducers({
     sidebar,
     photogalaryReducer,
     allReviews,
-    logout
+    logout,
+    adminResultsReduser
 });

+ 11 - 2
src/router.js

@@ -6,6 +6,7 @@ import AdminMainPage from './conteiners/adminMainPage/adminMainPage';
 import AdminAddEventPage from './conteiners/adminAddEventPage/adminAddEventPage';
 import AdminMyEventsPage from './conteiners/adminMyEventsPage/adminMyEventsPage';
 import AdminAddPhotogalarytPage from "./conteiners/adminPhotogalaryPage/adminPhotogalaryPage"
+import AdminResultsPage from "./conteiners/adminResultsPage/adminResultsPage"
 
 import Home from './conteiners/home/Home';
 import Result from './conteiners/result/Result';
@@ -48,7 +49,7 @@ const route = [
 		id: 4,
 		exact: true,
 		path: "/result",
-		protected: true,
+		protected: false,
 		component: Result
 	},
 	{
@@ -114,13 +115,21 @@ const route = [
     {
 		id: 13,
 		exact: true,
+		path: "/admin/results",
+        protected: true,
+        hasAccess: 'admin',
+		component: AdminResultsPage
+	},
+	{
+		id: 14,
+		exact: true,
 		path: "/admin/my_events",
         protected: true,
         hasAccess: 'admin',
 		component: AdminMyEventsPage
 	},
 	{
-		id: 14,
+		id: 15,
 		component: PAGENOTFOUND
 	}
 ];

+ 1 - 0
src/state/addEventInitialValue.js

@@ -26,6 +26,7 @@ eventFormInitialValue: {
 eventList: [],
 editFormFlag: false,
 gallery: [],
+// eventusers: [],
 
 eventTypes: [
     { optionName: 'Select Event Type', id: 1 },

+ 1 - 1
src/state/adminMenu.js

@@ -4,7 +4,7 @@ export const adminMenu = [
 	{ path: "/admin/my_events", id: 2, text: "My Events", logout: false },
     { path: "/admin/photogalary", id: 3, text: "Add Photogalery", logout: false },
 	{ path: "/admin/results", id: 4, text: "Add Results", logout: false },
-	{ path: "/admin/feedbacks", id: 5, text: "Feedbacks", logout: false },
+	// { path: "/admin/feedbacks", id: 5, text: "Feedbacks", logout: false },
 	{ path: "/", id: 6, text: "Go to WebSite", logout: false },
 	{ path: "/", id: 7, text: "Log out", logout: true }
 ];