merge all syd

containers/react/src/components/Messages/Message.tsx

@@ -10,10 +10,11 @@
 /*                                                                            */
 /* ************************************************************************** */
 
+import React, { HtmlHTMLAttributes } 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 DefaultPicture from '../../assets/profile.jpg'
+// import DefaultPicture from '../../assets/profile.jpg'
 // import { useRef } from "react";
 // import { useEffect } from "react";
 import '../../styles/Messages.css'
@@ -27,6 +28,7 @@ const MeStyleP = styled.p`
 	color: white;
 	margin-right: 20px;
 `
+<<<<<<< HEAD
 
 interface MessageMeProps {
 	message: Message;
@@ -44,6 +46,13 @@ function MessageMe({message, own}: MessageMeProps){
 
 	// 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(() => {
 		if (scrollRef.current)
 		{

containers/react/src/components/Messages/Modal.tsx

@@ -1,11 +1,11 @@
 import { motion } from "framer-motion";
-import Backdrop from "../Sidebar/Backdrop.tsx";
+import Backdrop from "../Sidebar/Backdrop";
 // 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 api from "../../script/axiosApi";
 import React from "react";
 
 const dropIn = {
@@ -100,7 +100,11 @@ const Modal = ({handleClose}) => {
     // let new_name;
 
     return (
+<<<<<<< HEAD
         <Backdrop onClick={handleClose}>
+=======
+        <Backdrop >
+>>>>>>> sadjigui
             <motion.div
                 onClick={(e) => e.stopPropagation()}
                 className="modal"