diff --git a/src/components/Container.ts b/src/components/Container.ts index b9d207fcb..9ec7b7faa 100644 --- a/src/components/Container.ts +++ b/src/components/Container.ts @@ -50,7 +50,7 @@ export const Value = styled.div<{ width?: string }>` justify-content: flex-start; align-items: center; width: ${(props) => props.width ?? '30%'}; - text-align: center; + color: #ddd; `; diff --git a/src/components/PhotoFrame.tsx b/src/components/PhotoFrame.tsx index 0f416abd5..b5ab73aa3 100644 --- a/src/components/PhotoFrame.tsx +++ b/src/components/PhotoFrame.tsx @@ -50,7 +50,7 @@ const EmptyScreen = styled.div` } `; -const PHOTOSWIPE_HASH_SUFFIX = '&photoswipe-opened'; +const PHOTOSWIPE_HASH_SUFFIX = '&opened'; interface Props { files: EnteFile[]; diff --git a/src/components/PhotoList.tsx b/src/components/PhotoList.tsx index e1d62b8da..598edb891 100644 --- a/src/components/PhotoList.tsx +++ b/src/components/PhotoList.tsx @@ -12,7 +12,7 @@ import { } from 'constants/gallery'; import constants from 'utils/strings/constants'; import { PublicCollectionGalleryContext } from 'utils/publicCollectionGallery'; -import { ENTE_WEBSITE_LINK } from 'constants/publicCollection'; +import { ENTE_WEBSITE_LINK } from 'constants/urls'; import { getVariantColor, ButtonVariant } from './pages/gallery/LinkButton'; const A_DAY = 24 * 60 * 60 * 1000; diff --git a/src/components/PhotoSwipe/PhotoSwipe.tsx b/src/components/PhotoSwipe/PhotoSwipe.tsx index 9b3ca6281..327644956 100644 --- a/src/components/PhotoSwipe/PhotoSwipe.tsx +++ b/src/components/PhotoSwipe/PhotoSwipe.tsx @@ -148,7 +148,14 @@ function RenderCreationTime({ <> {constants.CREATION_TIME} - + {isInEditMode ? ( - - {!shouldDisableEdits && - (!isInEditMode ? ( + {!shouldDisableEdits && ( + + {!isInEditMode ? ( @@ -181,8 +188,9 @@ function RenderCreationTime({ > - ))} - + )} + + )} > ); @@ -323,7 +331,7 @@ function RenderFileName({ {constants.FILE_NAME} {!isInEditMode ? ( <> - + {getFileTitle(filename, extension)} @@ -735,11 +743,13 @@ function PhotoSwipe(props: Iprops) { }} /> )} - + {!props.isSharedCollection && ( + + )} @@ -765,16 +775,18 @@ function PhotoSwipe(props: Iprops) { - + {!props.isSharedCollection && ( + + )} > ); } diff --git a/src/components/pages/sharedAlbum/GoToEnte.tsx b/src/components/pages/sharedAlbum/GoToEnte.tsx index b83fd88f2..7fefe8308 100644 --- a/src/components/pages/sharedAlbum/GoToEnte.tsx +++ b/src/components/pages/sharedAlbum/GoToEnte.tsx @@ -1,3 +1,4 @@ +import { ENTE_WEBSITE_LINK } from 'constants/urls'; import React, { useEffect, useState } from 'react'; import { Button } from 'react-bootstrap'; import styled from 'styled-components'; @@ -42,17 +43,9 @@ function GoToEnte() { } }; - const getHookLink = (os: OS) => { - if (os === OS.ANDROID || os === OS.IOS) { - return 'https://ente.io/app'; - } else { - return 'https://web.ente.io'; - } - }; - return ( - + {getButtonText(os)} diff --git a/src/constants/publicCollection/index.ts b/src/constants/publicCollection/index.ts index b5bce8cff..731e30d5e 100644 --- a/src/constants/publicCollection/index.ts +++ b/src/constants/publicCollection/index.ts @@ -2,5 +2,3 @@ export enum REPORT_REASON { COPYRIGHT = 'COPYRIGHT', MALICIOUS_CONTENT = 'MALICIOUS_CONTENT', } - -export const ENTE_WEBSITE_LINK = 'https://ente.io'; diff --git a/src/constants/urls/index.ts b/src/constants/urls/index.ts new file mode 100644 index 000000000..0d4dff35b --- /dev/null +++ b/src/constants/urls/index.ts @@ -0,0 +1 @@ +export const ENTE_WEBSITE_LINK = 'https://ente.io'; diff --git a/src/services/publicCollectionDownloadManager.ts b/src/services/publicCollectionDownloadManager.ts index 71a3a3cdb..f9ab95846 100644 --- a/src/services/publicCollectionDownloadManager.ts +++ b/src/services/publicCollectionDownloadManager.ts @@ -144,7 +144,7 @@ class PublicCollectionDownloadManager { } const resp = await fetch(getPublicCollectionFileURL(file.id), { headers: { - 'X-Auth-Token': token, + 'X-Auth-Access-Token': token, }, }); const reader = resp.body.getReader();