atridad/pollo
1
0
Fork 0
Code Activity Actions

session issues

Browse source
This commit is contained in:
Atridad Lahiji 2023-07-12 12:27:39 -06:00 • committed by atridadl
parent 0d2a392b52
commit 13cfd04f87
No known key found for this signature in database
1 changed files with 140 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/pages/room/[id].tsx
View file

@ -26,6 +26,7 @@ import { RiVipCrownFill } from "react-icons/ri";
import { env } from "~/env.mjs";
import { downloadCSV } from "~/utils/helpers";
import type { PresenceItem } from "~/utils/types";
import { Session } from "next-auth";
export const getServerSideProps: GetServerSideProps = async (ctx) => {
const session = await getServerAuthSession(ctx);
@ -46,7 +47,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
};
};
const Room: NextPage = () => {
const Room: NextPage<{ session: Session }> = ({ session }) => {
return (
<>
<Head>
@ -55,7 +56,7 @@ const Room: NextPage = () => {
<meta http-equiv="Cache-control" content="no-cache" />
</Head>
<div className="flex flex-col items-center justify-center text-center gap-2">
<RoomBody />
<RoomBody session={session} />
</div>
</>
);
@ -63,8 +64,7 @@ const Room: NextPage = () => {
export default Room;
const RoomBody: React.FC = () => {
const { data: sessionData } = useSession();
const RoomBody: React.FC<{ session: Session }> = ({ session }) => {
const { query } = useRouter();
const roomId = z.string().parse(query.id);
@ -83,7 +83,7 @@ const RoomBody: React.FC = () => {
configureAbly({
key: env.NEXT_PUBLIC_ABLY_PUBLIC_KEY,
clientId: sessionData?.user.id,
clientId: session.user.id,
recover: (_, cb) => {
cb(true);
},
@ -106,10 +106,10 @@ const RoomBody: React.FC = () => {
const [presenceData] = usePresence<PresenceItem>(
`${env.NEXT_PUBLIC_APP_ENV}-${roomId}`,
{
name: sessionData?.user.name || "",
image: sessionData?.user.image || "",
client_id: sessionData?.user.id || "",
role: sessionData?.user.role || "USER",
name: session.user.name || "",
image: session.user.image || "",
client_id: session.user.id || "",
role: session.user.role || "USER",
}
);
@ -126,18 +126,18 @@ const RoomBody: React.FC = () => {
// Init story name
useEffect(() => {
if (sessionData && roomFromDb) {
if (session && roomFromDb) {
setStoryNameText(roomFromDb.storyName || "");
setRoomScale(roomFromDb.scale || "ERROR");
}
}, [roomFromDb, roomId, sessionData]);
}, [roomFromDb, roomId, session]);
// Helper functions
const getVoteForCurrentUser = () => {
if (roomFromDb && sessionData) {
if (roomFromDb && session) {
return (
votesFromDb &&
votesFromDb.find((vote) => vote.userId === sessionData.user.id)
votesFromDb.find((vote) => vote.userId === session.user.id)
);
} else {
return null;
@ -338,7 +338,8 @@ const RoomBody: React.FC = () => {
return (
<button
key={index}
className={ `join-item ${getVoteForCurrentUser()?.value === scaleItem
className={`join-item ${
getVoteForCurrentUser()?.value === scaleItem
? "btn btn-active btn-primary"
: "btn"
}`}
@ -353,9 +354,7 @@ const RoomBody: React.FC = () => {
</div>
)}
{ sessionData &&
!!roomFromDb &&
roomFromDb.userId === sessionData.user.id && (
{session && !!roomFromDb && roomFromDb.userId === session.user.id && (
<>
<div className="card card-compact bg-neutral shadow-xl mx-auto m-4">
<div className="card-body flex flex-col flex-wrap">
@ -440,8 +439,7 @@ const RoomBody: React.FC = () => {
</div>
{votesFromDb &&
(roomFromDb.logs.length > 0 ||
votesFromDb.length > 0) && (
(roomFromDb.logs.length > 0 || votesFromDb.length > 0) && (
<div>
<button
onClick={() => downloadLogs()}