Skip to content

Commit b249de9

Browse files
MevanessaMevanessa
committed
cala changes
1 parent f946e2f commit b249de9

File tree

11 files changed

+743
-89
lines changed

11 files changed

+743
-89
lines changed

‎.env‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
2-
CONTAINER_NAME=cala-practice-day
3-
1+
CONTAINER_NAME=cala-quals

‎client/.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VITE_SCOUT_VERSION=PORT_HUENEME
1+
VITE_SCOUT_VERSION=LOS_ANGELES

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

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ function MatchApp() {
398398
</button>
399399
</div>
400400

401-
<div>
401+
<div className='relative'>
402402
<h2 className='mb-5 mt-12 text-center text-5xl font-semibold text-green-600'>
403403
Autonomous
404404
</h2>
@@ -407,90 +407,96 @@ function MatchApp() {
407407
{ <CheckBoxMatch
408408
checked={ground1}
409409
onChange={setGround1}
410-
className={`${blueAlliance ? 'top-[660px] left-[285px]' :'top-[670px] left-[440px] ' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
410+
className={`${blueAlliance ? 'top-[255px] left-[155px]' :'top-[265px] left-[335px] ' } 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-[440px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
417+
className={`${blueAlliance ? 'top-[335px] left-[155px]' :'top-[365px] left-[340px]' } 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-[440px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
423+
className={`${blueAlliance ? 'top-[415px] left-[155px]' :'top-[435px] left-[340px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
424424
</CheckBoxMatch>
425425
{/* ground 3 */}
426426
<CheckBoxMatch
427427
checked={source1}
428428
onChange={setSource1}
429-
className={`${blueAlliance? 'top-[570px] left-[250px]' :'top-[585px] left-[485px] ' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
429+
className={`${blueAlliance? 'top-[150px] left-[130px]' :'top-[175px] left-[345px] ' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
430430
</CheckBoxMatch>
431431
{/* source 1 */}
432432
<CheckBoxMatch
433433
checked={source2}
434434
onChange={setSource2}
435-
className={`${blueAlliance? 'top-[910px] left-[250px]' :'top-[930px] left-[485px] ' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
435+
className={`${blueAlliance? 'top-[510px] left-[130px]' :'top-[510px] left-[345px] ' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
436436
</CheckBoxMatch>
437437
{/* source 2 */}
438438
<CheckBoxMatch
439439
checked={start1}
440440
onChange={setStart1}
441-
className={`${blueAlliance? 'top-[645px] left-[565px] ' :'top-[660px] left-[160px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
441+
className={`${blueAlliance? 'top-[230px] left-[440px] ' :'top-[230px] left-[35px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
442442
</CheckBoxMatch>
443443
{/* starting location 1 */}
444444
<CheckBoxMatch
445445
checked={start2}
446446
onChange={setStart2}
447-
className={`${blueAlliance? 'top-[740px] left-[565px]' :'top-[760px] left-[160px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
447+
className={`${blueAlliance? 'top-[330px] left-[440px]' :'top-[330px] left-[35px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
448448
</CheckBoxMatch>
449449
{/* starting location 2 */}
450450
<CheckBoxMatch
451451
checked={start3}
452452
onChange={setStart3}
453-
className={`${blueAlliance? 'top-[835px] left-[565px]' :'top-[858px] left-[160px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
453+
className={`${blueAlliance? 'top-[430px] left-[440px]' :'top-[430px] left-[35px]' } absolute z-20 h-10 w-10 overflow-hidden rounded-full text-left`}>
454454
</CheckBoxMatch>
455455
{/* starting location 3 */}
456456

457-
457+
458458

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-[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]`}>
462+
className={`absolute ${blueAlliance? 'left-[19.5em] top-[19em]':'left-[12em] top-[20em]'} h-[1em] w-[4.5em] rotate-[30deg]`}
463+
selectClassName='bg-green-300'
464+
unselectClassName='bg-red-300'>
464465
</CoralSectionButton>
465466
<CoralSectionButton
466467
onChange={setDeposit2}
467468
value={deposit2}
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`}>
469+
className={`absolute ${blueAlliance? 'left-[21em] top-[21.5em]':'left-[13.5em] top-[23em]'} h-[1em] w-[4.5em] rotate-[90deg]`}
470+
selectClassName='bg-green-300'
471+
unselectClassName='bg-red-300'>
470472
</CoralSectionButton>
471473
<CoralSectionButton
472474
onChange={setDeposit3}
473475
value={deposit3}
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]`}>
476+
className={`absolute ${blueAlliance? 'left-[19.5em] top-[24.5em]':'left-[12em] top-[26em]'} h-[1em] w-[4.5em] rotate-[-30deg]`}
477+
selectClassName='bg-green-300'
478+
unselectClassName='bg-red-300' >
476479
</CoralSectionButton>
477480
<CoralSectionButton
478481
onChange={setDeposit4}
479482
value={deposit4}
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]`}>
483+
className={`absolute ${blueAlliance? 'left-[16em] top-[24.5em]':'left-[8.5em] top-[26em]'} h-[1em] w-[4.5em] rotate-[30deg]`}
484+
selectClassName='bg-green-300'
485+
unselectClassName='bg-red-300'>
482486
</CoralSectionButton>
483487
<CoralSectionButton
484488
onChange={setDeposit5}
485489
value={deposit5}
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`}>
490+
className={`absolute ${blueAlliance? 'left-[14.5em] top-[21.5em]':'left-[6.9em] top-[22.9em]'} h-[1em] w-[4.5em] rotate-[90deg]`}
491+
selectClassName='bg-green-300'
492+
unselectClassName='bg-red-300'>
488493
</CoralSectionButton>
489494
<CoralSectionButton
490495
onChange={setDeposit6}
491496
value={deposit6}
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]`}>
497+
className={`absolute ${blueAlliance? 'left-[16em] top-[19em]':'left-[8.5em] top-[20em]'} h-[1em] w-[4.5em] rotate-[-30deg]`}
498+
selectClassName='bg-green-300'
499+
unselectClassName='bg-red-300'>
494500
</CoralSectionButton>
495501

496502
<p

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
function CoralSectionButton({
44
selectClassName,
55
unselectClassName,
6+
className,
67
onChange,
78
value,
89
}: {
910
selectClassName: string;
1011
unselectClassName: string;
12+
className: string;
1113
onChange: (newValue: boolean) => void;
1214
value: boolean
1315
}) {
@@ -20,7 +22,7 @@ function CoralSectionButton({
2022
return(
2123
<button
2224
onClick={handleSelect}
23-
className={`${value? selectClassName : unselectClassName}`}
25+
className={`${className} ${value? selectClassName : unselectClassName}`}
2426
/>
2527
);
2628
}

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

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,38 +64,44 @@ const FieldAutoButton = () => {
6464
<CoralSectionButton
6565
onChange={setDeposit1}
6666
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]`}>
67+
className={`absolute ${blueAlliance? 'left-[19.5em] top-[19em]':'left-[12em] top-[20em]'} h-[1em] w-[4.5em] rotate-[30deg]`}
68+
selectClassName='bg-green-300'
69+
unselectClassName='bg-red-300'>
6970
</CoralSectionButton>
7071
<CoralSectionButton
7172
onChange={setDeposit2}
7273
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`}>
74+
className={`absolute ${blueAlliance? 'left-[21em] top-[21.5em]':'left-[13.5em] top-[23em]'} h-[1em] w-[4.5em] rotate-[90deg]`}
75+
selectClassName='bg-green-300'
76+
unselectClassName='bg-red-300'>
7577
</CoralSectionButton>
7678
<CoralSectionButton
7779
onChange={setDeposit3}
7880
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+
className={`absolute ${blueAlliance? 'left-[19.5em] top-[24.5em]':'left-[12em] top-[26em]'} h-[1em] w-[4.5em] rotate-[-30deg]`}
82+
selectClassName='bg-green-300'
83+
unselectClassName='bg-red-300' >
8184
</CoralSectionButton>
8285
<CoralSectionButton
8386
onChange={setDeposit4}
8487
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]`}>
88+
className={`absolute ${blueAlliance? 'left-[16em] top-[24.5em]':'left-[8.5em] top-[26em]'} h-[1em] w-[4.5em] rotate-[30deg]`}
89+
selectClassName='bg-green-300'
90+
unselectClassName='bg-red-300'>
8791
</CoralSectionButton>
8892
<CoralSectionButton
8993
onChange={setDeposit5}
9094
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`}>
95+
className={`absolute ${blueAlliance? 'left-[14.5em] top-[21.5em]':'left-[6.9em] top-[22.9em]'} h-[1em] w-[4.5em] rotate-[90deg]`}
96+
selectClassName='bg-green-300'
97+
unselectClassName='bg-red-300'>
9398
</CoralSectionButton>
9499
<CoralSectionButton
95100
onChange={setDeposit6}
96101
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]`}>
102+
className={`absolute ${blueAlliance? 'left-[16em] top-[19em]':'left-[8.5em] top-[20em]'} h-[1em] w-[4.5em] rotate-[-30deg]`}
103+
selectClassName='bg-green-300'
104+
unselectClassName='bg-red-300'>
99105
</CoralSectionButton>
100106
</>
101107
);

‎client/src/apps/score_calculator/ScoreCalculator.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function ScoreCalculator() {
6060
AlgaePoints +
6161
cagePoints ;
6262
const autoCoralTotal = autoCoral1 * 3 + autoCoral2 * 4 + autoCoral3 * 6 + autoCoral4 * 7;
63-
const teleCoralTotal = teleCoral1 * 2 + teleCoral2 * 3 + teleCoral3 * 4 + teleCoral4 * 5;
63+
const teleCoralTotal = (teleCoral1 - autoCoral1 )* 2 + (teleCoral2 - autoCoral2) * 3 + (teleCoral3 - autoCoral3) * 4 + (teleCoral4 - autoCoral4) * 5;
6464
const teleopPoints = teleCoralTotal + cagePoints + teleAlgaeNet * 4 + teleAlgaeProcessor * 6;
6565

6666
const handleReset = () => {

0 commit comments

Comments
 (0)