From 3dcebca585366f0abfdb83000f44796f1f61769b Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Mon, 15 Feb 2021 14:54:08 +0530 Subject: [PATCH 01/14] Remove old icon --- public/icon.png | Bin 27533 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/icon.png diff --git a/public/icon.png b/public/icon.png deleted file mode 100644 index 658ae352e0dbed6c443b02e4cdcc91363c28600d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27533 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 z 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 Z&73;h^-#%7gR8J08mc-f Date: Mon, 15 Feb 2021 14:54:15 +0530 Subject: [PATCH 02/14] Update strings --- src/pages/_app.tsx | 2 +- src/pages/_document.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 8584f8038..8823bfb0a 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -166,7 +166,7 @@ export default function App({ Component, pageProps }) { > - ente.io | Privacy friendly alternative to Google Photos + ente.io | Encrypted Photo Storage diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx index 111b9349c..353845129 100644 --- a/src/pages/_document.tsx +++ b/src/pages/_document.tsx @@ -34,7 +34,7 @@ export default class MyDocument extends Document { From 271b9c2e8886a3c588dbc0ac2d3048cb4f5ba99f Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Mon, 15 Feb 2021 15:10:38 +0530 Subject: [PATCH 03/14] Update icon --- public/icon.svg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/icon.svg b/public/icon.svg index a6d088c1c..a2cfc24b3 100644 --- a/public/icon.svg +++ b/public/icon.svg @@ -1,3 +1,6 @@ - + + + + From f42ae6e55101b848a8e03c951add701d73997674 Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Mon, 15 Feb 2021 16:16:16 +0530 Subject: [PATCH 04/14] Update login screen --- src/pages/_app.tsx | 14 +++++++++++++- src/pages/gallery/components/UploadButton.tsx | 3 ++- src/pages/index.tsx | 4 ++-- src/utils/strings/englishConstants.tsx | 10 ++++++---- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 8823bfb0a..46f467497 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -101,10 +101,22 @@ const GlobalStyles = createGlobalStyle` overflow: hidden; margin: 0 0 5px 0; } - .modal-content{ + .modal-content { background-color:#303030 !important; color:#aaa; } + .btn-primary { + background: #2dc262; + padding: 8px; + padding-left: 24px; + padding-right: 24px; + } + .btn-primary:hover { + background-color: #29a354; + } + .btn-primary:disabled { + background-color: #69b383; + } `; const Image = styled.img` diff --git a/src/pages/gallery/components/UploadButton.tsx b/src/pages/gallery/components/UploadButton.tsx index 0943bc5dd..228301120 100644 --- a/src/pages/gallery/components/UploadButton.tsx +++ b/src/pages/gallery/components/UploadButton.tsx @@ -1,10 +1,11 @@ import React from 'react'; import { Button } from 'react-bootstrap'; +import constants from 'utils/strings/constants'; function UploadButton({ showModal }) { return ( ); } diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 168ee2992..649d20df2 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -110,7 +110,7 @@ export default function Home() { disabled={loading} style={{ marginBottom: '12px' }} > - {constants.SUBMIT} + {constants.LOGIN} )} @@ -120,7 +120,7 @@ export default function Home() { onClick={register} style={{ fontSize: '14px' }} > - Don't have an account? + {constants.NO_ACCOUNT} diff --git a/src/utils/strings/englishConstants.tsx b/src/utils/strings/englishConstants.tsx index 4e76c934d..e5c8c34df 100644 --- a/src/utils/strings/englishConstants.tsx +++ b/src/utils/strings/englishConstants.tsx @@ -5,15 +5,15 @@ import { template } from './vernacularStrings'; */ const englishConstants = { COMPANY_NAME: 'ente', - LOGIN: 'Login', + LOGIN: 'login', SIGN_UP: 'Sign Up', NAME: 'Name', ENTER_NAME: 'your name', EMAIL: 'Email Address', - ENTER_EMAIL: 'email address', + ENTER_EMAIL: 'email', DATA_DISCLAIMER: `We'll never share your data with anyone else.`, - SUBMIT: 'Submit', - EMAIL_ERROR: 'Enter a valid email address', + SUBMIT: 'submit', + EMAIL_ERROR: 'Enter a valid email', REQUIRED: 'Required', VERIFY_EMAIL: 'Verify Email', EMAIL_SENT: ({ email }) => ( @@ -64,6 +64,8 @@ const englishConstants = { WEB_SIGNUPS_DISABLED: 'Web signups are disabled for now, please install the mobile app and signup there', USER_DOES_NOT_EXIST: 'Incorrect EmailId, No such user exists', + UPLOAD_BUTTON_TEXT: 'Upload', + NO_ACCOUNT: 'don\'t have an account?', }; export default englishConstants; From 89097485450151b45d4dec901c84a403d0f53517 Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Mon, 15 Feb 2021 16:17:24 +0530 Subject: [PATCH 05/14] Update string --- src/utils/strings/englishConstants.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/strings/englishConstants.tsx b/src/utils/strings/englishConstants.tsx index e5c8c34df..21f200a56 100644 --- a/src/utils/strings/englishConstants.tsx +++ b/src/utils/strings/englishConstants.tsx @@ -63,7 +63,7 @@ const englishConstants = { 'You have exceeded your designated storage Quota, please upgrade your plan to add more files', WEB_SIGNUPS_DISABLED: 'Web signups are disabled for now, please install the mobile app and signup there', - USER_DOES_NOT_EXIST: 'Incorrect EmailId, No such user exists', + USER_DOES_NOT_EXIST: 'sorry, could not find an ente user', UPLOAD_BUTTON_TEXT: 'Upload', NO_ACCOUNT: 'don\'t have an account?', }; From 7e588e7666f3164a06d9d4b0004e3abb39807b6a Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Mon, 15 Feb 2021 16:35:41 +0530 Subject: [PATCH 06/14] Update verification screen --- public/email_sent.svg | 1 - src/pages/verify/index.tsx | 3 +-- src/utils/strings/englishConstants.tsx | 32 +++++++++++++------------- 3 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 public/email_sent.svg diff --git a/public/email_sent.svg b/public/email_sent.svg deleted file mode 100644 index 01de333d3..000000000 --- a/public/email_sent.svg +++ /dev/null @@ -1 +0,0 @@ -new message \ No newline at end of file diff --git a/src/pages/verify/index.tsx b/src/pages/verify/index.tsx index 198e2569e..dd3a02360 100644 --- a/src/pages/verify/index.tsx +++ b/src/pages/verify/index.tsx @@ -82,10 +82,9 @@ export default function Verify() { return ( - Email Sent - {constants.VERIFY_EMAIL} + {constants.VERIFY_EMAIL} {constants.EMAIL_SENT({ email })} {constants.CHECK_INBOX}
diff --git a/src/utils/strings/englishConstants.tsx b/src/utils/strings/englishConstants.tsx index 21f200a56..bae398b9f 100644 --- a/src/utils/strings/englishConstants.tsx +++ b/src/utils/strings/englishConstants.tsx @@ -6,29 +6,29 @@ import { template } from './vernacularStrings'; const englishConstants = { COMPANY_NAME: 'ente', LOGIN: 'login', - SIGN_UP: 'Sign Up', - NAME: 'Name', + SIGN_UP: 'sign up', + NAME: 'name', ENTER_NAME: 'your name', - EMAIL: 'Email Address', + EMAIL: 'email', ENTER_EMAIL: 'email', - DATA_DISCLAIMER: `We'll never share your data with anyone else.`, + DATA_DISCLAIMER: `we'll never share your data with anyone else.`, SUBMIT: 'submit', - EMAIL_ERROR: 'Enter a valid email', - REQUIRED: 'Required', - VERIFY_EMAIL: 'Verify Email', + EMAIL_ERROR: 'enter a valid email', + REQUIRED: 'required', + VERIFY_EMAIL: 'verify email', EMAIL_SENT: ({ email }) => (

- We have sent a mail to {email}. + we have sent a mail to {email}

), - CHECK_INBOX: 'Please check your inbox (and spam) to complete verification.', - ENTER_OTT: 'Enter verification code here', - RESEND_MAIL: 'Did not get email?', - VERIFY: 'Verify', - UNKNOWN_ERROR: 'Oops! Something went wrong. Please try again.', - INVALID_CODE: 'Invalid verification code', - SENDING: 'Sending...', - SENT: 'Sent! Check again.', + CHECK_INBOX: 'please check your inbox (and spam) to complete verification', + ENTER_OTT: 'verification code', + RESEND_MAIL: 'did not get email?', + VERIFY: 'verify', + UNKNOWN_ERROR: 'something went wrong, please try again', + INVALID_CODE: 'invalid verification code', + SENDING: 'sending...', + SENT: 'sent!', ENTER_PASSPHRASE: 'Please enter your passphrase.', RETURN_PASSPHRASE_HINT: 'That thing you promised to never forget.', SET_PASSPHRASE: 'Set Passphrase', From 4e3b78eab1f9c6fdc1bab1aef11096e6da83b63f Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Mon, 15 Feb 2021 16:47:01 +0530 Subject: [PATCH 07/14] Update password entry screen --- src/pages/credentials/index.tsx | 8 ++++---- src/utils/strings/englishConstants.tsx | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/pages/credentials/index.tsx b/src/pages/credentials/index.tsx index f25888950..8593adccc 100644 --- a/src/pages/credentials/index.tsx +++ b/src/pages/credentials/index.tsx @@ -90,10 +90,10 @@ export default function Credentials() { return ( - vault - + {/* vault */} + -

{constants.ENTER_PASSPHRASE}

+ {constants.ENTER_PASSPHRASE} initialValues={{ passphrase: '' }} onSubmit={verifyPassphrase} @@ -123,7 +123,7 @@ export default function Credentials() { onBlur={handleBlur('passphrase')} isInvalid={Boolean( touched.passphrase && - errors.passphrase + errors.passphrase )} disabled={loading} /> diff --git a/src/utils/strings/englishConstants.tsx b/src/utils/strings/englishConstants.tsx index bae398b9f..f06e2562c 100644 --- a/src/utils/strings/englishConstants.tsx +++ b/src/utils/strings/englishConstants.tsx @@ -29,24 +29,24 @@ const englishConstants = { INVALID_CODE: 'invalid verification code', SENDING: 'sending...', SENT: 'sent!', - ENTER_PASSPHRASE: 'Please enter your passphrase.', - RETURN_PASSPHRASE_HINT: 'That thing you promised to never forget.', - SET_PASSPHRASE: 'Set Passphrase', - VERIFY_PASSPHRASE: 'Verify Passphrase', - INCORRECT_PASSPHRASE: 'Incorrect Passphrase', + ENTER_PASSPHRASE: 'please enter your password', + RETURN_PASSPHRASE_HINT: 'password', + SET_PASSPHRASE: 'set password', + VERIFY_PASSPHRASE: 'sign in', + INCORRECT_PASSPHRASE: 'incorrect password', ENTER_ENC_PASSPHRASE: - 'Please enter a passphrase that we can use to encrypt your data.', + 'please enter a password that we can use to encrypt your data', PASSPHRASE_DISCLAIMER: () => (

- We don't store your passphrase, so if you forget, + we don't store your password, so if you forget, we will not be able to help you recover your data.

), - PASSPHRASE_HINT: 'Something you will never forget', - PASSPHRASE_CONFIRM: 'Please repeat it once more', - PASSPHRASE_MATCH_ERROR: `Passphrase didn't match`, + PASSPHRASE_HINT: 'password', + PASSPHRASE_CONFIRM: 'password again', + PASSPHRASE_MATCH_ERROR: `passwords don't match`, CONSOLE_WARNING_STOP: 'STOP!', - CONSOLE_WARNING_DESC: `This is a browser feature intended for developers. If someone told you to copy-paste something here to enable a feature or "hack" someone's account, it is a scam and will give them access to your account.`, + CONSOLE_WARNING_DESC: `This is a browser feature intended for developers. Please don't copy-paste unverified code here.`, SELECT_COLLECTION: `Select/Click on Collection to upload`, CLOSE: 'Close', NOTHING_HERE: `nothing to see here! 👀`, From 4380d2cee0035dc30f9aaace32f297d806eede76 Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Mon, 15 Feb 2021 16:51:34 +0530 Subject: [PATCH 08/14] Change loading bar color --- src/pages/gallery/index.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/gallery/index.tsx b/src/pages/gallery/index.tsx index 0c1345907..f85f5ae46 100644 --- a/src/pages/gallery/index.tsx +++ b/src/pages/gallery/index.tsx @@ -340,7 +340,7 @@ export default function Gallery(props) { <> setProgress(0)} /> @@ -430,7 +430,7 @@ export default function Gallery(props) { timeStampList[index].itemType === - ITEM_TYPE.TIME + ITEM_TYPE.TIME ? DATE_CONTAINER_HEIGHT : IMAGE_CONTAINER_HEIGHT } @@ -447,14 +447,14 @@ export default function Gallery(props) { columns={ timeStampList[index] .itemType === - ITEM_TYPE.TIME + ITEM_TYPE.TIME ? 1 : columns } > {timeStampList[index] .itemType === - ITEM_TYPE.TIME ? ( + ITEM_TYPE.TIME ? ( { timeStampList[ @@ -473,7 +473,7 @@ export default function Gallery(props) { index ] .itemStartIndex + - idx + idx ); } ) From 9ef43724e6a446ed03e227b1aaab4243cc3c4b2c Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Mon, 15 Feb 2021 16:59:02 +0530 Subject: [PATCH 09/14] Remove redundant spinner --- src/pages/gallery/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/gallery/index.tsx b/src/pages/gallery/index.tsx index f85f5ae46..6280676fc 100644 --- a/src/pages/gallery/index.tsx +++ b/src/pages/gallery/index.tsx @@ -298,7 +298,6 @@ export default function Gallery(props) { if (!data || loading) { return (
-
); } From c57772c2fb6333cc801b788c9ee5db19032bba32 Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Mon, 15 Feb 2021 17:04:11 +0530 Subject: [PATCH 10/14] Update gallery screen --- src/pages/_app.tsx | 2 ++ src/pages/gallery/components/Collections.tsx | 6 +++--- src/utils/strings/englishConstants.tsx | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 46f467497..c8b94d3ef 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -107,12 +107,14 @@ const GlobalStyles = createGlobalStyle` } .btn-primary { background: #2dc262; + border-color: #29a354; padding: 8px; padding-left: 24px; padding-right: 24px; } .btn-primary:hover { background-color: #29a354; + border-color: #2dc262; } .btn-primary:disabled { background-color: #69b383; diff --git a/src/pages/gallery/components/Collections.tsx b/src/pages/gallery/components/Collections.tsx index 4a44b940c..d0e689bcc 100644 --- a/src/pages/gallery/components/Collections.tsx +++ b/src/pages/gallery/components/Collections.tsx @@ -36,9 +36,9 @@ const Wrapper = styled.div` max-width: 100%; `; const Chip = styled.button<{ active: boolean }>` - border-radius: 20px; - padding: 2px 10px; - margin: 2px 5px 2px 2px; + border-radius: 8px; + padding: 4px 14px; + margin: 2px 8px 2px 2px; border: none; background-color: ${(props) => props.active ? '#fff' : 'rgba(255, 255, 255, 0.3)'}; diff --git a/src/utils/strings/englishConstants.tsx b/src/utils/strings/englishConstants.tsx index f06e2562c..6d913948d 100644 --- a/src/utils/strings/englishConstants.tsx +++ b/src/utils/strings/englishConstants.tsx @@ -64,7 +64,7 @@ const englishConstants = { WEB_SIGNUPS_DISABLED: 'Web signups are disabled for now, please install the mobile app and signup there', USER_DOES_NOT_EXIST: 'sorry, could not find an ente user', - UPLOAD_BUTTON_TEXT: 'Upload', + UPLOAD_BUTTON_TEXT: 'upload', NO_ACCOUNT: 'don\'t have an account?', }; From a609f966cffa6c37b8e89c4b281e547b4cf73fe9 Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Mon, 15 Feb 2021 17:15:10 +0530 Subject: [PATCH 11/14] Remove background for unloaded image --- public/image.svg | 1 - src/pages/gallery/components/PreviewCard.tsx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 public/image.svg diff --git a/public/image.svg b/public/image.svg deleted file mode 100644 index e247cfe2a..000000000 --- a/public/image.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/pages/gallery/components/PreviewCard.tsx b/src/pages/gallery/components/PreviewCard.tsx index caecbea06..ec94e4e24 100644 --- a/src/pages/gallery/components/PreviewCard.tsx +++ b/src/pages/gallery/components/PreviewCard.tsx @@ -12,7 +12,7 @@ interface IProps { } const Cont = styled.div<{ disabled: boolean }>` - background: #555 url(/image.svg) no-repeat center; + background: #333; display: block; width: fit-content; height: 192px; From aaffd4d2896a37f350414631c8e43dd1654ddf26 Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Mon, 15 Feb 2021 18:12:03 +0530 Subject: [PATCH 12/14] Embrace the darkness --- src/components/Navbar.tsx | 2 +- src/pages/_app.tsx | 7 ++++++- src/pages/credentials/index.tsx | 2 +- src/pages/gallery/components/Collections.tsx | 3 ++- src/pages/gallery/components/PreviewCard.tsx | 2 +- src/pages/index.tsx | 10 +++++----- src/pages/verify/index.tsx | 1 + src/utils/strings/englishConstants.tsx | 9 +++++---- 8 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index f34ceba93..998a9b287 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -4,7 +4,7 @@ const Navbar = styled.div` padding: 8px 12px; font-size: 20px; line-height: 2rem; - background-color: #212121; + background-color: #111; color: #fff; min-height: 56px; display: flex; diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index c8b94d3ef..2795e77f5 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -32,7 +32,7 @@ const GlobalStyles = createGlobalStyle` flex: 1; display: flex; flex-direction: column; - background-color: #303030; + background-color: #191919; } #__next { @@ -119,6 +119,11 @@ const GlobalStyles = createGlobalStyle` .btn-primary:disabled { background-color: #69b383; } + .card { + background-color: #242424; + color: #fff; + border-radius: 12px; + } `; const Image = styled.img` diff --git a/src/pages/credentials/index.tsx b/src/pages/credentials/index.tsx index 8593adccc..049af9313 100644 --- a/src/pages/credentials/index.tsx +++ b/src/pages/credentials/index.tsx @@ -91,7 +91,7 @@ export default function Credentials() { return ( {/* vault */} - + {constants.ENTER_PASSPHRASE} diff --git a/src/pages/gallery/components/Collections.tsx b/src/pages/gallery/components/Collections.tsx index d0e689bcc..3e5238c08 100644 --- a/src/pages/gallery/components/Collections.tsx +++ b/src/pages/gallery/components/Collections.tsx @@ -11,7 +11,7 @@ interface CollectionProps { const Container = styled.div` margin: 0 auto; overflow-y: hidden; - height: 40px; + height: 50px; display: flex; max-width: 100%; @@ -30,6 +30,7 @@ const Container = styled.div` const Wrapper = styled.div` height: 70px; + margin-top: 10px; flex: 1; white-space: nowrap; overflow: auto; diff --git a/src/pages/gallery/components/PreviewCard.tsx b/src/pages/gallery/components/PreviewCard.tsx index ec94e4e24..ab6db985c 100644 --- a/src/pages/gallery/components/PreviewCard.tsx +++ b/src/pages/gallery/components/PreviewCard.tsx @@ -12,7 +12,7 @@ interface IProps { } const Cont = styled.div<{ disabled: boolean }>` - background: #333; + background: #222; display: block; width: fit-content; height: 192px; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 649d20df2..cd0a5a179 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -59,14 +59,14 @@ export default function Home() { return ( <> -
- {constants.WEB_SIGNUPS_DISABLED} +
+ {constants.WEB_SIGNUPS_DISABLED()}
- - - + + + {constants.LOGIN} diff --git a/src/pages/verify/index.tsx b/src/pages/verify/index.tsx index dd3a02360..98251fc1d 100644 --- a/src/pages/verify/index.tsx +++ b/src/pages/verify/index.tsx @@ -117,6 +117,7 @@ export default function Verify() { )} placeholder={constants.ENTER_OTT} disabled={loading} + autoFocus={true} /> {errors.ott} diff --git a/src/utils/strings/englishConstants.tsx b/src/utils/strings/englishConstants.tsx index 6d913948d..857f86167 100644 --- a/src/utils/strings/englishConstants.tsx +++ b/src/utils/strings/englishConstants.tsx @@ -29,7 +29,7 @@ const englishConstants = { INVALID_CODE: 'invalid verification code', SENDING: 'sending...', SENT: 'sent!', - ENTER_PASSPHRASE: 'please enter your password', + ENTER_PASSPHRASE: 'enter your password', RETURN_PASSPHRASE_HINT: 'password', SET_PASSPHRASE: 'set password', VERIFY_PASSPHRASE: 'sign in', @@ -61,9 +61,10 @@ const englishConstants = { "You don't have a active subscription plan!! Please get one in the mobile app", STORAGE_QUOTA_EXCEEDED: 'You have exceeded your designated storage Quota, please upgrade your plan to add more files', - WEB_SIGNUPS_DISABLED: - 'Web signups are disabled for now, please install the mobile app and signup there', - USER_DOES_NOT_EXIST: 'sorry, could not find an ente user', + WEB_SIGNUPS_DISABLED: () => ( +
sorry signups are possibly only on the mobile app
+ ), + USER_DOES_NOT_EXIST: 'sorry, could not find a user with that email', UPLOAD_BUTTON_TEXT: 'upload', NO_ACCOUNT: 'don\'t have an account?', }; From f3097a67c361b4635d9f785f9fc04e2b30a73860 Mon Sep 17 00:00:00 2001 From: Vishnu Mohandas Date: Mon, 15 Feb 2021 18:49:59 +0530 Subject: [PATCH 13/14] Update collection selector modal --- src/pages/_app.tsx | 6 +-- .../gallery/components/AddCollection.tsx | 7 ++-- .../gallery/components/CollectionSelector.tsx | 41 ++++++++++--------- src/utils/strings/englishConstants.tsx | 3 +- 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 2795e77f5..755586a01 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -82,7 +82,7 @@ const GlobalStyles = createGlobalStyle` } .modal-90w{ width:90vw; - max-width:880px!important; + max-width:960px!important; } .modal .modal-header, .modal .modal-footer { border-color: #444 !important; @@ -92,7 +92,7 @@ const GlobalStyles = createGlobalStyle` text-shadow: none; } .modal .card { - background-color: #303030; + background-color: #202020; border: none; color: #aaa; } @@ -102,7 +102,7 @@ const GlobalStyles = createGlobalStyle` margin: 0 0 5px 0; } .modal-content { - background-color:#303030 !important; + background-color:#202020 !important; color:#aaa; } .btn-primary { diff --git a/src/pages/gallery/components/AddCollection.tsx b/src/pages/gallery/components/AddCollection.tsx index 535b62a07..8a3c016fc 100644 --- a/src/pages/gallery/components/AddCollection.tsx +++ b/src/pages/gallery/components/AddCollection.tsx @@ -3,6 +3,7 @@ import { Card } from 'react-bootstrap'; import styled from 'styled-components'; import CreateCollection from './CreateCollection'; import DropzoneWrapper from './DropzoneWrapper'; +import constants from 'utils/strings/constants'; const ImageContainer = styled.div` min-height: 192px; @@ -32,12 +33,12 @@ export default function AddCollection(props) { + - Create New Album + {constants.CREATE_COLLECTION} ); return ( - <> +
setCreateCollectionView(false)} acceptedFiles={acceptedFiles} /> - +
); } diff --git a/src/pages/gallery/components/CollectionSelector.tsx b/src/pages/gallery/components/CollectionSelector.tsx index 18f9ee4f1..ebf3c5c54 100644 --- a/src/pages/gallery/components/CollectionSelector.tsx +++ b/src/pages/gallery/components/CollectionSelector.tsx @@ -15,24 +15,26 @@ function CollectionSelector(props) { } = props; const CollectionIcons = collectionAndItsLatestFile?.map((item) => ( - - - {}} - forcedEnable - /> - - {item.collection.name} - - - +
+ + + { }} + forcedEnable + /> + + {item.collection.name} + + + +
)); return ( @@ -40,9 +42,10 @@ function CollectionSelector(props) { show={uploadModalView} onHide={closeUploadModal} dialogClassName="modal-90w" + style={{ maxWidth: '100%' }} > - {constants.SELECT_COLLECTION} + {constants.SELECT_COLLECTION} Date: Mon, 15 Feb 2021 19:15:48 +0530 Subject: [PATCH 14/14] Update create collection dialog --- .../gallery/components/CreateCollection.tsx | 11 ++++++----- src/utils/strings/englishConstants.tsx | 16 +++++++++------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/pages/gallery/components/CreateCollection.tsx b/src/pages/gallery/components/CreateCollection.tsx index 210850686..4f0c7022f 100644 --- a/src/pages/gallery/components/CreateCollection.tsx +++ b/src/pages/gallery/components/CreateCollection.tsx @@ -4,6 +4,7 @@ import { createAlbum } from 'services/collectionService'; import UploadService from 'services/uploadService'; import { CollectionAndItsLatestFile } from 'services/collectionService'; import { getToken } from 'utils/common/key'; +import constants from 'utils/strings/constants'; export default function CreateCollection(props) { const { @@ -78,17 +79,17 @@ export default function CreateCollection(props) { } }; return ( - + - Create Collection + {constants.CREATE_COLLECTION}
- Album Name: @@ -98,7 +99,7 @@ export default function CreateCollection(props) { type="submit" style={{ width: '100%' }} > - Submit + {constants.CREATE}
diff --git a/src/utils/strings/englishConstants.tsx b/src/utils/strings/englishConstants.tsx index 97b0ffbab..a8fe0adec 100644 --- a/src/utils/strings/englishConstants.tsx +++ b/src/utils/strings/englishConstants.tsx @@ -49,25 +49,27 @@ const englishConstants = { CONSOLE_WARNING_DESC: `This is a browser feature intended for developers. Please don't copy-paste unverified code here.`, SELECT_COLLECTION: `select an album to upload to`, CREATE_COLLECTION: `create album`, - CLOSE: 'Close', + CLOSE: 'close', NOTHING_HERE: `nothing to see here! 👀`, UPLOAD: { - 0: 'Preparing to upload', - 1: 'Encryting your files', - 2: 'Uploading your Files', - 3: 'Files Uploaded Successfully !!!', + 0: 'preparing to upload', + 1: 'encrypting your files', + 2: 'uploading your files', + 3: 'files uploaded successfully!', }, OF: 'of', SUBSCRIPTION_EXPIRED: - "You don't have a active subscription plan!! Please get one in the mobile app", + "your subscription has expired, please renew it form the mobile app", STORAGE_QUOTA_EXCEEDED: - 'You have exceeded your designated storage Quota, please upgrade your plan to add more files', + 'you have exceeded your storage quota, please upgrade your plan from the mobile app', WEB_SIGNUPS_DISABLED: () => (
sorry signups are possibly only on the mobile app
), USER_DOES_NOT_EXIST: 'sorry, could not find a user with that email', UPLOAD_BUTTON_TEXT: 'upload', NO_ACCOUNT: 'don\'t have an account?', + ALBUM_NAME: 'album name', + CREATE: 'create', }; export default englishConstants;