beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed issues

Browse source
This commit is contained in:
Ananddubey01 2023-02-15 20:40:20 +05:30
parent b25d2ef135
commit 0ade1282f7
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/components/EmptyScreen.tsx
View file

@ -1,5 +1,5 @@
import React, { useContext } from 'react'; import React, { useContext } from 'react';
import { Button, styled, Typography } from '@mui/material'; import { Button, Stack, styled, Typography } from '@mui/material';
import constants from 'utils/strings/constants'; import constants from 'utils/strings/constants';
import { DeduplicateContext } from 'pages/deduplicate'; import { DeduplicateContext } from 'pages/deduplicate';
import VerticallyCentered, { FlexWrapper } from './Container'; import VerticallyCentered, { FlexWrapper } from './Container';
@ -29,7 +29,7 @@ export default function EmptyScreen({ openUploader }) {
</div> </div>
) : ( ) : (
<> <>
<VerticallyCentered <Stack
sx={{ sx={{
flex: 'none', flex: 'none',
pt: 1.5, pt: 1.5,
@ -44,7 +44,7 @@ export default function EmptyScreen({ openUploader }) {
color="text.secondary"> color="text.secondary">
{constants.WHERE_YOUR_BEST_PHOTOS_LIVE} {constants.WHERE_YOUR_BEST_PHOTOS_LIVE}
</Typography> </Typography>
</VerticallyCentered> </Stack>
<NonDraggableImage <NonDraggableImage
height={287.57} height={287.57}
src="/images/empty-state/ente_duck.png" src="/images/empty-state/ente_duck.png"
@ -57,9 +57,7 @@ export default function EmptyScreen({ openUploader }) {
!uploadManager.shouldAllowNewUpload() && !uploadManager.shouldAllowNewUpload() &&
'not-allowed', 'not-allowed',
}}> }}>
<VerticallyCentered <Stack paddingTop={1.5} paddingBottom={1.5}>
paddingTop={1.5}
paddingBottom={1.5}>
<Button <Button
color="accent" color="accent"
onClick={() => onClick={() =>
@ -101,7 +99,7 @@ export default function EmptyScreen({ openUploader }) {
{constants.IMPORT_YOUR_FOLDERS} {constants.IMPORT_YOUR_FOLDERS}
</FlexWrapper> </FlexWrapper>
</Button> </Button>
</VerticallyCentered> </Stack>
<VerticallyCentered <VerticallyCentered
paddingTop={3} paddingTop={3}
paddingBottom={3} paddingBottom={3}
@ -110,7 +108,7 @@ export default function EmptyScreen({ openUploader }) {
sx={{ gap: 1 }} sx={{ gap: 1 }}
justifyContent="center"> justifyContent="center">
<a href="https://apps.apple.com/app/id1542026904"> <a href="https://apps.apple.com/app/id1542026904">
<img <NonDraggableImage
height={59} height={59}
src="/images/download_assets/download_app_store.png" src="/images/download_assets/download_app_store.png"
srcSet="/images/download_assets/download_app_store@2x.png, srcSet="/images/download_assets/download_app_store@2x.png,
@ -118,7 +116,7 @@ export default function EmptyScreen({ openUploader }) {
/> />
</a> </a>
<a href="https://play.app.goo.gl/?link=https://play.google.com/store/apps/details?id=io.ente.photos"> <a href="https://play.app.goo.gl/?link=https://play.google.com/store/apps/details?id=io.ente.photos">
<img <NonDraggableImage
height={59} height={59}
src="/images/download_assets/download_play_store.png" src="/images/download_assets/download_play_store.png"
srcSet="/images/download_assets/download_play_store@2x.png, srcSet="/images/download_assets/download_play_store@2x.png,
@ -130,7 +128,7 @@ export default function EmptyScreen({ openUploader }) {
sx={{ gap: 1 }} sx={{ gap: 1 }}
justifyContent="center"> justifyContent="center">
<a href="https://f-droid.org/packages/io.ente.photos.fdroid/"> <a href="https://f-droid.org/packages/io.ente.photos.fdroid/">
<img <NonDraggableImage
height={49} height={49}
src="/images/download_assets/download_fdroid.png" src="/images/download_assets/download_fdroid.png"
srcSet="/images/download_assets/download_fdroid@2x.png, srcSet="/images/download_assets/download_fdroid@2x.png,
@ -139,7 +137,7 @@ export default function EmptyScreen({ openUploader }) {
/> />
</a> </a>
<a href="https://github.com/ente-io"> <a href="https://github.com/ente-io">
<img <NonDraggableImage
height={49} height={49}
src="/images/download_assets/download_github.png" src="/images/download_assets/download_github.png"
srcSet="/images/download_assets/download_github@2x.png, srcSet="/images/download_assets/download_github@2x.png,

4
src/components/PhotoFrame.tsx
View file

@ -112,7 +112,7 @@ const PhotoFrame = ({
const updateRequired = useRef(false); const updateRequired = useRef(false);
const [filteredData, setFilteredData] = useState<EnteFile[]>([]); const [filteredData, setFilteredData] = useState<EnteFile[]>([]);
const hasPersonalFiles = files.length - incomingShareFiles.length > 0;
useEffect(() => { useEffect(() => {
const user: User = getData(LS_KEYS.USER); const user: User = getData(LS_KEYS.USER);
setUser(user); setUser(user);
@ -633,7 +633,7 @@ const PhotoFrame = ({
return ( return (
<> <>
{!isFirstLoad && {!isFirstLoad &&
files.length - incomingShareFiles.length === 0 && !hasPersonalFiles &&
!isInSearchMode && !isInSearchMode &&
activeCollection === ALL_SECTION ? ( activeCollection === ALL_SECTION ? (
<EmptyScreen openUploader={openUploader} /> <EmptyScreen openUploader={openUploader} />

1
thirdparty/tesseract vendored Submodule

@ -0,0 +1 @@
Subproject commit 73b42f8cb0bc36aee08a837b4ea70c919edab4cc