Merge pull request #399 from ente-io/master

release
This commit is contained in:
Abhinav Kumar 2022-02-26 19:10:56 +05:30 committed by GitHub
commit 0f3bbc0995
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 9 deletions

View file

@ -1,6 +1,6 @@
{ {
"name": "bada-frame", "name": "bada-frame",
"version": "0.6.1", "version": "0.7.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",

View file

@ -32,7 +32,6 @@ import LoadingBar from 'react-top-loading-bar';
import CryptoWorker from 'utils/crypto'; import CryptoWorker from 'utils/crypto';
import { PAGES } from 'constants/pages'; import { PAGES } from 'constants/pages';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
import LogoImg from 'components/LogoImg';
import SingleInputForm from 'components/SingleInputForm'; import SingleInputForm from 'components/SingleInputForm';
import { Card } from 'react-bootstrap'; import { Card } from 'react-bootstrap';
import { logError } from 'utils/sentry'; import { logError } from 'utils/sentry';
@ -265,13 +264,9 @@ export default function PublicCollectionGallery() {
if (isPasswordProtected && !passwordJWTToken.current) { if (isPasswordProtected && !passwordJWTToken.current) {
return ( return (
<Container> <Container>
<Card style={{ width: '332px' }} className="text-center"> <Card style={{ maxWidth: '332px' }} className="text-center">
<Card.Body style={{ padding: '40px 30px' }}> <Card.Body style={{ padding: '40px 30px' }}>
<Card.Title style={{ marginBottom: '24px' }}> <Card.Subtitle style={{ marginBottom: '2rem' }}>
<LogoImg src="/icon.svg" />
{constants.PASSWORD}
</Card.Title>
<Card.Subtitle style={{ marginBottom: '1rem' }}>
{/* <LogoImg src="/icon.svg" /> */} {/* <LogoImg src="/icon.svg" /> */}
{constants.LINK_PASSWORD} {constants.LINK_PASSWORD}
</Card.Subtitle> </Card.Subtitle>

View file

@ -314,7 +314,7 @@ export const verifyPublicCollectionPassword = async (
const jwtToken = resp.data.jwtToken; const jwtToken = resp.data.jwtToken;
return jwtToken; return jwtToken;
} catch (e) { } catch (e) {
logError(e, 'failed to get public collection'); logError(e, 'failed to verify public collection password');
throw e; throw e;
} }
}; };