Skip to content
Snippets Groups Projects
Commit 3257f5ec authored by Léopold Chappuis's avatar Léopold Chappuis Committed by Adrien Béraud
Browse files

Unconnected-user-layout: Add SettingLanguage

In all unconnected user layouts, it is necessary to provide the ability to change the language.

GitLab: #234

Change-Id: Id94c85c69812aae5e6673b5802805e0a8b3b9c64
parent e5893403
No related branches found
No related tags found
No related merge requests found
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
import { Box, Card, CardContent, CardHeader, Container, Typography, useMediaQuery, useTheme } from '@mui/material' import { Box, Card, CardContent, CardHeader, Container, Typography, useMediaQuery, useTheme } from '@mui/material'
import { motion } from 'framer-motion' import { motion } from 'framer-motion'
import SettingLanguage from './GeneralSettings/SettingLanguage'
interface UnconnectedUserLayoutProps { interface UnconnectedUserLayoutProps {
pageName?: string pageName?: string
children: React.ReactNode children: React.ReactNode
...@@ -58,6 +60,10 @@ export default function UnconnectedUserLayout({ pageName, children, message }: U ...@@ -58,6 +60,10 @@ export default function UnconnectedUserLayout({ pageName, children, message }: U
} }
return ( return (
<>
<Box sx={{ position: 'absolute', right: '0', padding: '1px' }}>
<SettingLanguage doNotDisplayLabel={true}></SettingLanguage>
</Box>
<Box sx={backgroundStyle}> <Box sx={backgroundStyle}>
<Container className="message-list" sx={mainContainerStyle}> <Container className="message-list" sx={mainContainerStyle}>
<motion.div <motion.div
...@@ -70,7 +76,13 @@ export default function UnconnectedUserLayout({ pageName, children, message }: U ...@@ -70,7 +76,13 @@ export default function UnconnectedUserLayout({ pageName, children, message }: U
<CardContent <CardContent
sx={ sx={
isMobile isMobile
? { width: '100%', height: '90%', display: 'flex', flexDirection: 'column', justifyContent: 'center' } ? {
width: '100%',
height: '90%',
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
}
: {} : {}
} }
component="form" component="form"
...@@ -100,5 +112,6 @@ export default function UnconnectedUserLayout({ pageName, children, message }: U ...@@ -100,5 +112,6 @@ export default function UnconnectedUserLayout({ pageName, children, message }: U
</motion.div> </motion.div>
</Container> </Container>
</Box> </Box>
</>
) )
} }
...@@ -20,7 +20,7 @@ import { AnimatePresence, motion } from 'framer-motion' ...@@ -20,7 +20,7 @@ import { AnimatePresence, motion } from 'framer-motion'
import { useState } from 'react' import { useState } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import JamiLogo from '../icons/jamiLogoIcon.svg?react' import Logo from '../icons/jamiLogoIcon.svg?react'
const list = { const list = {
hidden: { opacity: 0 }, hidden: { opacity: 0 },
...@@ -80,7 +80,7 @@ export default function WelcomeAnimation(props) { ...@@ -80,7 +80,7 @@ export default function WelcomeAnimation(props) {
}} }}
> >
<motion.div style={{ width: '100%', display: 'flex', justifyContent: 'center' }} variants={item}> <motion.div style={{ width: '100%', display: 'flex', justifyContent: 'center' }} variants={item}>
<JamiLogo width="60%" /> <Logo width="60%" />
</motion.div> </motion.div>
</motion.div> </motion.div>
)} )}
......
...@@ -24,7 +24,7 @@ import { useTranslation } from 'react-i18next' ...@@ -24,7 +24,7 @@ import { useTranslation } from 'react-i18next'
import { Link, Navigate } from 'react-router-dom' import { Link, Navigate } from 'react-router-dom'
import UnconnectedUserLayout from '../components/UnconnectedUserLayout' import UnconnectedUserLayout from '../components/UnconnectedUserLayout'
import jamiLogoIcon from '../icons/jamiLogoIcon.svg' import logoIcon from '../icons/jamiLogoIcon.svg'
import { useLoginAdminMutation } from '../services/adminQueries' import { useLoginAdminMutation } from '../services/adminQueries'
export default function AdminLogin() { export default function AdminLogin() {
...@@ -56,10 +56,11 @@ export default function AdminLogin() { ...@@ -56,10 +56,11 @@ export default function AdminLogin() {
} }
return ( return (
<>
<UnconnectedUserLayout> <UnconnectedUserLayout>
<Box sx={isMobile ? { ...titleStyle, marginTop: '-20%' } : { ...titleStyle, marginTop: '-40%' }}> <Box sx={isMobile ? { ...titleStyle, marginTop: '-20%' } : { ...titleStyle, marginTop: '-40%' }}>
<img <img
src={jamiLogoIcon} src={logoIcon}
alt="Jami logo" alt="Jami logo"
style={{ width: '20%', height: 'auto', borderRadius: borderRadius, marginRight: '15px' }} style={{ width: '20%', height: 'auto', borderRadius: borderRadius, marginRight: '15px' }}
/> />
...@@ -92,6 +93,7 @@ export default function AdminLogin() { ...@@ -92,6 +93,7 @@ export default function AdminLogin() {
<GroupAddRounded /> <GroupAddRounded />
</Fab> </Fab>
</Box> </Box>
</Box>
<Box <Box
sx={{ sx={{
mt: theme.typography.pxToRem(100), mt: theme.typography.pxToRem(100),
...@@ -106,7 +108,7 @@ export default function AdminLogin() { ...@@ -106,7 +108,7 @@ export default function AdminLogin() {
</Link> </Link>
</Typography> </Typography>
</Box> </Box>
</Box>
</UnconnectedUserLayout> </UnconnectedUserLayout>
</>
) )
} }
...@@ -21,7 +21,6 @@ import { ChangeEvent, FormEvent, useContext, useState } from 'react' ...@@ -21,7 +21,6 @@ import { ChangeEvent, FormEvent, useContext, useState } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { Form, Link } from 'react-router-dom' import { Form, Link } from 'react-router-dom'
import SettingLanguage from '../components/GeneralSettings/SettingLanguage'
import { PasswordInput, UsernameInput } from '../components/Input' import { PasswordInput, UsernameInput } from '../components/Input'
import JamiWelcomeLogo from '../components/JamiWelcomeLogo' import JamiWelcomeLogo from '../components/JamiWelcomeLogo'
import ProcessingRequest from '../components/ProcessingRequest' import ProcessingRequest from '../components/ProcessingRequest'
...@@ -109,10 +108,6 @@ function LoginForm() { ...@@ -109,10 +108,6 @@ function LoginForm() {
return ( return (
<> <>
<Box sx={{ position: 'absolute', right: '0', padding: '1px' }}>
<SettingLanguage doNotDisplayLabel={true}></SettingLanguage>
</Box>
<ProcessingRequest open={isPending} /> <ProcessingRequest open={isPending} />
<UnconnectedUserLayout> <UnconnectedUserLayout>
<Box <Box
......
...@@ -22,7 +22,6 @@ import { ChangeEvent, FormEvent, useEffect, useState } from 'react' ...@@ -22,7 +22,6 @@ import { ChangeEvent, FormEvent, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { Form, Link, useNavigate } from 'react-router-dom' import { Form, Link, useNavigate } from 'react-router-dom'
import SettingLanguage from '../components/GeneralSettings/SettingLanguage'
import { NameStatus, PasswordInput, PasswordStatus, UsernameInput } from '../components/Input' import { NameStatus, PasswordInput, PasswordStatus, UsernameInput } from '../components/Input'
import JamiWelcomeLogo from '../components/JamiWelcomeLogo' import JamiWelcomeLogo from '../components/JamiWelcomeLogo'
import ProcessingRequest from '../components/ProcessingRequest' import ProcessingRequest from '../components/ProcessingRequest'
...@@ -146,11 +145,7 @@ function RegistrationForm() { ...@@ -146,11 +145,7 @@ function RegistrationForm() {
return ( return (
<> <>
<Box sx={{ position: 'absolute', right: '0', padding: '1px' }}>
<SettingLanguage doNotDisplayLabel={true}></SettingLanguage>
</Box>
<ProcessingRequest open={isPending} /> <ProcessingRequest open={isPending} />
<UnconnectedUserLayout> <UnconnectedUserLayout>
<Box <Box
sx={{ sx={{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment