diff --git a/client/src/assets/images/logo-only.svg b/client/src/assets/images/logo-only.svg new file mode 100644 index 0000000..6f3252e --- /dev/null +++ b/client/src/assets/images/logo-only.svg @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/client/src/components/AppHeader.tsx b/client/src/components/AppHeader.tsx index 7c41be2..32da63a 100644 --- a/client/src/components/AppHeader.tsx +++ b/client/src/components/AppHeader.tsx @@ -1,8 +1,9 @@ -import logo from '@assets/images/logo.svg'; +import logo from '@assets/images/logo-only.svg'; import { useQuery } from '@tanstack/react-query'; import { useCookies } from 'react-cookie'; import Avatar from '@components/Avatar'; import { getMeInfo } from '@controllers/UserController'; +import { FiLogOut } from 'react-icons/fi'; const AppHeader = () => { const meInfo = useQuery(['me'], getMeInfo, { @@ -22,11 +23,12 @@ const AppHeader = () => { return (
-
+
logo + Groupomania
-
+
{meInfo.data && }
@@ -37,7 +39,8 @@ const AppHeader = () => { className="group relative flex w-auto justify-center rounded-md border border-red bg-red py-2 px-2 text-sm font-medium text-white hover:bg-white hover:text-red focus:outline-none focus:ring-2 focus:ring-red focus:ring-offset-2" onClick={() => logOut()} > - Deconnexion + + Deconnexion
diff --git a/client/src/components/Avatar.tsx b/client/src/components/Avatar.tsx index cb0baea..742545f 100644 --- a/client/src/components/Avatar.tsx +++ b/client/src/components/Avatar.tsx @@ -19,7 +19,7 @@ const Avatar = ({ user }: any) => { return (
- avatar + avatar
); }; diff --git a/client/src/components/MessageWrapper.tsx b/client/src/components/MessageWrapper.tsx index 20eb3b3..0cfae61 100644 --- a/client/src/components/MessageWrapper.tsx +++ b/client/src/components/MessageWrapper.tsx @@ -20,8 +20,8 @@ const MessageWrapper = () => { } return ( -
- +
+ {isLoading ? '' : isError diff --git a/client/src/components/NewMessage.tsx b/client/src/components/NewMessage.tsx index 3040689..3ba694f 100644 --- a/client/src/components/NewMessage.tsx +++ b/client/src/components/NewMessage.tsx @@ -29,8 +29,8 @@ const NewMessage = () => { }; return ( -