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.

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

Jump to bottom

loading states added for possible loading situations #391

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

loading states added for possible loading situations #391

Show file tree
Hide file tree
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
10 changes: 9 additions & 1 deletion apps/web/src/components/auth/AuthContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,33 @@ import { signIn } from "next-auth/react";
import Link from "next/link";
import AuthLoginButton from "./AuthLoginButton";
import Logo from "../common/Logo";
import Loading from "../loading/Loading";

const AuthContainer = () => {
const [acceptTos, setAcceptTos] = useState<boolean>(false);
const [isloading, setIsLoading] = useState<boolean>(false);

const theme = useTheme();
const handleAcceptTos = (e: ChangeEvent<HTMLInputElement>) => {
setAcceptTos(e.target.checked);
};

return (
<>
<Loading isLoading={isloading} isAuthLoading={""} />
<Stack
direction="column"
spacing={2}
sx={{ p: 2, backgroundColor: "appLoginForm.background" }}>
<Link href={"/"}><Logo /></Link>
<Link href={"/"}>
<Logo />
</Link>
<Typography fontSize="x-large">Sign in/up</Typography>
<AuthLoginButton
disabled={!acceptTos}
fullWidth={true}
onClick={() => {
setIsLoading(true);
if (!acceptTos) return;
signIn("twitch", {
callbackUrl: `${window.location.origin}/app`,
Expand All @@ -48,6 +55,7 @@ const AuthContainer = () => {
disabled={!acceptTos}
fullWidth={true}
onClick={() => {
setIsLoading(true);
if (!acceptTos) return;

signIn("discord", {
Expand Down
8 changes: 7 additions & 1 deletion apps/web/src/components/landing/LandingTexts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import {
} from "@mui/material";
import { env } from "../../env/client.mjs";
import { FaDiscord, FaTwitch } from "react-icons/fa";
import { useCallback, useEffect, useState } from "react";
import Loading from "../loading/Loading";
import { useEffect, useState } from "react";
import {
addTwitchAccount,
checkTwitchAccount,
Expand All @@ -36,6 +37,7 @@ const LandingTexts = () => {
const [defaultCmdList, setDefaultCmdList] = useState<string[]>([]);
const [userCmdList, setUserCmdList] = useState<string[]>([]);
const [featureList, setFeatureList] = useState<string[]>([]);
const [isLoading, setIsLoading] = useState<boolean>(false);
const [alertIsOpen, setAlertIsOpen] = useState<boolean>(false);
const [alertText, setAlertText] = useState<string>("");

Expand Down Expand Up @@ -83,6 +85,7 @@ const LandingTexts = () => {

const addTwitchBotOrAccount = () => {
addTwitchAccount().then(res => {
setIsLoading(false);
if (!res || !res.success) {
setAlertText("Something went wrong. Please try again later.");
setAlertIsOpen(true);
Expand All @@ -97,6 +100,7 @@ const LandingTexts = () => {

return (
<>
<Loading isLoading={isLoading} isAuthLoading={""} />
<CustomAlert
isOpen={alertIsOpen}
closeHandler={() => setAlertIsOpen(!alertIsOpen)}
Expand Down Expand Up @@ -195,6 +199,7 @@ const LandingTexts = () => {
href={`${env.NEXT_PUBLIC_APP_DISCORD_BOT_INVITE_URL}`}
component={Link}
variant="contained"
onClick={() => setIsLoading(true)}
startIcon={<FaDiscord />}
sx={{
backgroundColor: "landingDiscordBtn.background",
Expand All @@ -206,6 +211,7 @@ const LandingTexts = () => {
</Button>
<Button
onClick={() => {
setIsLoading(true);
if (!session || !isTwitchAccAvailable.data?.data) {
signIn("twitch", {
callbackUrl: `${window.location.origin}/api/twitch/get-bot`,
Expand Down