Kinou/ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge all syd

Browse Source
This commit is contained in:
Alexandre POMMIER 2023-06-23 20:20:10 +02:00
commit b50d789d1d
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
containers/react/src/components/Messages/Message.tsx
View File

@ -10,10 +10,11 @@
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
import React, { HtmlHTMLAttributes } from "react";
import { useEffect, useState, useRef } from "react"; import { useEffect, useState, useRef } from "react";
import api from '../../script/axiosApi.tsx'; import api from '../../script/axiosApi';
import styled from "styled-components" import styled from "styled-components"
import DefaultPicture from '../../assets/profile.jpg' // import DefaultPicture from '../../assets/profile.jpg'
// import { useRef } from "react"; // import { useRef } from "react";
// import { useEffect } from "react"; // import { useEffect } from "react";
import '../../styles/Messages.css' import '../../styles/Messages.css'
@ -27,6 +28,7 @@ const MeStyleP = styled.p`
color: white; color: white;
margin-right: 20px; margin-right: 20px;
` `
<<<<<<< HEAD
interface MessageMeProps { interface MessageMeProps {
message: Message; message: Message;
@ -44,6 +46,13 @@ function MessageMe({message, own}: MessageMeProps){
// console.log("Message eher") // console.log("Message eher")
=======
function MessageMe({message, own}){
const [profilePicture, setProfilePicture] = useState('');
const scrollRef = useRef<HTMLDivElement>(null);
const DefaultPicture: string = '../../assets/profile.jpg'
>>>>>>> sadjigui
useEffect(() => { useEffect(() => {
if (scrollRef.current) if (scrollRef.current)
{ {

8
containers/react/src/components/Messages/Modal.tsx
View File

@ -1,11 +1,11 @@
import { motion } from "framer-motion"; import { motion } from "framer-motion";
import Backdrop from "../Sidebar/Backdrop.tsx"; import Backdrop from "../Sidebar/Backdrop";
// import { Rank } from "../../DataBase/DataRank" // import { Rank } from "../../DataBase/DataRank"
import '../../styles/Messages.css' import '../../styles/Messages.css'
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import { GrAdd } from "react-icons/gr"; import { GrAdd } from "react-icons/gr";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import api from "../../script/axiosApi.tsx"; import api from "../../script/axiosApi";
import React from "react"; import React from "react";
const dropIn = { const dropIn = {
@ -100,7 +100,11 @@ const Modal = ({handleClose}) => {
// let new_name; // let new_name;
return ( return (
<<<<<<< HEAD
<Backdrop onClick={handleClose}> <Backdrop onClick={handleClose}>
=======
<Backdrop >
>>>>>>> sadjigui
<motion.div <motion.div
onClick={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}
className="modal" className="modal"