beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
2682 commits 18 branches 104 tags 490 MiB
Commit graph

962 commits

Author SHA1 Message Date
Pushkar Anand 1a86ac43fb Fix style for first load alert. 2021-05-27 03:00:00 +05:30
Pushkar Anand f86354ca24 Fix build. 2021-05-27 02:41:48 +05:30
Pushkar Anand 838ebfc7f9 Fix search issue. 2021-05-27 02:41:48 +05:30
Pushkar Anand 6477555387 Fix build. 2021-05-27 02:13:30 +05:30
Pushkar Anand 363805bed7 Fix search issue. 2021-05-27 02:06:02 +05:30
Abhinav-grd 7cfe2fc32c random comment 2021-05-26 23:39:10 +05:30
Abhinav-grd 5724124d0f isMounted check 2021-05-26 23:35:38 +05:30
Abhinav-grd 488a02dc63 added fadeout and then fade in 2021-05-26 22:57:59 +05:30
Abhinav-grd 0828850fa4 fix searchbar not coming 2021-05-26 22:47:12 +05:30
Abhinav-grd 1fc664ed33 fadein searchbar on first load 2021-05-26 22:18:29 +05:30
Abhinav-grd 758a4ccd0c Merge branch 'master' into search 2021-05-26 21:02:31 +05:30
Abhinav-grd d0775d3a16 dont show search bar during first load 2021-05-26 20:25:06 +05:30
Abhinav-grd 6c7a173947 center sidebar 2021-05-26 18:19:18 +05:30
Abhinav-grd 8581843736 handled mobile view 2021-05-26 11:51:50 +05:30
Abhinav-grd 6c2a7cbf4e added bottom margin to collection Bar 2021-05-25 11:41:47 +05:30
Abhinav-grd 059a94e65b added logo to sidebar 2021-05-24 21:28:45 +05:30
Pushkar Anand 26613676be Adding missing files. 2021-05-24 21:28:30 +05:30
Abhinav-grd d2f4e1adc5 made search bar always present and remove search button 2021-05-24 21:22:07 +05:30
Abhinav-grd 6cd2865a8d Merge branch 'master' into search 2021-05-24 19:37:10 +05:30
Abhinav-grd ccf08a75fe updated token validity check 2021-05-24 18:49:05 +05:30
Abhinav-grd 04698a6d41 set uploadStage as Start while turning on view 2021-05-24 10:41:46 +05:30
Abhinav-grd 839a935f42 imporve thumbnial generation fail handling 2021-05-24 10:23:09 +05:30
Abhinav-grd 90e586dded corrected storage limit exceeded banner setting logic 2021-05-24 09:41:32 +05:30
Abhinav-grd 695cdf58dd updated sinup page style 2021-05-23 22:25:48 +05:30
Abhinav-grd 8fc27abe6c updated generate page 2021-05-23 22:24:14 +05:30
Abhinav-grd 65b034c62a removed understood check 2021-05-23 21:35:00 +05:30
Abhinav-grd c01a827e00 moved whole useEffect inside async main 2021-05-23 21:34:38 +05:30
Abhinav-grd bc7fa5278c added terms and condition 2021-05-23 21:06:44 +05:30
Abhinav-grd 2d7c9fa5a4 clearKey on verify page if server send keyAttributes 2021-05-23 21:06:44 +05:30
Abhinav-grd 67aa33cac3
Merge pull request #73 from ente-io/signup-flow-update 
Signup flow update
 2021-05-23 20:30:58 +05:30
Abhinav-grd 1aeaa23ebd passed setLoading to component 2021-05-23 20:29:11 +05:30
Abhinav-grd 90659cca58 moved save logic inside generateAndSaveIntermediateKeyAttributes 2021-05-23 20:23:11 +05:30
Pushkar Anand 2f4dbaa30a Fix offline handling. 2021-05-23 20:22:54 +05:30
Abhinav-grd 4bc152f354 removed ORIGINAL_KEY_ATTRIBUTES from ls storage after putAttribute call 2021-05-23 20:18:27 +05:30
Abhinav-grd 936a4e9643 added logic to skip password set if keyAttribute already in localDB 2021-05-23 20:10:29 +05:30
Pushkar Anand ccaf133e1a Offline cache and manifest. 2021-05-23 19:55:48 +05:30
Abhinav-grd 0f9f9c10d7 seperated out save logic from generateIntermediateKeyAttributes 2021-05-23 19:29:00 +05:30
Abhinav-grd d5b971ae91 complete signup flow logic 2021-05-23 19:28:14 +05:30
Abhinav-grd e5c56d1250 refactored generateKeyAttributes to util 2021-05-23 19:25:56 +05:30
Abhinav-grd 1d74382ccd updated singup form with pasword generation logic 2021-05-23 18:54:25 +05:30
Abhinav-grd b3594ca7cf change signup link on loginPage to button 2021-05-23 18:32:05 +05:30
Pushkar Anand 560bec4c05 Choose Plan design update. 2021-05-23 17:34:29 +05:30
Pushkar Anand 3f26ccc555 First load scroll button issue fix 2021-05-23 11:43:38 +05:30
Pushkar Anand 580d17422b Empty Screen and sidebar design update. 2021-05-23 11:19:53 +05:30
Pushkar Anand 48b1e18da6 Updated Collection Scroll button design. 2021-05-23 09:58:11 +05:30
Abhinav-grd 0a66e963f9 added install mobile app to photoFrame 2021-05-23 05:44:02 +05:30
Vishnu Mohandas 0b08eeec5b Update alert success color 2021-05-23 00:10:34 +05:30
Abhinav-grd b04fcee3f9 reset to all on updateFile 2021-05-21 18:59:28 +05:30
Abhinav-grd 3753ab8110 do't show INSTALL_MOBILE_APP banner on searchmode 2021-05-21 15:15:10 +05:30
Abhinav-grd 824cf59dd4 passed loadingBar ref to searchBar 2021-05-20 14:35:21 +05:30
Abhinav-grd 605eab483e updated passed props and setFiles logic 2021-05-20 13:30:26 +05:30
Abhinav-grd 9ff5140e61 passthe required props to SearchBar 2021-05-18 19:50:38 +05:30
Abhinav-grd 80f79855f7 passs searchView and setSearchView to searchBar 2021-05-18 13:15:04 +05:30
Abhinav-grd 41d117f04e Merge branch 'master' into search 2021-05-18 12:22:17 +05:30
Abhinav-grd dd2e9ddc07 hide only the logo by searchbar 2021-05-18 12:22:11 +05:30
Abhinav-grd bfaef634cf
Merge pull request #66 from ente-io/forms-restructing 
Forms restructing
 2021-05-18 10:30:45 +05:30
Abhinav-grd da10d9dc4a removed separed ending tag for messageDailog in account recover page 2021-05-18 10:27:21 +05:30
Abhinav-grd 71c4627908 made ssesionExipred and accout deleted message non closable 2021-05-18 10:11:20 +05:30
Abhinav-grd 750a6e0308 updated passphraseForm to SingleInputForm 2021-05-18 10:07:20 +05:30
Abhinav-grd f42269dfe4 changed setPlanSelector prop to showPlanSelector 2021-05-18 10:06:22 +05:30
Abhinav-grd b9f1870760 renamed passwordForm to SetPasswordForm 2021-05-18 10:04:38 +05:30
Abhinav-grd f1338baeb0 created SearchBar component 2021-05-18 10:02:37 +05:30
Abhinav-grd 95265dd6f4 added searchView state 2021-05-18 09:57:02 +05:30
Abhinav-grd a7a8515431 close choiceModal after upload start 2021-05-11 18:06:52 +05:30
Abhinav-grd f1989df034 made choice modal large 2021-05-11 17:42:28 +05:30
Abhinav-grd 004ac5826b reduced messageDialog size to lg 2021-05-11 17:42:17 +05:30
Abhinav-grd 0385f51d04 Merge branch 'master' into dummy-loader-from-delete 2021-05-11 17:24:10 +05:30
Abhinav-grd cb75b46e4a reset the collection scroll to start on refresh 2021-05-11 17:14:23 +05:30
Abhinav-grd a4e331ab81 corrected message dialog style 2021-05-09 12:23:56 +05:30
Abhinav-grd 889689636e refresh only when modal opened 2021-05-08 12:52:13 +05:30
Abhinav-grd 0281567bb9 fix max width of modal to 960px 2021-05-08 12:37:03 +05:30
Abhinav-grd 6d45b2f33e updated choice modal 2021-05-08 12:25:15 +05:30
Abhinav-grd 64a95c2d6c made top botton plan selector margin equal 2021-05-08 11:57:46 +05:30
Abhinav-grd c9d030dabf added modal dialog styles 2021-05-08 11:44:30 +05:30
Abhinav-grd 37157455c0 used modal size prop instead of custom classes 2021-05-08 10:59:19 +05:30
Abhinav-grd 84d5f266a3 updated collection selector style 2021-05-08 10:58:16 +05:30
Abhinav-grd 4e31719dbf removed redundant modals classes 2021-05-08 10:50:48 +05:30
Abhinav-grd fb504c8d6f made collection selector item centered 2021-05-08 10:23:06 +05:30
Abhinav-grd a7f02ef045 made div horizontally centered 2021-05-08 09:51:48 +05:30
Abhinav-grd d87931cb94 start loadingbar before action 2021-05-07 17:41:20 +05:30
Abhinav-grd 0e05a44752 passed and dummy loading for collection ops 2021-05-07 17:36:23 +05:30
Abhinav-grd 7afd2c8195 show error message if collection delete fail 2021-05-07 15:38:14 +05:30
Abhinav-grd 966e7ea09b fixed passed function to UpdatePayment onClick 2021-05-07 15:23:32 +05:30
Abhinav-grd 59bd7061a6 remove redundant event prop 2021-05-07 15:17:41 +05:30
Abhinav-grd 0b03e70755 made callback sync 2021-05-07 15:07:31 +05:30
Abhinav-grd 5c6294d53a show dummy loader for selectedFile Ops 2021-05-07 15:07:12 +05:30
Abhinav-grd 48b7dc349d set callbacks as type to void instead of promise void 2021-05-07 14:19:44 +05:30
Abhinav-grd 4cb7d4af7d Merge branch 'master' into handle-create-collection-fail-ui 2021-05-07 13:05:47 +05:30
Abhinav-grd 2c7f07da72 Merge branch 'master' into remove_back_button_password_reset 2021-05-07 13:03:17 +05:30
Abhinav-grd 7815b50b2c force relogin if session doesn't have sessionKeyAttributes 2021-05-07 12:52:03 +05:30
Abhinav-grd 5d86997edb updated upload to handle create collection fail gracefully 2021-05-07 12:37:42 +05:30
Abhinav-grd 74669c1464 remove back button from password set page 2021-05-07 12:26:32 +05:30
Abhinav-grd ad1e89a269 Merge branch 'master' into multiple-tab-error-fix 2021-04-29 14:37:06 +05:30
Abhinav-grd 67371e389d added logic to handle multiple Tabs 2021-04-29 14:28:34 +05:30
Vishnu Mohandas 0a80a56acc Minor UI changes 2021-04-29 14:28:29 +05:30
Abhinav-grd 776eebde4b updated error handling 2021-04-29 14:13:18 +05:30
Abhinav-grd d0c102470d removed onBlur handling from forms 2021-04-29 12:30:23 +05:30
Abhinav-grd 2a36bce875 added not null check 2021-04-29 04:02:13 +05:30
Abhinav-grd 1346acf1db updated collections component 2021-04-29 03:02:37 +05:30
Abhinav-grd 60a7b94d0b abstracted out optionIcon 2021-04-29 03:02:00 +05:30
Abhinav-grd 58190f7f6a redirec to all after collection delete 2021-04-28 15:27:08 +05:30
Abhinav-grd bc29363629 style changes 2021-04-28 15:27:08 +05:30
Vishnu Mohandas d777975122 Minor style changes 2021-04-28 15:14:00 +05:30
Vishnu Mohandas 59a0a694d1 Change background color of alert-success 2021-04-28 14:24:15 +05:30
Abhinav-grd eee0f05ac8 don't rename if collection new Name same as old one 2021-04-28 12:36:51 +05:30
Abhinav-grd 3f42a15f02 added style changes 2021-04-28 12:28:32 +05:30
Abhinav-grd 382c44a44d moved SetDialogMessage and setLoaging to correct places 2021-04-28 12:08:52 +05:30
Abhinav-grd ef24e4372a moved collection Option to seperate component 2021-04-28 12:08:22 +05:30
Abhinav-grd 09c6923675 removed default margin from LinkButton 2021-04-28 11:39:56 +05:30
Abhinav-grd ef0c99e737 integrated selectedFileOption to gallery 2021-04-27 17:28:55 +05:30
Abhinav-grd bf4871aa00 added selectedFileOptions component 2021-04-27 17:28:27 +05:30
Abhinav-grd 44fb64340c added types 2021-04-27 17:06:38 +05:30
Abhinav-grd 08c8a0b0a9 readd removed overflow 2021-04-27 16:24:30 +05:30
Abhinav-grd d867c8b120 udpate file interfcae name to PascalCase 2021-04-27 14:47:38 +05:30
Abhinav-grd 1d9dcfac89 moved image display logic to photoframe 2021-04-27 14:10:37 +05:30
Abhinav-grd 506a85785f use show prefix instead of setup 2021-04-27 13:12:07 +05:30
Abhinav-grd ee928e527a remove duplicate declaration 2021-04-27 13:09:35 +05:30
Abhinav-grd c0b9258fc2 rename collectionAndItsLatestFile array to collectionsAndTheirLatestFile 2021-04-27 13:07:42 +05:30
Abhinav-grd b52bc0af20 reorder declarations 2021-04-27 13:02:24 +05:30
Abhinav-grd 24bc4d57ca prevent esc close of upload progress modal 2021-04-27 12:55:58 +05:30
Abhinav-grd a83524b3d8 passed fileAnalysisResult to prefill name 2021-04-27 12:53:21 +05:30
Abhinav-grd ef0863f8ef coorected props to listen for change in useEffect 2021-04-27 12:53:02 +05:30
Abhinav-grd d245345222 added logic to close collectionSelector uploading to new Collection 2021-04-27 12:38:58 +05:30
Abhinav-grd 927790a992 added collection not null check in click handler 2021-04-27 12:20:03 +05:30
Abhinav-grd 6d9b22272b added close onCallback tigger logic - collectionSelector 2021-04-27 12:14:01 +05:30
Abhinav-grd 9a05958b87 corrected setCollectionNamerView useEffect dependency 2021-04-27 12:06:56 +05:30
Abhinav-grd fcbd1b7558 removed unused props 2021-04-27 11:40:24 +05:30
Abhinav-grd 6dac3fded2 return empty message Modal wihen attributes is null - CollectionNamer 2021-04-27 11:39:49 +05:30
Abhinav-grd f11eac0512 updated the upload modal to refactor collectionNamer and collectionSelector component to gallery 2021-04-27 11:34:13 +05:30
Abhinav-grd ea079fffe8 moved attribute type to respective components 2021-04-27 11:20:03 +05:30
Abhinav-grd 506a889c98 update collectionSelector to be used seperately from upload service 2021-04-27 11:11:08 +05:30
Abhinav-grd d3a760d336 moved nameCollection to gallery 2021-04-27 11:06:56 +05:30
Abhinav-grd 9bce58824d moved upload related props to gallery 2021-04-27 11:05:49 +05:30
Abhinav-grd 26608df407 rename NameCollection to CollectionNamer 2021-04-27 10:59:50 +05:30
Abhinav-grd 326f3820c1 updated AddCollectionButton prop name 2021-04-27 10:59:15 +05:30
Abhinav-grd 55b957053d moved pload related logic to gallery 2021-04-27 01:40:06 +05:30
Abhinav-grd 4f33adba49 updated collection share to share and unshare collection 2021-04-26 17:01:06 +05:30
Abhinav-grd 5ca3a2a935 added collection share component 2021-04-26 13:14:56 +05:30
Abhinav-grd 5b21d6a380 made Namecollection modal smaller 2021-04-26 13:08:28 +05:30
Abhinav-grd 399b441740 used the message dialog in name collections 2021-04-26 09:50:53 +05:30
Abhinav-grd dfdbd1894f made variant complusory 2021-04-25 21:05:43 +05:30
Abhinav-grd 22491040d2 remove confirm dialog box component 2021-04-25 20:57:35 +05:30
Abhinav-grd e217a6e345 minor changes 2021-04-25 20:48:17 +05:30
Abhinav-grd c57c0f6aea moved from confirmDialog to generic message dialog 2021-04-25 20:46:58 +05:30
Abhinav-grd 71c71bf129 updated submit button styles 2021-04-25 20:31:44 +05:30
Abhinav-grd d1996c07c4 build fix 2021-04-25 16:14:13 +05:30
Abhinav-grd 7a9dcb018c style changes to dropdown menu 2021-04-24 16:24:16 +05:30
Abhinav-grd 309532ad3f added collection rename logic and rename Collection service 2021-04-24 15:33:52 +05:30
Abhinav-grd fa67c8d693 added Name component to collection to get new Name 2021-04-24 13:44:08 +05:30
Abhinav-grd 53d449b415 updated UploadComponent to use update nameCollection component 2021-04-24 13:40:38 +05:30
Abhinav-grd 84bc2fcbd0 updated createCollection to NameCollection 2021-04-24 13:39:56 +05:30
Abhinav-grd 849213a50b added delete collection logic 2021-04-24 12:39:37 +05:30
Abhinav-grd 16dec299bf added option icon on hover over collection chips 2021-04-24 12:37:51 +05:30
Abhinav-grd 214a999661 corrected syncFile logic is Updated state when just files deleted 2021-04-24 00:46:27 +05:30
Abhinav-grd bdf25711aa updated progress bar UI 2021-04-24 00:45:24 +05:30
Abhinav-grd 0de72cffa9 updated the createCollection compoenent with formik 2021-04-23 22:14:11 +05:30
Abhinav-grd 8379293dd7 use Ubuntu as font-family 2021-04-23 21:05:48 +05:30
Vishnu Mohandas aae606f001 Rename imported attribute 2021-04-23 13:19:49 +05:30
Vishnu Mohandas de13b957b9 Define background color for the subscription plan selector 2021-04-23 12:54:18 +05:30
Abhinav-grd 7b3f2e0e1e clean up 2021-04-23 12:52:52 +05:30
Abhinav-grd 4688f1c4f7 added logic to show loader is plans not loaded before plan selector modal load 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 2fb9152626 Fix padding 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 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 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 894b8ed8c5 allow close on background click if user has piad plan 2021-04-22 10:55:38 +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 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 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
Abhinav-grd 23bb2e29ec banner message should appear after a delay 2021-03-18 19:20:17 +05:30
Vishnu Mohandas dcbe7d4c4e Use sensitive ops and mem limits to derive key 2021-03-18 15:26:40 +05:30
Abhinav-grd 5b9a9c8371 minor ui improvements 2021-03-17 20:08:05 +05:30
Abhinav-grd d164bc6a26 added alert message for subscription ops 2021-03-17 17:37:20 +05:30
Abhinav-grd 61b6bcdcdc minor patches 2021-03-17 16:14:29 +05:30
Abhinav-grd 0799d7c8ee removed unnessary imports 2021-03-17 13:01:07 +05:30
Abhinav-grd 489a83762a remove subsciption and plan state and directly read and write localstorage value 2021-03-17 13:00:36 +05:30
Abhinav-grd a886488865 updated to use util functions and improve styling 2021-03-17 12:59:21 +05:30
Abhinav-grd 6ced65fb50 updated sidebar and plan selector to manage plans 2021-03-17 04:08:18 +05:30
Abhinav-grd 5351c4e671 added logic to show modal on subscribe button 2021-03-17 02:38:46 +05:30
Abhinav-grd 54d35aace1 added cancel redirect page 2021-03-17 01:31:34 +05:30
Abhinav-grd e412fec108 Merge branch 'master' into stripe-integration 2021-03-16 19:05:41 +05:30
Abhinav-grd dbdf74922f added conditional manage or subscribe button 2021-03-16 18:22:57 +05:30
Abhinav-grd 8a749abf5e added logic to update data if favorites changes 2021-03-16 15:58:45 +05:30
Abhinav-grd 5bacbdfd65 updated plan selector style 2021-03-16 14:32:57 +05:30
Abhinav-grd a8b678b0a1 Merge branch 'master' into stripe-integration 2021-03-16 14:32:15 +05:30
Abhinav-grd 9846f70bda added interface for galelry props 2021-03-16 12:36:33 +05:30
Abhinav-grd d13c13f8c4 clear any left previous user data on new login 2021-03-16 12:20:24 +05:30
Abhinav-grd dc9c081706 cancel async calls if token beomes null 2021-03-16 12:19:34 +05:30
Abhinav-grd a2d18a0d7e added null check 2021-03-16 11:31:42 +05:30