all repos — caroster @ 354035ce0132854c931c73a0751dbe3d98a8ceb9

[Octree] Group carpool to your event https://caroster.io

set titles for every screen
Hadrien Froger hadrien@octree.ch
Mon, 20 Jul 2020 14:30:53 +0100
commit

354035ce0132854c931c73a0751dbe3d98a8ceb9

parent

d5fbdc997d2adb0897c5ce629a92c302a43a77fd

M app/src/pages/Dashboard.jsapp/src/pages/Dashboard.js

@@ -50,6 +50,7 @@ const [myEvents, setMyEvents] = useState([]);

const [isLoading, setIsLoading] = useState(true); const strapi = useStrapi(); const {authState, token} = useAuth(); + const {t} = useTranslation(); const history = useHistory(); const classes = useStyles(); const goNewEvent = history.push.bind(undefined, '/new');

@@ -113,7 +114,7 @@ if (!isLoading && myEvents.length === 0) {

return ( <> <Menu /> - <LayoutCentered> + <LayoutCentered title={t('meta.dashboard_title')}> <EmptyDashboard /> <DashboardFab onClick={() => goNewEvent()} /> </LayoutCentered>

@@ -124,7 +125,7 @@

return ( <> <Menu /> - <LayoutDefault className={classes.root}> + <LayoutDefault className={classes.root} title={t('meta.dashboard_title')}> <DashboardWithCard pastEvents={pastEvents} futureEvents={futureEvents}
M app/src/pages/Event.jsapp/src/pages/Event.js

@@ -1,5 +1,4 @@

import React, {useState, useReducer, useEffect} from 'react'; -import {Helmet} from 'react-helmet'; import {useTranslation} from 'react-i18next'; import {useAuth} from 'strapi-react-context'; import AppBar from '@material-ui/core/AppBar';

@@ -88,10 +87,7 @@

if (!event) return <Loading />; return ( - <Layout> - <Helmet> - <title>{t('meta.title', {title: event.name})}</title> - </Helmet> + <Layout title={t('meta.event_title', {event})}> <AppBar position="static" color="primary"
M app/src/pages/Home.jsapp/src/pages/Home.js

@@ -52,10 +52,11 @@ );

}; const Home = () => { + const {t} = useTranslation(); return ( <> <Menu /> - <Layout> + <Layout title={t('meta.new_event_title')}> <Paper> <Logo /> <CreateEvent />
M app/src/pages/Profile.jsapp/src/pages/Profile.js

@@ -44,10 +44,11 @@ );

}; const Profile = () => { + const {t} = useTranslation(); return ( <> <Menu /> - <Layout>Profile – NOT IMPLEMENTED</Layout> + <Layout title={t('meta.profile_title')}>Profile – NOT IMPLEMENTED</Layout> </> ); };
M app/src/pages/SignIn.jsapp/src/pages/SignIn.js

@@ -4,10 +4,11 @@ import Card from '@material-ui/core/Card';

import CardMedia from '@material-ui/core/CardMedia'; import Logo from '../components/Logo'; import SignInContainer from '../containers/SignIn'; - +import {useTranslation} from 'react-i18next'; const SignIn = () => { + const {t} = useTranslation(); return ( - <Layout> + <Layout title={t('meta.login_title')}> <Card> <CardMedia component={Logo} /> <SignInContainer />
M app/src/pages/SignUp.jsapp/src/pages/SignUp.js

@@ -4,10 +4,11 @@ import Card from '@material-ui/core/Card';

import CardMedia from '@material-ui/core/CardMedia'; import Logo from '../components/Logo'; import Su from '../containers/SignUp'; - +import {useTranslation} from 'react-i18next'; const SignUp = () => { + const {t} = useTranslation(); return ( - <Layout> + <Layout title={t('meta.register_title')}> <Card> <CardMedia component={Logo} /> <Su />
M app/src/pages/SignUpSuccess.jsapp/src/pages/SignUpSuccess.js

@@ -17,7 +17,7 @@ if (!token) {

return <Redirect to="/" />; } return ( - <Layout> + <Layout title={t('meta.register_success_title')}> <Card> <CardMedia component={Logo} /> <CardContent>