Commit graph

1071 commits

Author SHA1 Message Date
Abhinav-grd d0a6fa8447 added content messageAttribute prop 2021-04-19 22:59:03 +05:30
Abhinav-grd 28625ff24d minor cleanup 2021-04-19 18:49:04 +05:30
Abhinav-grd a88f498567 updated message dialog style 2021-04-19 16:51:46 +05:30
Abhinav-grd 8376eee8e4 update update payment method message 2021-04-19 16:34:48 +05:30
Abhinav-grd c18ffe3b14 updated manage Payment Method to show loading screen 2021-04-19 16:32:00 +05:30
Abhinav-grd 74cc5ba20f updated CANCEL_SUBSCRIPTION_MESSAGE confirm message 2021-04-19 16:15:09 +05:30
Abhinav-grd e9f2dd2d53 updated confirm dialog and message dailog styles 2021-04-19 16:14:03 +05:30
Abhinav-grd 428d06ba35 refactored confirm callbacks to util funtions 2021-04-19 15:45:05 +05:30
Abhinav-grd 15437f3652 wait for callback to finish before closing 2021-04-19 15:42:16 +05:30
Abhinav-grd 5a45867eac moved backdrop up to come above prev modal 2021-04-19 15:22:45 +05:30
Abhinav-grd 5bd9461d5a added loadingOverlay for wait for subscription update 2021-04-19 15:14:51 +05:30
Abhinav-grd 11b3bad8e0 setup callback action for buy subscription and moved logic to util 2021-04-19 15:06:50 +05:30
Abhinav-grd 1b9d43df96 fixed close button style 2021-04-19 15:03:17 +05:30
Abhinav-grd 72591e3505 added confirm susbcription update 2021-04-19 14:23:20 +05:30
Abhinav-grd b84443f464 updated message dailog styles 2021-04-19 14:22:56 +05:30
Abhinav-grd de1ace0502 improved plan selector style 2021-04-19 13:59:12 +05:30
Abhinav-grd 331f3053bf corrected isUserRenewingPlan check 2021-04-19 11:15:08 +05:30
Abhinav-grd a05debf4c5 removed newEnte loader from SubmitButton 2021-04-18 19:06:23 +05:30
Abhinav-grd e4a2c0758e updated strings 2021-04-18 19:05:52 +05:30
Abhinav-grd 3a80936ab8 updated to use EnteSpinner 2021-04-18 18:31:40 +05:30
Abhinav-grd ca5d0fe48f added customised spinner component 2021-04-18 18:29:48 +05:30
Abhinav-grd 1b7ad0e1b5 made sidebar button outline type 2021-04-18 18:13:54 +05:30
Abhinav-grd e2ce51cc67 removed subscribe button from gallery 2021-04-18 16:39:23 +05:30
Abhinav-grd dcf1b9c322 added close button 2021-04-18 16:38:38 +05:30
Abhinav-grd 6c88bc37a3 extracted styles to globalCSS 2021-04-18 16:11:56 +05:30
Abhinav-grd d26e8e5442 updated plan-period-switcher 2021-04-18 16:03:22 +05:30
Abhinav-grd d8feeda1c5 tidy up 2021-04-18 12:58:49 +05:30
Abhinav-grd 30a12b6a7e added toggle switch to change plan period 2021-04-18 12:41:09 +05:30
Abhinav-grd f24be87ed8 updated error handling 2021-04-18 10:33:22 +05:30
Abhinav-grd 8aedf2b514 call actiavte api if subscritpin was cancelled before update 2021-04-17 19:26:28 +05:30
Abhinav-grd 5475de6074 renamed is PlanActive to isSubscriptionActive 2021-04-17 19:18:25 +05:30
Abhinav-grd a611d2e8ca coorected ErrorHandler 2021-04-17 18:40:50 +05:30
Abhinav-grd 3264e2d0c4 Merge branch 'master' into stripe-integration 2021-04-17 18:15:38 +05:30
Abhinav-grd e7808813ee remove testing false set from has paidPlan check 2021-04-17 13:42:26 +05:30
Abhinav-grd 1e6d8f7161 updated stripe subscriptionupate response 2021-04-16 17:37:25 +05:30
Abhinav-grd 337c3a5248 setup cloudflare analytics 2021-04-15 14:20:18 +05:30
Abhinav-grd 1673a79908 handled verification failed 2021-04-14 14:19:48 +05:30
Abhinav-grd dca4a42bba verify subcription update with verify-subscrption api 2021-04-13 14:55:04 +05:30
Abhinav-grd 1ad7788afb prevent selecting active subscription plan while upgrading 2021-04-13 14:18:43 +05:30
Abhinav-grd e3141d8ad0 use paln id as subscription productID 2021-04-13 14:17:15 +05:30
Abhinav-grd 0ae2e4838d handle warning while intailising DedicatedCryptoWorker 2021-04-12 14:29:51 +05:30
Abhinav-grd 79de18a843 get Dedicated worker for upload 2021-04-12 12:56:38 +05:30
Abhinav-grd db6e8dfbae completed files already filtered in upload service 2021-04-12 11:36:48 +05:30
Abhinav-grd f22ef34420 show progress for metadata file reading 2021-04-12 11:36:02 +05:30
Abhinav-grd c6168ea752 increase WAIT_TIME_THUMBNAIL_GENERATION to 30 sec and reduce MAX_CONCURRENT_UPLOADS to 2 2021-04-11 23:12:54 +05:30
Abhinav-grd 09f03ffd21 made progress bar div maxhieght 250px 2021-04-11 21:55:38 +05:30
Abhinav-grd 4e8168f2fa
Merge pull request #52 from ente-io/dedupe-upload
Dedupe upload
2021-04-11 21:42:44 +05:30
Abhinav-grd 00efef9445 increased upload dailog size 2021-04-11 21:34:24 +05:30
Abhinav-grd 208b8918d9 upadted util name to sortFilesIntoCollections 2021-04-11 21:21:04 +05:30
Abhinav-grd ba602d6e11 removed filename from BackupedFile interface 2021-04-11 20:45:05 +05:30
Abhinav-grd 539ab66bc1 handle new collection 2021-04-11 20:26:44 +05:30
Abhinav-grd 6e5b9b1eec made button green 2021-04-11 20:26:27 +05:30
Abhinav-grd 440a550404 updated submit button style 2021-04-11 19:50:24 +05:30
Abhinav-grd 80601e14ab group files collectionWise for fileAlreadyInCollection check 2021-04-11 19:29:28 +05:30
Abhinav-grd 4f9e0bd66f Merge branch 'master' into dedupe-upload 2021-04-11 15:45:20 +05:30
Abhinav-grd 7ddd3f8a0d added bottom margin of 40px in gallery to view file at end without install banner interfering 2021-04-11 15:44:32 +05:30
Abhinav-grd ffd76ce6d4 Merge branch 'master' into button-with-loading 2021-04-11 15:38:32 +05:30
Abhinav-grd ff898c0c5c updated button style 2021-04-11 15:37:57 +05:30
Abhinav-grd cac1cf4631 tidy up 2021-04-11 15:28:02 +05:30
Abhinav-grd f78fd6dcfb combine ensted if with and 2021-04-11 14:40:21 +05:30
Abhinav-grd 3ba8b87c2c rename changeProgressBarProps to updateProgressBarUI 2021-04-11 14:34:31 +05:30
Abhinav-grd 9cce57fdf1 added lgoic to return exisitng collection if collection with name exists 2021-04-11 14:10:05 +05:30
Abhinav-grd 9fbd8ae136 increase fileCompleted count after skipping 2021-04-11 13:51:10 +05:30
Abhinav-grd 524e9f7ee4 added logic to skip files that are already uploaded 2021-04-11 13:46:39 +05:30
Abhinav-grd 947734753b updated FILE_UPLOAD_PROGRESS to add fine skipping message 2021-04-11 13:43:23 +05:30
Abhinav-grd bf7083442e passed files to uploadService 2021-04-11 13:42:44 +05:30
Abhinav-grd e2e6d4198d moved file related utils to utils/file 2021-04-11 12:13:47 +05:30
Abhinav-grd 1ae5dd81c6 fix thumbnail generation fail for heic 2021-04-11 11:32:53 +05:30
Abhinav-grd cf4c840ba4 properly catch and handle upload errors 2021-04-11 11:32:53 +05:30
Abhinav-grd 2d1d496e98 added padding at some places 2021-04-11 10:43:36 +05:30
Abhinav-grd 15ad43f674 updated pages with submitButton 2021-04-11 10:38:06 +05:30
Abhinav-grd 14ce450a16 added new component SubmitButton 2021-04-11 10:32:32 +05:30
Abhinav-grd 854570c9f5 added plans null check 2021-04-09 19:16:04 +05:30
Abhinav-grd 4a859a0d32 reverted testing changes 2021-04-09 15:08:27 +05:30
Abhinav-grd 0f60824f17 updated button styles 2021-04-09 14:23:13 +05:30
Abhinav-grd 614700d748 added yearly plan UI 2021-04-09 14:08:43 +05:30
Abhinav-grd 7ba7044216 style changes 2021-04-08 11:48:34 +05:30
Abhinav-grd fa8afcc102 added confirm dialog for update payment details 2021-04-08 11:48:18 +05:30
Abhinav-grd a4fde14a88 arrange subscription buttons 2021-04-08 11:22:46 +05:30
Abhinav-grd bfbff09e0a added manage payment method button 2021-04-08 10:43:34 +05:30
Abhinav-grd f6a391d666 updated customer portal api 2021-04-08 10:26:37 +05:30
Abhinav-grd 10a217427a corrected message dialog import 2021-04-07 14:52:59 +05:30
Abhinav-grd 959b59cea6 updated confirm dialog to use message dialog 2021-04-07 14:52:47 +05:30
Abhinav-grd 5bf02498e8 removed duplicated message dialog 2021-04-07 14:52:30 +05:30
Abhinav-grd b7d83917cd updated message dialog 2021-04-07 14:51:44 +05:30
Abhinav-grd 35d9eb329d button style fix 2021-04-07 13:21:34 +05:30
Abhinav-grd 2b5d881f99 Merge branch 'master' into stripe-integration 2021-04-07 12:48:45 +05:30
Abhinav-grd 5ca4523281 updated updateSubscription logic and added acknowledgeSubscriptionUpdate function 2021-04-06 19:13:11 +05:30
Abhinav-grd cacd22c5ae added stripe package 2021-04-06 19:11:57 +05:30
Abhinav-grd b4ff03b79a remove proration preview 2021-04-06 12:38:38 +05:30
Abhinav-grd 452718f1ff default just signed up value false 2021-04-06 10:26:49 +05:30
Abhinav-grd 9ac0a5e573 replaced generateMasterKey with updated name generateEncryptionKey 2021-04-06 09:46:56 +05:30
Abhinav-grd 9dfca18451 remove something wrong from props before passing it to recoveryKeyModal 2021-04-05 21:52:54 +05:30
Abhinav-grd 6e26dc1792 made backup your first photo centered 2021-04-05 21:18:23 +05:30
Abhinav-grd ced850317c used JustSignedUp to show recovery code modal 2021-04-05 21:08:02 +05:30
Abhinav-grd 82938f42ab added just signed up local storage entry 2021-04-05 21:08:02 +05:30
Abhinav-grd 42d9429745 added action on cancel message dailog 2021-04-05 21:08:02 +05:30
Abhinav-grd 3b7c1d4f05 added option for setting static backdrop on message dialog 2021-04-05 21:08:02 +05:30
Vishnu Mohandas 33b1b8f139 Reorder sidebar items 2021-04-05 20:18:57 +05:30
Abhinav-grd cfe21884af passed correct master key to functions for encryption 2021-04-05 20:11:33 +05:30
Vishnu Mohandas cd2ff88b8a Update home screen 2021-04-05 20:02:15 +05:30
Vishnu Mohandas ab046a85f0 Set default value for name 2021-04-05 19:48:36 +05:30
Vishnu Mohandas 3ed53c805f Return b64 encoded string 2021-04-05 19:40:40 +05:30
Vishnu Mohandas c3c989e029 Convert b64 key to Uint8Array before encoding to hex 2021-04-05 19:37:27 +05:30
Vishnu Mohandas 519811bdba Fix button styles 2021-04-05 19:29:48 +05:30
Vishnu Mohandas 267149dfb1 Add dividers 2021-04-05 19:25:41 +05:30
Vishnu Mohandas ad3745aef8 Change button styles 2021-04-05 19:23:12 +05:30
Vishnu Mohandas 60a11d6dba Update copies 2021-04-05 19:18:47 +05:30
Abhinav-grd a708535323 show something went wrong dialog if getRecoverycode fails 2021-04-05 18:48:41 +05:30
Abhinav-grd 41f2a5cf92 added something went wrotn message dialog 2021-04-05 18:47:48 +05:30
Abhinav-grd 1ea9c28bf0 updated message dailog 2021-04-05 18:47:18 +05:30
Abhinav-grd b0b7e0bafd uncomment getRecoveryCode 2021-04-05 17:48:29 +05:30
Abhinav-grd 866402a832 updated message Dailog 2021-04-05 17:47:33 +05:30
Abhinav-grd bab0b6791a added no recovery code message dialog 2021-04-05 17:40:52 +05:30
Abhinav-grd d3aaca4c82 updated messageDialog 2021-04-05 17:40:32 +05:30
Abhinav-grd 28bfffc8cc removed mistake export 2021-04-05 17:31:24 +05:30
Abhinav-grd 6cdfc9fee1 use message dailog with recoverykeyModal 2021-04-05 17:30:17 +05:30
Abhinav-grd e156ec7798 add message dialog component 2021-04-05 17:29:22 +05:30
Abhinav-grd 6b8f7e6962 biuld fix 2021-04-05 16:56:40 +05:30
Abhinav-grd 2bca89f4e5 updated credential form to use Passphrase form 2021-04-05 16:49:15 +05:30
Abhinav-grd 0e5dd6adeb updated PassPhraseForm to accpted input fieldType 2021-04-05 16:48:43 +05:30
Abhinav-grd 3a33ebb00e added recover page 2021-04-05 16:39:21 +05:30
Abhinav-grd 32f6f2cc5d added new component passphrase form 2021-04-05 16:35:41 +05:30
Abhinav-grd 6fd74a1089 hide recoveryKeyModal on keyDownload 2021-04-05 16:09:58 +05:30
Abhinav-grd 48d0be32db added fromHex crypto function 2021-04-05 15:54:20 +05:30
Abhinav-grd b31a5df188 added forgot password button 2021-04-05 15:35:52 +05:30
Abhinav-grd a7c14715fc updated singup flow to generate RecoveryKey 2021-04-05 15:26:13 +05:30
Abhinav-grd b3dc992c23 rename generateMasterKey to generateEncryptionKey 2021-04-05 15:00:47 +05:30
Abhinav-grd 59581f2c4e make recpveryKey modal code area smaller 2021-04-05 14:50:38 +05:30
Abhinav-grd d00325b477 added missing await on createNewRecoveryKey 2021-04-05 14:41:27 +05:30
Abhinav-grd bd043ddf62 run use Effect only on modal open 2021-04-05 14:41:06 +05:30
Abhinav-grd 9dc3c9c149 added createNewRecoveryKey logic 2021-04-05 14:33:12 +05:30
Abhinav-grd 7628c14a79 added getRecoveryKey logic 2021-04-05 14:04:30 +05:30
Abhinav-grd 1703df7ec7 added downloadAsFile Logic 2021-04-05 13:59:35 +05:30
Abhinav-grd d674717cb0 added new crypto function toHex 2021-04-05 13:32:02 +05:30
Abhinav-grd 687b68a11f updated keyAttribute interface 2021-04-05 13:31:39 +05:30
Abhinav-grd 0f231f8679 added recoveryKey component to sidebar 2021-04-05 13:11:48 +05:30
Abhinav-grd fbe96f4b53 addded recoveryKeyModal component 2021-04-05 13:11:31 +05:30
Abhinav-grd 92f6d1f5c4 added download recovery code button 2021-04-05 12:10:48 +05:30
Abhinav-grd ca16148fbe updated password form to have back button 2021-04-05 12:05:58 +05:30
Abhinav-grd 4faa7cddd6 updated changePasswod and generate to use Password Form 2021-04-05 12:04:25 +05:30
Abhinav-grd 0b4e0f6ab0 absracted password form to PasswordForm component 2021-04-05 11:46:25 +05:30
Abhinav-grd b0b93bfb45 update button text and removed logout button from chnage password page 2021-04-05 11:24:25 +05:30
Abhinav-grd 6059e63064 updated generateIntermediateKeyAttribute to save key to localDB 2021-04-05 11:20:40 +05:30
Abhinav-grd 176db8b9ee abstracted keySession to util 2021-04-05 11:14:56 +05:30
Abhinav-grd c67006345b added setKeys service function 2021-04-05 11:09:25 +05:30
Abhinav-grd 659b75a930 added changePassword page 2021-04-05 11:08:42 +05:30
Abhinav-grd 8752ac77af added chnage password button 2021-04-05 10:42:37 +05:30
Abhinav-grd bf78b18b1a fixed build 2021-04-04 19:33:05 +05:30
Abhinav-grd 93b93d35b7 use message suffix for confirm acrtion messages 2021-04-04 19:31:04 +05:30
Abhinav-grd e9f9d63791 moved to using confirmDialog for download 2021-04-04 19:29:13 +05:30
Abhinav-grd 00f9fde6e2 added new download app callback and pass setconfirmAction prop to sidebar 2021-04-04 19:28:17 +05:30
Abhinav-grd 3cb7b70c90 updated confirm dialog for showing download confirmation 2021-04-04 19:27:26 +05:30
Abhinav-grd 78de76fd3d fix build 2021-04-04 18:44:04 +05:30
Abhinav-grd 40bb651f16 Merge branch 'master' into export-data 2021-04-04 18:38:54 +05:30
Abhinav-grd 32ca9f754d
corrected sanitizeName call 2021-04-04 14:04:42 +05:30
Abhinav-grd ad3faec8a6
rename sanitize function to singular 2021-04-04 13:53:00 +05:30
Abhinav-grd 6c97981e35 added spinner on button during load 2021-04-03 10:30:37 +05:30
Abhinav-grd 803ed2df9a moved sentry util to folder 2021-04-03 10:22:37 +05:30
Abhinav-grd c6139bd05b moved isFirstLogin and setIsFIrstLogin to util/storage 2021-04-03 10:19:52 +05:30
Abhinav-grd d45a12ceae renamed utilFunctions tpoindex and corrected imports 2021-04-03 10:13:13 +05:30
Abhinav-grd b632481317 Merge branch 'master' into intermediate-key 2021-04-03 10:09:02 +05:30
Abhinav-grd cddff63a31 moved crytoWorker to util/cryto/index 2021-04-03 10:06:15 +05:30
Abhinav-grd 6a216f4e0f set isFirstLogin defaukt value to false 2021-04-03 09:53:16 +05:30
Abhinav-grd 6c7de83a5f moved setting first login false logic to gallery 2021-04-03 09:52:57 +05:30
Abhinav-grd b89d0d0b96 renamed variables 2021-04-03 09:45:25 +05:30
Abhinav-grd f31f97dd8c removed opslimit check 2021-04-02 22:13:09 +05:30
Abhinav-grd 78815120c7 added error message kek generation failure 2021-04-02 19:12:28 +05:30
Abhinav-grd 7dfcd52811 removed temp variable 2021-04-02 10:22:45 +05:30
Abhinav-grd d22606636e updated isFirstLogin to function to get Fresh values 2021-04-02 10:19:57 +05:30
Abhinav-grd 6f0fb87c6b check setIsFirstLogin true on verify and generateIntermediateKey if isFirstLogin is true 2021-04-02 09:56:25 +05:30
Abhinav-grd 38ce8ae2bc added new local record for isFirstLogin 2021-04-02 09:51:42 +05:30
Abhinav-grd 281fab1b5a updated type name KeyAttribute 2021-04-02 09:33:00 +05:30
Abhinav-grd a59eb49f89 moved generate intermediate key to crypto util 2021-04-02 09:26:21 +05:30
Vishnu Mohandas 790eb35786 Calculate feasible limits for key derivation 2021-04-02 03:26:02 +05:30
Abhinav-grd 3aa69efc32 generate Intermediate Key and store it in localDB 2021-04-01 22:08:51 +05:30
Abhinav-grd fb4fda6ae3 Merge branch 'master' into intermediate-key 2021-04-01 21:46:05 +05:30
Abhinav-grd a86b1ac928 removed side margin 2021-04-01 21:38:45 +05:30
Abhinav-grd 3deeadfb10 Merge branch 'master' into intermediate-key 2021-04-01 20:47:23 +05:30
Abhinav-grd af2e6706e0 fixed token validity check api 2021-04-01 19:22:30 +05:30
Abhinav-grd d5a416997a added deriveIntermediateKey crytpo function 2021-04-01 18:45:51 +05:30
Abhinav-grd 7c0aea258b updated keyAttribute interface 2021-04-01 18:45:00 +05:30
Abhinav-grd 3dfe084850 fix downloadFIle response for images 2021-03-31 17:45:37 +05:30
Abhinav-grd 29207fa0c1 handled abort export 2021-03-31 14:04:00 +05:30
Abhinav-grd f29d4e714a send export already in progress notification 2021-03-31 12:43:01 +05:30
Abhinav-grd 9ac0e83735 save metadata files along with files 2021-03-31 12:15:41 +05:30
Abhinav-grd 67678650db change collection folder name structure to id_name 2021-03-31 12:00:42 +05:30
Abhinav-grd 2ee0045b56 create collectionw wise folders during export 2021-03-31 11:23:21 +05:30
Abhinav-grd 9c34231dff added try catch to export files function 2021-03-30 18:30:09 +05:30
Abhinav-grd 7034c6ff8f added logic to send notification of export start and finish and show progress on ssytem tray icon 2021-03-30 17:07:32 +05:30
Abhinav-grd aa34a99b2c updated record after exporting files 2021-03-30 17:05:47 +05:30
Abhinav-grd afbf9c741f improved error handling 2021-03-30 13:53:36 +05:30
Abhinav-grd 05170341bb read error reponse properly 2021-03-30 13:52:46 +05:30
Abhinav-grd 1c1e322195 updated strings 2021-03-30 12:40:25 +05:30
Abhinav-grd c14974672a upadted strings and confirm dialog 2021-03-30 12:20:13 +05:30
Abhinav-grd ff4064d2ef ignore unknown errors 2021-03-30 11:07:45 +05:30
Abhinav-grd c7f51d7c93 dont retry get request 2021-03-30 11:07:13 +05:30
Abhinav-grd 4a8dfe57bd use fresh token on each request 2021-03-30 11:06:58 +05:30
Abhinav-grd 15d5a1660c updated token null handling 2021-03-30 10:39:43 +05:30
Abhinav-grd 12a28e4fc7 added axios interceptor 2021-03-30 10:38:41 +05:30