From 8d7a7045c429189f4ff6e154645a0d61d6475788 Mon Sep 17 00:00:00 2001 From: Titouan Rigoudy Date: Fri, 30 Jul 2021 14:04:35 -0400 Subject: [PATCH] Fix /users, display links. --- src/modules/user/UserList.tsx | 6 +++--- src/modules/user/{User.tsx => UserListEntry.tsx} | 4 ++-- src/modules/user/UsersPane.tsx | 1 + src/modules/user/slice.ts | 5 ++++- 4 files changed, 10 insertions(+), 6 deletions(-) rename src/modules/user/{User.tsx => UserListEntry.tsx} (79%) diff --git a/src/modules/user/UserList.tsx b/src/modules/user/UserList.tsx index f8d8f57..b2b864d 100644 --- a/src/modules/user/UserList.tsx +++ b/src/modules/user/UserList.tsx @@ -2,16 +2,16 @@ import { FC } from "react"; import SearchableList from "components/SearchableList"; import { UserMap } from "modules/user/slice"; -import User from "modules/user/User"; +import UserListEntry from "modules/user/UserListEntry"; -const SearchableUserList = SearchableList(User); +const SearchableUserList = SearchableList(UserListEntry); interface Props { users: UserMap; } const UserList: FC = ({ users }) => ( - {}} /> + {}} /> ); export default UserList; diff --git a/src/modules/user/User.tsx b/src/modules/user/UserListEntry.tsx similarity index 79% rename from src/modules/user/User.tsx rename to src/modules/user/UserListEntry.tsx index 2e937e2..480b2cb 100644 --- a/src/modules/user/User.tsx +++ b/src/modules/user/UserListEntry.tsx @@ -7,7 +7,7 @@ interface Props { name: string; } -const User: FC = ({ name }) => { +const UserListEntry: FC = ({ name }) => { const path = `/users/${encode(name)}`; return ( @@ -17,4 +17,4 @@ const User: FC = ({ name }) => { ); }; -export default User; +export default UserListEntry; diff --git a/src/modules/user/UsersPane.tsx b/src/modules/user/UsersPane.tsx index d52665c..99a6a9e 100644 --- a/src/modules/user/UsersPane.tsx +++ b/src/modules/user/UsersPane.tsx @@ -6,6 +6,7 @@ import UserList from "modules/user/UserList"; const UsersPane: FC<{}> = () => { const users = useSelector(selectAllUsers); + console.log("Users:", users); return (
diff --git a/src/modules/user/slice.ts b/src/modules/user/slice.ts index e763860..0088ce8 100644 --- a/src/modules/user/slice.ts +++ b/src/modules/user/slice.ts @@ -10,6 +10,7 @@ export enum UserStatus { export interface UserState { name: string; + status: UserStatus; averageSpeed: number; numDownloads: number; numFiles: number; @@ -29,9 +30,10 @@ export interface RoomSliceState { const initialState: UserSliceState = { // TODO: Set to {} once UserListResponse actually comes. Until then, it helps // to have some state that we can observe in the UI. - rooms: { + users: { alice: { name: "alice", + status: UserStatus.Online, averageSpeed: 1, numDownloads: 2, numFiles: 3, @@ -41,6 +43,7 @@ const initialState: UserSliceState = { }, bob: { name: "bob", + status: UserStatus.Offline, averageSpeed: 1, numDownloads: 2, numFiles: 3,