diff --git a/containers/react/src/components/Messages/ModalSetting.tsx b/containers/react/src/components/Messages/ModalSetting.tsx index c925a8e9..3b73b59b 100644 --- a/containers/react/src/components/Messages/ModalSetting.tsx +++ b/containers/react/src/components/Messages/ModalSetting.tsx @@ -41,6 +41,10 @@ const ModalSetting = ({handleClose, convId}: ModalSettingProps) => { const [privateConv, setPrivateConv] = useState(false); const dark = () => setPrivateConv(true); const light = () => setPrivateConv(false); + const [mute, setMute] = useState(false); + const darkMute = () => setMute(false); + const lightMute = () => setMute(true); + useEffect(()=> { @@ -186,11 +190,11 @@ const ModalSetting = ({handleClose, convId}: ModalSettingProps) => {

Password

- {password ? ( + {password || privateConv ? ( setNewPassword(e.target.value)} onKeyDown={handlePassword} - type="text" + type="password" className="in" placeholder="Password"/> ): @@ -236,11 +240,14 @@ const ModalSetting = ({handleClose, convId}: ModalSettingProps) => {
Send Ban - Mute + Mute Admin
+ {mute ? ( + + ):("")} diff --git a/containers/react/src/pages/Home.tsx b/containers/react/src/pages/Home.tsx index 4e59a416..9bb31121 100644 --- a/containers/react/src/pages/Home.tsx +++ b/containers/react/src/pages/Home.tsx @@ -21,6 +21,9 @@ import { motion, AnimatePresence } from 'framer-motion' import { Link } from "react-router-dom"; import ModalEdit from "../components/Profile/EditName.tsx"; import {AiOutlineHistory} from 'react-icons/ai' +import { MdQrCodeScanner, MdOutlinePhotoLibrary } from 'react-icons/md'; +import { GiWingedSword, GiCrownedSkull } from 'react-icons/gi'; + // import { Link } from "react-router-dom"; // import {UserProfile} from "../DataBase/DataUserProfile"; // import axios from "axios"; @@ -186,14 +189,18 @@ function Profile () { {modalOpen === true ? : } + {modalOpen === true ? ("") : ( + <> + + + + )} -
- - + {/*
*/} {/* */} {/* */} -
+ {/*
*/} ) : ( <> @@ -212,13 +219,40 @@ function Profile () { function Home () { const [move, setmove ] = useState(false); + const [user, setUser] = useState([]); + useEffect(() => { + const fetchSuccess = async () => { + try { + const tmpUser = await api.get("/profile"); + setUser(tmpUser.data); + } + catch (error) + { + console.log(error); + } + }; + fetchSuccess(); + }) + return ( +
+ {/* {user.otp_verified ? ( */} + + {/* ):("")} */} + {/* {user.win >= 2 ? ( */} + + {/* ):("")} */} + + {/* {user.win >= 5 ? ( */} + + {/* ):("")} */} +
- diff --git a/containers/react/src/styles/App.css b/containers/react/src/styles/App.css index d2a7c169..d4d7c8c6 100644 --- a/containers/react/src/styles/App.css +++ b/containers/react/src/styles/App.css @@ -9,7 +9,7 @@ input.qr{ width: 20%; border-radius: 5px; - background-color: rgb(66, 66, 66); + background-color: rgb(0, 0, 0); margin : 1%; color:white; } diff --git a/containers/react/src/styles/Header.css b/containers/react/src/styles/Header.css index c3f1732a..55a965e2 100644 --- a/containers/react/src/styles/Header.css +++ b/containers/react/src/styles/Header.css @@ -90,11 +90,12 @@ span { } .success { - height: 25px; - width: 25px; + height: 2%; + width: 2%; /* border: solid; */ - margin-top: 2.5vh; - margin-left: 1vh; + margin-top: 1%; + margin: 3vh; + /* margin-bottom: -12vh; */ /* border-color: black; */ /* border-radius: 50%; */ } diff --git a/containers/react/src/styles/Messages.css b/containers/react/src/styles/Messages.css index 86ef6726..39c457fc 100644 --- a/containers/react/src/styles/Messages.css +++ b/containers/react/src/styles/Messages.css @@ -310,7 +310,7 @@ p { .settingSecondPart{ margin-top: 10%; - margin-left: 10%; + margin-left: 5%; /* margin-left: 20%; */ } @@ -329,6 +329,15 @@ input.in{ width: 70%; } +input.in_howLong{ + margin-top: 14.5%; + margin-left: 0px; + background-color: black; + color: white; + border-radius: 12px; + width: 15%; +} + .mdp{ background-color : black; border-radius: 8px; diff --git a/containers/react/src/styles/Profile.css b/containers/react/src/styles/Profile.css index 6d41023c..9749e86e 100644 --- a/containers/react/src/styles/Profile.css +++ b/containers/react/src/styles/Profile.css @@ -61,12 +61,15 @@ .page { text-align: center; + overflow-y: scroll; /* height: 50vh; */ /* width: 50vh; */ /* background-color: black; */ } .profile { + align-items: center; + text-align: center; flex-direction: row; color: white; } @@ -79,7 +82,7 @@ border-color: red; /* border-image: linear-gradient(90deg, #5843e4, #5a0760); */ - margin-top: 20px; + /* margin-top: 20px; */ } .home{ @@ -106,7 +109,7 @@ .div_history { flex-direction: row; align-items: center; - margin-top: -80px; + /* margin-top: -80px; */ } .edit_name { diff --git a/containers/react/src/styles/Win_Loss.css b/containers/react/src/styles/Win_Loss.css index fdb3df72..1677e6bd 100644 --- a/containers/react/src/styles/Win_Loss.css +++ b/containers/react/src/styles/Win_Loss.css @@ -2,7 +2,7 @@ /* display: flex; */ /* flex-direction: column; */ /* background-color: red; */ - height: 70vh; + height: 60vh; /* padding: 15px; */ /* overflow: scroll; */