From 984b3745001e02e89f05c666bfa4f2231887fa2c Mon Sep 17 00:00:00 2001 From: Alexandre POMMIER Date: Mon, 26 Jun 2023 07:46:00 +0200 Subject: [PATCH] fix alert in modal setting --- .../src/components/Messages/ModalSetting.tsx | 94 ++----------------- containers/react/src/pages/Home.tsx | 4 +- 2 files changed, 11 insertions(+), 87 deletions(-) diff --git a/containers/react/src/components/Messages/ModalSetting.tsx b/containers/react/src/components/Messages/ModalSetting.tsx index beb6c54a..cd4dcd57 100644 --- a/containers/react/src/components/Messages/ModalSetting.tsx +++ b/containers/react/src/components/Messages/ModalSetting.tsx @@ -1,9 +1,7 @@ import { AnimatePresence, motion } from "framer-motion"; import Backdrop from "../Sidebar/Backdrop.tsx"; -// import { Rank } from "../../DataBase/DataRank" import '../../styles/Messages.css' import { useState, useEffect } from "react"; -import { GrAdd } from "react-icons/gr"; import { Link } from "react-router-dom"; import api from "../../script/axiosApi.tsx"; import React from "react"; @@ -11,29 +9,6 @@ import { User } from "../../../interfaces.tsx" import { Socket } from "socket.io-client"; import GreenAlert from "../Alert/GreenAlert.tsx"; - -const dropIn = { - hidden: { - y: "-100vh", - opacity: 0, - }, - visible: { - y: "0", - opacity: 0, - transotion: { - duration: 0.1, - type: "spring", - damping: 100, - stiffness: 500, - } - }, - exit: { - y: "100vh", - opacity: 0, - }, - -}; - interface ModalSettingProps { handleClose: Function, convId: string, @@ -63,8 +38,6 @@ const ModalSetting = ({ handleClose, convId, socket }: ModalSettingProps) => { const getUsers = async () => { try { const currentConv = await api.post("/convId", { convId: convId }); - - // console.log("conv private =================== ", ) if (currentConv.data.private) setPrivateConv(true); const tmpUsers = await api.get("/users"); @@ -79,7 +52,6 @@ const ModalSetting = ({ handleClose, convId, socket }: ModalSettingProps) => { }, []); useEffect(() => { - // Function to run when myVariable changes const handleVariableChange = () => { console.log('Variable changed:', privateConv); if (privateConv === undefined) { @@ -97,15 +69,8 @@ const ModalSetting = ({ handleClose, convId, socket }: ModalSettingProps) => { }; if (!loading) handleVariableChange(); - // return () => { - // handleVariableChange(); - // }; }, [privateConv]); - // const [multi, setMulti] = useState(false); - // const [selectedOptionArray, setSelectedOptionArray] = useState([]); - - const handleOptionChange = (selectId: number, selectedOption: string) => { console.log("tag= ", selectTags) console.log("option= ", selectedOption) @@ -122,28 +87,6 @@ const ModalSetting = ({ handleClose, convId, socket }: ModalSettingProps) => { console.log("password??", e.target.checked); } - // const handleCheckPriv = (e: { target: { checked: any; }; }) => { - // // setPassword(e.target.checked); - // if (e.target.checked) - // { - // console.log("chack true", e.target.checked) - // try{ - // api.post("/private", {convId: convId}) - // } catch(err) { - // console.log(err); - // } - // } - // else - // { - // console.log("chack false", e.target.checked) - // try{ - // api.post("/private", {convId: convId}) - // } catch(err) { - // console.log(err); - // } - // } - // } - const handleName = async (e: { key: string; }) => { if (e.key !== "Enter") return; @@ -169,16 +112,18 @@ const ModalSetting = ({ handleClose, convId, socket }: ModalSettingProps) => { const [unban, setUnban] = useState(false); const closeUnban = () => setUnban(false); + const handleBan = async () => { - // console.log("ban option= ", selectedUser) try { - // console.log("user select=", selectedUser.length) if (!selectedUser.length) return; const res = await api.post("/ban", { convId: convId, username: selectedUser }) - if (res.data === 2) - setUnban(true); + console.log("res of ban", res.data) + if (res.data === 2) { + console.log("hehe true"); + setUnban(true); + } if (socket) { console.log("emit to ban server") socket.emit("ban", { username: selectedUser }) @@ -186,7 +131,7 @@ const ModalSetting = ({ handleClose, convId, socket }: ModalSettingProps) => { } catch (err) { console.log(err); } - handleClose(); + setTimeout(handleClose, 1500); }; const handleAdmin = async () => { @@ -207,8 +152,6 @@ const ModalSetting = ({ handleClose, convId, socket }: ModalSettingProps) => { console.log(`e in press= ${e.key}`) if (e.key != "Enter") return; - - // console.log("value mute = ", e.target.value); console.log("value mute = ", time); try { const ret = await api.post("/mute", { convId: convId, username: selectedUser, time: time }) @@ -230,17 +173,6 @@ const ModalSetting = ({ handleClose, convId, socket }: ModalSettingProps) => { handleClose(); }; - const handleKeyPress = async (e: { key: string; }) => { - if (e.key !== "Enter") - return; - try { - - } - catch (err) { - - } - } - return ( { animate="visible" exit="exit" > - - {/* First selection */}
Public Private
- {/*

Private

*/}

Password

- - {password ? ( setNewPassword(e.target.value)} @@ -285,8 +212,6 @@ const ModalSetting = ({ handleClose, convId, socket }: ModalSettingProps) => {
- {/* Second selection */} -
@@ -308,7 +233,6 @@ const ModalSetting = ({ handleClose, convId, socket }: ModalSettingProps) => {
))} -
Invite Ban @@ -332,8 +256,8 @@ const ModalSetting = ({ handleClose, convId, socket }: ModalSettingProps) => { ) : ("")} {muteAlert ? ( - - ):("")} + + ) : ("")} diff --git a/containers/react/src/pages/Home.tsx b/containers/react/src/pages/Home.tsx index fb101446..1b81daa0 100644 --- a/containers/react/src/pages/Home.tsx +++ b/containers/react/src/pages/Home.tsx @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/06/09 08:19:04 by apommier #+# #+# */ -/* Updated: 2023/06/26 06:58:05 by apommier ### ########.fr */ +/* Updated: 2023/06/26 07:06:35 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -127,7 +127,7 @@ function Profile () { null}> - {modalOpen && } + {modalOpen && }
)