diff options
author | haraldox <hnaumann+github@gmail.com> | 2018-01-30 12:10:12 +0100 |
---|---|---|
committer | haraldox <hnaumann+github@gmail.com> | 2018-01-30 12:10:12 +0100 |
commit | fdbd7f58eaf9597ae879878ab76a90148bc789eb (patch) | |
tree | 7dbc43421b84d63319ccf1e22fe597763fbf92b4 /src | |
parent | Merge branch 'fix-invite-screen' into feature/invite-button (diff) | |
parent | Merge pull request #599 from meetfranz/fix-form-validation (diff) | |
download | ferdium-app-fdbd7f58eaf9597ae879878ab76a90148bc789eb.tar.gz ferdium-app-fdbd7f58eaf9597ae879878ab76a90148bc789eb.tar.zst ferdium-app-fdbd7f58eaf9597ae879878ab76a90148bc789eb.zip |
Merge branch 'develop' into feature/invite-button
Diffstat (limited to 'src')
-rw-r--r-- | src/components/auth/Login.js | 4 | ||||
-rw-r--r-- | src/components/auth/Password.js | 2 | ||||
-rw-r--r-- | src/components/auth/Signup.js | 10 | ||||
-rw-r--r-- | src/components/layout/Sidebar.js | 4 | ||||
-rw-r--r-- | src/components/ui/Subscription.js | 2 | ||||
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 4 | ||||
-rw-r--r-- | src/containers/settings/EditUserScreen.js | 12 |
7 files changed, 21 insertions, 17 deletions
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 67e92849d..4a3cd6776 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js | |||
@@ -76,12 +76,12 @@ export default class Login extends Component { | |||
76 | email: { | 76 | email: { |
77 | label: this.context.intl.formatMessage(messages.emailLabel), | 77 | label: this.context.intl.formatMessage(messages.emailLabel), |
78 | value: '', | 78 | value: '', |
79 | validate: [required, email], | 79 | validators: [required, email], |
80 | }, | 80 | }, |
81 | password: { | 81 | password: { |
82 | label: this.context.intl.formatMessage(messages.passwordLabel), | 82 | label: this.context.intl.formatMessage(messages.passwordLabel), |
83 | value: '', | 83 | value: '', |
84 | validate: [required], | 84 | validators: [required], |
85 | type: 'password', | 85 | type: 'password', |
86 | }, | 86 | }, |
87 | }, | 87 | }, |
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js index d2b196853..5bcc80b6e 100644 --- a/src/components/auth/Password.js +++ b/src/components/auth/Password.js | |||
@@ -60,7 +60,7 @@ export default class Password extends Component { | |||
60 | email: { | 60 | email: { |
61 | label: this.context.intl.formatMessage(messages.emailLabel), | 61 | label: this.context.intl.formatMessage(messages.emailLabel), |
62 | value: '', | 62 | value: '', |
63 | validate: [required, email], | 63 | validators: [required, email], |
64 | }, | 64 | }, |
65 | }, | 65 | }, |
66 | }, this.context.intl); | 66 | }, this.context.intl); |
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index a990a112e..219948274 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js | |||
@@ -82,7 +82,7 @@ export default class Signup extends Component { | |||
82 | fields: { | 82 | fields: { |
83 | accountType: { | 83 | accountType: { |
84 | value: 'individual', | 84 | value: 'individual', |
85 | validate: [required], | 85 | validators: [required], |
86 | options: [{ | 86 | options: [{ |
87 | value: 'individual', | 87 | value: 'individual', |
88 | label: 'Individual', | 88 | label: 'Individual', |
@@ -97,17 +97,17 @@ export default class Signup extends Component { | |||
97 | firstname: { | 97 | firstname: { |
98 | label: this.context.intl.formatMessage(messages.firstnameLabel), | 98 | label: this.context.intl.formatMessage(messages.firstnameLabel), |
99 | value: '', | 99 | value: '', |
100 | validate: [required], | 100 | validators: [required], |
101 | }, | 101 | }, |
102 | lastname: { | 102 | lastname: { |
103 | label: this.context.intl.formatMessage(messages.lastnameLabel), | 103 | label: this.context.intl.formatMessage(messages.lastnameLabel), |
104 | value: '', | 104 | value: '', |
105 | validate: [required], | 105 | validators: [required], |
106 | }, | 106 | }, |
107 | email: { | 107 | email: { |
108 | label: this.context.intl.formatMessage(messages.emailLabel), | 108 | label: this.context.intl.formatMessage(messages.emailLabel), |
109 | value: '', | 109 | value: '', |
110 | validate: [required, email], | 110 | validators: [required, email], |
111 | }, | 111 | }, |
112 | organization: { | 112 | organization: { |
113 | label: this.context.intl.formatMessage(messages.companyLabel), | 113 | label: this.context.intl.formatMessage(messages.companyLabel), |
@@ -116,7 +116,7 @@ export default class Signup extends Component { | |||
116 | password: { | 116 | password: { |
117 | label: this.context.intl.formatMessage(messages.passwordLabel), | 117 | label: this.context.intl.formatMessage(messages.passwordLabel), |
118 | value: '', | 118 | value: '', |
119 | validate: [required, minLength(6)], | 119 | validators: [required, minLength(6)], |
120 | type: 'password', | 120 | type: 'password', |
121 | }, | 121 | }, |
122 | }, | 122 | }, |
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 915ebeace..fa269f216 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
@@ -42,6 +42,10 @@ export default class Sidebar extends Component { | |||
42 | tooltipEnabled: true, | 42 | tooltipEnabled: true, |
43 | }; | 43 | }; |
44 | 44 | ||
45 | componentDidUpdate() { | ||
46 | ReactTooltip.rebuild(); | ||
47 | } | ||
48 | |||
45 | enableToolTip() { | 49 | enableToolTip() { |
46 | this.setState({ tooltipEnabled: true }); | 50 | this.setState({ tooltipEnabled: true }); |
47 | } | 51 | } |
diff --git a/src/components/ui/Subscription.js b/src/components/ui/Subscription.js index 41f8ba5d7..dd350479d 100644 --- a/src/components/ui/Subscription.js +++ b/src/components/ui/Subscription.js | |||
@@ -108,7 +108,7 @@ export default class SubscriptionForm extends Component { | |||
108 | fields: { | 108 | fields: { |
109 | paymentTier: { | 109 | paymentTier: { |
110 | value: 'year', | 110 | value: 'year', |
111 | validate: [required], | 111 | validators: [required], |
112 | options: [{ | 112 | options: [{ |
113 | value: 'month', | 113 | value: 'month', |
114 | label: `€ ${Object.hasOwnProperty.call(this.props.plan, 'month') | 114 | label: `€ ${Object.hasOwnProperty.call(this.props.plan, 'month') |
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index c26195a1e..00e888cc4 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -121,7 +121,7 @@ export default class EditServiceScreen extends Component { | |||
121 | label: intl.formatMessage(messages.team), | 121 | label: intl.formatMessage(messages.team), |
122 | placeholder: intl.formatMessage(messages.team), | 122 | placeholder: intl.formatMessage(messages.team), |
123 | value: service.team, | 123 | value: service.team, |
124 | validate: [required], | 124 | validators: [required], |
125 | }, | 125 | }, |
126 | }); | 126 | }); |
127 | } | 127 | } |
@@ -132,7 +132,7 @@ export default class EditServiceScreen extends Component { | |||
132 | label: intl.formatMessage(messages.customUrl), | 132 | label: intl.formatMessage(messages.customUrl), |
133 | placeholder: 'https://', | 133 | placeholder: 'https://', |
134 | value: service.customUrl, | 134 | value: service.customUrl, |
135 | validate: [required, url], | 135 | validators: [required, url], |
136 | }, | 136 | }, |
137 | }); | 137 | }); |
138 | } | 138 | } |
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js index fb5c5db89..dda8ce513 100644 --- a/src/containers/settings/EditUserScreen.js +++ b/src/containers/settings/EditUserScreen.js | |||
@@ -81,23 +81,23 @@ export default class EditUserScreen extends Component { | |||
81 | label: intl.formatMessage(messages.firstname), | 81 | label: intl.formatMessage(messages.firstname), |
82 | placeholder: intl.formatMessage(messages.firstname), | 82 | placeholder: intl.formatMessage(messages.firstname), |
83 | value: user.firstname, | 83 | value: user.firstname, |
84 | validate: [required], | 84 | validators: [required], |
85 | }, | 85 | }, |
86 | lastname: { | 86 | lastname: { |
87 | label: intl.formatMessage(messages.lastname), | 87 | label: intl.formatMessage(messages.lastname), |
88 | placeholder: intl.formatMessage(messages.lastname), | 88 | placeholder: intl.formatMessage(messages.lastname), |
89 | value: user.lastname, | 89 | value: user.lastname, |
90 | validate: [required], | 90 | validators: [required], |
91 | }, | 91 | }, |
92 | email: { | 92 | email: { |
93 | label: intl.formatMessage(messages.email), | 93 | label: intl.formatMessage(messages.email), |
94 | placeholder: intl.formatMessage(messages.email), | 94 | placeholder: intl.formatMessage(messages.email), |
95 | value: user.email, | 95 | value: user.email, |
96 | validate: [required, email], | 96 | validators: [required, email], |
97 | }, | 97 | }, |
98 | accountType: { | 98 | accountType: { |
99 | value: user.accountType, | 99 | value: user.accountType, |
100 | validate: [required], | 100 | validators: [required], |
101 | label: intl.formatMessage(messages.accountType.label), | 101 | label: intl.formatMessage(messages.accountType.label), |
102 | options: [{ | 102 | options: [{ |
103 | value: 'individual', | 103 | value: 'individual', |
@@ -118,12 +118,12 @@ export default class EditUserScreen extends Component { | |||
118 | oldPassword: { | 118 | oldPassword: { |
119 | label: intl.formatMessage(messages.currentPassword), | 119 | label: intl.formatMessage(messages.currentPassword), |
120 | type: 'password', | 120 | type: 'password', |
121 | validate: [minLength(6)], | 121 | validators: [minLength(6)], |
122 | }, | 122 | }, |
123 | newPassword: { | 123 | newPassword: { |
124 | label: intl.formatMessage(messages.newPassword), | 124 | label: intl.formatMessage(messages.newPassword), |
125 | type: 'password', | 125 | type: 'password', |
126 | validate: [minLength(6)], | 126 | validators: [minLength(6)], |
127 | }, | 127 | }, |
128 | }, | 128 | }, |
129 | }; | 129 | }; |