1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Commit Graph

448 Commits

Author SHA1 Message Date
Tim Daubenschütz
34126c2254 Fix negation of expanded prop of Property 2015-12-04 10:49:41 +01:00
Tim Daubenschütz
36041d3b51 Refactor ContractAgreementProperty to InputContractAgreementCheckbox. Thx to @Brett 2015-12-03 21:30:05 +01:00
Tim Daubenschütz
8ec0634d2e Cherry-pick from 1ac2fe7f96:
- Integrate PropertyCollapsible's functionality to Property
2015-12-03 20:26:53 +01:00
Tim Daubenschütz
cb19c46dac Implement PropertyCollapsible's functionality into Property 2015-12-03 20:09:27 +01:00
Brett Sun
f5a527b251 Fix references to form due to nested property elements 2015-12-03 17:19:17 +01:00
Brett Sun
9c64cf2b80 Add hot fix from AD-1313 for using refs in properties
https://github.com/ascribe/onion/blob/AD-1313-Attach-thumbnail-to-piece-
in-register-form/js/components/ascribe_forms/form.js
2015-12-03 17:17:52 +01:00
Brett Sun
328d60b279 Rename ContractAgreementForm to avoid confusion with ContractAgreementProperty 2015-12-03 15:22:37 +01:00
Brett Sun
3c516c1598 Refactor contract agreement to be a self contained component that can be used in forms 2015-12-03 15:22:17 +01:00
Brett Sun
e442e6bcec Make email input be react controlled in loan and consign forms 2015-12-03 15:21:14 +01:00
Brett Sun
e1477be393 Fix typo in PropertyCollapsible declaration 2015-12-03 13:34:24 +01:00
Brett Sun
bde1e454ed Change loan form's startdate and enddate props to be camel case 2015-12-03 13:34:00 +01:00
Tim Daubenschütz
911860ccb5 Finalize cancel and delete functionality for UploadButton 2015-12-03 10:42:55 +01:00
Brett Sun
55bdd4e03f Only show the label or errors part of a Property if they exist
Fix weird spacing for properties that don’t have labels (ie. checkboxes
for terms of service, etc)
2015-12-03 00:49:26 +01:00
Tim Daubenschütz
fe24a5e15a Remove all occurrences of inactivity mgmt of ReactS3Fineuploader 2015-12-02 12:37:21 +01:00
Brett Sun
539c34db48 Fix typo for getDefaultProps() in consign form 2015-11-30 11:19:59 +01:00
Brett Sun
0c02c033e5 Fix consign form when labels aren't give as props 2015-11-27 23:53:54 +01:00
Brett Sun
4821e36189 Update FineUploader utils to use FileStatus 2015-11-25 18:58:49 +01:00
Brett Sun
efdc5d32e7 Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark 2015-11-24 10:42:15 +01:00
Tim Daubenschütz
809ca6f40a Restructure thumbnail creation functionality
- Add function in Property and Form for creating refs
- Change `handleSelectFiles` to `handleChangedFile`
- Add `setThumbnailForFile` method to `ReactS3Fineuploader`
2015-11-23 17:59:20 +01:00
Tim Daubenschütz
59244f208a Fix detachment of DOM <-> browser state 2015-11-23 13:59:07 +01:00
Tim Daubenschütz
96ad05cef4 Unknot (and maybe reknot) layouting for FileDragAndDrop 2015-11-20 15:02:39 +01:00
Tim Daubenschütz
c0f5351645 Fix badly indentation 2015-11-19 18:09:42 +01:00
Tim Daubenschütz
2aab5d2d0d Fix bug in RegisterPieceForm when defining no editions 2015-11-19 16:16:25 +01:00
Tim Daubenschütz
6d08540d8b Sync thumbnail uploader to digitalWork uploader in RegisterPieceForm 2015-11-19 11:45:29 +01:00
Tim Daubenschütz
399f670bed Add variety of supported file formats & fix bug when parsing mime type 2015-11-18 17:55:27 +01:00
Tim Daubenschütz
43c6ee929b Remove PropertyCollapsible 2015-11-18 16:32:07 +01:00
Tim Daubenschütz
25372a3edf Include PropertyCollapsible's functionality into Property 2015-11-18 16:31:37 +01:00
Tim Daubenschütz
6d828ac959 Remove hidden prop from Property 2015-11-17 16:14:20 +01:00
Tim Daubenschütz
1ac2fe7f96 Remove all occurences of 'hidden' prop usage for Property 2015-11-17 15:52:40 +01:00
Tim Daubenschütz
971d42b36d Add file-format-specific call to action for thumbnail generation 2015-11-17 15:46:46 +01:00
Tim Daubenschütz
16840a6136 Generalize InputFineuploader's submitFileName method to submitFile 2015-11-17 11:57:18 +01:00
Tim Daubenschütz
14621b5b38 Generalize UploadButton styling 2015-11-17 11:22:24 +01:00
Tim Daubenschütz
4f0c0fe65a Add static version of thumbnail uploader in register piece form 2015-11-17 10:38:10 +01:00
Tim Daubenschütz
e016ee7446 Merge pull request #12 from ascribe/AD-1242-Frontend-caching-using-local-storage
Implement functionality for feature-detecting webStorage
2015-11-16 17:37:29 +01:00
Tim Daubenschütz
ac07107210 Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
Conflicts:
	js/constants/application_constants.js
	js/utils/requests.js
2015-11-16 16:38:35 +01:00
Tim Daubenschütz
da73d40fd6 Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-
Cleared all conflicts

Conflicts:
	js/components/ascribe_forms/form.js
	js/components/ascribe_forms/input_fineuploader.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
	js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
	js/utils/requests.js
2015-11-16 15:27:00 +01:00
Tim Daubenschütz
286dd114af Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio
Ad 1255 refactor aclbuttons form creatio
2015-11-16 13:50:13 +01:00
Tim Daubenschütz
8b335cfb07 Include feedback from PR 2015-11-13 09:48:22 +01:00
Tim Daubenschütz
62f19467b7 Changing behavior for ReactS3Fineuploader not having access to createBlobRoutine 2015-11-11 18:17:32 +01:00
Brett Sun
84e8e4612f Autofocus message field in consignment form and use custom labels
For now, we’ll let the artist specify their suggested price in the
consignment form’s message field.
2015-11-10 18:24:46 +01:00
Tim Daubenschütz
ea321a4a77 Finalize submission flow with validation and thumbnail creation 2015-11-10 17:35:57 +01:00
Tim Daubenschütz
aec850a905 Improve validation for non-HTML5 inputs 2015-11-10 15:51:24 +01:00
Tim Daubenschütz
62eb78ae76 Add naive & manual validation to Form 2015-11-10 13:40:34 +01:00
Brett Sun
adf0d411d6 Fetch piece data in AdditionalDetailForm
Although this moves state further down the hierarchy, it allows the
AdditionalDataForm to be used more easily. Parent components would
otherwise have to have the piece prop carried down through multiple
levels or create a makeshift object.
2015-11-05 11:56:17 +01:00
Brett Sun
cd6673f255 Merge with AD-1264 2015-11-03 11:34:48 +01:00
Brett Sun
f7259a8ab3 Merge with AD-1255 2015-11-03 11:13:32 +01:00
Brett Sun
68c1dd9407 Merge with AD1251 2015-11-03 10:48:28 +01:00
Brett Sun
d2529bf015 Merge with master 2015-11-03 10:39:01 +01:00
Brett Sun
fe4e337690 Use Object.assign() instead of writing own merge function 2015-11-02 18:27:45 +01:00
Tim Daubenschütz
0157c048ab Add cache invalidation for signup and login 2015-11-02 15:38:37 +01:00
Brett Sun
a0ebc7dc58 Use string formatting for RequestActionForm's notification message 2015-11-02 15:21:33 +01:00
Brett Sun
fe06ea607f Remove unnecessary default props 2015-11-02 15:20:02 +01:00
Brett Sun
d23331d9b9 Remove ReactS3FineUploader's dependency on react-router's location
ReactS3FineUploader used to check the current url’s query params to
determine which method it should use to upload, but this decision means
the component is tightly coupled with react-router and history.js. A
major pain point is having to propagate the location prop all the way
down to this component even when it’s not necessary.

Now, ReactS3FineUploader’s parent elements can either parse the current
query params themselves or, if they have a location from react-router,
simply use the location.

Added a few utils to help parse url params.
2015-10-30 17:43:20 +01:00
Brett Sun
67fbfbd470 Update RequestActionForm to use form utils 2015-10-30 11:46:01 +01:00
Brett Sun
03e0bbd024 Separate form building concerns from AclButton
AclButton’s form building is now delegated to AclFormFactory so other
components can use the same forms with ease. Its show/hide behaviour is
also now controlled with AclProxy.
2015-10-30 11:10:31 +01:00
Brett Sun
864e0bd2a6 Remove redundant truth check for required prop 2015-10-29 15:45:00 +01:00
Brett Sun
906ef7c37e Refactor InputTextAreaToggable's required property to take a bool instead 2015-10-28 19:19:14 +01:00
Brett Sun
ac1b43d24b Set the consignee email by using the server's white label settings
Consignee email is available through the white label settings we get
from the server, so we don’t need to hardcode them into the constants.

Separated out AclButtonList from PieceListbulkModal to make the modal
more flexible and separated in concerns.
2015-10-26 19:17:06 +01:00
Brett Sun
3dedc93d2e Force consignee to be submissions@lumenus.co
Special white label form settings only defined for consign form for
now, but could be added to others as needed.
2015-10-23 14:19:44 +02:00
Tim Daubenschütz
cd3c8b8f6e Complete visual styling 2015-10-23 10:37:23 +02:00
Tim Daubenschütz
d4de2434ee Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
	js/components/ascribe_forms/form_share_email.js
	js/components/ascribe_forms/form_transfer.js
	js/utils/general_utils.js
	sass/main.scss
2015-10-22 13:38:49 +02:00
Tim Daubenschütz
8d0e9a42fc Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
	package.json
2015-10-20 18:11:41 +02:00
Tim Daubenschütz
ddc2e7b919 Rename intersectAcls to intersectList and do some clean up 2015-10-20 18:10:48 +02:00
Tim Daubenschütz
f0d8e32ecf Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
	js/components/ascribe_accordion_list/accordion_list_item_piece.js
	js/components/ascribe_app.js
	js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
	js/components/logout_container.js
	js/components/whitelabel/wallet/wallet_app.js
2015-10-19 10:30:14 +02:00
TimDaubenschuetz
d66c201a98 Merged in AD-727-missing-redirects-to-login-page (pull request #95)
Ad 727 missing redirects to login page
2015-10-19 10:13:54 +02:00
Tim Daubenschütz
712ec74247 add getLangText 2015-10-16 12:10:28 +02:00
Tim Daubenschütz
32d317cdef add download button to loan form 2015-10-16 11:29:08 +02:00
diminator
ed24ec194e added PR comments 2015-10-15 15:24:40 +02:00
Tim Daubenschütz
8bb971d9df Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
Conflicts:
	js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
	js/components/whitelabel/wallet/components/cyland/cyland_landing.js
2015-10-15 11:55:44 +02:00
Tim Daubenschütz
d77bdb25a5 Cleanup code 2015-10-15 11:17:16 +02:00
Tim Daubenschütz
a1f159fc2d Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
	js/components/ascribe_detail/edition.js
	js/utils/general_utils.js
	sass/main.scss
2015-10-15 10:06:39 +02:00
diminator
c24021302f Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
	js/components/whitelabel/wallet/components/cyland/cyland_hero.js
2015-10-14 17:25:53 +02:00
diminator
317d2611ba spinners part2
scrollbar

uploader styles

property blur
2015-10-14 16:17:10 +02:00
vrde
2869cbc125 Disable eslint check on specific proptype 2015-10-14 15:49:04 +02:00
vrde
01cea9ad3d Property component now propagate its name to its input child 2015-10-14 15:30:10 +02:00
Cevo
b4b05b3161 information added to forms and delete form title changed, acl information component created, information text is added to the constants 2015-10-13 18:33:08 +02:00
diminator
6175775503 property blur refactor 2015-10-12 17:59:45 +02:00
diminator
8d970a65c4 spinners in forms
button wide
2015-10-12 17:55:02 +02:00
diminator
aaa1a9a000 replaced fonts
replaced spinners WIP

renamed settings-property to property
2015-10-12 15:25:21 +02:00
Tim Daubenschütz
299007baab Refactor redirect and redirectAuthenticated 2015-10-09 13:51:21 +02:00
Tim Daubenschütz
f066971ccc Finalize ProxyRoute and RedirectProxyRoute 2015-10-06 18:28:15 +02:00
Tim Daubenschütz
28dfcfa75a Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
Conflicts:
	js/components/ascribe_detail/edition.js
	js/components/ascribe_forms/form_login.js
	js/components/ascribe_forms/form_signup.js
2015-10-06 16:40:02 +02:00
Tim Daubenschütz
9a17e44df1 Refactor of wallet app routing 2015-10-01 15:57:46 +02:00
diminator
5f201ad76a fix redirect 2015-10-01 15:38:37 +02:00
Tim Daubenschütz
83c652a4f0 Rename pieces routes back to collection 2015-10-01 14:30:11 +02:00
Tim Daubenschütz
957d0c66c9 minor fixes for last commit 2015-10-01 11:24:19 +02:00
Tim Daubenschütz
829f2c592b Switch all usages of Router.Navigation and Router.State 2015-10-01 11:16:38 +02:00
diminator
dfa01a0dde signup fix
consign redirect
2015-10-01 09:45:12 +02:00
Tim Daubenschütz
8cd4377a58 Change links in app to new react-router@1.0rc1 syntax 2015-09-30 18:30:50 +02:00
diminator
bbae33a40f avoid dispatcherror when switching to signup 2015-09-30 17:07:18 +02:00
diminator
0d6e82a45d WIP signup/login redirect and redirectAuthenticated 2015-09-30 17:05:40 +02:00
Tim Daubenschütz
5b9d7eae65 Corrections on loan form 2015-09-28 15:14:45 +02:00
Tim Daubenschütz
62e85c66ac Rename 'Send loan request' to 'send contract' for ikonoTv 2015-09-28 11:51:02 +02:00
Tim Daubenschütz
afef5db150 Add proper button to create editions form 2015-09-28 10:19:12 +02:00
diminator
5ddf89e020 forward to collection after contract sent 2015-09-25 15:39:36 +02:00
Tim Daubenschütz
4302da2f81 Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra 2015-09-23 14:22:09 +02:00
Tim Daubenschütz
4acbc2c923 fix InputTextareaToggable 2015-09-23 14:12:33 +02:00
Tim Daubenschütz
3a11efb2fc Improve input_textarea_toggleable 2015-09-22 17:13:06 +02:00
Tim Daubenschütz
1320b5c965 cleanup form_loan and contract_agreement_list_actions 2015-09-22 16:45:24 +02:00
Tim Daubenschütz
33b8e51aee Fix react warning for select inputs 2015-09-22 14:13:04 +02:00