diff --git a/client/src/components/AppHeader.tsx b/client/src/components/AppHeader.tsx index 43c76aa..55d6df9 100644 --- a/client/src/components/AppHeader.tsx +++ b/client/src/components/AppHeader.tsx @@ -34,16 +34,14 @@ const AppHeader = () => { }; return ( -
+
- logo + logo
-
- {meInfo.data && } -
+ {meInfo.data && }
{meInfo.isLoading ? '' : meInfo.data ? meInfo.data.firstName + ' ' + meInfo.data.lastName : ''} diff --git a/client/src/components/Message.tsx b/client/src/components/Message.tsx index 88fcc2c..07367e3 100644 --- a/client/src/components/Message.tsx +++ b/client/src/components/Message.tsx @@ -1,8 +1,7 @@ import { FaEllipsisH } from 'react-icons/fa'; import Avatar from '@components/Avatar'; -const Message = ({ text, user, date }: any) => { - +const Message = ({ text, user, date, image = '' }: any) => { return ( <>
@@ -12,11 +11,18 @@ const Message = ({ text, user, date }: any) => {
{user.firstName} {user.lastName}
-
- +
+
{text}
+ {image === '' ? ( + '' + ) : ( +
+ image +
+ )}
{date}
diff --git a/client/src/routes/home.tsx b/client/src/routes/home.tsx index 6904193..53dc21d 100644 --- a/client/src/routes/home.tsx +++ b/client/src/routes/home.tsx @@ -1,26 +1,37 @@ -import AppHeader from "@components/AppHeader"; -import Message from "@components/Message"; +import AppHeader from '@components/AppHeader'; +import Message from '@components/Message'; const Home = () => { const user = { - firstName: "Guillaume", - lastName: "Dorce", - email: "guillaume.dorce@bm-services.com", + firstName: 'Guillaume', + lastName: 'Dorce', + email: 'guillaume.dorce@bm-services.com', }; return (
-
- + - + nisl nisl aliquet nisl, eget aliquam nisl nisl sit amet mauris." + date="14 août 2022 19:00" + /> +
); -} +}; -export default Home; \ No newline at end of file +export default Home; diff --git a/client/tailwind.config.cjs b/client/tailwind.config.cjs index fb2db45..82c4812 100644 --- a/client/tailwind.config.cjs +++ b/client/tailwind.config.cjs @@ -9,7 +9,7 @@ module.exports = { red: '#fd2d01', 'red-light': '#ffd7d7', 'grey': '#4E5166', - 'grey-light': '#8F8F8F', + 'grey-light': '#717695', 'grey-dark': '#2E3144', }, },