Skip to content

Align with the actual accounts-ui #7

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Align with the actual accounts-ui #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 25 additions & 4 deletions main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,27 @@ class Form extends Accounts.ui.Form {
fields,
buttons,
error,
message,
messages,
ready = true,
className,
formState
} = this.props;

let classes = ["accounts ui form", className];
const hasErrors = messages.length > 0;
if (hasErrors) {
classes.push("error warning");
}

const genericMessages = messages.filter((message) => ! message.field);
const message = genericMessages.map(({ message }) => message).join("\n");

return (
<form ref={(ref) => this.form = ref} className={[ "accounts ui form", className ].join(' ')}>
<form ref={(ref) => this.form = ref} className={classes.join(' ')}>
{Object.keys(fields).length > 0 ? (
<Accounts.ui.Fields fields={ fields } />
): null }
<Accounts.ui.FormMessage className="ui message error" style={{display: 'block'}} message={message} />
{ buttons['switchToPasswordReset'] ? (
<div className="field">
<Accounts.ui.Button {...buttons['switchToPasswordReset']} />
Expand Down Expand Up @@ -60,7 +71,6 @@ class Form extends Accounts.ui.Form {
{ formState == STATES.SIGN_IN || formState == STATES.SIGN_UP ? (
<Accounts.ui.SocialButtons oauthServices={ oauthServices } />
) : null }
<Accounts.ui.FormMessage className="ui message" style={{display: 'block'}} {...message} />
</form>
);
}
Expand Down Expand Up @@ -116,13 +126,20 @@ class Field extends Accounts.ui.Field {
label,
type = 'text',
onChange,
message,
required = false,
className,
defaultValue = ""
} = this.props;
const { mount = true } = this.state;

let classes = ["ui field", required ? "required" : ""];
if (message) {
classes.push(message.type);
}

return mount ? (
<div className={["ui field", required ? "required" : ""].join(' ')}>
<div className={classes.join(' ')}>
<label htmlFor={ id }>{ label }</label>
<div className="ui fluid input">
<input id="password" name="password" style={{display: 'none'}} />
Expand All @@ -135,6 +152,10 @@ class Field extends Accounts.ui.Field {
onChange={ onChange }
placeholder={ hint } defaultValue={ defaultValue } />
</div>
{message && (
<span className={['ui message', message.type].join(' ').trim()}>
{message.message}</span>
)}
</div>
) : null;
}
Expand Down