From 0fb34582ecfa9151ed15dbf603a1364f279fba48 Mon Sep 17 00:00:00 2001 From: Luis Felipe Risch <lfr20@inf.ufpr.br> Date: Thu, 1 Apr 2021 11:46:43 -0300 Subject: [PATCH] Add routes to Requirements and Actions --- .../Components/Components/DisplayIcon.js | 10 ++++-- src/App.js | 34 ++++++++++++++++++- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/src/Admin/Components/Components/DisplayIcon.js b/src/Admin/Components/Components/DisplayIcon.js index 933243c1..b5692e42 100644 --- a/src/Admin/Components/Components/DisplayIcon.js +++ b/src/Admin/Components/Components/DisplayIcon.js @@ -39,6 +39,8 @@ import ExitToAppRoundedIcon from "@material-ui/icons/ExitToAppRounded"; import AllOutIcon from "@material-ui/icons/AllOut"; import SportsEsportsRoundedIcon from '@material-ui/icons/SportsEsportsRounded'; import { GiAchievement } from "react-icons/gi" +import { DiRequirejs } from "react-icons/di" +import { GrAction } from 'react-icons/gr' //This file manipulate the icon that will be displayed in the left navigation menu @@ -64,15 +66,17 @@ const icons = [ <BlockRoundedIcon style={{ fill: pink }} />, <AnnouncementRoundedIcon style={{ fill: purple }} />, <EmailRoundedIcon style={{ fill: blue }} />, - <SportsEsportsRoundedIcon style={{fill: orange }}/>, - <GiAchievement size={24} style={{fill: pink }}/>, + <SportsEsportsRoundedIcon style={{ fill: orange }} />, + <GiAchievement size={24} style={{ fill: pink }} />, + <DiRequirejs size={24} style={{ fill: purple }} />, + <GrAction size={24} style={{ fill: blue }} />, <TimelineRoundedIcon style={{ fill: orange }} />, <SettingsRoundedIcon style={{ fill: pink }} />, <ExitToAppRoundedIcon style={{ fill: purple }} />, ]; const DisplayIcon = (props) => { - return( + return ( <ListItemIcon> {icons[props.i]} </ListItemIcon> diff --git a/src/App.js b/src/App.js index f5c01884..328131d0 100644 --- a/src/App.js +++ b/src/App.js @@ -103,6 +103,15 @@ import EditItem from "./Admin/Components/Components/Inputs/EditItem/EditItem" import GameficationAchieves from './Admin/Pages/Pages/SubPages/GameficationAchieves' import AchievementCard from './Admin/Components/Components/DataCards/AchievementsCard' import EditAchievement from "./Admin/Components/Components/Inputs/EditAchievement" +import CreateAchievements from './Admin/Components/Components/Inputs/CreateAchievements' +import GameficationRequires from './Admin/Pages/Pages/SubPages/GameficationRequires' +import EditRequirement from "./Admin/Components/Components/Inputs/EditRequirements" +import CreateRequirement from './Admin/Components/Components/Inputs/CreateRequirement' +import RequirementCard from './Admin/Components/Components/DataCards/RequirementCard' +import GameficationActions from './Admin/Pages/Pages/SubPages/GameficationActions' +import ActionCard from './Admin/Components/Components/DataCards/ActionCard' +import EditAction from "./Admin/Components/Components/Inputs/EditAction" +import CreateAction from "./Admin/Components/Components/Inputs/CreateAction" import PropTypes from "prop-types"; import Typography from "@material-ui/core/Typography"; @@ -371,12 +380,26 @@ export default function App() { {...a11yProps(16)} /> <Tab - label="Achievements" + label="Conquistas" to="/admin/achievements" icon={<DisplayIcon i={17} />} component={Link} {...a11yProps(17)} /> + <Tab + label="Requisitos" + to="/admin/requirements" + icon={<DisplayIcon i={18} />} + component={Link} + {...a11yProps(18)} + /> + <Tab + label="Ações" + to="/admin/actions" + icon={<DisplayIcon i={19} />} + component={Link} + {...a11yProps(19)} + /> </Tabs> </AppBar> <div style={{ padding: "2em" }}> @@ -452,6 +475,15 @@ export default function App() { <Route path="/admin/achievements" component={GameficationAchieves} /> <Route path="/admin/achievement/:id" component={AchievementCard} /> <Route path="/admin/EditAchievement/:id" component={EditAchievement} /> + <Route path="/admin/createAchievements" component={CreateAchievements} /> + <Route path="/admin/requirements" component={GameficationRequires} /> + <Route path="/admin/EditRequirement/:id" component={EditRequirement} /> + <Route path="/admin/CreateRequirement" component={CreateRequirement} /> + <Route path="/admin/requirement/:id" component={RequirementCard} /> + <Route path="/admin/actions" component={GameficationActions} /> + <Route path="/admin/action/:id" component={ActionCard} /> + <Route path="/admin/EditAction/:id" component={EditAction} /> + <Route path="/admin/CreateAction" component={CreateAction} /> </div> </div> </Switch> -- GitLab