feat: connect onboarding to APIs

This commit is contained in:
Liyang Zhu
2022-06-05 23:58:13 +08:00
parent 78a585f137
commit defacf6b63
7 changed files with 404 additions and 340 deletions
+11 -6
View File
@@ -24,6 +24,7 @@ import SettingChannelPage from "./settingChannel";
import OnboardingPage from "./onboarding";
import toast from "react-hot-toast";
import ResourceManagement from "./resources";
import RequireInitialized from "../common/component/RequireInitialized";
const PageRoutes = () => {
const {
@@ -49,9 +50,11 @@ const PageRoutes = () => {
<Route
path="/login"
element={
<RequireNoAuth>
<LoginPage />
</RequireNoAuth>
<RequireInitialized>
<RequireNoAuth>
<LoginPage />
</RequireNoAuth>
</RequireInitialized>
}
/>
<Route
@@ -89,9 +92,11 @@ const PageRoutes = () => {
<Route
path="/"
element={
<RequireAuth>
<HomePage />
</RequireAuth>
<RequireInitialized>
<RequireAuth>
<HomePage />
</RequireAuth>
</RequireInitialized>
}
>
<Route path="setting">
+1 -5
View File
@@ -11,11 +11,7 @@ import StyledOnboardingPage from "./styled";
export default function OnboardingPage() {
const [step, setStep] = useState(0);
const [data, setData] = useState({
spaceName: "",
adminEmail: "",
adminPassword: "",
adminPassword2: "",
inviteRule: null
spaceName: ""
});
const props = { step, setStep, data, setData };
@@ -1,7 +1,10 @@
import { useEffect, useState } from "react";
import styled from "styled-components";
import toast from "react-hot-toast";
import StyledInput from "../../../common/component/styled/Input";
import StyledButton from "../../../common/component/styled/Button";
import toast from "react-hot-toast";
import { useCreateAdminMutation } from "../../../app/services/server";
import { useLoginMutation } from "../../../app/services/auth";
const StyledAdminCredentialsStep = styled.div`
height: 100%;
@@ -19,7 +22,34 @@ const StyledAdminCredentialsStep = styled.div`
}
`;
export default function AdminCredentialsStep({ step, setStep, data, setData }) {
export default function AdminCredentialsStep({ step, setStep }) {
const [
createAdmin,
{ isLoading: isSignUpLoading, isSuccess: isSignUpSuccess, error: signUpError }
] = useCreateAdminMutation();
const [login, { isLoading: isLoginLoading, isSuccess: isLoginSuccess, error: loginError }] =
useLoginMutation();
const [email, setEmail] = useState("");
const [password, setPassword] = useState("");
const [confirm, setConfirm] = useState("");
// Display error
useEffect(() => {
if (signUpError === undefined) return;
toast.error(`Failed to sign up: ${signUpError.data}`);
}, [signUpError]);
useEffect(() => {
if (loginError === undefined) return;
toast.error(`Login failed: ${loginError.data}`);
}, [loginError]);
// Increment `step` when both signing up and logging in have completed
useEffect(() => {
if (isSignUpSuccess && isLoginSuccess) setStep(step + 1);
}, [isSignUpSuccess, isLoginSuccess]);
return (
<StyledAdminCredentialsStep>
<span className="primaryText">Now lets set up your admin account</span>
@@ -27,56 +57,51 @@ export default function AdminCredentialsStep({ step, setStep, data, setData }) {
<StyledInput
className="input"
placeholder="Enter your email"
value={data.adminEmail}
onChange={(e) =>
setData({
...data,
adminEmail: e.target.value
})
}
value={email}
onChange={(e) => setEmail(e.target.value)}
/>
<StyledInput
className="input"
type="password"
placeholder="Enter your password"
value={data.adminPassword}
onChange={(e) =>
setData({
...data,
adminPassword: e.target.value
})
}
value={password}
onChange={(e) => setPassword(e.target.value)}
/>
<StyledInput
className="input"
type="password"
placeholder="Confirm your password"
value={data.adminPassword2}
onChange={(e) =>
setData({
...data,
adminPassword2: e.target.value
})
}
value={confirm}
onChange={(e) => setConfirm(e.target.value)}
/>
<StyledButton
className="button"
onClick={() => {
onClick={async () => {
// Verification for admin credentials
if (data.adminEmail === "") {
if (email === "") {
toast.error("Please enter admin email!");
return;
} else if (data.adminPassword === "") {
} else if (password === "") {
toast.error("Please enter admin password!");
return;
} else if (data.adminPassword !== data.adminPassword2) {
} else if (password !== confirm) {
toast.error("Two passwords do not match!");
return;
}
setStep(step + 1);
await createAdmin({
email,
name: "Admin",
password,
gender: 0
});
await login({
email,
password,
type: "password"
});
}}
>
Sign Up
{!(isSignUpLoading || isLoginLoading) ? "Sign Up" : "..."}
</StyledButton>
</StyledAdminCredentialsStep>
);
+29 -9
View File
@@ -1,6 +1,9 @@
import { useState, useEffect } from "react";
import toast from "react-hot-toast";
import styled from "styled-components";
import StyledRadio from "../../../common/component/styled/Radio";
import StyledButton from "../../../common/component/styled/Button";
import { useGetLoginConfigQuery, useUpdateLoginConfigMutation } from "../../../app/services/server";
const StyledInviteRuleStep = styled.div`
height: 100%;
@@ -14,22 +17,39 @@ const StyledInviteRuleStep = styled.div`
}
`;
export default function InviteRuleStep({ step, setStep, data, setData }) {
export default function InviteRuleStep({ step, setStep }) {
const { data: loginConfig } = useGetLoginConfigQuery();
const [updateLoginConfig, { isSuccess, error }] = useUpdateLoginConfigMutation();
const [value, setValue] = useState(null);
// Display error
useEffect(() => {
if (error === undefined) return;
toast.error(`Failed to update invitation rule: ${error.data}`);
}, [error]);
// Increment `step` when updating has completed
useEffect(() => {
if (isSuccess) setStep(step + 1);
}, [isSuccess]);
return (
<StyledInviteRuleStep>
<span className="primaryText">Last step: invite others!</span>
<span className="secondaryText">Firstly, who can sign up to this server?</span>
<StyledRadio
options={["Everyone", "Invitation link only"]}
value={data.inviteRule}
value={value}
onChange={(v) => {
setData({
...data,
inviteRule: v
});
setTimeout(() => {
setStep(step + 1);
}, 750);
setValue(v);
if (loginConfig !== undefined) {
const whoCanSignUp = ["EveryOne", "InvitationOnly"][v];
updateLoginConfig({
...loginConfig,
who_can_sign_up: whoCanSignUp
});
}
}}
/>
<StyledButton className="button border_less ghost" onClick={() => setStep(step + 1)}>