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/public/icon.png b/public/icon.png deleted file mode 100644 index 658ae352e..000000000 Binary files a/public/icon.png and /dev/null differ 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 @@ - + + + + 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/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 8584f8038..755586a01 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 { @@ -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; } @@ -101,10 +101,29 @@ const GlobalStyles = createGlobalStyle` overflow: hidden; margin: 0 0 5px 0; } - .modal-content{ - background-color:#303030 !important; + .modal-content { + background-color:#202020 !important; color:#aaa; } + .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; + } + .card { + background-color: #242424; + color: #fff; + border-radius: 12px; + } `; const Image = styled.img` @@ -166,7 +185,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 { diff --git a/src/pages/credentials/index.tsx b/src/pages/credentials/index.tsx index f25888950..049af9313 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/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} ` - 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/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/pages/gallery/components/PreviewCard.tsx b/src/pages/gallery/components/PreviewCard.tsx index caecbea06..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: #555 url(/image.svg) no-repeat center; + background: #222; display: block; width: fit-content; height: 192px; 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/gallery/index.tsx b/src/pages/gallery/index.tsx index 0a0a58328..b7592334f 100644 --- a/src/pages/gallery/index.tsx +++ b/src/pages/gallery/index.tsx @@ -304,7 +304,6 @@ export default function Gallery(props) { {constants.INITIAL_LOAD_DELAY_WARNING} )} - ); } @@ -346,7 +345,7 @@ export default function Gallery(props) { <> setProgress(0)} /> diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 168ee2992..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} @@ -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/pages/verify/index.tsx b/src/pages/verify/index.tsx index 198e2569e..98251fc1d 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}
@@ -118,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 3d55533d6..0bb739933 100644 --- a/src/utils/strings/englishConstants.tsx +++ b/src/utils/strings/englishConstants.tsx @@ -5,66 +5,78 @@ import { template } from './vernacularStrings'; */ const englishConstants = { COMPANY_NAME: 'ente', - LOGIN: 'Login', - SIGN_UP: 'Sign Up', - NAME: 'Name', + LOGIN: 'login', + SIGN_UP: 'sign up', + NAME: 'name', ENTER_NAME: 'your name', - EMAIL: 'Email Address', - ENTER_EMAIL: 'email address', - DATA_DISCLAIMER: `We'll never share your data with anyone else.`, - SUBMIT: 'Submit', - EMAIL_ERROR: 'Enter a valid email address', - REQUIRED: 'Required', - VERIFY_EMAIL: 'Verify Email', + EMAIL: 'email', + ENTER_EMAIL: 'email', + 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_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.', - 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', + 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: '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.`, - SELECT_COLLECTION: `Select/Click on Collection to upload`, - CLOSE: 'Close', + 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', 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', - 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', + 'you have exceeded your storage quota, please upgrade your plan from the mobile app', INITIAL_LOAD_DELAY_WARNING: 'Please wait, intial load may take some time', + + 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;