Commit graph

582 commits

Author SHA1 Message Date
Abhinav-grd f685036816 type and string changes 2021-04-20 16:39:03 +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 9f3bcfb9bc removed unwanted pages 2021-04-20 10:47:35 +05:30
Abhinav-grd aa1ac99f65 added checkSubscriptionPurchase billing util 2021-04-19 22:59:30 +05:30
Abhinav-grd 28625ff24d minor cleanup 2021-04-19 18:49:04 +05:30
Abhinav-grd c18ffe3b14 updated manage Payment Method to show loading screen 2021-04-19 16:32:00 +05:30
Abhinav-grd 428d06ba35 refactored confirm callbacks to util funtions 2021-04-19 15:45:05 +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 72591e3505 added confirm susbcription update 2021-04-19 14:23:20 +05:30
Abhinav-grd de1ace0502 improved plan selector style 2021-04-19 13:59:12 +05:30
Abhinav-grd 3a80936ab8 updated to use EnteSpinner 2021-04-18 18:31:40 +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 8aedf2b514 call actiavte api if subscritpin was cancelled before update 2021-04-17 19:26:28 +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 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 1ad7788afb prevent selecting active subscription plan while upgrading 2021-04-13 14:18:43 +05:30
Abhinav-grd db6e8dfbae completed files already filtered in upload service 2021-04-12 11:36:48 +05:30
Abhinav-grd 09f03ffd21 made progress bar div maxhieght 250px 2021-04-11 21:55:38 +05:30
Abhinav-grd 00efef9445 increased upload dailog size 2021-04-11 21:34:24 +05:30
Abhinav-grd 6e5b9b1eec made button green 2021-04-11 20:26:27 +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 bf7083442e passed files to uploadService 2021-04-11 13:42:44 +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 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 10a217427a corrected message dialog import 2021-04-07 14:52:59 +05:30
Abhinav-grd 5bf02498e8 removed duplicated message dialog 2021-04-07 14:52:30 +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 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 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 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 519811bdba Fix button styles 2021-04-05 19:29:48 +05:30
Vishnu Mohandas ad3745aef8 Change button styles 2021-04-05 19:23:12 +05:30
Abhinav-grd 41f2a5cf92 added something went wrotn message dialog 2021-04-05 18:47:48 +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 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 3a33ebb00e added recover page 2021-04-05 16:39:21 +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 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 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 659b75a930 added changePassword page 2021-04-05 11:08:42 +05:30
Abhinav-grd bf78b18b1a fixed build 2021-04-04 19:33:05 +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 40bb651f16 Merge branch 'master' into export-data 2021-04-04 18:38:54 +05:30
Abhinav-grd 6c97981e35 added spinner on button during load 2021-04-03 10:30: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 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 78815120c7 added error message kek generation failure 2021-04-02 19:12:28 +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 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
Abhinav-grd 3aa69efc32 generate Intermediate Key and store it in localDB 2021-04-01 22:08:51 +05:30
Abhinav-grd a86b1ac928 removed side margin 2021-04-01 21:38:45 +05:30
Abhinav-grd 2ee0045b56 create collectionw wise folders during export 2021-03-31 11:23:21 +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 4a8dfe57bd use fresh token on each request 2021-03-30 11:06:58 +05:30
Abhinav-grd 961e9b4199 moved confirm dialog to the top 2021-03-29 18:47:00 +05:30
Abhinav-grd 94903a2009 minor fixes 2021-03-29 16:59:01 +05:30
Abhinav-grd 114eaa0ee4 used confirm banner to show session exipired warning 2021-03-29 16:00:20 +05:30
Abhinav-grd dddccc8bd2 make check icon on the right 2021-03-29 15:18:29 +05:30
Abhinav-grd 7bdb4816e2 made alert banner closeable 2021-03-29 15:03:28 +05:30
Abhinav-grd 4e6651b5c0 added logic to logout user on session exipiration 2021-03-29 14:30:35 +05:30
Abhinav-grd 4d65768b1f handled getCollection Errors with setting banner message 2021-03-29 14:22:56 +05:30
Abhinav-grd 9abf005cb5 updated alter banner 2021-03-29 13:31:02 +05:30
Abhinav-grd 25a3e1a43d logout user if token expired 2021-03-29 11:52:39 +05:30
Abhinav-grd 2c29ed6606 execute useEffect of upload component on accepted and collectionSelector both changes 2021-03-26 14:59:34 +05:30
Vishnu Mohandas 02cc15f3bd
Merge pull request #43 from ente-io/sensitive_keys
Use sensitive ops and mem limits to derive key
2021-03-26 12:25:55 +05:30
Abhinav-grd 92aa41e6e7 moved upload Button and sidebar to gallery 2021-03-25 01:22:36 +05:30
Abhinav-grd ab56307bd2 change useEffect watch state to acceptedFIles and prevent modal open when accpeted not loaded 2021-03-25 01:18:21 +05:30
Abhinav-grd eee947e515 readded onDropAccepted callback to open collection selector with uploadButton Click upload 2021-03-24 16:10:05 +05:30
Abhinav-grd bbc1896f89 added logout button on generate page 2021-03-22 19:36:43 +05:30
Abhinav-grd 3ba6eafd01 Handled "Yesterday" and "Today" timestamps separately 2021-03-22 19:36:43 +05:30
Vishnu Mohandas 60b19811b4 Merge branch 'master' into tile-selection 2021-03-22 18:41:58 +05:30
Vishnu Mohandas 4c52cb462a Update more styles 2021-03-22 18:35:04 +05:30
Vishnu Mohandas e82f043c56 Update styles 2021-03-22 18:35:01 +05:30
Abhinav-grd 0ae15d2c82 show uploaded file count only if file count greater than 1 2021-03-22 18:05:51 +05:30
Abhinav-grd 668214d717 add close on bg click after upload finish 2021-03-22 18:02:15 +05:30
Abhinav-grd 021d3b3610 fix single collection upload File call 2021-03-22 17:31:20 +05:30
Abhinav-grd 5e5c67adb3 open collection on drop and wait in the collectionSelctor screen with overlay to select collection 2021-03-22 15:12:35 +05:30
Abhinav-grd 069f989860 removed console log 2021-03-22 11:52:37 +05:30
Abhinav-grd 241afa3412 updated upload component to call nextModal instead on collectionCreateModal when no Colletions present 2021-03-22 11:22:05 +05:30
Abhinav-grd 8b33de6ff3 added try catch to upadte subscription 2021-03-21 20:38:29 +05:30
Pushkar Anand 6e49a7ad9e Fix for selected tile after delete. 2021-03-21 20:06:40 +05:30
Pushkar Anand a4bbf85559 Build optimization. 2021-03-21 19:48:38 +05:30
Abhinav-grd 02995f844a updated logic to wait for delete to complete before colosing delete dialog 2021-03-21 12:29:18 +05:30
Abhinav-grd c8afec67bb integrated file delete and show confrim dialog 2021-03-21 12:24:40 +05:30
Abhinav-grd 1a5eaa75e0 added preview proration before subscription upgrade 2021-03-21 10:19:37 +05:30
Pushkar Anand 12d8243916 Build and CSS fixes. 2021-03-21 00:18:02 +05:30
Pushkar Anand 57bd754fc0 Implemented tile selection feature 2021-03-20 20:28:12 +05:30
Abhinav-grd 08b71b04d2 build fix 2021-03-20 18:51:21 +05:30
Abhinav-grd 8661e4fd76 added logic to open choice div if multiple folder dropped 2021-03-20 18:35:50 +05:30
Abhinav-grd eef139a858 beautified upload progress bar 2021-03-20 13:57:53 +05:30
Abhinav-grd 5e00e8e833 added file progres prop 2021-03-19 18:59:07 +05:30
Abhinav-grd 55a682c3b0 extracted upload logic to seperate function 2021-03-19 13:58:08 +05:30
Abhinav-grd fd4bd9a1f0 chnaged cursor on add collection button to pointer 2021-03-19 13:49:49 +05:30
Abhinav-grd a7752b31bd fixed createCollection autoFill name logic 2021-03-19 13:46:26 +05:30
Abhinav-grd ee792a7734 added upload to exiting collection and new colllections logic and updtaed the upload service to recieve FilwWithCollection 2021-03-19 13:44:01 +05:30
Abhinav-grd 17f6cfdbd6 corrected getCollectionWiseFile logic 2021-03-19 13:41:31 +05:30
Abhinav-grd 5dfe3a8e93 implement multiple upload strategy 2021-03-19 05:10:54 +05:30
Abhinav-grd bb722fa692 renamed uploadModal View to collection Selector View 2021-03-19 05:09:02 +05:30
Abhinav-grd 4ee5d81e30 updated the collection selector component with new props type defination 2021-03-19 05:08:17 +05:30
Abhinav-grd 6464255bbd added upload stratergy choice modal 2021-03-19 05:07:25 +05:30
Abhinav-grd 5bf0c7d354 abstracted out collection create component 2021-03-19 05:06:40 +05:30
Abhinav-grd 98c896f450 updated add =collection to add collection button 2021-03-19 05:05:53 +05:30
Abhinav-grd 93ca29e0b8 moved dropzone to gallery to avoid trigerring it on login page 2021-03-19 01:46:18 +05:30
Abhinav-grd 0b8480c980 made button primary to button success 2021-03-18 22:45:56 +05:30
Abhinav-grd 80a95e214f replaced AlertBanner with message Dialog 2021-03-18 22:36:11 +05:30
Abhinav-grd dd18a2175e updated util function names 2021-03-18 20:56:43 +05:30
Abhinav-grd 0e062c1093 renamed subcription service to billing service 2021-03-18 20:52:34 +05:30
Abhinav-grd 504d2f6f68 updated gallery to show subscribe banner on isCancelled state 2021-03-18 20:46:34 +05:30
Abhinav-grd 584fef80cd update plan selector to handled isCancelled state 2021-03-18 20:45:45 +05:30