Skip to content

Commit baa21e6

Browse files
MevanessaMevanessa
authored
Merge pull request #38 from 4201VitruvianBots/matchbuttonadjust
match button work pls
2 parents 8632177 + 9799cc1 commit baa21e6

File tree

4 files changed

+133
-20
lines changed

4 files changed

+133
-20
lines changed

‎client/src/apps/match/MatchApp.tsx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -407,20 +407,20 @@ function MatchApp() {
407407
{ <CheckBoxMatch
408408
checked={ground1}
409409
onChange={setGround1}
410-
className={`${blueAlliance ? 'top-[660px] left-[285px]' :'top-[675px] left-[455px] ' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
410+
className={`${blueAlliance ? 'top-[660px] left-[285px]' :'top-[670px] left-[440px] ' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
411411
</CheckBoxMatch>
412412
// ground 1
413413
}
414414
<CheckBoxMatch
415415
checked={ground2}
416416
onChange={setGround2}
417-
className={`${blueAlliance ? 'top-[740px] left-[285px]' :'top-[760px] left-[455px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
417+
className={`${blueAlliance ? 'top-[740px] left-[285px]' :'top-[760px] left-[440px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
418418
</CheckBoxMatch>
419419
{/* ground 2 */}
420420
<CheckBoxMatch
421421
checked={ground3}
422422
onChange={setGround3}
423-
className={`${blueAlliance ? 'top-[820px] left-[285px]' :'top-[840px] left-[455px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
423+
className={`${blueAlliance ? 'top-[820px] left-[285px]' :'top-[840px] left-[440px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
424424
</CheckBoxMatch>
425425
{/* ground 3 */}
426426
<CheckBoxMatch
@@ -459,38 +459,38 @@ function MatchApp() {
459459
<CoralSectionButton
460460
onChange={setDeposit1}
461461
value={deposit1}
462-
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[27.45em] top-[44.3em]':'bg-green-300 absolute left-[20.15em] top-[45.3em]'} h-[1em] w-[4.5em] rotate-[6.83rad]`}
463-
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[27.45em] top-[44.3em]':'bg-red-300 absolute left-[20.15em] top-[45.3em]'} h-[1em] w-[4.5em] rotate-[6.83rad]`}>
462+
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[27.45em] top-[44.3em]':'bg-green-300 absolute left-[18.5em] top-[45.3em]'} h-[1em] w-[4.5em] rotate-[6.83rad]`}
463+
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[27.45em] top-[44.3em]':'bg-red-300 absolute left-[18.5em] top-[45.3em]'} h-[1em] w-[4.5em] rotate-[6.83rad]`}>
464464
</CoralSectionButton>
465465
<CoralSectionButton
466466
onChange={setDeposit2}
467467
value={deposit2}
468-
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[29.4em] top-[47.1em]':'bg-green-300 absolute left-[22em] top-[48.4em]'} h-[1em] w-[4em] rotate-90`}
469-
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[29.4em] top-[47.1em]':'bg-red-300 absolute left-[22em] top-[48.4em]'} h-[1em] w-[4em] rotate-90`}>
468+
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[29.4em] top-[47.1em]':'bg-green-300 absolute left-[20.2em] top-[48.4em]'} h-[1em] w-[4em] rotate-90`}
469+
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[29.4em] top-[47.1em]':'bg-red-300 absolute left-[20.2em] top-[48.4em]'} h-[1em] w-[4em] rotate-90`}>
470470
</CoralSectionButton>
471471
<CoralSectionButton
472472
onChange={setDeposit3}
473473
value={deposit3}
474-
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[27.6em] top-[49.9em]':'bg-green-300 absolute left-[20.2em] top-[51.1em]'} h-[1em] w-[4em] rotate-[2.6rad]`}
475-
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[27.6em] top-[49.9em]':'bg-red-300 absolute left-[20.2em] top-[51.1em]'} h-[1em] w-[4em] rotate-[2.6rad]`}>
474+
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[27.6em] top-[49.9em]':'bg-green-300 absolute left-[18.5em] top-[51.1em]'} h-[1em] w-[4em] rotate-[2.6rad]`}
475+
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[27.6em] top-[49.9em]':'bg-red-300 absolute left-[18.5em] top-[51.1em]'} h-[1em] w-[4em] rotate-[2.6rad]`}>
476476
</CoralSectionButton>
477477
<CoralSectionButton
478478
onChange={setDeposit4}
479479
value={deposit4}
480-
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[24.35em] top-[49.9em]':'bg-green-300 absolute left-[16.95em] top-[51em]'} h-[1em] w-[4em] rotate-[6.83rad]`}
481-
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[24.35em] top-[49.9em]':'bg-red-300 absolute left-[16.95em] top-[51em]'} h-[1em] w-[4em] rotate-[6.83rad]`}>
480+
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[24.35em] top-[49.9em]':'bg-green-300 absolute left-[15.2em] top-[51em]'} h-[1em] w-[4em] rotate-[6.83rad]`}
481+
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[24.35em] top-[49.9em]':'bg-red-300 absolute left-[15.2em] top-[51em]'} h-[1em] w-[4em] rotate-[6.83rad]`}>
482482
</CoralSectionButton>
483483
<CoralSectionButton
484484
onChange={setDeposit5}
485485
value={deposit5}
486-
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[22.85em] top-[47.3em]':'bg-green-300 absolute left-[15.4em] top-[48.05em]'} h-[1em] w-[4em] rotate-90`}
487-
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[22.85em] top-[47.3em]':'bg-red-300 absolute left-[15.4em] top-[48.05em]'} h-[1em] w-[4em] rotate-90`}>
486+
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[22.85em] top-[47.3em]':'bg-green-300 absolute left-[13.75em] top-[48.05em]'} h-[1em] w-[4em] rotate-90`}
487+
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[22.85em] top-[47.3em]':'bg-red-300 absolute left-[13.75em] top-[48.05em]'} h-[1em] w-[4em] rotate-90`}>
488488
</CoralSectionButton>
489489
<CoralSectionButton
490490
onChange={setDeposit6}
491491
value={deposit6}
492-
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[24.3em] top-[44.4em]':'bg-green-300 absolute left-[17em] top-[45.3em]'} h-[1em] w-[4em] rotate-[2.6rad]`}
493-
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[24.3em] top-[44.4em]':'bg-red-300 absolute left-[17em] top-[45.3em]'} h-[1em] w-[4em] rotate-[2.6rad]`}>
492+
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[24.3em] top-[44.4em]':'bg-green-300 absolute left-[15.4em] top-[45.3em]'} h-[1em] w-[4em] rotate-[2.6rad]`}
493+
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[24.3em] top-[44.4em]':'bg-red-300 absolute left-[15.4em] top-[45.3em]'} h-[1em] w-[4em] rotate-[2.6rad]`}>
494494
</CoralSectionButton>
495495

496496
<p

‎client/src/apps/match/components/FieldAutoButton.tsx‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
import { useState } from "react";
2+
import { RobotPosition } from "requests";
3+
import CheckBoxMatch from './CheckBoxButton';
4+
import CoralSectionButton from "./CoralSectionButton";
5+
import bluesidematch from 'path/to/bluesidematch.png';
6+
import redsidematch from 'path/to/redsidematch.png';
7+
8+
const FieldAutoButton = () => {
9+
const [robotPosition] = useState<RobotPosition>();
10+
const [ground1, setGround1] = useState(false);
11+
const [ground2, setGround2] = useState(false);
12+
const [ground3, setGround3] = useState(false);
13+
const [source1, setSource1] = useState(false);
14+
const [source2, setSource2] = useState(false);
15+
const [start1, setStart1] = useState(false);
16+
const [start2, setStart2] = useState(false);
17+
const [start3, setStart3] = useState(false);
18+
const [deposit1, setDeposit1] = useState(false);
19+
const [deposit2, setDeposit2] = useState(false);
20+
const [deposit3, setDeposit3] = useState(false);
21+
const [deposit4, setDeposit4] = useState(false);
22+
const [deposit5, setDeposit5] = useState(false);
23+
const [deposit6, setDeposit6] = useState(false);
24+
const blueAlliance = (
25+
['blue_1', 'blue_2', 'blue_3'] as (string | undefined)[]
26+
).includes(robotPosition);
27+
28+
return (
29+
<>
30+
<img src={`${blueAlliance ? bluesidematch : redsidematch}`} width={500} height={600} className="justify-self-center my-7" />
31+
<CheckBoxMatch
32+
checked={ground1}
33+
onChange={setGround1}
34+
className={`${blueAlliance ? 'top-[660px] left-[285px]' : 'top-[675px] left-[455px]'} absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
35+
</CheckBoxMatch>
36+
<CheckBoxMatch
37+
checked={ground2}
38+
onChange={setGround2}
39+
className={`${blueAlliance ? 'top-[740px] left-[285px]' :'top-[760px] left-[455px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`} />
40+
<CheckBoxMatch
41+
checked={ground3}
42+
onChange={setGround3}
43+
className={`${blueAlliance ? 'top-[820px] left-[285px]' :'top-[840px] left-[455px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`} />
44+
<CheckBoxMatch
45+
checked={source1}
46+
onChange={setSource1}
47+
className={`${blueAlliance? 'top-[570px] left-[250px]' :'top-[585px] left-[485px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`} />
48+
<CheckBoxMatch
49+
checked={source2}
50+
onChange={setSource2}
51+
className={`${blueAlliance? 'top-[910px] left-[250px]' :'top-[930px] left-[485px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`} />
52+
<CheckBoxMatch
53+
checked={start1}
54+
onChange={setStart1}
55+
className={`${blueAlliance? 'top-[645px] left-[565px]' :'top-[660px] left-[160px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`} />
56+
<CheckBoxMatch
57+
checked={start2}
58+
onChange={setStart2}
59+
className={`${blueAlliance? 'top-[740px] left-[565px]' :'top-[760px] left-[160px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`} />
60+
<CheckBoxMatch
61+
checked={start3}
62+
onChange={setStart3}
63+
className={`${blueAlliance? 'top-[835px] left-[565px]' :'top-[858px] left-[160px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`} />
64+
<CoralSectionButton
65+
onChange={setDeposit1}
66+
value={deposit1}
67+
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[27.45em] top-[44.3em]':'bg-green-300 absolute left-[20.15em] top-[45.3em]'} h-[1em] w-[4.5em] rotate-[6.83rad]`}
68+
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[27.45em] top-[44.3em]':'bg-red-300 absolute left-[20.15em] top-[45.3em]'} h-[1em] w-[4.5em] rotate-[6.83rad]`}>
69+
</CoralSectionButton>
70+
<CoralSectionButton
71+
onChange={setDeposit2}
72+
value={deposit2}
73+
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[29.4em] top-[47.1em]':'bg-green-300 absolute left-[22em] top-[48.4em]'} h-[1em] w-[4em] rotate-90`}
74+
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[29.4em] top-[47.1em]':'bg-red-300 absolute left-[22em] top-[48.4em]'} h-[1em] w-[4em] rotate-90`}>
75+
</CoralSectionButton>
76+
<CoralSectionButton
77+
onChange={setDeposit3}
78+
value={deposit3}
79+
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[27.6em] top-[49.9em]':'bg-green-300 absolute left-[20.2em] top-[51.1em]'} h-[1em] w-[4em] rotate-[2.6rad]`}
80+
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[27.6em] top-[49.9em]':'bg-red-300 absolute left-[20.2em] top-[51.1em]'} h-[1em] w-[4em] rotate-[2.6rad]`}>
81+
</CoralSectionButton>
82+
<CoralSectionButton
83+
onChange={setDeposit4}
84+
value={deposit4}
85+
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[24.35em] top-[49.9em]':'bg-green-300 absolute left-[16.95em] top-[51em]'} h-[1em] w-[4em] rotate-[6.83rad]`}
86+
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[24.35em] top-[49.9em]':'bg-red-300 absolute left-[16.95em] top-[51em]'} h-[1em] w-[4em] rotate-[6.83rad]`}>
87+
</CoralSectionButton>
88+
<CoralSectionButton
89+
onChange={setDeposit5}
90+
value={deposit5}
91+
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[22.85em] top-[47.3em]':'bg-green-300 absolute left-[15.4em] top-[48.05em]'} h-[1em] w-[4em] rotate-90`}
92+
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[22.85em] top-[47.3em]':'bg-red-300 absolute left-[15.4em] top-[48.05em]'} h-[1em] w-[4em] rotate-90`}>
93+
</CoralSectionButton>
94+
<CoralSectionButton
95+
onChange={setDeposit6}
96+
value={deposit6}
97+
selectClassName={`${blueAlliance? 'bg-green-300 absolute left-[24.3em] top-[44.4em]':'bg-green-300 absolute left-[17em] top-[45.3em]'} h-[1em] w-[4em] rotate-[2.6rad]`}
98+
unselectClassName={`${blueAlliance? 'bg-red-300 absolute left-[24.3em] top-[44.4em]':'bg-red-300 absolute left-[17em] top-[45.3em]'} h-[1em] w-[4em] rotate-[2.6rad]`}>
99+
</CoralSectionButton>
100+
</>
101+
);
102+
};
103+
104+
export default FieldAutoButton;

‎client/src/apps/super/SuperApp.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ function SuperApp() {
311311
<button
312312
onClick={() => {
313313
handleSubmit();
314-
scrollTo(0, 0);
314+
315315
}}
316316
className='m-5 w-full max-w-80 rounded-md bg-[#48c55c] px-4 py-2 text-lg'>
317317
Submit

‎server/src/server.ts‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,19 @@ app.post('/data/pit', async (req, res) => {
6161
const body = req.body as PitFile;
6262

6363
try {
64-
const PitApp = new pitApp({
65-
...body,
66-
photo: Buffer.from(dataUriToBuffer(body.photo).buffer),
67-
});
64+
let PitApp;
65+
if (body.photo == '') {
66+
PitApp = new pitApp({
67+
...body,
68+
photo: Buffer.from([]),
69+
});
70+
} else {
71+
PitApp = new pitApp({
72+
...body,
73+
photo: Buffer.from(dataUriToBuffer(body.photo).buffer),
74+
});
75+
}
76+
6877
// const aPitApp =
6978

7079
await PitApp.save();

0 commit comments

Comments
 (0)