From be16915fbcc46e0d3957feb5c264c6ab1c70b54a Mon Sep 17 00:00:00 2001 From: Little Dipper Date: Sun, 11 Jun 2023 23:12:48 +0200 Subject: [PATCH] remise en place des conversation --- .../src/components/Messages/AddSelectTag.jsx | 52 ------------------- .../react/src/components/Messages/Chats.jsx | 6 ++- .../react/src/components/Messages/Modal.jsx | 16 ------ containers/react/src/styles/Messages.css | 2 + 4 files changed, 7 insertions(+), 69 deletions(-) delete mode 100644 containers/react/src/components/Messages/AddSelectTag.jsx diff --git a/containers/react/src/components/Messages/AddSelectTag.jsx b/containers/react/src/components/Messages/AddSelectTag.jsx deleted file mode 100644 index 320bd040..00000000 --- a/containers/react/src/components/Messages/AddSelectTag.jsx +++ /dev/null @@ -1,52 +0,0 @@ -import React, { useState } from "react"; -import { Rank } from "../../DataBase/DataRank"; -import { GrAdd } from "react-icons/gr"; - -function AddSelectTag ({number, array, new_name}) { - // const [selectCount, setSelectCount] = useState(0); - // const [selectValues, setSelectValues] = useState([]); - - // const handleAddSelect = () => { - // setSelectCount((selectCount) => selectCount + 1); - // setSelectCount((selectValues) =>[...selectValues, `select${selectCount + 1}`] ); - // }; - // function insertInArray (number, array, new_name) { - // return ( - // array[number] = new_name - // ); - // }; - return ( -
- {/* -
- {selectValues.map((selectName, index) => ( - - ))} -
*/} - {/* */} - {/* */} - {/* ) */} - {/* // })} */} - {/* // */} - {/*
}> */} -
- - {/*

{new_name}

*/} -
- {/* {number != 0 ? ( -
-

{array[number]}

-
- ) : ("")} */} -
- ) -} - -export default AddSelectTag; \ No newline at end of file diff --git a/containers/react/src/components/Messages/Chats.jsx b/containers/react/src/components/Messages/Chats.jsx index 10cf2e10..bf0bfdb3 100644 --- a/containers/react/src/components/Messages/Chats.jsx +++ b/containers/react/src/components/Messages/Chats.jsx @@ -6,6 +6,7 @@ import DefaultPic from '../../assets/profile.jpg' import api from '../../script/axiosApi'; import { motion } from "framer-motion"; import Modal from "./Modal"; +import { NavLink } from "react-router-dom"; import Message from "./Message" // import Input from "./Input"; @@ -41,6 +42,9 @@ const UserChat = styled.div ` &:hover{ background-color: #3e3c61; } + &:active { + filter: black; + } ` // const SideSpan = styled.span` @@ -284,7 +288,7 @@ function Chats(){ {conversations.map((c, index ) => { return (
setCurrentChat(c)}> + onClick={() => setCurrentChat(c)}> User
diff --git a/containers/react/src/components/Messages/Modal.jsx b/containers/react/src/components/Messages/Modal.jsx index 1af38a66..4dea9b6e 100644 --- a/containers/react/src/components/Messages/Modal.jsx +++ b/containers/react/src/components/Messages/Modal.jsx @@ -5,7 +5,6 @@ import '../../styles/Messages.css' import { useState } from "react"; import { GrAdd } from "react-icons/gr"; import { Link } from "react-router-dom"; -import AddSelectTag from "./AddSelectTag"; const dropIn = { hidden:{y:"-100vh", @@ -45,18 +44,7 @@ const Modal = ({handleClose, text}) => { const selectedOptions = selectTags.map((tag) => tag.selectedOption); setSelectedOptionArray(selectedOptions); } - function try_me() - { - - for (let i = 0; i < 2; i++) - { - AddSelectTag(); - } - } let new_name; - let number; - let array; - // const [nickname, setNickname] = useState(""); return ( {
)) } - {/* - */}

Selected Option:

    @@ -110,9 +96,7 @@ const Modal = ({handleClose, text}) => {
- {/*

nickname = "{new_name}"

*/} {multi === true ? ( - // ) : " "}
diff --git a/containers/react/src/styles/Messages.css b/containers/react/src/styles/Messages.css index ecc0bd30..96d437a2 100644 --- a/containers/react/src/styles/Messages.css +++ b/containers/react/src/styles/Messages.css @@ -46,6 +46,8 @@ select{ .contact{ background-color: rgb(46, 46, 46); align-items: left; + height: 29.7rem; + overflow: scroll; /* width: 2rem; */ /* height: 4rem; */ }