-
-
-
-
-
-
-
-
-
+ {data.map((mission, index) => (
+
+ ))}
@@ -61,4 +67,4 @@ function AdminMission(props) {
)
}
-export default AdminMission;
\ No newline at end of file
+export default withRouter(AdminMission);
\ No newline at end of file
diff --git a/frontend/src/admin/AdminMissionListItem.jsx b/frontend/src/admin/AdminMissionListItem.jsx
index 15b3994..a455863 100644
--- a/frontend/src/admin/AdminMissionListItem.jsx
+++ b/frontend/src/admin/AdminMissionListItem.jsx
@@ -11,40 +11,85 @@ import LocationOnIcon from '@material-ui/icons/LocationOn';
import TextFormatIcon from '@material-ui/icons/TextFormat';
import EditIcon from '@material-ui/icons/Edit';
import colors from '../utils/colors';
+import Dialog from '@material-ui/core/Dialog';
+import DialogActions from '@material-ui/core/DialogActions';
+import DialogContent from '@material-ui/core/DialogContent';
+import DialogContentText from '@material-ui/core/DialogContentText';
+import DialogTitle from '@material-ui/core/DialogTitle';
+import Button from '@material-ui/core/Button';
+import client from '../api/client';
+import { withRouter } from 'react-router-dom';
function AdminMissionListItem(props) {
const [secondary, setSecondary] = React.useState(false);
- const renderType = (type) => {
- if (type === "1") {
- return (
);
+ const [open, setOpen] = React.useState(false);
+ const { history } = props;
+ const handleClickOpen = () => {
+ setOpen(true);
+ };
+
+ const handleClose = () => {
+ setOpen(false);
+ };
+ const handleDeleteConfirm = () => {
+ setOpen(false);
+ const confirmDelete = async () => {
+ const response = await client.delete(`api/admin/mission/delete/${props.values._id}`);
+ console.log(response);
}
- else if (type === "2") {
- return (
);
+ confirmDelete();
+ }
+ const renderType = (type) => {
+ const object = {
+ 'Picture':
,
+ 'Text':
,
+ 'Picture and Location':
,
+ 'Video':
}
- else
- return (
);
+ return object[type];
}
return (
- {renderType(props.type)}
+ {renderType(props.values.Category)}
-
+ { history.push(`edit/${props.values._id}`) }}>
-
+
+
)
}
-export default AdminMissionListItem;
\ No newline at end of file
+export default withRouter(AdminMissionListItem);
\ No newline at end of file
diff --git a/frontend/src/admin/Drawer.jsx b/frontend/src/admin/Drawer.jsx
index ac386ba..2f68583 100644
--- a/frontend/src/admin/Drawer.jsx
+++ b/frontend/src/admin/Drawer.jsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useContext } from "react";
import {
Drawer as MUIDrawer,
ListItem,
@@ -19,6 +19,7 @@ import Avatar from '@material-ui/core/Avatar';
import { deepOrange } from '@material-ui/core/colors';
import colors from '../utils/colors';
import Routes from '../utils/routes';
+import { AuthContext } from "../api/authContext";
const useStyles = makeStyles((theme) => ({
drawer: {
@@ -39,13 +40,13 @@ const useStyles = makeStyles((theme) => ({
const Drawer = props => {
const { history } = props;
+ const authContext = useContext(AuthContext);
const classes = useStyles();
const itemsList = [
{
text: "Mission",
icon:
,
onClick: () => {
- props.onTitleChange('Missions')
history.push(Routes.ADMIN_MISSIONS);
}
},
@@ -53,7 +54,6 @@ const Drawer = props => {
text: "Activity",
icon:
,
onClick: () => {
- props.onTitleChange('Activity feed')
history.push(Routes.ADMIN_ACTIVITY_FEED);
}
},
@@ -61,14 +61,16 @@ const Drawer = props => {
text: "Score Board",
icon:
,
onClick: () => {
- props.onTitleChange('Score Board')
history.push(Routes.ADMIN_LEADERBOARD)
}
},
{
text: "Logout",
icon:
,
- onClick: () => history.push("/logout")
+ onClick: () => {
+ authContext.logout();
+ history.push(Routes.USER_LOGIN);
+ }
}
];
const adminList = [
@@ -76,7 +78,6 @@ const Drawer = props => {
text: "Admin List",
icon:
,
onClick: () => {
- props.onTitleChange('Admin List');
history.push(Routes.ADMIN_LIST);
}
},
@@ -84,8 +85,7 @@ const Drawer = props => {
text: "Missions",
icon:
,
onClick: () => {
- props.onTitleChange('Missions');
- history.push(Routes.ADMIN_MISSION_EDIT);
+ history.push(Routes.ADMIN_MISSION_UPDATE);
}
}
]
@@ -111,6 +111,8 @@ const Drawer = props => {
);
})}
+ {authContext.isSuperAdmin() && (
+ <>
{
);
})}
+
+ )}
);
};
diff --git a/frontend/src/admin/DrawerHeader.jsx b/frontend/src/admin/DrawerHeader.jsx
new file mode 100644
index 0000000..55db995
--- /dev/null
+++ b/frontend/src/admin/DrawerHeader.jsx
@@ -0,0 +1,128 @@
+import React from 'react';
+import CssBaseline from '@material-ui/core/CssBaseline';
+import clsx from 'clsx';
+import AppBar from '@material-ui/core/AppBar';
+import Toolbar from '@material-ui/core/Toolbar';
+import IconButton from '@material-ui/core/IconButton';
+import Typography from '@material-ui/core/Typography';
+import Badge from '@material-ui/core/Badge';
+import MenuIcon from '@material-ui/icons/Menu';
+import NotificationsActiveIcon from '@material-ui/icons/NotificationsActive';
+import { makeStyles } from "@material-ui/core/styles";
+
+const drawerWidth = 190;
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ display: "flex"
+ },
+ toolbar: {
+ paddingRight: 24,
+ },
+ toolbarIcon: {
+ display: 'flex',
+ alignItems: 'center',
+ justifyContent: 'flex-end',
+ padding: '0 8px',
+ ...theme.mixins.toolbar,
+ },
+ appBar: {
+ zIndex: theme.zIndex.drawer + 1,
+ transition: theme.transitions.create(['width', 'margin'], {
+ easing: theme.transitions.easing.sharp,
+ duration: theme.transitions.duration.leavingScreen,
+ }),
+ },
+ appBarShift: {
+ marginLeft: drawerWidth,
+ width: `calc(100% - ${drawerWidth}px)`,
+ transition: theme.transitions.create(['width', 'margin'], {
+ easing: theme.transitions.easing.sharp,
+ duration: theme.transitions.duration.enteringScreen,
+ }),
+ },
+ menuButton: {
+ marginRight: 36,
+ },
+ menuButtonHidden: {
+ display: 'none',
+ },
+ title: {
+ flexGrow: 1,
+ },
+ drawerPaper: {
+ position: 'relative',
+ whiteSpace: 'nowrap',
+ width: drawerWidth,
+ transition: theme.transitions.create('width', {
+ easing: theme.transitions.easing.sharp,
+ duration: theme.transitions.duration.enteringScreen,
+ }),
+ },
+ drawerPaperClose: {
+ overflowX: 'hidden',
+ transition: theme.transitions.create('width', {
+ easing: theme.transitions.easing.sharp,
+ duration: theme.transitions.duration.leavingScreen,
+ }),
+ width: theme.spacing(7),
+ [theme.breakpoints.up('sm')]: {
+ width: theme.spacing(9),
+ },
+ },
+ appBarSpacer: theme.mixins.toolbar,
+ content: {
+ flexGrow: 1,
+ height: '100vh',
+ overflow: 'auto',
+ },
+ container: {
+ paddingTop: theme.spacing(4),
+ paddingBottom: theme.spacing(4),
+ },
+ paper: {
+ padding: theme.spacing(2),
+ display: 'flex',
+ overflow: 'auto',
+ flexDirection: 'column',
+ },
+ fixedHeight: {
+ height: 240,
+ },
+}));
+
+const DrawerHeader = (props) => {
+ const classes = useStyles();
+ const [open, setOpen] = React.useState(true);
+ const handleDrawerOpen = () => {
+ setOpen(true);
+ };
+ return (
+
+
+
+
+
+
+
+
+ {props.title}
+
+
+
+
+
+
+
+
+
+
history.push('/admin/mission/update')}>
+
+
+
+
Edit
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ {data.map((mission, index) => (
+
+ ))}
);
}
diff --git a/frontend/src/admin/MissionCard.jsx b/frontend/src/admin/MissionCard.jsx
index c237897..bf1ec93 100644
--- a/frontend/src/admin/MissionCard.jsx
+++ b/frontend/src/admin/MissionCard.jsx
@@ -4,29 +4,25 @@ import LocationOnIcon from '@material-ui/icons/LocationOn';
import TextFormatIcon from '@material-ui/icons/TextFormat';
import { withRouter } from 'react-router-dom'
import './admin.css'
-import Routes from '../utils/routes'
-
const MissionCard = (props) => {
const { history } = props;
const renderType = (type) => {
- if (type === "1") {
- return ();
- }
- else if (type === "2") {
- return ();
- }
- else {
- return ();
+ const object = {
+ 'Picture': ,
+ 'Text': ,
+ 'Picture and Location': ,
+ 'Video':
}
+ return object[type];
}
return (
- { history.push(Routes.ADMIN_MISSION_DETAILS) }}>
+
- {renderType(props.type)}
+ {renderType(props.values.Category)}
-
Mission 1
+
{`Mission ${props.index}`}
);
diff --git a/frontend/src/admin/MissionDetail.jsx b/frontend/src/admin/MissionDetail.jsx
index 47b76c1..0845223 100644
--- a/frontend/src/admin/MissionDetail.jsx
+++ b/frontend/src/admin/MissionDetail.jsx
@@ -1,7 +1,8 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
import { makeStyles } from "@material-ui/core/styles";
import MissionListItem from './MissionListItem'
-import CameraAltIcon from '@material-ui/icons/CameraAlt';
+import ArrowBackIcon from '@material-ui/icons/ArrowBack';
+import client from '../api/client';
const useStyles = makeStyles((theme) => ({
root: {
@@ -17,33 +18,61 @@ const useStyles = makeStyles((theme) => ({
},
}))
+const dummyData = {
+ Location: { Lat: 23, Long: 24 },
+ Category: 'Picture and Location',
+ clue: 'I am clueless yaaar',
+ answer_Type: 'Picture and Location',
+ answer: ['orange', 'apple', 'mango'],
+ Other_Info: 'I am orange'
+}
function MissionDetail(props) {
const classes = useStyles();
+ const [data, setData] = useState(dummyData);
+ const { history } = props;
+ useEffect(() => {
+ const fetchData = async () => {
+ const result = await client.get(`api/mission/${props.match.params.id}`);
+ console.log(result.data);
+ setData(result.data);
+ }
+ fetchData();
+ }, [props.match.params.id]);
return (
-
+
-
Mission 1
+ position: 'absolute',
+ left: '28%',
+ top: '20%',
+ cursor: 'pointer',
+ }} onClick={() => history.push('/admin')}>
+
-
-
diff --git a/frontend/src/admin/MissionListItem.jsx b/frontend/src/admin/MissionListItem.jsx
index c29ba7e..9f43ff6 100644
--- a/frontend/src/admin/MissionListItem.jsx
+++ b/frontend/src/admin/MissionListItem.jsx
@@ -15,7 +15,7 @@ function MissionListItem(props) {
const classes = useStyles();
return (
-
{props.title} Lorem ipsum dolor sit amet, consectetur adipis
+
{props.title} {props.value}
)
}
diff --git a/frontend/src/admin/NewMission.jsx b/frontend/src/admin/NewMission.jsx
index 3adccfb..a5add8a 100644
--- a/frontend/src/admin/NewMission.jsx
+++ b/frontend/src/admin/NewMission.jsx
@@ -1,131 +1,183 @@
import React from 'react';
import { useFormik } from 'formik';
-
+import ArrowBackIcon from '@material-ui/icons/ArrowBack';
import Button from '@material-ui/core/Button';
import TextField from '@material-ui/core/TextField';
import Select from '@material-ui/core/Select';
+import client from '../api/client';
+import { withRouter } from 'react-router-dom';
-
-const NewMission = () => {
+const NewMission = (props) => {
+ const { history } = props;
const formik = useFormik({
initialValues: {
- category: '',
+ Category: '',
clue: '',
- password: '',
answer: '',
- otherinfo: '',
- answertype: '',
+ Other_Info: '',
+ answer_Type: '',
},
- onSubmit: (values) => {
- console.log(values);
+ onSubmit: async (values) => {
+ const { Category, clue, answer, answer_Type, Other_Info, Lat, Long, maxPoints, MissionName } = values;
+ const answerArray = [];
+ answerArray.push(answer);
+ const object = {
+ Category,
+ clue,
+ answer: answerArray,
+ answer_Type,
+ Other_Info,
+ Location: {
+ Lat,
+ Long
+ },
+ MissionName,
+ Feed: true,
+ ServerEvaluation: false,
+ maxPoints,
+ Hints: [
+ {
+ Content: "hfbfrbfrfrfgrfbrjbfjrbgjrbgbr",
+ MaxPoints: 123
+ }, {
+ Content: "hfbfrbfrfrfgrfbrjbfjrbgjrbgbr",
+ MaxPoints: 123
+ }, {
+ Content: "hfbfrbfrfrfgrfbrjbfjrbgjrbgbr",
+ MaxPoints: 123
+ }
+ ]
+ };
+ const response = await client.post('api/admin/mission/add', object);
+ console.log(response);
},
});
return (
-