From 378c8979591763c492865e9e448f1045f1ee3624 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 14 Jan 2024 22:01:50 +0100 Subject: [PATCH] kilka mniejszych bledow --- app/src/components/Hero.jsx | 59 +++++------------- .../modele/__pycache__/modele.cpython-310.pyc | Bin 6301 -> 6835 bytes 2 files changed, 15 insertions(+), 44 deletions(-) diff --git a/app/src/components/Hero.jsx b/app/src/components/Hero.jsx index a83eaf5..887cb03 100644 --- a/app/src/components/Hero.jsx +++ b/app/src/components/Hero.jsx @@ -5,7 +5,6 @@ import { Link } from "react-router-dom"; const Hero = () => { - const [isOpen, setIsOpen] = useState(false); const [gameMinute, setGameMinute] = useState(''); const [firstShot, setfirstShot] = useState(''); @@ -15,7 +14,6 @@ const Hero = () => { const [afterDribbling, SetafterDribbling] = useState(''); const [redirect, SetRedirect] = useState(''); - const toggleDropdown = () => setIsOpen(!isOpen); const handleMinuteChange = (e) => setGameMinute(e.target.value); const handleFirstShotChange = (event) => { @@ -106,9 +104,8 @@ const handleRedirectChange = (event) => { setNumberOfGoalkeppers(0) setNumberOfShooters(0) setGameMinute('') + document.getElementById("ex").innerHTML = 0; } - - //funkcja dodaje zawodnika do listy zawodnikow. zmienne x oraz y to wspolrzedne a position // to pozycja zawodnika 0 - strzelec, 1 - bramkarz, 2 - broniacy, 3 napastnik // ball - to odnosnik do punktu na boisku @@ -121,9 +118,9 @@ const handleRedirectChange = (event) => { if(possition == 1){ setNumberOfGoalkeppers(0) }else if(possition == 2){ - setNumberOfDevenders(number_of_defenders-1) ; + setNumberOfDevenders(prev => prev -1 ) ; }else if (possition == 3){ - setNumberOfStrikers(number_of_strikers-1) ; + setNumberOfStrikers(prev => prev -1 ) ; }else if(possition == 0){ setNumberOfShooters(0) } @@ -160,7 +157,6 @@ const handleRedirectChange = (event) => { var pName = "Strzelec" //kolor kropki // kolor tła kafelka - var pColor = "#fc0303" if(possition == 1){ var pName = "Bramkarz" @@ -171,8 +167,9 @@ const handleRedirectChange = (event) => { }else if (possition ==3){ var pName = "Napastnik" var pColor = "#fc6703" + }else{ + setNumberOfShooters(prev => prev +1) } - var player = document.createElement('div'); player.className = 'player'; player.style.width = "inherit" @@ -252,7 +249,7 @@ const handleRedirectChange = (event) => { //var shooterX = konwerturX(ball.style.left) //var shooterY = konwetujY(ball.style.top) posytion.innerHTML = "x:" + konwerturX(ball.style.left) + "m " + "y:" + konwetujY(ball.style.top) + "m"; - //player.setAttribute('possition',[konwerturX(ball.style.left),konwetujY(ball.style.top)]); + player.setAttribute('possition',[konwerturX(ball.style.left),konwetujY(ball.style.top)]); bojo.addEventListener("mouseup", function(){ ball.style.background = pColor bojo.removeEventListener("mousemove", whileMove) @@ -262,14 +259,6 @@ const handleRedirectChange = (event) => { }) } - - function updateXGMeter(xgValue) { - var xgMeter = document.querySelector('.xg-meter'); - var greenIntensity = xgValue * 100; // Zakładając, że xgValue jest między 0 a 1 - //xgMeter.style.background = `linear-gradient(to top, #006400 ${greenIntensity}%, #90EE90)`; -} - - // // Wyłanie zapytania do serwera function sentQuestion() { ///Dziwny Blad @@ -286,7 +275,7 @@ const handleRedirectChange = (event) => { // Przenieś tę linię do środka bloku .then(), aby uniknąć błędów let eX = data.response; document.getElementById("ex").innerHTML = eX; - updateXGMeter(eX); + //updateXGMeter(eX); } ).catch(error => { console.error('Błąd:', error); @@ -294,6 +283,7 @@ const handleRedirectChange = (event) => { } else { alert('Piłka nie jest obecnie na boisku.'); } + } @@ -320,26 +310,25 @@ const handleRedirectChange = (event) => { addPlayer(0,ball) bojo.appendChild(ball) ball.style.background = "#fc0303" - setNumberOfShooters(number_of_shooters+1) }else{alert("mozesz dodac tylko jednego strzelca")} }else if(active_bbt == "bbt2"){ if ( number_of_goalkeepers < 1){ addPlayer(1,ball) bojo.appendChild(ball) ball.style.background = "#03e7fc" - setNumberOfGoalkeppers(number_of_goalkeepers+1) + setNumberOfGoalkeppers(prev => prev +1) }else{alert("mozesz dodac tylko jednego bramkarza")} }else if(active_bbt == "bbt3"){ - if(number_of_defenders <= 10){ + if(number_of_defenders < 10){ addPlayer(2,ball); - setNumberOfDevenders(number_of_defenders+1) + setNumberOfDevenders(perv => prev +1 ) bojo.appendChild(ball) ball.style.background = "#0324fc" }else{alert("maksymalna liczba obroncow")} }else if(active_bbt == "bbt4"){ - if(number_of_strikers <= 10){ + if(number_of_strikers < 10){ addPlayer(3,ball); - setNumberOfStrikers(number_of_strikers+1); + setNumberOfStrikers(prev => prev + 1 ); bojo.appendChild(ball) ball.style.background = "#fc6703" }else{alert("maksymalna liczba napastnikow")} @@ -495,24 +484,6 @@ const handleRedirectChange = (event) => { Rykoszet - - - {/*
- -
-
- -
-
- -
-
- -
-
- -
*/} -
@@ -522,8 +493,8 @@ const handleRedirectChange = (event) => {
-
- +
+ 0
diff --git a/app/src/flask-server/modele/__pycache__/modele.cpython-310.pyc b/app/src/flask-server/modele/__pycache__/modele.cpython-310.pyc index 5f6495df539579769dec03a1e4148135fd538767..e280ac930e8f798fb7ff2d265ec9e9480a1ed49e 100644 GIT binary patch delta 2379 zcmcIlO>7%Q6y90e>-Bnf{g=dc+LH9YhPJc`MMx$la$^njWLI?>hQY8eJsN#kyR1WaHbwbkIyQ}YeGjHC! znVt9M?H9-IpE&GVmZ9LOoc+?dbwW{or_R=A7@ZNId6C^bJhY^6jYql8W8B#C#(A78 zcp;tWbnMw->Df7-8s;XquCt=SZJxNU6yrR}Q;;T4^9-cLyZGL2G;H3(vycg%<9Wy= z@8vrnQ(V2E6n5VGYMilx{D-x)UL4$$cV%16hu?5ZHTk((TiOZTqJ7$_dyeQIb;Z?^ z;ETrjYUQ$ruIm-GaaYWiYKyUR4X57!cCEB9TEU#)DN{H$o>ORqfzv?q8dDTc;cS_; zhdnl}Rurz@VLWt$wMQySOS#Ef3{d4*XvI2!)qSY+wRPKQ$JW!=ZPCZb@M^3za+`5IukaXVA!BYcoKSrH zi9KJLbls+RblRP)RVNEZJv5jF z6;1_?Wj5U>e~ulBM`_>)(NU=zmy&eo;tUamLA)*-$*bKtYUYV3@*UbCQ}MnY6G$0D-Kn&;s3?L4efCU7r2NIqk(?AAD0;!wK zZgrs%;ubcCEyxvXmwaHE%#hz$M-m~P?&x8oa!dYc4O#XUjUi9jL-LSq%9d@gZn3r59@M8}AZ6Aj4S#z8hH&lq>*eTv(w!_#Tp5_dXmbx;o=`Z+ z^t}8oz0bDQjSECl{+&K9_h;@I$u&KnR&%PDm#4bAFQb701hGj1kLO$p^H&7tU=Rrkve!y232DVM}6E(Ly z0C4P}R4+Tf%2&I;9^y330r_E3;!QuqoyxYE!o~1Iph>B5fb}qgg_&^Wv7VVRKVBn$ z7d%m|S9~MrjMm%|ikVY$X1BYl!^0osit>uw=qyRjNMC01+pgTL?8^JI=&i*;g@_*! zrFzBbRLoDI5)=+`g$BcZBv{YaW=rL&v*@#`uXT=j`??7v%D`awDu zwMMDVOU+J|{)GIayeWR9J~!J~=qyOT%wW}^Fp7EVQpf~FL$rzLn1T-xw8oYl1ci79 zbiRJ_;;hT(YR+p&C#887WGXr{aSV7vny%q6I>%x{yYbTKM!O?*W<1gz{gNKhLwGea F`XAa`0Y3l$ delta 1761 zcmZ8hO>7%Q6y8~{?X|t@UH@;Kgo-LjdafY9Ljr(-_Dojnf23jV5Udq)x>}A(uXQhb$2CIlm`1hx)h9sOII9= zIZKxp%S#t5r{da;rA60tXYI}6I=|toP7K1t;xy3XHVYjIfYP}@1i=+3*&(fImu!e7 zfr_6H>U*EGX809}t3$h_ISd#9oZx>;D>E-bZwfH8;d3Qm{|-4XG^h6h&6#~dr9OfB z`-Ht94eS#*ba3HebgQ&#+m3sB!(OeHS98<+Xa9R4YOPhRqHEEEYk?cmXj^sGZFi+o zE>>3TwKb-~=@=YNU>cH+6a&i5@^@qNkyEIjMhfy@Vg~;$GRG(4Zx1b@X&LEtq&}o9 z62_}T1N^RXEc-9$vZ0f>ArkSwBZ%T7{*UtOtoWyx)*l!dwgU5txclRVj*h~2&36<& zy(fGz{&aLa6nFhJ=mwf`z8vijB|wuwOYpa%mLXAI(N6IJUEyD9c|NKuY8cW6se^eUjq<;=$w=bJlHt?3w^H|3>XZB{{S0`z zr_b}zSa`AzR%HPiAhw~nDsa>*3Vly&#=43^r>a*JsRi~FgfTaTxg6@sB^cQ=NN14p zNaIM)@&}O<(I(*Hhu}$9O8K z@jJ2bd{4Or(W`fpC%5zNbP)%Jk)GV4yEbno2Q?gVjzjUwKAp%}{#kM;9v6>l6zdi1 z^nUUzkEXtm#Y551|1kRbcd3)lqpzG;2sf(cw#D$&-mSXpA2+`a^bKx<(UC-UosXoi z4!;3P@5~0+z6E$QvxGJHe)^UCNt_Aqo=_0C@@;WD-?OZ(RqbLPK;Z;ty=dL#$1`6~ znz(Egmr2Z|PTNPVQqM|OgW>N14rX$Mq)C`agw=S;sJv8&RMFp}%gXgqA?zu0Roisi zl2x^8y{@X@;YW0ZrGRc^qNB4a|H1h5Rt1cQ5ulvE?Pq4aWOd5oHkg=$-I@O%3d z0yVQ(w%%-$av{(OZ|{B#=Kln6@WGHs5KJB)wU97e3@_^W?>doJRRb{4me1F0x>>be!1vTa alOo8(P#_%e`D9tXBrnT;==tP;68s-{=6ntS