Skip to content

Commit

Permalink
feat(v2): added notifications & fixed tracking and room join
Browse files Browse the repository at this point in the history
The users will now see notifications if people join or leave. Also is auto flip gets enabled.
  • Loading branch information
jkrumm committed Jan 19, 2024
1 parent 3f6b30f commit 150bf92
Show file tree
Hide file tree
Showing 26 changed files with 363 additions and 529 deletions.
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"@typescript-eslint/parser": "^6.18.0",
"autoprefixer": "^10.4.14",
"dotenv": "^16.1.4",
"drizzle-kit": "^0.20.10",
"drizzle-kit": "^0.20.13",
"eslint": "^8.55.0",
"eslint-config-next": "^14.0.3",
"postcss": "^8.4.33",
Expand Down
211 changes: 0 additions & 211 deletions src/components/index/form-old.tsx

This file was deleted.

26 changes: 8 additions & 18 deletions src/components/index/form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,15 @@ import React, { useEffect } from "react";
import { Button, Group, TextInput } from "@mantine/core";
import { IconArrowBadgeRightFilled } from "@tabler/icons-react";
import { useRouter } from "next/router";
import { type Logger } from "next-axiom";
import { logMsg, roomEvent } from "fpp/constants/logging.constant";
import { api } from "fpp/utils/api";
import { RoomEvent } from "fpp/server/db/schema";

const IndexForm = ({ logger }: { logger: Logger }) => {
const IndexForm = () => {
const router = useRouter();

const userId = useLocalstorageStore((state) => state.userId);

const roomReadable = useLocalstorageStore((state) => state.roomReadable);
const setRoomReadable = useLocalstorageStore(
(state) => state.setRoomReadable,
);
const setRoomReadable = useLocalstorageStore((state) => state.setRoomName);
const setRoomEvent = useLocalstorageStore((state) => state.setRoomEvent);

const { data: randomRoomNumber } = api.room.getOpenRoomNumber.useQuery();

Expand Down Expand Up @@ -48,7 +44,9 @@ const IndexForm = ({ logger }: { logger: Logger }) => {
},
});

// let secondRender = false;
useEffect(() => {
// secondRender = true;
const roomValue = form.values.room
.replace(/[^A-Za-z0-9]/g, "")
.toUpperCase();
Expand All @@ -69,11 +67,7 @@ const IndexForm = ({ logger }: { logger: Logger }) => {
console.error("No random room number found");
}
setRoomReadable(String(randomRoomNumber));
logger.info(logMsg.TRACK_ROOM_EVENT, {
userId,
roomNumber: String(randomRoomNumber),
event: roomEvent.ENTER_RANDOM_ROOM,
});
setRoomEvent(RoomEvent.ENTERED_RANDOM_ROOM);
router
.push(`/room/${randomRoomNumber}`)
.then(() => ({}))
Expand All @@ -87,11 +81,7 @@ const IndexForm = ({ logger }: { logger: Logger }) => {
onSubmit={form.onSubmit(() => {
const roomValue = form.values.room.toLowerCase();
setRoomReadable(roomValue);
logger.info(logMsg.TRACK_ROOM_EVENT, {
userId,
room: roomValue,
event: roomEvent.ENTER_NEW_ROOM,
});
setRoomEvent(RoomEvent.ENTERED_ROOM_DIRECTLY);
router
.push(`/room/${roomValue}`)
.then(() => ({}))
Expand Down
Loading

0 comments on commit 150bf92

Please sign in to comment.