From 379dcdcd512d4fe45292da0d2ff3ca90d4c316a8 Mon Sep 17 00:00:00 2001 From: Jane Petrovna Date: Mon, 11 Apr 2022 13:52:22 -0400 Subject: [PATCH] userInfo component includes avatar; add default border image --- components/borderSelect.js | 3 +++ components/userInfo.js | 54 +++++++++++++++++++++++++------------ pages/api/border/[id].js | 6 ++--- public/images/default.png | Bin 0 -> 13190 bytes 4 files changed, 42 insertions(+), 21 deletions(-) create mode 100644 components/borderSelect.js create mode 100644 public/images/default.png diff --git a/components/borderSelect.js b/components/borderSelect.js new file mode 100644 index 0000000..dfdacde --- /dev/null +++ b/components/borderSelect.js @@ -0,0 +1,3 @@ +export default function BorderSelect() { + +} \ No newline at end of file diff --git a/components/userInfo.js b/components/userInfo.js index e400c67..18c440d 100644 --- a/components/userInfo.js +++ b/components/userInfo.js @@ -1,25 +1,45 @@ import { useSession, signIn, signOut } from "next-auth/react"; +import { useEffect, useState } from "react"; import styles from "../styles/Components.module.css"; -export async function getServerSideProps(context) { - return { - props: { - borderInfo, - }, - }; -} - export default function UserInfo(borderInfo) { const { data: session } = useSession(); + const [isLoading, setLoading] = useState(false); + const [borderData, setBorderData] = useState(undefined); + + useEffect(async () => { + setLoading(true); + const res = await fetch('api/user/border/@me'); + const data = await res.json(); + setBorderData(data); + setLoading(false); + }, []); + return ( -

- {session ? `Signed in as ${session.user.name}` : "Not signed in"} -
- {session ? ( - - ) : ( - - )} -

+
{ + isLoading ? +

Loading...

+ : +
+

+ {session ? `Signed in as ${session.user.name} (${borderData.discordId})` : "Not signed in"} +
+ {session ? ( + + ) : ( + + )} +

+ { + !!borderData ? + (
+ + +
) + : undefined + } +
+ } +
); } diff --git a/pages/api/border/[id].js b/pages/api/border/[id].js index 9ec5c5a..b5de21a 100644 --- a/pages/api/border/[id].js +++ b/pages/api/border/[id].js @@ -7,10 +7,8 @@ export default function handler(req, res) { getBorderById(id).then((result) => { const imageName = result?.imageName ?? "default.png"; - - console.log(result, imageName); - return res.status(200).json(result); - // return res.redirect(301, `/images/${imageName}`) + // return res.status(200).json(result); + return res.redirect(301, `/images/${imageName}`) }); } \ No newline at end of file diff --git a/public/images/default.png b/public/images/default.png new file mode 100644 index 0000000000000000000000000000000000000000..aeb23d051c1eb5931f2b495d71ab1fb817299322 GIT binary patch literal 13190 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