Commit graph

1071 commits

Author SHA1 Message Date
Abhinav-grd 1a79e88ed8 changed logic to decrypt files per request 2021-04-23 12:52:04 +05:30
Abhinav-grd cf27370e37 updated collection interface name to PascalCase 2021-04-23 12:52:04 +05:30
Vishnu Mohandas 48c8708c77 Add a hover color to subscription plans 2021-04-23 12:50:33 +05:30
Vishnu Mohandas a57c6f6968 Remove P tag 2021-04-23 12:50:27 +05:30
Vishnu Mohandas 2fb9152626 Fix padding 2021-04-23 12:07:52 +05:30
Vishnu Mohandas 6257211650 Highlight user email 2021-04-23 12:07:52 +05:30
Abhinav-grd 7cb8ba62e7 corrected CANCEL_SUBSCRIPTION_ON_MOBILE condition check 2021-04-23 12:04:21 +05:30
Abhinav-grd 94f744b686 sync subscription and plan before collections 2021-04-23 11:29:09 +05:30
Abhinav-grd 817b2aba89 added min plan Icon wrapper div height 2021-04-23 11:14:08 +05:30
Abhinav-grd 52abd94b84 Merge branch 'master' into stripe-integration 2021-04-23 11:04:40 +05:30
Abhinav-grd 4ac1d27e3a update utils 2021-04-23 10:56:16 +05:30
Abhinav-grd 612e415e26 show cancel subscription on mobile popup for subscription change request by non stripe subscription user 2021-04-23 10:55:57 +05:30
Abhinav-grd 03a03ad36a allow managament page to be opened for non stripe subscription 2021-04-23 10:49:45 +05:30
Abhinav-grd 207f677bb2 added error handling to buyPaidSubscription 2021-04-23 09:16:25 +05:30
Abhinav-grd 19101302c4 fixed session expired mewssage parsing 2021-04-23 09:08:55 +05:30
Abhinav-grd b20a68da30 added recoveryModal to generatePage 2021-04-22 20:00:07 +05:30
Abhinav-grd 9488626de6 update confirm action component 2021-04-22 18:26:06 +05:30
Abhinav-grd 2c98208e07 updated ACTIVATE_SUBSCRIPTION_MESSAGE 2021-04-22 11:26:31 +05:30
Abhinav-grd 8aa1898799 updated strings 2021-04-22 10:56:30 +05:30
Abhinav-grd 68274d5e67 added hasStripeSubscription function 2021-04-22 10:56:18 +05:30
Abhinav-grd ed41b97044 added new trick to show titles 2021-04-22 10:55:55 +05:30
Abhinav-grd 894b8ed8c5 allow close on background click if user has piad plan 2021-04-22 10:55:38 +05:30
Abhinav-grd 8b8021ab37 add stripePaymentProvider check before opening management page 2021-04-22 10:52:42 +05:30
Abhinav-grd 819aa54c4a update subscription interface 2021-04-21 22:15:50 +05:30
Abhinav-grd a5f8b35a8b updated api methods 2021-04-21 22:12:27 +05:30
Abhinav-grd c1d4dc8e19 make message strings as functions 2021-04-21 14:14:47 +05:30
Abhinav-grd cf5375810e remove 0 2021-04-21 14:03:55 +05:30
Abhinav-grd bd9115712e move cancel subscribe up 2021-04-21 14:03:18 +05:30
Abhinav-grd 9ede8c0e43 moved yearly plan first 2021-04-21 13:46:09 +05:30
Abhinav-grd e581f9cd26 corrected isUserSubscribedPlan logic 2021-04-21 13:45:53 +05:30
Abhinav-grd cd4a4f6d12 change plan icon border
width
2021-04-21 13:38:03 +05:30
Abhinav-grd ba42b072df make plan div centered 2021-04-21 13:22:56 +05:30
Abhinav-grd d59fde5cba made div centered 2021-04-21 12:26:57 +05:30
Abhinav-grd 885cc49725 moved subscribe button 2021-04-20 16:57:27 +05:30
Abhinav-grd f685036816 type and string changes 2021-04-20 16:39:03 +05:30
Abhinav-grd eb9c6a9e95 added type definations and message dialog title 2021-04-20 16:35:53 +05:30
Abhinav-grd a7694e6d84 updated message dailog box 2021-04-20 16:27:25 +05:30
Abhinav-grd 0dc67fcbb7 stored DESKTOP_APP_DOWNLOAD_URL as constant 2021-04-20 15:52:38 +05:30
Abhinav-grd c4d100df74 grouped similar strings together 2021-04-20 15:51:55 +05:30
Abhinav-grd 587fa694b4 updated confirm dialog title text 2021-04-20 15:28:19 +05:30
Abhinav-grd 75a89b1d6f clear sessionID from URL after verification 2021-04-20 15:13:38 +05:30
Abhinav-grd 23e86be77d seperate update buy flow , removing confirmation on buying 2021-04-20 15:01:45 +05:30
Abhinav-grd 99372dafba correct show planModal on signup 2021-04-20 15:00:45 +05:30
Abhinav-grd 71516f7d8a updated UI handling of cancel state 2021-04-20 12:19:32 +05:30
Abhinav-grd da4a2a1d61 added new confirm action activate subscription 2021-04-20 12:15:24 +05:30
Abhinav-grd 79d67d5915 added logic to show subscribe modal on singup 2021-04-20 11:04:19 +05:30
Abhinav-grd e57b08b248 improved variable name 2021-04-20 11:03:57 +05:30
Abhinav-grd 9f3bcfb9bc removed unwanted pages 2021-04-20 10:47:35 +05:30
Abhinav-grd fa7f5e6731 updated subscription related strings 2021-04-19 22:59:46 +05:30
Abhinav-grd aa1ac99f65 added checkSubscriptionPurchase billing util 2021-04-19 22:59:30 +05:30
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