Merge branch 'feat/VersionsExplorer' of https://git.popa-popa.ru/DIKER/popa-launcher into feat/VersionsExplorer
This commit is contained in:
@ -331,7 +331,6 @@ const Login = ({ onLoginSuccess }: LoginProps) => {
|
|||||||
<FullScreenLoader message="Входим..." />
|
<FullScreenLoader message="Входим..." />
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<PopaPopa />
|
|
||||||
|
|
||||||
{/* ===== QR экран по умолчанию ===== */}
|
{/* ===== QR экран по умолчанию ===== */}
|
||||||
{!showPasswordLogin ? (
|
{!showPasswordLogin ? (
|
||||||
@ -343,6 +342,7 @@ const Login = ({ onLoginSuccess }: LoginProps) => {
|
|||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
<PopaPopa/>
|
||||||
<Typography
|
<Typography
|
||||||
sx={{
|
sx={{
|
||||||
fontFamily: 'Benzin-Bold',
|
fontFamily: 'Benzin-Bold',
|
||||||
@ -368,14 +368,6 @@ const Login = ({ onLoginSuccess }: LoginProps) => {
|
|||||||
{/* QR контейнер */}
|
{/* QR контейнер */}
|
||||||
<div ref={qrRef} style={{ minHeight: 300 }} />
|
<div ref={qrRef} style={{ minHeight: 300 }} />
|
||||||
|
|
||||||
{qrLoading ? (
|
|
||||||
<FullScreenLoader fullScreen={false} />
|
|
||||||
) : (
|
|
||||||
<Typography variant="body1">
|
|
||||||
Ждем подтверждения в боте
|
|
||||||
</Typography>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
@ -384,6 +376,7 @@ const Login = ({ onLoginSuccess }: LoginProps) => {
|
|||||||
gap: '2vh',
|
gap: '2vh',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
{qrLoading && <FullScreenLoader fullScreen={true} /> }
|
||||||
<Typography onClick={startQrLogin} sx={gradientTextSx}>
|
<Typography onClick={startQrLogin} sx={gradientTextSx}>
|
||||||
Обновить QR
|
Обновить QR
|
||||||
</Typography>
|
</Typography>
|
||||||
|
|||||||
Reference in New Issue
Block a user