Merge branch 'master' of https://codefirst.iut.uca.fr/git/Crypteam/Cryptid into errorHandle
continuous-integration/drone/push Build is passing Details

pull/91/head
Pierre Ferreira 1 year ago
commit 1193e8ee93

@ -460,6 +460,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
const tester = IndiceTesterFactory.Create(indice) const tester = IndiceTesterFactory.Create(indice)
const tabPossible: Person[] = [] const tabPossible: Person[] = []
for(const person of personNetwork.getPersons()){ for(const person of personNetwork.getPersons()){
//@ts-ignore
const node = nodes.get().find((n) => n.id == person.getId()) const node = nodes.get().find((n) => n.id == person.getId())
if (node != undefined) { if (node != undefined) {
let isSquare = false let isSquare = false
@ -584,6 +585,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
//Pour poser un carré //Pour poser un carré
const tester = IndiceTesterFactory.Create(indice) const tester = IndiceTesterFactory.Create(indice)
for(const person of personNetwork.getPersons()){ for(const person of personNetwork.getPersons()){
//@ts-ignore
const node = nodes.get().find((n) => n.id == person.getId()) const node = nodes.get().find((n) => n.id == person.getId())
if (node == undefined) continue if (node == undefined) continue
let isSquare = false let isSquare = false
@ -724,6 +726,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
if (!solo){ if (!solo){
if (askedWrongLocal){ if (askedWrongLocal){
const person = personNetwork?.getPersons().find((p) => p.getId() == params.nodes[0]) const person = personNetwork?.getPersons().find((p) => p.getId() == params.nodes[0])
//@ts-ignore
const node = nodes.get().find((n) => n.id == params.nodes[0]) const node = nodes.get().find((n) => n.id == params.nodes[0])
if (person !== undefined && indice !== null && node!=undefined){ if (person !== undefined && indice !== null && node!=undefined){
const tester = IndiceTesterFactory.Create(indice) const tester = IndiceTesterFactory.Create(indice)

@ -2,10 +2,10 @@ import React, { useEffect, useState } from 'react';
import ProfilePDP from '../Components/ProfilePDP'; import ProfilePDP from '../Components/ProfilePDP';
import SessionService from '../services/SessionService'; import SessionService from '../services/SessionService';
import AuthService from '../services/AuthService';
import { PlayerProps } from '../types/Player'; import { PlayerProps } from '../types/Player';
import { delay, update } from 'lodash'; import { delay, update } from 'lodash';
import { socket } from '../SocketConfig'; import { socket } from '../SocketConfig';
import AuthService from '../services/AuthService';
/* Style */ /* Style */
@ -14,6 +14,9 @@ import Edit from "../res/icon/edit-pen.png"
import Coche from '../res/icon/coche.png' import Coche from '../res/icon/coche.png'
import Cancel from '../res/icon/cancel.png' import Cancel from '../res/icon/cancel.png'
/* Nav */
import { useNavigate } from 'react-router-dom';
/* Model */ /* Model */
import User from '../model/User'; import User from '../model/User';
@ -25,7 +28,7 @@ import Button from 'react-bootstrap/Button';
import Alert from 'react-bootstrap/Alert'; import Alert from 'react-bootstrap/Alert';
import Modal from 'react-bootstrap/Modal'; import Modal from 'react-bootstrap/Modal';
import Form from 'react-bootstrap/Form'; import Form from 'react-bootstrap/Form';
import { useNavigate } from 'react-router-dom';
//@ts-ignore //@ts-ignore
const Profile = () => { const Profile = () => {

Loading…
Cancel
Save