Finish Fetching Recent & Public Rooms (#62)

Wadie-ess · Oct 20, 2023 · 9d69fbe · 9d69fbe
2 parents a59f10b + cb30cb0
commit 9d69fbe
Show file tree

Hide file tree

Showing 12 changed files with 281 additions and 2,324 deletions.
diff --git a/frontend/code/a7a.txt b/frontend/code/a7a.txt
diff --git a/frontend/code/src/Components/Chat/Components/Conversation.tsx b/frontend/code/src/Components/Chat/Components/Conversation.tsx
@@ -9,7 +9,10 @@ import users, {
 } from "./tools/Assets";
 import { ChatType, useChatStore } from "../Controllers/ChatControllers";
 
-import { ConfirmationModal, NullPlaceHolder } from "./RoomChatHelpers";
+import {
+ ChatPlaceHolder,
+ ConfirmationModal,
+} from "./RoomChatHelpers";
 import { KeyboardEvent } from "react";
 
 export interface ChatPaceHolderProps {
@@ -286,16 +289,16 @@ export const Conversation: React.FC<ConversationProps> = ({
  {(selectedMessages?.length as number) > 0 ? (
  selectedMessages?.map((message) => (
  <CurrentUserMessage
- // to set a unique key
- // key={message.senderId}
+  // to set a unique key
+  // key={message.senderId}
  message={message.message}
  time={message.time}
  senderId={message.senderId}
  isRead={message.isRead}
  />
  ))
  ) : (
- <NullPlaceHolder message="No Messages Yet!, be The First" />
+ <ChatPlaceHolder message="No Messages Yet!, Send The First" />
  )}
  </div>
 

diff --git a/frontend/code/src/Components/Chat/Components/RecentChat.tsx b/frontend/code/src/Components/Chat/Components/RecentChat.tsx
@@ -18,6 +18,7 @@ import {
  RoomSettingsModal,
  ShowLogoModal,
 } from "./RoomChatHelpers";
+import { useModalStore } from "../Controllers/ModalControllers";
 
 export const RecentConversations = () => {
  const [MyUsers] = useState(users);
@@ -118,6 +119,7 @@ export const OnlineNowUsers = () => {
  const [Users] = useState(users);
  // take the first five users from the array
  const onlineUsers = Users.slice(0, 5);
+ const setModalState = useModalStore((state) => state.setShowExploreModal);
 
  return (
  <>
@@ -131,15 +133,19 @@ export const OnlineNowUsers = () => {
  <img className="w-[80%]" alt="" src={GroupChat} />
  </a>
  <a href="#my_modal_5" className="">
- <img className="w-[100%]" alt="" src={Explore} />
+ <img
+ className="w-[100%]"
+ alt=""
+ onClick={() => setModalState(true)}
+ src={Explore}
+ />
  </a>
  <div>
  <ExploreRoomsModal />
  <RoomSettingsModal />
  <AddUsersModal />
  <CreateNewRoomModal />
- <ShowLogoModal/>
-
+ <ShowLogoModal />
  </div>
  </div>
  </div>