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

fix: Multiple nicknames error fixed. #24

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

fix: Multiple nicknames error fixed. #24

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
22 changes: 20 additions & 2 deletions gurubu-client/src/app/components/room/grooming-board-profile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ import { IconUserCircle } from "@tabler/icons-react";
import { useGroomingRoom } from "../../contexts/GroomingRoomContext";
import { useSocket } from "../../contexts/SocketContext";

type NicknameData = [
{
roomId: string;
nickname: string;
}
];

const GroomingBoardProfile = () => {
const socket = useSocket();
const { userInfo, setUserinfo } = useGroomingRoom();
Expand All @@ -23,9 +30,20 @@ const GroomingBoardProfile = () => {

const handleUpdateNicknameButtonClick = () => {
if (newNickname.trim()) {
socket.emit("updateNickName", userInfo.lobby.roomID, newNickname, userInfo.lobby.credentials);
socket.emit(
"updateNickName",
userInfo.lobby.roomID,
newNickname.trim(),
userInfo.lobby.credentials
);
setUserinfo({ ...userInfo, nickname: newNickname.trim() });
localStorage.setItem("nickname", newNickname.trim());
const nicknameData = JSON.parse(
localStorage.getItem("nickname") || "[]"
) as NicknameData;
nicknameData.find(
(item) => item.roomId === userInfo.lobby.roomID
)!.nickname = newNickname.trim();
localStorage.setItem("nickname", JSON.stringify(nicknameData));
}
};

Expand Down
29 changes: 17 additions & 12 deletions gurubu-client/src/app/components/room/nickname-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,8 @@ interface IProps {
roomId?: string;
}

const defaultNickname = () => {
return (
(typeof window !== "undefined" &&
window.localStorage.getItem("nickname")) ||
""
);
};

const NicknameForm = ({ joinMode, roomId }: IProps) => {
const [nickname, setNickname] = useState(defaultNickname);
const [nickname, setNickname] = useState("");
const [groomingType, setGroomingType] = useState<null | string>(null);
const [errorMessage, setErrorMessage] = useState("");
const [showInfoMessage, setShowInfoMessage] = useState(false);
Expand All @@ -46,9 +38,15 @@ const NicknameForm = ({ joinMode, roomId }: IProps) => {
if (trimmedNickName === "") {
return;
}
localStorage.setItem("nickname", trimmedNickName);

const payload = { nickName: trimmedNickName, groomingType };
const response = await roomService.createRoom(payload);
const nicknameData = JSON.parse(localStorage.getItem("nickname") || "[]");
nicknameData.push({
roomId: response.roomID,
nickname: trimmedNickName,
});
localStorage.setItem("nickname", JSON.stringify(nicknameData));

if (!response) {
return;
Expand Down Expand Up @@ -80,7 +78,12 @@ const NicknameForm = ({ joinMode, roomId }: IProps) => {
if (trimmedNickName === "" || !roomId) {
return;
}
localStorage.setItem("nickname", trimmedNickName);
const nicknameData = JSON.parse(localStorage.getItem("nickname") || "[]");
nicknameData.push({
roomId,
nickname: trimmedNickName,
});
localStorage.setItem("nickname", JSON.stringify(nicknameData));
const payload = { nickName: trimmedNickName };
const response = await roomService.join(roomId, payload);

Expand Down Expand Up @@ -194,7 +197,9 @@ const NicknameForm = ({ joinMode, roomId }: IProps) => {
{joinMode ? "Join Room" : "Create Room"}
</button>
{showInfoMessage && (
<p className="nickname-form__info-message">{joinMode ? "Joining Room..." : "Creating Room..."}</p>
<p className="nickname-form__info-message">
{joinMode ? "Joining Room..." : "Creating Room..."}
</p>
)}
</div>
</div>
Expand Down
29 changes: 23 additions & 6 deletions gurubu-client/src/app/contexts/GroomingRoomContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ import React, {
} from "react";
import { ROOM_STATUS } from "../room/[id]/enums";
import { getCurrentLobby } from "../shared/helpers/lobbyStorage";
import { EncounteredError, GroomingInfo, UserInfo, UserVote } from "../shared/interfaces";
import {
EncounteredError,
GroomingInfo,
UserInfo,
UserVote,
} from "../shared/interfaces";

interface GroomingContextValues {
roomStatus: keyof typeof ROOM_STATUS;
Expand All @@ -25,6 +30,13 @@ interface GroomingContextValues {
setShowErrorPopup: Function;
}

type NicknameData = [
{
roomId: string;
nickname: string;
}
];

const GroomingRoomContext = createContext({} as GroomingContextValues);

export function useGroomingRoom() {
Expand All @@ -39,19 +51,24 @@ export function GroomingRoomProvider({
const [userInfo, setUserinfo] = useState({} as UserInfo);
const [groomingInfo, setGroomingInfo] = useState({} as GroomingInfo);
const [userVote, setUserVote] = useState({} as UserVote);
const [encounteredError, setEncounteredError] = useState({} as EncounteredError);
const [encounteredError, setEncounteredError] = useState(
{} as EncounteredError
);
const [showErrorPopup, setShowErrorPopup] = useState(false);

useEffect(() => {
const nickname = localStorage.getItem("nickname");
const nickname = JSON.parse(
localStorage.getItem("nickname") || "[]"
) as NicknameData;
const lobby = getCurrentLobby(roomId);

if (!nickname || !lobby) {
return;
}

setUserinfo({
nickname,
nickname:
nickname.find((item) => item.roomId === roomId)?.nickname || "user",
lobby,
});
}, [roomId]);
Expand All @@ -69,7 +86,7 @@ export function GroomingRoomProvider({
encounteredError,
setEncounteredError,
showErrorPopup,
setShowErrorPopup
setShowErrorPopup,
}),
[
roomStatus,
Expand All @@ -83,7 +100,7 @@ export function GroomingRoomProvider({
encounteredError,
setEncounteredError,
showErrorPopup,
setShowErrorPopup
setShowErrorPopup,
]
);
return (
Expand Down