Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
12c41251
Commit
12c41251
authored
Aug 10, 2019
by
Ben Wheeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add formik checkbox component, Show password checkbox
parent
4e0aaafa
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
146 additions
and
16 deletions
+146
-16
src/components/formik-forms/formik-checkbox.jsx
src/components/formik-forms/formik-checkbox.jsx
+84
-0
src/components/formik-forms/formik-checkbox.scss
src/components/formik-forms/formik-checkbox.scss
+39
-0
src/components/formik-forms/formik-forms.scss
src/components/formik-forms/formik-forms.scss
+3
-0
src/components/formik-forms/formik-radio-button.jsx
src/components/formik-forms/formik-radio-button.jsx
+2
-0
src/components/formik-forms/formik-radio-button.scss
src/components/formik-forms/formik-radio-button.scss
+0
-1
src/components/join-flow/join-flow-steps.scss
src/components/join-flow/join-flow-steps.scss
+4
-0
src/components/join-flow/username-step.jsx
src/components/join-flow/username-step.jsx
+14
-15
No files found.
src/components/formik-forms/formik-checkbox.jsx
0 → 100644
View file @
12c41251
const
classNames
=
require
(
'
classnames
'
);
const
PropTypes
=
require
(
'
prop-types
'
);
const
React
=
require
(
'
react
'
);
import
{
Field
}
from
'
formik
'
;
require
(
'
./formik-checkbox.scss
'
);
require
(
'
./formik-forms.scss
'
);
require
(
'
../forms/row.scss
'
);
const
FormikCheckboxSubComponent
=
({
className
,
field
,
id
,
label
,
...
props
})
=>
(
<
div
className=
"checkbox"
>
<
input
checked=
{
field
.
value
}
className=
{
classNames
(
'
formik-checkbox
'
,
className
)
}
id=
{
id
}
name=
{
field
.
name
}
type=
"checkbox"
value=
{
field
.
value
}
onBlur=
{
field
.
onBlur
}
/* eslint-disable-line react/jsx-handler-names */
onChange=
{
field
.
onChange
}
/* eslint-disable-line react/jsx-handler-names */
{
...
props
}
/>
{
label
&&
(
<
label
className=
{
classNames
(
'
formik-label
'
,
'
formik-checkbox-label
'
)
}
htmlFor=
{
id
}
>
{
label
}
</
label
>
)
}
</
div
>
);
FormikCheckboxSubComponent
.
propTypes
=
{
className
:
PropTypes
.
string
,
field
:
PropTypes
.
shape
({
name
:
PropTypes
.
string
,
onBlur
:
PropTypes
.
function
,
onChange
:
PropTypes
.
function
,
value
:
PropTypes
.
bool
}),
id
:
PropTypes
.
string
,
label
:
PropTypes
.
string
,
value
:
PropTypes
.
oneOfType
([
PropTypes
.
number
,
PropTypes
.
string
])
};
const
FormikCheckbox
=
({
className
,
id
,
label
,
name
,
...
props
})
=>
(
<
Field
className=
{
className
}
component=
{
FormikCheckboxSubComponent
}
id=
{
id
}
label=
{
label
}
name=
{
name
}
{
...
props
}
/>
);
FormikCheckbox
.
propTypes
=
{
className
:
PropTypes
.
string
,
id
:
PropTypes
.
string
,
label
:
PropTypes
.
string
,
name
:
PropTypes
.
string
};
module
.
exports
=
FormikCheckbox
;
src/components/formik-forms/formik-checkbox.scss
0 → 100644
View file @
12c41251
@import
"../../colors"
;
.formik-checkbox-label
{
font-weight
:
300
;
}
input
[
type
=
"checkbox"
]
.formik-checkbox
{
display
:
block
;
float
:
left
;
margin-right
:
.625rem
;
border
:
1px
solid
$active-dark-gray
;
border-radius
:
3px
;
width
:
1
.25rem
;
height
:
1
.25rem
;
appearance
:
none
;
&
:focus:checked
{
transition
:
all
.5s
ease
;
outline
:
none
;
box-shadow
:
0
0
0
.25rem
$ui-blue-25percent
;
}
&
:focus:not
(
:checked
)
{
outline
:
none
;
}
&
:checked
{
background-color
:
$ui-blue
;
text-align
:
center
;
text-indent
:
.125rem
;
line-height
:
1
.25rem
;
font-size
:
.75rem
;
&
:after
{
color
:
$type-white
;
content
:
"\2714"
;
}
}
}
src/components/formik-forms/formik-forms.scss
0 → 100644
View file @
12c41251
.formik-label
{
font-weight
:
500
;
}
src/components/formik-forms/formik-radio-button.jsx
View file @
12c41251
...
@@ -5,6 +5,7 @@ import {Field} from 'formik';
...
@@ -5,6 +5,7 @@ import {Field} from 'formik';
const
FormikInput
=
require
(
'
./formik-input.jsx
'
);
const
FormikInput
=
require
(
'
./formik-input.jsx
'
);
require
(
'
./formik-forms.scss
'
);
require
(
'
./formik-radio-button.scss
'
);
require
(
'
./formik-radio-button.scss
'
);
require
(
'
../forms/row.scss
'
);
require
(
'
../forms/row.scss
'
);
...
@@ -34,6 +35,7 @@ const FormikRadioButtonSubComponent = ({
...
@@ -34,6 +35,7 @@ const FormikRadioButtonSubComponent = ({
{
label
&&
(
{
label
&&
(
<
label
<
label
className=
{
classNames
(
className=
{
classNames
(
'
formik-label
'
,
'
formik-radio-label
'
,
'
formik-radio-label
'
,
labelClassName
labelClassName
)
}
)
}
...
...
src/components/formik-forms/formik-radio-button.scss
View file @
12c41251
@import
"../../colors"
;
@import
"../../colors"
;
.formik-radio-label
{
.formik-radio-label
{
font-weight
:
300
;
margin-left
:
1rem
;
margin-left
:
1rem
;
}
}
...
...
src/components/join-flow/join-flow-steps.scss
View file @
12c41251
...
@@ -13,6 +13,10 @@
...
@@ -13,6 +13,10 @@
}
}
}
}
.join-flow-password-confirm
{
margin-bottom
:
.6875rem
;
}
.join-flow-input-tall
{
.join-flow-input-tall
{
height
:
3rem
;
height
:
3rem
;
}
}
...
...
src/components/join-flow/username-step.jsx
View file @
12c41251
...
@@ -7,6 +7,7 @@ const {injectIntl, intlShape} = require('react-intl');
...
@@ -7,6 +7,7 @@ const {injectIntl, intlShape} = require('react-intl');
const
validate
=
require
(
'
../../lib/validate
'
);
const
validate
=
require
(
'
../../lib/validate
'
);
const
FormikInput
=
require
(
'
../../components/formik-forms/formik-input.jsx
'
);
const
FormikInput
=
require
(
'
../../components/formik-forms/formik-input.jsx
'
);
const
FormikCheckbox
=
require
(
'
../../components/formik-forms/formik-checkbox.jsx
'
);
const
JoinFlowStep
=
require
(
'
./join-flow-step.jsx
'
);
const
JoinFlowStep
=
require
(
'
./join-flow-step.jsx
'
);
require
(
'
./join-flow-steps.scss
'
);
require
(
'
./join-flow-steps.scss
'
);
...
@@ -26,9 +27,6 @@ class UsernameStep extends React.Component {
...
@@ -26,9 +27,6 @@ class UsernameStep extends React.Component {
'
validateUsernameIfPresent
'
,
'
validateUsernameIfPresent
'
,
'
validateForm
'
'
validateForm
'
]);
]);
this
.
state
=
{
showPassword
:
false
};
}
}
handleChangeShowPassword
()
{
handleChangeShowPassword
()
{
this
.
setState
({
showPassword
:
!
this
.
state
.
showPassword
});
this
.
setState
({
showPassword
:
!
this
.
state
.
showPassword
});
...
@@ -88,6 +86,7 @@ class UsernameStep extends React.Component {
...
@@ -88,6 +86,7 @@ class UsernameStep extends React.Component {
// called after all validations pass with no errors
// called after all validations pass with no errors
handleValidSubmit
(
formData
,
formikBag
)
{
handleValidSubmit
(
formData
,
formikBag
)
{
formikBag
.
setSubmitting
(
false
);
// formik makes us do this ourselves
formikBag
.
setSubmitting
(
false
);
// formik makes us do this ourselves
delete
formData
.
showPassword
;
this
.
props
.
onNextStep
(
formData
);
this
.
props
.
onNextStep
(
formData
);
}
}
render
()
{
render
()
{
...
@@ -96,7 +95,8 @@ class UsernameStep extends React.Component {
...
@@ -96,7 +95,8 @@ class UsernameStep extends React.Component {
initialValues=
{
{
initialValues=
{
{
username
:
''
,
username
:
''
,
password
:
''
,
password
:
''
,
passwordConfirm
:
''
passwordConfirm
:
''
,
showPassword
:
false
}
}
}
}
validate=
{
this
.
validateForm
}
validate=
{
this
.
validateForm
}
validateOnBlur=
{
false
}
validateOnBlur=
{
false
}
...
@@ -154,7 +154,7 @@ class UsernameStep extends React.Component {
...
@@ -154,7 +154,7 @@ class UsernameStep extends React.Component {
error=
{
errors
.
password
}
error=
{
errors
.
password
}
id=
"password"
id=
"password"
name=
"password"
name=
"password"
type=
{
this
.
state
.
showPassword
?
'
text
'
:
'
password
'
}
type=
{
values
.
showPassword
?
'
text
'
:
'
password
'
}
/* eslint-disable react/jsx-no-bind */
/* eslint-disable react/jsx-no-bind */
validate=
{
password
=>
this
.
validatePasswordIfPresent
(
password
,
values
.
username
)
}
validate=
{
password
=>
this
.
validatePasswordIfPresent
(
password
,
values
.
username
)
}
validationClassName=
"validation-full-width-input"
validationClassName=
"validation-full-width-input"
...
@@ -167,12 +167,14 @@ class UsernameStep extends React.Component {
...
@@ -167,12 +167,14 @@ class UsernameStep extends React.Component {
/>
/>
<
FormikInput
<
FormikInput
className=
{
classNames
(
className=
{
classNames
(
'
join-flow-input
'
'
join-flow-input
'
,
'
join-flow-password-confirm
'
,
{
fail
:
errors
.
passwordConfirm
}
)
}
)
}
error=
{
errors
.
passwordConfirm
}
error=
{
errors
.
passwordConfirm
}
id=
"passwordConfirm"
id=
"passwordConfirm"
name=
"passwordConfirm"
name=
"passwordConfirm"
type=
{
this
.
state
.
showPassword
?
'
text
'
:
'
password
'
}
type=
{
values
.
showPassword
?
'
text
'
:
'
password
'
}
/* eslint-disable react/jsx-no-bind */
/* eslint-disable react/jsx-no-bind */
validate=
{
()
=>
validate=
{
()
=>
this
.
validatePasswordConfirmIfPresent
(
values
.
password
,
this
.
validatePasswordConfirmIfPresent
(
values
.
password
,
...
@@ -189,14 +191,11 @@ class UsernameStep extends React.Component {
...
@@ -189,14 +191,11 @@ class UsernameStep extends React.Component {
/* eslint-enable react/jsx-no-bind */
/* eslint-enable react/jsx-no-bind */
/>
/>
<
div
className=
"join-flow-input-title"
>
<
div
className=
"join-flow-input-title"
>
<
div
<
FormikCheckbox
onClick=
{
this
.
handleChangeShowPassword
}
id=
"showPassword"
>
label=
{
this
.
props
.
intl
.
formatMessage
({
id
:
'
registration.showPassword
'
})
}
{
/* TODO: should localize 'Hide password' if we use that */
}
name=
"showPassword"
{
this
.
state
.
showPassword
?
'
Hide password
'
:
(
/>
this
.
props
.
intl
.
formatMessage
({
id
:
'
registration.showPassword
'
})
)
}
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment