Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add username #1133

Merged
merged 34 commits into from
Jun 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ad65141
ui ready
tanmoyAtb Jun 13, 2021
46d05d7
adding username functions
tanmoyAtb Jun 14, 2021
8bd15ea
wip
tanmoyAtb Jun 14, 2021
6d3d460
wip
tanmoyAtb Jun 14, 2021
8672701
chenging to form
tanmoyAtb Jun 14, 2021
1703a30
before lookup problem
tanmoyAtb Jun 14, 2021
81b6a9f
profile update
tanmoyAtb Jun 14, 2021
65f2e8f
adding username reeady
tanmoyAtb Jun 14, 2021
4198b60
lingui extract
actions-user Jun 14, 2021
7eb135d
disable email
tanmoyAtb Jun 15, 2021
824e6b6
merged
tanmoyAtb Jun 15, 2021
a2ff275
Merge branch 'feat/add-username-1091' of github.com:imploy/ui into fe…
tanmoyAtb Jun 15, 2021
e45463c
removed FB logo
tanmoyAtb Jun 15, 2021
d252b39
changes and comments
tanmoyAtb Jun 15, 2021
a3f0086
profile update
tanmoyAtb Jun 15, 2021
309fdcd
Merge branch 'dev' of github.com:imploy/ui into feat/add-username-1091
tanmoyAtb Jun 15, 2021
967f8d1
Update packages/common-components/src/TextInput/FormikTextInput.tsx
tanmoyAtb Jun 16, 2021
003539f
Update packages/common-components/src/TextInput/TextInput.tsx
tanmoyAtb Jun 16, 2021
eeec3f3
Update packages/files-ui/src/Components/Modules/Settings/Profile.tsx
tanmoyAtb Jun 16, 2021
a971c5f
Update packages/files-ui/src/Contexts/UserContext.tsx
tanmoyAtb Jun 16, 2021
d666072
lingui extract
actions-user Jun 16, 2021
53674dd
Update packages/files-ui/src/Components/Modules/Settings/Profile.tsx
tanmoyAtb Jun 16, 2021
f7b3530
Update packages/files-ui/src/Contexts/UserContext.tsx
tanmoyAtb Jun 16, 2021
d435815
Update packages/files-ui/src/Contexts/UserContext.tsx
tanmoyAtb Jun 16, 2021
a0bdb65
Update packages/files-ui/src/Components/Modules/Settings/Profile.tsx
tanmoyAtb Jun 16, 2021
f2b001a
Update packages/files-ui/src/Contexts/UserContext.tsx
tanmoyAtb Jun 16, 2021
dce13fb
suggested changes
tanmoyAtb Jun 16, 2021
0053e02
Merge branch 'feat/add-username-1091' of github.com:imploy/ui into fe…
tanmoyAtb Jun 16, 2021
6e91dd2
lingui extract
actions-user Jun 16, 2021
3997683
pushed to 300ms debounce
tanmoyAtb Jun 16, 2021
dae1f41
Merge branch 'feat/add-username-1091' of github.com:imploy/ui into fe…
tanmoyAtb Jun 16, 2021
9efa618
lingui extract
actions-user Jun 16, 2021
2e4e72f
Merge branch 'dev' into feat/add-username-1091
FSM1 Jun 16, 2021
45fbe19
Merge branch 'dev' into feat/add-username-1091
tanmoyAtb Jun 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/common-components/src/TextInput/FormikTextInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import TextInput, { ITextInputProps } from "./TextInput"
export interface FormikTextInputProps
extends Omit<ITextInputProps, "onChange" | "state" | "value"> {
name: string
hideLabel?: boolean
}

const FormikTextInput = React.forwardRef(
Expand All @@ -21,14 +22,15 @@ const FormikTextInput = React.forwardRef(
disabled = false,
autoFocus,
captionMessage,
hideLabel,
...rest
}: FormikTextInputProps,
forwardedRef: any
) => {
const [field, meta, helpers] = useField(name)
return (
<TextInput
label={label ? label : field.name}
label={hideLabel ? undefined : label || field.name}
inputVariant={inputVariant}
disabled={disabled}
type={type}
Expand Down
4 changes: 2 additions & 2 deletions packages/common-components/src/TextInput/TextInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ export interface ITextInputProps
inputVariant?: "default" | "minimal"
size?: "large" | "medium" | "small"
captionMessage?: string | ReactNode
onChange: (value: string | number | undefined) => void
onChange?: (value?: string | number) => void
type?: "text" | "email" | "password" | "url" | "search"
autoFocus?: boolean
}
Expand Down Expand Up @@ -468,7 +468,7 @@ const TextInput = React.forwardRef(
name={name}
value={value}
placeholder={placeholder}
onChange={(e) => onChange(e.target.value)}
onChange={(e) => onChange && onChange(e.target.value)}
autoFocus={autoFocus}
ref={forwardedRef}
{...rest}
Expand Down
Loading