LoginResponse,
Register,
} from "lemmy-js-client";
-import { i18n } from "../../i18next";
-import { UserService } from "../../services";
+import { I18NextService, UserService } from "../../services";
import { HttpService, RequestState } from "../../services/HttpService";
import { Spinner } from "../common/icon";
+import PasswordInput from "../common/password-input";
import { SiteForm } from "./site-form";
interface State {
}
get documentTitle(): string {
- return `${i18n.t("setup")} - Lemmy`;
+ return `${I18NextService.i18n.t("setup")} - Lemmy`;
}
render() {
<Helmet title={this.documentTitle} />
<div className="row">
<div className="col-12 offset-lg-3 col-lg-6">
- <h3>{i18n.t("lemmy_instance_setup")}</h3>
+ <h1 className="h4 mb-4">
+ {I18NextService.i18n.t("lemmy_instance_setup")}
+ </h1>
{!this.state.doneRegisteringUser ? (
this.registerUser()
) : (
registerUser() {
return (
<form onSubmit={linkEvent(this, this.handleRegisterSubmit)}>
- <h5>{i18n.t("setup_admin")}</h5>
+ <h2 className="h5 mb-3">{I18NextService.i18n.t("setup_admin")}</h2>
<div className="mb-3 row">
<label className="col-sm-2 col-form-label" htmlFor="username">
- {i18n.t("username")}
+ {I18NextService.i18n.t("username")}
</label>
<div className="col-sm-10">
<input
</div>
<div className="mb-3 row">
<label className="col-sm-2 col-form-label" htmlFor="email">
- {i18n.t("email")}
+ {I18NextService.i18n.t("email")}
</label>
<div className="col-sm-10">
type="email"
id="email"
className="form-control"
- placeholder={i18n.t("optional")}
+ placeholder={I18NextService.i18n.t("optional")}
value={this.state.form.email}
onInput={linkEvent(this, this.handleRegisterEmailChange)}
minLength={3}
/>
</div>
</div>
- <div className="mb-3 row">
- <label className="col-sm-2 col-form-label" htmlFor="password">
- {i18n.t("password")}
- </label>
- <div className="col-sm-10">
- <input
- type="password"
- id="password"
- value={this.state.form.password}
- onInput={linkEvent(this, this.handleRegisterPasswordChange)}
- className="form-control"
- required
- autoComplete="new-password"
- minLength={10}
- maxLength={60}
- />
- </div>
+ <div className="mb-3">
+ <PasswordInput
+ id="password"
+ value={this.state.form.password}
+ onInput={linkEvent(this, this.handleRegisterPasswordChange)}
+ label={I18NextService.i18n.t("password")}
+ />
</div>
- <div className="mb-3 row">
- <label className="col-sm-2 col-form-label" htmlFor="verify-password">
- {i18n.t("verify_password")}
- </label>
- <div className="col-sm-10">
- <input
- type="password"
- id="verify-password"
- value={this.state.form.password_verify}
- onInput={linkEvent(this, this.handleRegisterPasswordVerifyChange)}
- className="form-control"
- required
- autoComplete="new-password"
- minLength={10}
- maxLength={60}
- />
- </div>
+ <div className="mb-3">
+ <PasswordInput
+ id="verify-password"
+ value={this.state.form.password_verify}
+ onInput={linkEvent(this, this.handleRegisterPasswordVerifyChange)}
+ label={I18NextService.i18n.t("verify_password")}
+ />
</div>
<div className="mb-3 row">
<div className="col-sm-10">
{this.state.registerRes.state == "loading" ? (
<Spinner />
) : (
- i18n.t("sign_up")
+ I18NextService.i18n.t("sign_up")
)}
</button>
</div>
if (i.state.registerRes.state == "success") {
const data = i.state.registerRes.data;
- UserService.Instance.login(data);
- if (UserService.Instance.jwtInfo) {
- i.setState({ doneRegisteringUser: true });
- }
+ UserService.Instance.login({ res: data });
+ i.setState({ doneRegisteringUser: true });
}
}
}