Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/UI improvements #336

Closed
wants to merge 3 commits into from
Closed

Feat/UI improvements #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ab3303
feat: loading in dashboard view
Toto-hitori May 1, 2024
b3ba4d1
refactor: moved menuButtons into different function
Toto-hitori May 1, 2024
e21094d
feat: updated statistics view
Toto-hitori May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
192 changes: 104 additions & 88 deletions webapp/src/pages/Dashboard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState, useEffect } from "react";
import { Heading, Button, Box, Stack, Tabs, TabList, Tab, TabPanels, TabPanel, Flex, Text } from "@chakra-ui/react";
import { Heading, Button, Box, Stack, Tabs, TabList, Tab, TabPanels, TabPanel, Flex, Text, Spinner } from "@chakra-ui/react";
import { Center } from "@chakra-ui/layout";
import { useNavigate } from "react-router-dom";
import { useTranslation } from "react-i18next";
Expand All @@ -19,10 +19,10 @@ import { userInfo } from '../components/user/UserInfo';
export default function Dashboard() {
const navigate = useNavigate();

const [gamemode, setGamemode] = useState("KIWI_QUEST");
const [gameMode, setGameMode] = useState("KIWI_QUEST");

const { t, i18n } = useTranslation();

const [isDashboardLoading, setIsDashboardLoading] = useState(true);
const [isMenuOpen, setIsMenuOpen] = useState(false);
const [selectedButton, setSelectedButton] = useState("Kiwi Quest");
const [modes, setModes] = useState([]);
Expand Down Expand Up @@ -62,6 +62,7 @@ export default function Dashboard() {
async function checkActiveStatus() {
const i = await isActive();
setActive(i.data.is_active);
setIsDashboardLoading(false);
}
checkActiveStatus();
}, []);
Expand Down Expand Up @@ -91,6 +92,34 @@ export default function Dashboard() {
}
};

const menuButtons = (modes) => {
return <Flex justify="center" flexWrap="wrap" flexDirection={{ base: "column", md: "row" }}>
{modes.length > 0 && modes.map(mode => (
<Button
key={mode.internal_representation}
colorScheme={"green"}
variant={selectedButton === mode.name ? "solid" : "ghost"}
textAlign="center"
m="1em"
display="flex"
flexDirection="column"
alignItems="center"
size="lg"
height="4rem"
maxW={{ base: "100%", md: "calc(100% / 3 - 2em)" }}
onClick={() => {
setSelectedButton(mode.name);
setGameMode(mode.internal_representation);
}}
>
{selectIcon(mode.icon_name)}
<Box>{mode.name}</Box>
</Button>
))}
<SettingsButton onClick={() => setIsSettingsOpen(true)} name={t("game.custom")}/>
<CustomGameMenu isOpen={isSettingsOpen} onClose={() => setIsSettingsOpen(false)}/>
</Flex>
}
const initializeGameMode = async () => {
try {
let lang = i18n.language;
Expand All @@ -100,7 +129,7 @@ export default function Dashboard() {
lang = "es"
else
lang = "en";
const newGameResponse = await newGame(lang, gamemode, null);
const newGameResponse = await newGame(lang, gameMode, null);
if (newGameResponse)
navigate("/dashboard/game");
} catch (error) {
Expand All @@ -118,90 +147,77 @@ export default function Dashboard() {
<Heading as="h2" data-testid={"Welcome"}>{t("common.welcome") + " " + user.username}</Heading>

<Box minW={{ md: "400px" }} shadow="2xl">
<Stack spacing={4} p="1rem" backgroundColor="whiteAlpha.900" boxShadow="md" rounded="1rem">
<Tabs isFitted variant='enclosed'>
<TabList mb='1em'>
<Tab color="green.500"><FaGamepad /><Box ml={2}>{t("game.gamemodes")}</Box></Tab>
<Tab color="green.500"><FaUser/> <Box ml={2}>{t("game.userinfo")}</Box></Tab>
</TabList>
<TabPanels>
<TabPanel>
{!active && (
<Flex justify="center" flexWrap="wrap" flexDirection={{ base: "column", md: "row" }}>
{modes.length > 0 && modes.map(mode => (
<Button
key={mode.internal_representation}
colorScheme={"green"}
variant={selectedButton === mode.name ? "solid" : "ghost"}
textAlign="center"
m="1em"
display="flex"
flexDirection="column"
alignItems="center"
size="lg"
height="4rem"
maxW={{ base: "100%", md: "calc(100% / 3 - 2em)" }}
onClick={() => {
setSelectedButton(mode.name);
setGamemode(mode.internal_representation);
}}
>
{selectIcon(mode.icon_name)}
<Box>{mode.name}</Box>
</Button>
))}
<SettingsButton onClick={() => setIsSettingsOpen(true)} name={t("game.custom")}/>
<CustomGameMenu isOpen={isSettingsOpen} onClose={() => setIsSettingsOpen(false)}/>
</Flex>
)}
</TabPanel>
<TabPanel>
<Stack spacing={2}>
<Heading as="h3" color="green.400" fontSize="xl">{t("session.username")}</Heading>
<Text fontWeight='extrabold' color={"forest_green.400"}>{user.username}</Text>
<Heading as="h3" color="green.400" fontSize="xl">{t("session.email")}</Heading>
<Text fontWeight='extrabold' color={"forest_green.400"}>{user.email}</Text>
<UserStatistics />
</Stack>
</TabPanel>
</TabPanels>
</Tabs>
<Flex justify="center">
{!active ? (
<Button
type="submit"
data-testid={"Play"}
variant={"solid"}
colorScheme={"pigment_green"}
margin={"0.5rem"}
className={"custom-button effect2"}
onClick={initializeGameMode}
size={"lg"}
fontSize={"2xl"}
flex="1"
id={"play"}
>
{t("common.play")}
</Button>
) : (
<Button
type="submit"
data-testid={"Resume"}
variant={"solid"}
colorScheme={"pigment_green"}
margin={"0.5rem"}
className={"custom-button effect2"}
onClick={initializeGameMode}
size={"lg"}
id={"resumeBtn"}
fontSize={"2xl"}
flex="1"
>
{t("session.resume")}
</Button>
)}
</Flex>
</Stack>
{(isDashboardLoading) ? (
<Flex flexWrap={"wrap"} gap={4} mb={4} justify={"center"}>
<Spinner
thickness='9px'
speed='0.65s'
emptyColor='gray.200'
color='green.500'
size='xl'
data-testid={"spinner"}
/>
</Flex>
) : <>
<Stack spacing={4} p="1rem" backgroundColor="whiteAlpha.900" boxShadow="md" rounded="1rem">
<Tabs isFitted variant='enclosed'>
<TabList mb='1em'>
<Tab color="green.500"><FaGamepad /><Box ml={2}>{t("game.gamemodes")}</Box></Tab>
<Tab color="green.500"><FaUser/> <Box ml={2}>{t("game.userinfo")}</Box></Tab>
</TabList>
<TabPanels>
<TabPanel>
{ (!active) ? <>{ menuButtons(modes) }</> : <></> }
</TabPanel>
<TabPanel>
<Stack spacing={2}>
<Heading as="h3" color="green.400" fontSize="xl">{t("session.username")}</Heading>
<Text fontWeight='extrabold' color={"forest_green.400"}>{user.username}</Text>
<Heading as="h3" color="green.400" fontSize="xl">{t("session.email")}</Heading>
<Text fontWeight='extrabold' color={"forest_green.400"}>{user.email}</Text>
<UserStatistics />
</Stack>
</TabPanel>
</TabPanels>
</Tabs>
<Flex justify="center">
{!active ? (
<Button
type="submit"
data-testid={"Play"}
variant={"solid"}
colorScheme={"pigment_green"}
margin={"0.5rem"}
className={"custom-button effect2"}
onClick={initializeGameMode}
size={"lg"}
fontSize={"2xl"}
flex="1"
id={"play"}
>
{t("common.play")}
</Button>
) : (
<Button
type="submit"
data-testid={"Resume"}
variant={"solid"}
colorScheme={"pigment_green"}
margin={"0.5rem"}
className={"custom-button effect2"}
onClick={initializeGameMode}
size={"lg"}
id={"resumeBtn"}
fontSize={"2xl"}
flex="1"
>
{t("session.resume")}
</Button>
)}
</Flex>
</Stack>
</>
}
</Box>
</>
)}
Expand Down
56 changes: 39 additions & 17 deletions webapp/src/pages/Statistics.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
AccordionPanel,
Flex, ListItem, ListIcon, UnorderedList
} from "@chakra-ui/react";
import Avatar, { genConfig } from 'react-nice-avatar';
import React, {useEffect, useState} from "react";
import { useTranslation } from "react-i18next";
import GoBack from "components/GoBack";
Expand All @@ -24,6 +25,7 @@ import { FaChartBar } from 'react-icons/fa';
import MenuButton from '../components/menu/MenuButton';
import LateralMenu from '../components/menu/LateralMenu';
import {MdCheckCircle, MdClear, MdPercent} from "react-icons/md";
import {Cell, Pie, PieChart} from "recharts";

export default function Statistics() {
const { t, i18n } = useTranslation();
Expand Down Expand Up @@ -57,35 +59,55 @@ export default function Statistics() {
setErrorMessage(errorType);
}
}

const formatTopTen = () => {
return topTen.map((element, counter) => {
return <AccordionItem key={`row-${counter}`}>
<AccordionButton _hover={{animation:"zoomIn 0.05s ease-in forwards"}}>
<Box as='span' flex='1' textAlign='space-between'>
<Box as='span' flex='1' textAlign='space-around'>
<Flex justifyContent="space-between">
<Text fontSize='l' fontWeight='extrabold' color={"pigment_green.400"} >{counter + 1}</Text>
<Text fontSize='l' fontWeight='extrabold' color={"pigment_green.400"} minW={"10%"} >{counter + 1}</Text>
<Text fontSize='l'>{element.user.username} </Text>
<Text fontSize='l' fontWeight='extrabold' color={"pigment_green.400"}>{element.points} {element.user.username !== 'Dario G. Mori'? '🥝': '🍌' } </Text>
</Flex>
</Box>
<AccordionIcon />
</AccordionButton>
<AccordionPanel pb={4}>
<UnorderedList spacing={3}>
<ListItem key={`row-${counter}-right`}>
<ListIcon as={MdCheckCircle} color={"green"} />
{t("statistics.texts.personalRight", {right: element.right})}
</ListItem>
<ListItem key={`row-${counter}-wrong`}>
<ListIcon as={MdClear} color={"red"}/>
{t("statistics.texts.personalWrong", {wrong: element.wrong})}
</ListItem>
<ListItem key={`row-${counter}-percentage`}>
<ListIcon as={MdPercent} color={"blue"}/>
{t("statistics.texts.personalRate", {rate: element.percentage})}
</ListItem>
</UnorderedList>
<Flex justifyContent={"space-around"}>
<Avatar style={{ width: '6rem', height: '6rem' }} {...genConfig(element.user.email)} data-testid={"avatar"}/>
<Flex minW={"60%"} justifyContent={"space-between"}>
<PieChart width={100} height={100} data-testid={"chart"}>
<Pie data={[
{
name: t("statistics.texts.personalRight"),
value: element.right,
},
{
name: t("statistics.texts.personalWrong"),
value: element.wrong,
},
]} dataKey="value" innerRadius={28} outerRadius={40} fill="#82ca9d" paddingAngle={5}
cx={50} cy={50} labelLine={false} >
<Cell key={"cell-right"} fill={"green"}/>
<Cell key={"cell-right"} fill={"#955e42"}/>
</Pie>
</PieChart>
<UnorderedList spacing={3}>
<ListItem key={`row-${counter}-right`}>
<ListIcon as={MdCheckCircle} color={"green"} />
{t("statistics.texts.personalRight", {right: element.right})}
</ListItem>
<ListItem key={`row-${counter}-wrong`}>
<ListIcon as={MdClear} color={"red"}/>
{t("statistics.texts.personalWrong", {wrong: element.wrong})}
</ListItem>
<ListItem key={`row-${counter}-percentage`}>
<ListIcon as={MdPercent} color={"blue"}/>
{t("statistics.texts.personalRate", {rate: element.percentage})}
</ListItem>
</UnorderedList>
</Flex>
</Flex>
</AccordionPanel>
</AccordionItem>

Expand Down