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

Merge branch 'cast' of github.com:ente-io/photos-web into cast

Browse source
This commit is contained in:
Neeraj Gupta 2024-01-30 14:34:41 +05:30
commit d94ea221c7
4 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/cast/src/pages/_app.tsx
View file

@ -1,5 +1,4 @@
import type { AppProps } from 'next/app';
import 'styles/global.css';
import { ThemeProvider, CssBaseline } from '@mui/material';
import { getTheme } from '@ente/shared/themes';

30
apps/photos/src/components/Collections/CollectionInfoWithOptions.tsx
View file

@ -53,22 +53,20 @@ export default function CollectionInfoWithOptions({
};
return (
<>
<CollectionInfoBarWrapper>
<SpaceBetweenFlex>
<CollectionInfo
name={name}
fileCount={fileCount}
endIcon={<EndIcon type={type} />}
<CollectionInfoBarWrapper>
<SpaceBetweenFlex>
<CollectionInfo
name={name}
fileCount={fileCount}
endIcon={<EndIcon type={type} />}
/>
{shouldShowOptions(type) && (
<CollectionOptions
{...props}
collectionSummaryType={type}
/>
{shouldShowOptions(type) && (
<CollectionOptions
{...props}
collectionSummaryType={type}
/>
)}
</SpaceBetweenFlex>
</CollectionInfoBarWrapper>
</>
)}
</SpaceBetweenFlex>
</CollectionInfoBarWrapper>
);
}

3
apps/photos/src/components/Collections/CollectionOptions/AlbumCastDialog.tsx
View file

@ -109,10 +109,9 @@ export default function AlbumCastDialog(props: Props) {
return;
}
const session = instance.getCurrentSession();
console.log(session);
session.addMessageListener(
'urn:x-cast:pair-request',
(namespace, message) => {
(_, message) => {
const data = message;
const obj = JSON.parse(data);
const code = obj.code;

5
apps/photos/src/components/Collections/index.tsx
View file

@ -140,6 +140,7 @@ export default function Collections(props: Iprops) {
const closeAllCollections = () => setAllCollectionView(false);
const openAllCollections = () => setAllCollectionView(true);
const closeCollectionShare = () => setCollectionShareModalView(false);
const closeAlbumCastDialog = () => setShowAlbumCastDialog(false);
return (
<>
@ -176,9 +177,9 @@ export default function Collections(props: Iprops) {
collection={activeCollection}
/>
<AlbumCastDialog
currentCollection={props.activeCollection}
currentCollection={activeCollection}
show={showAlbumCastDialog}
onHide={() => setShowAlbumCastDialog(false)}
onHide={closeAlbumCastDialog}
/>
</>
);