(["1","0"]);
useEffect(() => {
if (groomingInfo.isResultShown) {
@@ -27,17 +61,19 @@ const GroomingBoardParticipants = () => {
}
}, [groomingInfo]);
+ console.log(sortedParticipants)
+
return (
<>
-
+ {/* */}
{sortedParticipants.map((participantKey) => (
))}
-
+ {/* */}
>
);
diff --git a/gurubu-client/src/app/components/room/grooming-board/grooming-board.tsx b/gurubu-client/src/app/components/room/grooming-board/grooming-board.tsx
index 80437dee..22ff7ca2 100644
--- a/gurubu-client/src/app/components/room/grooming-board/grooming-board.tsx
+++ b/gurubu-client/src/app/components/room/grooming-board/grooming-board.tsx
@@ -141,18 +141,6 @@ const GroomingBoard = ({
setEditVoteClicked(!editVoteClicked);
};
- if (showNickNameForm) {
- return null;
- }
-
- if (encounteredError.id === ENCOUTERED_ERROR_TYPE.ROOM_EXPIRED) {
- notFound();
- }
-
- if (!isGroomingInfoLoaded && roomStatus !== ROOM_STATUS.CHECKING) {
- return ;
- }
-
return (
{showLoader && }
diff --git a/gurubu-client/src/app/components/room/grooming-navbar/grooming-navbar.tsx b/gurubu-client/src/app/components/room/grooming-navbar/grooming-navbar.tsx
index d593f007..345824d3 100644
--- a/gurubu-client/src/app/components/room/grooming-navbar/grooming-navbar.tsx
+++ b/gurubu-client/src/app/components/room/grooming-navbar/grooming-navbar.tsx
@@ -36,10 +36,6 @@ const GroomingNavbar = ({ showNickNameForm, roomId }: Props) => {
const { groomingInfo, roomStatus, userInfo, jiraSidebarExpanded } = useGroomingRoom();
const [isGroomingLinkCopied, setIsGroomingLinkCopied] = useState(false);
- if (roomStatus !== ROOM_STATUS.FOUND || showNickNameForm) {
- return null;
- }
-
const getGroomingLink = () => {
let currentUrl: string = "";
if (typeof window !== "undefined") {
diff --git a/gurubu-client/src/app/contexts/GroomingRoomContext.tsx b/gurubu-client/src/app/contexts/GroomingRoomContext.tsx
index 8551c3ad..88727160 100644
--- a/gurubu-client/src/app/contexts/GroomingRoomContext.tsx
+++ b/gurubu-client/src/app/contexts/GroomingRoomContext.tsx
@@ -34,8 +34,73 @@ export function useGroomingRoom() {
export function GroomingRoomProvider({ children, roomId }: GroomingRoomProviderProps) {
const [roomStatus, setRoomStatus] = useState(ROOM_STATUS.CHECKING);
- const [userInfo, setUserinfo] = useState({} as UserInfo);
- const [groomingInfo, setGroomingInfo] = useState({} as GroomingInfo);
+ const [userInfo, setUserinfo] = useState({lobby: {isAdmin: true },nickname: "Armagan"} as any);
+ const [groomingInfo, setGroomingInfo] = useState({
+ "mode": "0",
+ "participants": {
+ "0": {
+ "userID": 0,
+ "nickname": "Armagan",
+ "roomID": "e44fabf2-fe3f-4115-885e-117d7d6355bf",
+ "sockets": [
+ "ZvbLDqyZZdoZ47lqAAAH"
+ ],
+ "isAdmin": true,
+ "connected": true,
+ "avatar": {
+ "seed": "xie3wsmnu9",
+ "scale": 150
+ },
+ "votes": {
+ "storyPoint": "2"
+ }
+ },
+ "1": {
+ "userID": 1,
+ "nickname": "HelloFigma",
+ "roomID": "e44fabf2-fe3f-4115-885e-117d7d6355bf",
+ "sockets": [
+ "NcA0GdSQRLhyWPbKAAAF"
+ ],
+ "isAdmin": false,
+ "connected": true,
+ "avatar": {
+ "seed": "yzrl7syjjdc"
+ },
+ "votes": {
+ "storyPoint": "3"
+ }
+ }
+ },
+ "metrics": [
+ {
+ "id": 1,
+ "name": "storyPoint",
+ "displayName": "Story Point",
+ "points": [
+ "0.5",
+ "1",
+ "2",
+ "3",
+ "5",
+ "8",
+ "13",
+ "21",
+ "?",
+ "break"
+ ],
+ "text": "Story point of task"
+ }
+ ],
+ "score": "3.00",
+ "status": "ongoing",
+ "isResultShown": true,
+ "issues": [],
+ "timer": {
+ "timeLeft": 0,
+ "isRunning": false
+ }
+ } as any);
const [userVote, setUserVote] = useState({} as UserVote);
const [encounteredError, setEncounteredError] = useState({} as EncounteredError);
const [showErrorPopup, setShowErrorPopup] = useState(false);
diff --git a/gurubu-client/src/app/room/[id]/page.tsx b/gurubu-client/src/app/room/[id]/page.tsx
index 66c8a02f..d28b3bc5 100644
--- a/gurubu-client/src/app/room/[id]/page.tsx
+++ b/gurubu-client/src/app/room/[id]/page.tsx
@@ -97,7 +97,6 @@ const GroomingRoomContent = ({ params }: { params: { id: string } }) => {
[`${currentTheme}-active`]: isThemeActive,
})}
>
-