Skip to content
Snippets Groups Projects
Commit 4e5475f9 authored by Raul Almeida's avatar Raul Almeida
Browse files

Replace placeholders with actual functionality

AchievementDescriptionCard isn't just dummy text anymore; it works
with actual parameters passed by his parent TabPanel.
The tabpanel itself doesn't get information from the API yet.
parent 250ec117
No related branches found
No related tags found
1 merge request!21Gamification
...@@ -6,25 +6,19 @@ import { Grid } from '@material-ui/core' ...@@ -6,25 +6,19 @@ import { Grid } from '@material-ui/core'
import RequirementDialog from './RequirementsDialog.js'; import RequirementDialog from './RequirementsDialog.js';
export default function AchievementDescriptionCard(props) { export default function AchievementDescriptionCard(props) {
var teste = [
{name: "Casas", description: "Construa três casas"},
{name: "Carros", description: "Dirija três carros"},
{name: "Esportes", description: "Pratique três esportes"},
{name: "Noites", description: "Sobreviva a três noites"}
];
return ( return (
<Paper elevation={3}> <Paper elevation={3}>
<Grid container direction="row" justify="space-around" alignItems="center"> <Grid container direction="row" justify="space-around" alignItems="center">
<Grid item xs={3}> <Grid item xs={3}>
<AchievementImg src={props.src ? props.src : "https://material-ui.com/static/images/grid/complex.jpg"}/> <AchievementImg src={props.src}/>
</Grid> </Grid>
<Grid item xs={7}> <Grid item xs={7}>
<AchievementTitle>{props.title ? props.title : "Conquistador de conquistas"}</AchievementTitle> <AchievementTitle>{props.title}</AchievementTitle>
<AchievementDescription>{props.description ? props.description : "Conquiste conquistas"}</AchievementDescription> <AchievementDescription>{props.description}</AchievementDescription>
<RequirementDialog <RequirementDialog
title="Conquistador de conquistas" title={props.title}
description="Conquiste conquistas" description={props.description}
requirements={teste} requirements={props.requirements}
/> />
</Grid> </Grid>
</Grid> </Grid>
......
...@@ -14,6 +14,18 @@ import AchievementDescriptionCard from '../AchievementDescriptionCard.js' ...@@ -14,6 +14,18 @@ import AchievementDescriptionCard from '../AchievementDescriptionCard.js'
import { Grid } from '@material-ui/core' import { Grid } from '@material-ui/core'
export default function TabPanelStatusEConquistas (props) { export default function TabPanelStatusEConquistas (props) {
const [achievements, setAchievements] = useState([]);
useEffect(() => {
axios.get(`https://api.portalmec.c3sl.ufpr.br/v1/users/1`)
.then(res => {
const achievements = res.data;
console.log("Teste");
console.log(achievements);
//this.setAchievements(achievements);
})
}, [])
return ( return (
<div> <div>
<ContainerDivStyled> <ContainerDivStyled>
...@@ -27,12 +39,18 @@ export default function TabPanelStatusEConquistas (props) { ...@@ -27,12 +39,18 @@ export default function TabPanelStatusEConquistas (props) {
</AchievementsSectionTitle> </AchievementsSectionTitle>
<AchievementsList> <AchievementsList>
<Grid container direction="row" justify="space-around" alignItems="center"> <Grid container direction="row" justify="space-around" alignItems="center">
{achievements.map(
(a) => { return (
<Grid item xs={12} md={5}> <Grid item xs={12} md={5}>
<AchievementDescriptionCard/> <AchievementDescriptionCard
</Grid> title={a.title}
<Grid item xs={12} md={5}> description={a.description}
<AchievementDescriptionCard/> src={a.imgsrc}
requirements={a.requirements} />
//requirements={[{name: "teste", description: "teste"}]}/>
</Grid> </Grid>
)}
)}
</Grid> </Grid>
</AchievementsList> </AchievementsList>
</AchievementsContainer> </AchievementsContainer>
...@@ -47,7 +65,6 @@ const AchievementsContainer = styled.div` ...@@ -47,7 +65,6 @@ const AchievementsContainer = styled.div`
max-width : 1140px; max-width : 1140px;
margin-left : auto; margin-left : auto;
margin-right : auto; margin-right : auto;
margin-left : 20em;
margin-bottom: 30px; margin-bottom: 30px;
margin-top: 70px; margin-top: 70px;
` `
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment