randyjc/Rahoot
1
0
Fork 0
mirror of https://github.com/randyjc/Rahoot.git synced 2026-03-13 20:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(components): use arrow function syntax and improve consistency

Browse Source
This commit is contained in:
Ralex
2025-10-25 15:04:03 +02:00
parent ac486b3d7d
commit dbefaa0557
32 changed files with 351 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/web/src/app/(auth)/manager/page.tsx
View File

@@ -8,7 +8,7 @@ import { useManagerStore } from "@rahoot/web/stores/manager"
import { useRouter } from "next/navigation"
import { useState } from "react"
export default function Manager() {
const Manager = () => {
const { setGameId, setStatus } = useManagerStore()
const router = useRouter()
const { socket } = useSocket()
@@ -40,3 +40,5 @@ export default function Manager() {
return <SelectQuizz quizzList={quizzList} onSelect={handleCreate} />
}
export default Manager

4
packages/web/src/app/(auth)/page.tsx
View File

@@ -7,7 +7,7 @@ import { usePlayerStore } from "@rahoot/web/stores/player"
import { useEffect } from "react"
import toast from "react-hot-toast"
export default function Home() {
const Home = () => {
const { isConnected, connect } = useSocket()
const { player } = usePlayerStore()
@@ -27,3 +27,5 @@ export default function Home() {
return <Room />
}
export default Home

4
packages/web/src/app/game/[gameId]/page.tsx
View File

@@ -15,7 +15,7 @@ import { GAME_STATE_COMPONENTS } from "@rahoot/web/utils/constants"
import { useParams, useRouter } from "next/navigation"
import toast from "react-hot-toast"
export default function Game() {
const Game = () => {
const router = useRouter()
const { socket } = useSocket()
const { gameId: gameIdParam }: { gameId?: string } = useParams()
@@ -95,3 +95,5 @@ export default function Game() {
return <GameWrapper statusName={status.name}>{component}</GameWrapper>
}
export default Game

4
packages/web/src/app/game/manager/[gameId]/page.tsx
View File

@@ -17,7 +17,7 @@ import { GAME_STATE_COMPONENTS_MANAGER } from "@rahoot/web/utils/constants"
import { useParams, useRouter } from "next/navigation"
import toast from "react-hot-toast"
export default function ManagerGame() {
const ManagerGame = () => {
const router = useRouter()
const { gameId: gameIdParam }: { gameId?: string } = useParams()
const { socket } = useSocket()
@@ -131,3 +131,5 @@ export default function ManagerGame() {
</GameWrapper>
)
}
export default ManagerGame

8
packages/web/src/app/layout.tsx
View File

@@ -15,8 +15,7 @@ export const metadata: Metadata = {
icons: "/icon.svg",
}
export default function RootLayout({ children }: PropsWithChildren) {
return (
const RootLayout = ({ children }: PropsWithChildren) => (
<html lang="en" suppressHydrationWarning={true} data-lt-installed="true">
<body className={`${montserrat.variable} bg-secondary antialiased`}>
<SocketProvider>
@@ -25,5 +24,6 @@ export default function RootLayout({ children }: PropsWithChildren) {
</SocketProvider>
</body>
</html>
)
}
)
export default RootLayout

10
packages/web/src/components/AnswerButton.tsx
View File

@@ -6,13 +6,12 @@ type Props = PropsWithChildren &
icon: ElementType
}
export default function AnswerButton({
const AnswerButton = ({
className,
icon: Icon,
children,
...otherProps
}: Props) {
return (
}: Props) => (
<button
className={clsx(
"shadow-inset flex items-center gap-3 rounded px-4 py-6 text-left",
@@ -23,5 +22,6 @@ export default function AnswerButton({
<Icon className="h-6 w-6" />
<span className="drop-shadow-md">{children}</span>
</button>
)
}
)
export default AnswerButton

9
packages/web/src/components/Button.tsx
View File

@@ -2,8 +2,8 @@ import clsx from "clsx"
import { ButtonHTMLAttributes, PropsWithChildren } from "react"
type Props = ButtonHTMLAttributes<HTMLButtonElement> & PropsWithChildren
export default function Button({ children, className, ...otherProps }: Props) {
return (
const Button = ({ children, className, ...otherProps }: Props) => (
<button
className={clsx(
"btn-shadow bg-primary rounded-md p-2 text-lg font-semibold text-white",
@@ -13,5 +13,6 @@ export default function Button({ children, className, ...otherProps }: Props) {
>
<span>{children}</span>
</button>
)
}
)
export default Button

8
packages/web/src/components/Form.tsx
View File

@@ -1,9 +1,9 @@
import { PropsWithChildren } from "react"
export default function Form({ children }: PropsWithChildren) {
return (
const Form = ({ children }: PropsWithChildren) => (
<div className="z-10 flex w-full max-w-80 flex-col gap-4 rounded-md bg-white p-4 shadow-sm">
{children}
</div>
)
}
)
export default Form

12
packages/web/src/components/Input.tsx
View File

@@ -3,12 +3,7 @@ import React from "react"
type Props = React.InputHTMLAttributes<HTMLInputElement>
export default function Input({
className,
type = "text",
...otherProps
}: Props) {
return (
const Input = ({ className, type = "text", ...otherProps }: Props) => (
<input
type={type}
className={clsx(
@@ -17,5 +12,6 @@ export default function Input({
)}
{...otherProps}
/>
)
}
)
export default Input

13
packages/web/src/components/game/GameWrapper.tsx
View File

@@ -3,13 +3,13 @@
import { Status } from "@rahoot/common/types/game/status"
import background from "@rahoot/web/assets/background.webp"
import Button from "@rahoot/web/components/Button"
import Loader from "@rahoot/web/components/Loader"
import { useEvent, useSocket } from "@rahoot/web/contexts/socketProvider"
import { usePlayerStore } from "@rahoot/web/stores/player"
import { useQuestionStore } from "@rahoot/web/stores/question"
import { MANAGER_SKIP_BTN } from "@rahoot/web/utils/constants"
import Image from "next/image"
import { PropsWithChildren } from "react"
import Loader from "../Loader"
type Props = PropsWithChildren & {
statusName: Status
@@ -17,12 +17,7 @@ type Props = PropsWithChildren & {
manager?: boolean
}
export default function GameWrapper({
children,
statusName,
onNext,
manager,
}: Props) {
const GameWrapper = ({ children, statusName, onNext, manager }: Props) => {
const { isConnected } = useSocket()
const { player } = usePlayerStore()
const { questionStates, setQuestionStates } = useQuestionStore()
@@ -61,7 +56,7 @@ export default function GameWrapper({
{manager && next && (
<Button
className="self-end bg-white px-4 !text-black"
className="self-end bg-white px-4 text-black!"
onClick={onNext}
>
{next}
@@ -84,3 +79,5 @@ export default function GameWrapper({
</section>
)
}
export default GameWrapper

4
packages/web/src/components/game/create/ManagerPassword.tsx
View File

@@ -9,7 +9,7 @@ type Props = {
onSubmit: (_password: string) => void
}
export default function ManagerPassword({ onSubmit }: Props) {
const ManagerPassword = ({ onSubmit }: Props) => {
const [password, setPassword] = useState("")
const handleSubmit = () => {
@@ -38,3 +38,5 @@ export default function ManagerPassword({ onSubmit }: Props) {
</Form>
)
}
export default ManagerPassword

4
packages/web/src/components/game/create/SelectQuizz.tsx
View File

@@ -11,7 +11,7 @@ type Props = {
onSelect: (_id: string) => void
}
export default function SelectQuizz({ quizzList, onSelect }: Props) {
const SelectQuizz = ({ quizzList, onSelect }: Props) => {
const [selected, setSelected] = useState<string | null>(null)
const handleSelect = (id: string) => () => {
@@ -62,3 +62,5 @@ export default function SelectQuizz({ quizzList, onSelect }: Props) {
</div>
)
}
export default SelectQuizz

4
packages/web/src/components/game/join/Room.tsx
View File

@@ -5,7 +5,7 @@ import { useEvent, useSocket } from "@rahoot/web/contexts/socketProvider"
import { usePlayerStore } from "@rahoot/web/stores/player"
import { KeyboardEvent, useState } from "react"
export default function Room() {
const Room = () => {
const { socket } = useSocket()
const { join } = usePlayerStore()
const [invitation, setInvitation] = useState("")
@@ -35,3 +35,5 @@ export default function Room() {
</Form>
)
}
export default Room

4
packages/web/src/components/game/join/Username.tsx
View File

@@ -9,7 +9,7 @@ import { usePlayerStore } from "@rahoot/web/stores/player"
import { useRouter } from "next/navigation"
import { KeyboardEvent, useState } from "react"
export default function Username() {
const Username = () => {
const { socket } = useSocket()
const { gameId, login } = usePlayerStore()
const router = useRouter()
@@ -46,3 +46,5 @@ export default function Username() {
</Form>
)
}
export default Username

6
packages/web/src/components/game/states/Answers.tsx
View File

@@ -19,9 +19,9 @@ type Props = {
data: CommonStatusDataMap["SELECT_ANSWER"]
}
export default function Answers({
const Answers = ({
data: { question, answers, image, time, totalPlayer },
}: Props) {
}: Props) => {
const { gameId }: { gameId?: string } = useParams()
const { socket } = useSocket()
const { player } = usePlayerStore()
@@ -116,3 +116,5 @@ export default function Answers({
</div>
)
}
export default Answers

8
packages/web/src/components/game/states/Leaderboard.tsx
View File

@@ -4,8 +4,7 @@ type Props = {
data: ManagerStatusDataMap["SHOW_LEADERBOARD"]
}
export default function Leaderboard({ data: { leaderboard } }: Props) {
return (
const Leaderboard = ({ data: { leaderboard } }: Props) => (
<section className="relative mx-auto flex w-full max-w-7xl flex-1 flex-col items-center justify-center px-2">
<h2 className="mb-6 text-5xl font-bold text-white drop-shadow-md">
Leaderboard
@@ -22,5 +21,6 @@ export default function Leaderboard({ data: { leaderboard } }: Props) {
))}
</div>
</section>
)
}
)
export default Leaderboard

10
packages/web/src/components/game/states/Podium.tsx
View File

@@ -17,7 +17,7 @@ type Props = {
data: ManagerStatusDataMap["FINISHED"]
}
export default function Podium({ data: { subject, top } }: Props) {
const Podium = ({ data: { subject, top } }: Props) => {
const [apparition, setApparition] = useState(0)
const { width, height } = useScreenSize()
@@ -112,7 +112,7 @@ export default function Podium({ data: { subject, top } }: Props) {
<div
className={clsx(
"z-20 flex h-[50%] w-full translate-y-full flex-col items-center justify-center gap-3 opacity-0 transition-all",
{ "!translate-y-0 opacity-100": apparition >= 2 },
{ "translate-y-0! opacity-100": apparition >= 2 },
)}
>
<p
@@ -140,7 +140,7 @@ export default function Podium({ data: { subject, top } }: Props) {
className={clsx(
"z-30 flex h-[60%] w-full translate-y-full flex-col items-center gap-3 opacity-0 transition-all",
{
"!translate-y-0 opacity-100": apparition >= 3,
"translate-y-0! opacity-100": apparition >= 3,
},
{
"md:min-w-64": top.length < 2,
@@ -170,7 +170,7 @@ export default function Podium({ data: { subject, top } }: Props) {
className={clsx(
"z-10 flex h-[40%] w-full translate-y-full flex-col items-center gap-3 opacity-0 transition-all",
{
"!translate-y-0 opacity-100": apparition >= 1,
"translate-y-0! opacity-100": apparition >= 1,
},
)}
>
@@ -200,3 +200,5 @@ export default function Podium({ data: { subject, top } }: Props) {
</>
)
}
export default Podium

10
packages/web/src/components/game/states/Prepared.tsx
View File

@@ -7,10 +7,7 @@ type Props = {
data: CommonStatusDataMap["SHOW_PREPARED"]
}
export default function Prepared({
data: { totalAnswers, questionNumber },
}: Props) {
return (
const Prepared = ({ data: { totalAnswers, questionNumber } }: Props) => (
<section className="anim-show relative mx-auto flex w-full max-w-7xl flex-1 flex-col items-center justify-center">
<h2 className="anim-show mb-20 text-center text-3xl font-bold text-white drop-shadow-lg md:text-4xl lg:text-5xl">
Question #{questionNumber}
@@ -29,5 +26,6 @@ export default function Prepared({
))}
</div>
</section>
)
}
)
export default Prepared

6
packages/web/src/components/game/states/Question.tsx
View File

@@ -9,9 +9,7 @@ type Props = {
data: CommonStatusDataMap["SHOW_QUESTION"]
}
export default function Question({
data: { question, image, cooldown },
}: Props) {
const Question = ({ data: { question, image, cooldown } }: Props) => {
const [sfxShow] = useSound(SFX_SHOW_SOUND, { volume: 0.5 })
useEffect(() => {
@@ -40,3 +38,5 @@ export default function Question({
</section>
)
}
export default Question

33
packages/web/src/components/game/states/Responses.tsx
View File

@@ -1,48 +1,25 @@
"use client"
import { ManagerStatusDataMap } from "@rahoot/common/types/game/status"
import AnswerButton from "@rahoot/web/components/AnswerButton"
import {
ANSWERS_COLORS,
ANSWERS_ICONS,
SFX_ANSWERS_MUSIC,
SFX_RESULTS_SOUND,
} from "@rahoot/web/utils/constants"
import { calculatePercentages } from "@rahoot/web/utils/score"
import clsx from "clsx"
import { useEffect, useState } from "react"
import useSound from "use-sound"
import AnswerButton from "../../AnswerButton"
const calculatePercentages = (
objectResponses: Record<string, number>,
): Record<string, string> => {
const keys = Object.keys(objectResponses)
const values = Object.values(objectResponses)
if (!values.length) {
return {}
}
const totalSum = values.reduce(
(accumulator, currentValue) => accumulator + currentValue,
0,
)
const result: Record<string, string> = {}
keys.forEach((key) => {
result[key] = `${((objectResponses[key] / totalSum) * 100).toFixed()}%`
})
return result
}
type Props = {
data: ManagerStatusDataMap["SHOW_RESPONSES"]
}
export default function Responses({
const Responses = ({
data: { question, answers, responses, correct },
}: Props) {
}: Props) => {
const [percentages, setPercentages] = useState<Record<string, string>>({})
const [isMusicPlaying, setIsMusicPlaying] = useState(false)
@@ -123,3 +100,5 @@ export default function Responses({
</div>
)
}
export default Responses

6
packages/web/src/components/game/states/Result.tsx
View File

@@ -12,9 +12,9 @@ type Props = {
data: CommonStatusDataMap["SHOW_RESULT"]
}
export default function Result({
const Result = ({
data: { correct, message, points, myPoints, rank, aheadOfMe },
}: Props) {
}: Props) => {
const player = usePlayerStore()
const [sfxResults] = useSound(SFX_RESULTS_SOUND, {
@@ -48,3 +48,5 @@ export default function Result({
</section>
)
}
export default Result

4
packages/web/src/components/game/states/Room.tsx
View File

@@ -10,7 +10,7 @@ type Props = {
data: ManagerStatusDataMap["SHOW_ROOM"]
}
export default function Room({ data: { text, inviteCode } }: Props) {
const Room = ({ data: { text, inviteCode } }: Props) => {
const { socket } = useSocket()
const { players } = useManagerStore()
const [playerList, setPlayerList] = useState<Player[]>(players)
@@ -70,3 +70,5 @@ export default function Room({ data: { text, inviteCode } }: Props) {
</section>
)
}
export default Room

4
packages/web/src/components/game/states/Start.tsx
View File

@@ -11,7 +11,7 @@ type Props = {
data: CommonStatusDataMap["SHOW_START"]
}
export default function Start({ data: { time, subject } }: Props) {
const Start = ({ data: { time, subject } }: Props) => {
const [showTitle, setShowTitle] = useState(true)
const [cooldown, setCooldown] = useState(time)
@@ -53,3 +53,5 @@ export default function Start({ data: { time, subject } }: Props) {
</section>
)
}
export default Start

8
packages/web/src/components/game/states/Wait.tsx
View File

@@ -5,13 +5,13 @@ type Props = {
data: PlayerStatusDataMap["WAIT"]
}
export default function Wait({ data: { text } }: Props) {
return (
const Wait = ({ data: { text } }: Props) => (
<section className="relative mx-auto flex w-full max-w-7xl flex-1 flex-col items-center justify-center">
<Loader />
<h2 className="mt-5 text-center text-3xl font-bold text-white drop-shadow-lg md:text-4xl lg:text-5xl">
{text}
</h2>
</section>
)
}
)
export default Wait

16
packages/web/src/components/icons/Circle.tsx
View File

@@ -3,21 +3,14 @@ type Props = {
fill?: string
}
export default function Circle({ className, fill = "#FFF" }: Props) {
return (
const Circle = ({ className, fill = "#FFF" }: Props) => (
<svg
className={className}
viewBox="0 0 512 512"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
>
<g
id="Page-1"
stroke="none"
strokeWidth="1"
fill="none"
fillRule="evenodd"
>
<g id="Page-1" stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
<g id="icon" fill={fill} transform="translate(42.666667, 42.666667)">
<path
d="M213.333333,3.55271368e-14 C331.15408,3.55271368e-14 426.666667,95.5125867 426.666667,213.333333 C426.666667,331.15408 331.15408,426.666667 213.333333,426.666667 C95.5125867,426.666667 3.55271368e-14,331.15408 3.55271368e-14,213.333333 C3.55271368e-14,95.5125867 95.5125867,3.55271368e-14 213.333333,3.55271368e-14 Z"
@@ -26,5 +19,6 @@ export default function Circle({ className, fill = "#FFF" }: Props) {
</g>
</g>
</svg>
)
}
)
export default Circle

8
packages/web/src/components/icons/CricleCheck.tsx
View File

@@ -2,8 +2,7 @@ type Props = {
className?: string
}
export default function CricleCheck({ className }: Props) {
return (
const CricleCheck = ({ className }: Props) => (
<svg
fill="#22c55e"
width="800px"
@@ -37,5 +36,6 @@ export default function CricleCheck({ className }: Props) {
<path d="M 27.9999 51.9063 C 41.0546 51.9063 51.9063 41.0781 51.9063 28 C 51.9063 14.9453 41.0312 4.0937 27.9765 4.0937 C 14.8983 4.0937 4.0937 14.9453 4.0937 28 C 4.0937 41.0781 14.9218 51.9063 27.9999 51.9063 Z M 24.7655 40.0234 C 23.9687 40.0234 23.3593 39.6719 22.6796 38.8750 L 15.9296 30.5312 C 15.5780 30.0859 15.3671 29.5234 15.3671 29.0078 C 15.3671 27.9063 16.2343 27.0625 17.2655 27.0625 C 17.9452 27.0625 18.5077 27.3203 19.0702 28.0469 L 24.6718 35.2890 L 35.5702 17.8281 C 36.0155 17.1016 36.6249 16.75 37.2343 16.75 C 38.2655 16.75 39.2733 17.4297 39.2733 18.5547 C 39.2733 19.0703 38.9687 19.6328 38.6640 20.1016 L 26.7577 38.8750 C 26.2421 39.6484 25.5858 40.0234 24.7655 40.0234 Z" />
</g>
</svg>
)
}
)
export default CricleCheck

8
packages/web/src/components/icons/CricleXmark.tsx
View File

@@ -2,8 +2,7 @@ type Props = {
className?: string
}
export default function CricleXmark({ className }: Props) {
return (
const CricleXmark = ({ className }: Props) => (
<svg
fill="#ef4444"
width="800px"
@@ -31,5 +30,6 @@ export default function CricleXmark({ className }: Props) {
<path d="M 27.9999 51.9063 C 41.0546 51.9063 51.9063 41.0781 51.9063 28 C 51.9063 14.9453 41.0312 4.0937 27.9765 4.0937 C 14.8983 4.0937 4.0937 14.9453 4.0937 28 C 4.0937 41.0781 14.9218 51.9063 27.9999 51.9063 Z M 19.5858 38.4063 C 18.4843 38.4063 17.5936 37.5156 17.5936 36.4141 C 17.5936 35.8750 17.8280 35.4063 18.2030 35.0547 L 25.1874 28.0234 L 18.2030 20.9922 C 17.8280 20.6641 17.5936 20.1719 17.5936 19.6328 C 17.5936 18.5547 18.4843 17.6875 19.5858 17.6875 C 20.1249 17.6875 20.5936 17.8984 20.9452 18.2734 L 27.9765 25.2812 L 35.0546 18.25 C 35.4530 17.8281 35.8749 17.6406 36.3905 17.6406 C 37.4921 17.6406 38.3827 18.5312 38.3827 19.6094 C 38.3827 20.1484 38.1952 20.5937 37.7968 20.9688 L 30.7655 28.0234 L 37.7733 35.0078 C 38.1249 35.3828 38.3593 35.8516 38.3593 36.4141 C 38.3593 37.5156 37.4687 38.4063 36.3671 38.4063 C 35.8046 38.4063 35.3358 38.1719 34.9843 37.8203 L 27.9765 30.7890 L 20.9921 37.8203 C 20.6405 38.1953 20.1249 38.4063 19.5858 38.4063 Z" />
</g>
</svg>
)
}
)
export default CricleXmark

8
packages/web/src/components/icons/Pentagon.tsx
View File

@@ -4,8 +4,7 @@ type Props = {
stroke?: string
}
export default function Pentagon({ className, fill, stroke }: Props) {
return (
const Pentagon = ({ className, fill, stroke }: Props) => (
<svg
className={className}
fill={fill}
@@ -42,5 +41,6 @@ export default function Pentagon({ className, fill, stroke }: Props) {
</g>
</g>
</svg>
)
}
)
export default Pentagon

8
packages/web/src/components/icons/Rhombus.tsx
View File

@@ -3,8 +3,7 @@ type Props = {
fill?: string
}
export default function Rhombus({ className, fill = "#FFF" }: Props) {
return (
const Rhombus = ({ className, fill = "#FFF" }: Props) => (
<svg
className={className}
fill={fill}
@@ -20,5 +19,6 @@ export default function Rhombus({ className, fill = "#FFF" }: Props) {
<rect x="48" y="48" width="416" height="416" />
</g>
</svg>
)
}
)
export default Rhombus

8
packages/web/src/components/icons/Square.tsx
View File

@@ -3,8 +3,7 @@ type Props = {
fill?: string
}
export default function Square({ className, fill = "#FFF" }: Props) {
return (
const Square = ({ className, fill = "#FFF" }: Props) => (
<svg
className={className}
fill={fill}
@@ -13,5 +12,6 @@ export default function Square({ className, fill = "#FFF" }: Props) {
>
<rect x="48" y="48" width="416" height="416" />
</svg>
)
}
)
export default Square

8
packages/web/src/components/icons/Triangle.tsx
View File

@@ -3,8 +3,7 @@ type Props = {
fill?: string
}
export default function Triangle({ className, fill = "#FFF" }: Props) {
return (
const Triangle = ({ className, fill = "#FFF" }: Props) => (
<svg
className={className}
fill={fill}
@@ -13,5 +12,6 @@ export default function Triangle({ className, fill = "#FFF" }: Props) {
>
<polygon points="256 32 20 464 492 464 256 32" />
</svg>
)
}
)
export default Triangle

23
packages/web/src/utils/score.ts Normal file
View File

@@ -0,0 +1,23 @@
export const calculatePercentages = (
objectResponses: Record<string, number>,
): Record<string, string> => {
const keys = Object.keys(objectResponses)
const values = Object.values(objectResponses)
if (!values.length) {
return {}
}
const totalSum = values.reduce(
(accumulator, currentValue) => accumulator + currentValue,
0,
)
const result: Record<string, string> = {}
keys.forEach((key) => {
result[key] = `${((objectResponses[key] / totalSum) * 100).toFixed()}%`
})
return result
}