xwx.moe/el.xwx.moe
xwx.moe/ el.xwx.moe
1
0
Disbranĉigi 0
Fontkodo Issues Tirpetoj Actions Packages Projects Eldonoj Wiki Activity

Merge pull request #109 from linkwarden/dev 

major bug fixed
This commit is contained in:
Daniel 2023-08-03 14:05:38 -04:00 committed by GitHub
parent 501e9e59e0 1bb1d8140d
commit 44f17ba0ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hooks/useInitialData.tsx
View File

@ -13,7 +13,10 @@ export default function useInitialData() {
const { setAccount } = useAccountStore(); const { setAccount } = useAccountStore();
useEffect(() => { useEffect(() => {
if (status === "authenticated" && data.user.isSubscriber) { if (
status === "authenticated" &&
(!process.env.NEXT_PUBLIC_STRIPE_IS_ACTIVE || data.user.isSubscriber)
) {
setCollections(); setCollections();
setTags(); setTags();
// setLinks(); // setLinks();

21
pages/register.tsx
View File

@ -3,7 +3,7 @@ import { useState } from "react";
import { toast } from "react-hot-toast"; import { toast } from "react-hot-toast";
import SubmitButton from "@/components/SubmitButton"; import SubmitButton from "@/components/SubmitButton";
import { signIn } from "next-auth/react"; import { signIn } from "next-auth/react";
import Image from "next/image"; import { useRouter } from "next/router";
import CenteredForm from "@/layouts/CenteredForm"; import CenteredForm from "@/layouts/CenteredForm";
const emailEnabled = process.env.NEXT_PUBLIC_EMAIL_PROVIDER; const emailEnabled = process.env.NEXT_PUBLIC_EMAIL_PROVIDER;
@ -18,6 +18,7 @@ type FormData = {
export default function Register() { export default function Register() {
const [submitLoader, setSubmitLoader] = useState(false); const [submitLoader, setSubmitLoader] = useState(false);
const router = useRouter();
const [form, setForm] = useState<FormData>({ const [form, setForm] = useState<FormData>({
name: "", name: "",
@ -28,7 +29,7 @@ export default function Register() {
}); });
async function registerUser() { async function registerUser() {
const checkHasEmptyFields = () => { const checkFields = () => {
if (emailEnabled) { if (emailEnabled) {
return ( return (
form.name !== "" && form.name !== "" &&
@ -46,14 +47,7 @@ export default function Register() {
} }
}; };
const sendConfirmation = async () => { if (checkFields()) {
await signIn("email", {
email: form.email,
callbackUrl: "/",
});
};
if (checkHasEmptyFields()) {
if (form.password !== form.passwordConfirmation) if (form.password !== form.passwordConfirmation)
return toast.error("Passwords do not match."); return toast.error("Passwords do not match.");
else if (form.password.length < 8) else if (form.password.length < 8)
@ -78,7 +72,12 @@ export default function Register() {
setSubmitLoader(false); setSubmitLoader(false);
if (response.ok) { if (response.ok) {
if (form.email) await sendConfirmation(); if (form.email && emailEnabled)
await signIn("email", {
email: form.email,
callbackUrl: "/",
});
else if (!emailEnabled) router.push("/login");
toast.success("User Created!"); toast.success("User Created!");
} else { } else {