diff --git a/containers/react/src/assets/110-1104986_download-medal-hd-png-download.png b/containers/react/src/assets/110-1104986_download-medal-hd-png-download.png new file mode 100644 index 00000000..7fa54245 Binary files /dev/null and b/containers/react/src/assets/110-1104986_download-medal-hd-png-download.png differ diff --git a/containers/react/src/assets/81-810382_gold-medal-olympic-medal-bronze-medal-clip-art.png b/containers/react/src/assets/81-810382_gold-medal-olympic-medal-bronze-medal-clip-art.png new file mode 100644 index 00000000..1617c25d Binary files /dev/null and b/containers/react/src/assets/81-810382_gold-medal-olympic-medal-bronze-medal-clip-art.png differ diff --git a/containers/react/src/assets/Silver-Medal-PNG-Image-0986sd.jpg b/containers/react/src/assets/Silver-Medal-PNG-Image-0986sd.jpg new file mode 100644 index 00000000..6ca1316d Binary files /dev/null and b/containers/react/src/assets/Silver-Medal-PNG-Image-0986sd.jpg differ diff --git a/containers/react/src/assets/silver-medal-gold-medal-png-favpng-WmKbe5M1ptvCs0UCUQiCXiHBA.jpg b/containers/react/src/assets/silver-medal-gold-medal-png-favpng-WmKbe5M1ptvCs0UCUQiCXiHBA.jpg new file mode 100644 index 00000000..7bfd217d Binary files /dev/null and b/containers/react/src/assets/silver-medal-gold-medal-png-favpng-WmKbe5M1ptvCs0UCUQiCXiHBA.jpg differ diff --git a/containers/react/src/components/Messages/Chats.tsx b/containers/react/src/components/Messages/Chats.tsx index 0ada4409..9805e584 100644 --- a/containers/react/src/components/Messages/Chats.tsx +++ b/containers/react/src/components/Messages/Chats.tsx @@ -107,12 +107,16 @@ function Chats(){ const convs = await api.get("/conv") const tmpInvite = await api.get("/partyInvite") const tmpUser = await api.get("/profile") + const tmpUsers = await api.get("/users"); + console.log(convs); // console.log("invite data use effect= ", tmpInvite.data); setPartyInvite(tmpInvite.data); setUser(tmpUser.data); setConversation(convs.data); + setUsers(tmpUsers.data); + // console.log(`connection....`); socket.current = io('http://' + process.env.REACT_APP_BASE_URL + ':4001', { transports: ['polling'] }); // console.log(`connection done`); @@ -255,6 +259,10 @@ function Chats(){ const [newGameModalOpen, setNewGameModalOpen] = useState(false); const [newConversationModalOpen, setNewConversationModalOpen] = useState(false); + + const [selectTags, setSelectTag] = useState([{ id: 1, selectedOption: ''}]); + const [users, setUsers] = useState([]); + const openNewGameModal = () => { setNewGameModalOpen(true); @@ -335,6 +343,15 @@ function Chats(){ setShowBlockAlert(false); }; + const handleOptionChange = (selectId, selectedOption) => { + console.log("selected Option=", selectedOption) + setSelectTag((prevTags) => + prevTags.map((tag) => + tag.id === selectId ? { ...tag, selectedOption } : tag + ) + ); + }; + //======================================================================================================== //======================================================================================================== // HTML @@ -399,9 +416,26 @@ function Chats(){ ):("")} */} -
- - +
+ {selectTags.map((selectTag) => ( +
+ +
+ ))} + diff --git a/containers/react/src/components/Messages/Modal.tsx b/containers/react/src/components/Messages/Modal.tsx index a6546944..16a50bce 100644 --- a/containers/react/src/components/Messages/Modal.tsx +++ b/containers/react/src/components/Messages/Modal.tsx @@ -155,6 +155,10 @@ const Modal = ({handleClose}) => { ))} )} + {channel.private ? ( + + ):("")} +
Join diff --git a/containers/react/src/styles/Messages.css b/containers/react/src/styles/Messages.css index 57bbe076..88a6d3d3 100644 --- a/containers/react/src/styles/Messages.css +++ b/containers/react/src/styles/Messages.css @@ -315,4 +315,12 @@ input.in{ color: white; border-radius: 12px; width: 70%; -} \ No newline at end of file +} + +.mdp{ + background-color : black; + border-radius: 8px; + color: white; + width: 20%; +} +