From fb2778e009ca4bd7403c77f1a4753d05693ea1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=81=E6=B2=BB=E5=B9=B3?= Date: Tue, 8 Nov 2016 03:02:27 +0800 Subject: [PATCH 01/10] Add type `plaintext` --- src/common/components/forms/user/LoginForm.js | 7 +++++++ src/common/components/utils/BsForm.js | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/common/components/forms/user/LoginForm.js b/src/common/components/forms/user/LoginForm.js index 704e1ff..a732780 100644 --- a/src/common/components/forms/user/LoginForm.js +++ b/src/common/components/forms/user/LoginForm.js @@ -83,6 +83,13 @@ class LoginForm extends Component { return (
{submitFailed && error && ({error})} + { @@ -100,6 +100,12 @@ let BsFormField = ({ )) ); + } else if (type === 'plaintext') { + formControl = ( +

+ {text} +

+ ); } else { formControl = ( Date: Tue, 8 Nov 2016 03:14:29 +0800 Subject: [PATCH 02/10] Fix avatar uploading bug --- src/common/components/forms/user/AvatarForm.js | 6 ++++++ src/common/components/pages/user/ShowPage.js | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/components/forms/user/AvatarForm.js b/src/common/components/forms/user/AvatarForm.js index 8e5f4a5..a260a62 100644 --- a/src/common/components/forms/user/AvatarForm.js +++ b/src/common/components/forms/user/AvatarForm.js @@ -10,6 +10,7 @@ import userAPI from '../../../api/user'; import { pushErrors } from '../../../actions/errorActions'; import { setCookies } from '../../../actions/cookieActions'; import { Form, FormField, FormFooter } from '../../utils/BsForm'; +import Head from '../../widgets/Head'; import toRefreshURL from '../../../utils/toRefreshURL'; const initialValues = { @@ -196,6 +197,11 @@ class AvatarForm extends Component { return ( + {avatarURL && } - {this.renderModal()} From c60e1f4704abffd0d387cb89ffdd373070af2c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=81=E6=B2=BB=E5=B9=B3?= Date: Tue, 8 Nov 2016 03:15:12 +0800 Subject: [PATCH 03/10] Update field type `radio` to `radiobutton` --- src/common/components/forms/user/AvatarForm.js | 1 + src/common/components/utils/BsForm.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/components/forms/user/AvatarForm.js b/src/common/components/forms/user/AvatarForm.js index a260a62..5d24bac 100644 --- a/src/common/components/forms/user/AvatarForm.js +++ b/src/common/components/forms/user/AvatarForm.js @@ -212,6 +212,7 @@ class AvatarForm extends Component { label="Store avatar into" name="storage" component={FormField} + type="radiobutton" options={[{ label: 'Firebase', value: 'firebase', diff --git a/src/common/components/utils/BsForm.js b/src/common/components/utils/BsForm.js index abc8f87..c42e0ee 100644 --- a/src/common/components/utils/BsForm.js +++ b/src/common/components/utils/BsForm.js @@ -82,7 +82,7 @@ let BsFormField = ({ 
Recaptcha is disabled
); /* eslint-enable */ - } else if (options) { + } else if (type === 'radiobutton') { // ref: formControl = ( options.map((option) => ( From b80fdef23b079f138a373fc4488bed0e23595bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=81=E6=B2=BB=E5=B9=B3?= Date: Tue, 8 Nov 2016 03:27:59 +0800 Subject: [PATCH 04/10] Add field type `textarea` --- src/common/components/utils/BsForm.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/common/components/utils/BsForm.js b/src/common/components/utils/BsForm.js index c42e0ee..008d9c2 100644 --- a/src/common/components/utils/BsForm.js +++ b/src/common/components/utils/BsForm.js @@ -106,6 +106,14 @@ let BsFormField = ({ {text}

); + } else if (type === 'textarea') { + formControl = ( +