Merge pull request #108 from B-ki/someFix

little fixes
B-ki · Nov 27, 2023 · 31d1501 · 31d1501
2 parents 5953f6e + 0b025a9
commit 31d1501
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/front/src/components/Dropdown.tsx b/front/src/components/Dropdown.tsx
@@ -9,8 +9,9 @@ import { Button } from './Button';
 const navigation = [
   { id: '0', name: 'Game', href: '/game' },
   { id: '1', name: 'Profile', href: '/profile' },
-  { id: '2', name: 'Friends', href: '/friends' },
-  { id: '3', name: '2FA', href: '/2fa' },
+  { id: '2', name: 'Chat', href: '/chat' },
+  { id: '3', name: 'Friends', href: '/friends' },
+  { id: '4', name: '2FA', href: '/2fa' },
 ];
 
 export const Dropdown = () => {

diff --git a/front/src/components/FriendList.tsx b/front/src/components/FriendList.tsx
@@ -125,10 +125,18 @@ const FriendList = () => {
           placeholder="Search a friend"
           ref={nameRef}
         ></input>
-        <button className="rounded-full p-1 hover:bg-dark-3" onClick={addFriend}>
+        <button
+          className="rounded-full p-1 hover:bg-white-3"
+          title="Add friend"
+          onClick={addFriend}
+        >
           <img className="w-5 md:w-6" src={chat_add} alt="add friend" />
         </button>
-        <button className="rounded-full p-1 hover:bg-dark-3" onClick={removeFriend}>
+        <button
+          className="rounded-full p-1 hover:bg-white-3"
+          title="Remove friend"
+          onClick={removeFriend}
+        >
           <img className="w-5 md:w-6" src={close_icon} alt="remove friend" />
         </button>
       </div>

diff --git a/front/src/components/GameHistoryTable.tsx b/front/src/components/GameHistoryTable.tsx
@@ -20,7 +20,7 @@ export const GameHistoryTable: FC<HistoryProps> = ({ login }) => {
     data: games,
     isLoading,
     isError,
-  } = useApi().get('get games', `game/all/${login}`) as UseQueryResult<gameDto[]>;
+  } = useApi().get(`get games of ${login}`, `game/all/${login}`) as UseQueryResult<gameDto[]>;
 
   if (isLoading) {
     return <div>Loading...</div>;

diff --git a/front/src/components/Navbar.tsx b/front/src/components/Navbar.tsx
@@ -37,7 +37,7 @@ export const Navbar = () => {
             Our Pong
           </span>
         </button>
-        <div className="hidden space-x-4 sm:flex sm:items-center sm:justify-center">
+        <div className="hidden space-x-4 sm:items-center sm:justify-center md:flex">
           {navigation.map((item) => (
             <NavLink
               key={item.name}
@@ -56,12 +56,12 @@ export const Navbar = () => {
           ))}
         </div>
       </div>
-      <div className="hidden items-center justify-end sm:flex ">
+      <div className="hidden items-center justify-end md:flex ">
         <Button size="small" type="primary" onClick={() => handleLogoutClick()}>
           logout
         </Button>
       </div>
-      <div className="flex sm:hidden">
+      <div className="flex md:hidden">
         <Dropdown />
       </div>
     </div>

diff --git a/front/src/pages/Game.tsx b/front/src/pages/Game.tsx
@@ -243,7 +243,7 @@ export class Pong extends Component {
   }
 
   componentWillUnmount(): void {
-    this.app.destroy(true, { children: false, texture: true, baseTexture: true });
+    this.app.destroy(true, { children: true, texture: true, baseTexture: true });
     this.socket.disconnect();
     window.onresize = () => {};
   }

diff --git a/front/src/pages/User.tsx b/front/src/pages/User.tsx
@@ -9,10 +9,6 @@ import { useApi } from '@/hooks/useApi';
 
 function User() {
   const routeParams = useParams();
-  const [username, setUsername] = useState('');
-  const [description, setDescription] = useState('');
-  const [File, setFile] = useState<File | null>(null);
-  const [banner, setBanner] = useState<File | null>(null);
 
   const { data: games } = useApi().get(
     'get user win',