diff --git a/front/components/CompetenciesTable.tsx b/front/components/CompetenciesTable.tsx index 6dc772c..628d346 100644 --- a/front/components/CompetenciesTable.tsx +++ b/front/components/CompetenciesTable.tsx @@ -2,6 +2,7 @@ import { useNavigation } from "@react-navigation/core"; import { HStack, VStack, Text, Progress, Pressable } from "native-base"; import { translate } from "../i18n/i18n"; import Card from './Card'; + type CompetenciesTableProps = { pedalsCompetency: number; rightHandCompetency: number; diff --git a/front/i18n/Translations.ts b/front/i18n/Translations.ts index 6acc31d..3093038 100644 --- a/front/i18n/Translations.ts +++ b/front/i18n/Translations.ts @@ -17,6 +17,7 @@ export const en = { recentlyPlayed: 'Recently played', search: 'Search', lastSearched: "Last searched", + levelProgress: 'good notes', // competencies pedalsCompetency: 'Pedals', @@ -47,7 +48,7 @@ export const fr: typeof en = { recentlyPlayed: "Récemment joués", lastSearched: "Dernières recherches", search: 'Rechercher', - + levelProgress: 'bonnes notes', // competencies pedalsCompetency: 'Pédales', diff --git a/front/views/HomeView.tsx b/front/views/HomeView.tsx index bf0b686..951e135 100644 --- a/front/views/HomeView.tsx +++ b/front/views/HomeView.tsx @@ -2,7 +2,7 @@ import React from "react"; import { useQuery } from "react-query"; import API from "../API"; import LoadingComponent from "../components/Loading"; -import { Box, ScrollView, Flex, useBreakpointValue, Text, VStack, Progress, Button, useTheme, Heading } from 'native-base'; +import { Box, ScrollView, Flex, useBreakpointValue, Text, VStack, Progress, Button, useTheme, Heading, Divider } from 'native-base'; import { useNavigation } from "@react-navigation/native"; import SongCardGrid from '../components/SongCardGrid'; import CompetenciesTable from '../components/CompetenciesTable' @@ -13,13 +13,16 @@ const ProgressBar = ({ xp }: { xp: number}) => { const nextLevel = level + 1; const nextLevelThreshold = nextLevel * 1000; const progessValue = 100 * xp / nextLevelThreshold; - return - {`${translate('level')} ${level}`} - - - - {xp} / {nextLevelThreshold} bonnes notes - + + return ( + + {`${translate('level')} ${level}`} + + + + {xp} / {nextLevelThreshold} {translate('levelProgress')} + + ); } const HomeView = () => { @@ -28,6 +31,7 @@ const HomeView = () => { const screenSize = useBreakpointValue({ base: 'small', md: "big"}); const flexDirection = useBreakpointValue({ base: 'column', xl: "row"}); const userQuery = useQuery(['user'], () => API.getUserInfo()); + if (!userQuery.data) { return @@ -35,12 +39,14 @@ const HomeView = () => { } return + {`${translate('welcome')} ${userQuery.data.name}!`} + { songId: 1 }))} /> + {translate('mySkillsToImprove')} - + + + + ({ albumCover: "", songTitle: "Song", @@ -76,22 +87,33 @@ const HomeView = () => { songId: 1 }))} /> - + + - - - - ({ - albumCover: "", - songTitle: "Song", - artistName: "Artist", - songId: 1 - }))} - /> + + + + + + + + + + + ({ + albumCover: "", + songTitle: "Song", + artistName: "Artist", + songId: 1 + }))} + /> + +