mirror of
https://git.rezel.net/LudoTech/traque.git
synced 2026-02-09 10:20:16 +01:00
fixed pbms found during demo
This commit is contained in:
@@ -65,9 +65,9 @@ export default function ActionDrawer() {
|
||||
<GreenButton onClick={handleCapture}>Capture target</GreenButton>
|
||||
</div>
|
||||
</div>
|
||||
<div className="h-20">
|
||||
{/* <div className="h-20">
|
||||
<RedButton onClick={sendCurrentPosition}>Signal emergency</RedButton>
|
||||
</div>
|
||||
</div> */}
|
||||
</div>
|
||||
}
|
||||
<EnemyTeamModal visible={enemyModalVisible} onClose={() => setEnemyModalVisible(false)} />
|
||||
|
||||
@@ -1,34 +1,36 @@
|
||||
import { useSocketListener } from "@/hook/useSocketListener";
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
export function Notification({socket }) {
|
||||
export function Notification({ socket }) {
|
||||
const [visible, setVisible] = useState(false);
|
||||
const [timeoutId, setTimeoutId] = useState(null);
|
||||
|
||||
|
||||
const [notification, setNotification] = useState(null);
|
||||
useSocketListener(socket, "error", (notification) => {
|
||||
console.log("error", notification);
|
||||
setNotification({type: "error", text: notification});
|
||||
setNotification({ type: "error", text: notification });
|
||||
setVisible(true);
|
||||
});
|
||||
useSocketListener(socket, "success", (notification) => {
|
||||
console.log("success", notification);
|
||||
setNotification({type: "success", text: notification});
|
||||
setNotification({ type: "success", text: notification });
|
||||
setVisible(true);
|
||||
});
|
||||
useSocketListener(socket, "warning", (notification) => {
|
||||
console.log("warning", notification);
|
||||
setNotification({type: "warning", text: notification});
|
||||
setNotification({ type: "warning", text: notification });
|
||||
setVisible(true);
|
||||
});
|
||||
// Hide the notification after 5 seconds
|
||||
useEffect(() => {
|
||||
console.log({visible});
|
||||
console.log({ visible });
|
||||
if (visible && notification?.text != undefined) {
|
||||
clearTimeout(timeoutId);
|
||||
setTimeoutId(setTimeout(() => {
|
||||
setVisible(false);
|
||||
}, 3000));
|
||||
if (notification?.type == "success") {
|
||||
setTimeoutId(setTimeout(() => {
|
||||
setVisible(false);
|
||||
}, 3000));
|
||||
}
|
||||
}
|
||||
}, [visible]);
|
||||
|
||||
@@ -38,11 +40,11 @@ export function Notification({socket }) {
|
||||
warning: "bg-yellow-500"
|
||||
}
|
||||
const classNames = 'fixed w-11/12 p-5 z-30 mx-auto inset-x-0 flex justify-center rounded-xl transition-all shadow-xl ' + (visible ? "top-5 " : "-translate-y-full ");
|
||||
return (
|
||||
return (
|
||||
Object.keys(bgColorMap).map((key) =>
|
||||
notification?.type == key &&
|
||||
notification?.type == key &&
|
||||
<div key={key} className={classNames + bgColorMap[key]} onClick={() => setVisible(false)}>
|
||||
<p className='text-center text-xl'>{notification?.text}</p>
|
||||
</div>
|
||||
));
|
||||
));
|
||||
}
|
||||
@@ -7,7 +7,7 @@ export default function PlacementOverlay() {
|
||||
const {logout} = useTeamConnexion();
|
||||
return (
|
||||
<>
|
||||
<Image src="/icons/logout.png" onClick={logout} className='w-12 h-12 bg-red-500 p-2 top-1 right-1 rounded-lg cursor-pointer bg-red fixed z-20' />
|
||||
<img src="/icons/logout.png" onClick={logout} className='w-12 h-12 bg-red-500 p-2 top-1 right-1 rounded-lg cursor-pointer bg-red fixed z-20' />
|
||||
<div className='fixed top-0 p-3 w-full bg-gray-300 shadow-xl rounded-b-xl flex flex-col z-10 justify-center items-center'>
|
||||
<div className='text-2xl my-3'>Placement</div>
|
||||
<div className='text-md'>{name}</div>
|
||||
|
||||
@@ -2,9 +2,11 @@ import useGame from "@/hook/useGame"
|
||||
import { GreenButton, LogoutButton } from "../util/button";
|
||||
import { useRef } from "react";
|
||||
import Image from "next/image";
|
||||
import { useTeamContext } from "@/context/teamContext";
|
||||
|
||||
export function WaitingScreen() {
|
||||
const { name, teamId } = useGame();
|
||||
const { name, teamId } = useGame();
|
||||
const { gameSettings } = useTeamContext();
|
||||
const imageRef = useRef(null);
|
||||
const SERVER_URL = "https://" + process.env.NEXT_PUBLIC_SOCKET_HOST + ":" + process.env.NEXT_PUBLIC_SOCKET_PORT;
|
||||
|
||||
@@ -33,7 +35,7 @@ export function WaitingScreen() {
|
||||
Equipe : {name}
|
||||
</div>
|
||||
<div className='text-2xl text-center'>
|
||||
Jeu en préparation, veuillez patienter...
|
||||
{gameSettings?.waitingMessage}
|
||||
</div>
|
||||
<div className='text-2xl text-center my-10'>
|
||||
<p>Uploadez une photo où tous les membres de l'équipe sont visibles</p>
|
||||
|
||||
Reference in New Issue
Block a user