4201VitruvianBots · Mevanessa · Mar 13, 2025 · Mar 2, 2025 · Mar 5, 2025 · Mar 5, 2025
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/bin
+**/charts
+**/docker-compose*
+**/compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
diff --git a/.env b/.env
@@ -1,2 +1,2 @@
 IMAGE_NAME=scouting-database
-CONTAINER_NAME=season-test
+CONTAINER_NAME=port-quals_1
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules/
 dist/
+venv/
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,4 @@
+FROM docker/whalesay:latest
+LABEL Name=scoutingapp2025 Version=0.0.1
+RUN apt-get -y update && apt-get install -y fortunes
+CMD ["sh", "-c", "/usr/games/fortune -a | cowsay"]
diff --git a/client/.env b/client/.env
@@ -1 +1 @@
-VITE_SCOUT_VERSION=2025
+VITE_SCOUT_VERSION=PORT_HUENEME
diff --git a/client/src/apps/pit/PitApp.tsx b/client/src/apps/pit/PitApp.tsx
@@ -71,6 +71,17 @@ function PitApp() {
                     <h1 className='mb-4 text-center text-3xl font-bold text-[#48c55c]'>
                         Pit App
                     </h1>
+
+                  <h1 className='text-center text-3x1 text-white'>Pit Scouting Guide!</h1>
+                  <p className='text-center text-md text-white'>1. Introduce yourself to the team! <br/> 
+                  Ex: "Hi I'm {scouterName} and I'm from Team 4201. <br/> 
+                  What are you guys working on?" <br/>
+                  2. Be curious! Engage with the members and <br/>
+                  don't treat them as if you're just surveying them. <br/>
+                  3. Compliment their robot and be friendly. <br/> 
+                  Ease into questions about the robot. <br/>
+                  4. Be confident and uphold Gracious Professionalism.<br/>
+                  Good luck!!</p>
                 </div>
 
                 <div className='fixed left-4 top-4 z-20  flex flex-col gap-2 rounded-md bg-slate-200 p-2'>
@@ -110,23 +121,21 @@ function PitApp() {
                     <ConeStacker />
                 </div>
 
-                <div className='mb-2 flex items-center justify-center'>
+                <div className='mb-6 flex items-center justify-center'>
                     <div className='flex h-72 w-2/4 flex-col items-center justify-center rounded-lg border-4 border-[#2f3646] bg-[#2f3646]'>
-                        <h1 className='text-center text-white'>Team Number</h1>
+                        <h1 className='text-center text-white text-3xl font-bold'>Team Number</h1>
                         <TeamDropdown
                             onChange={setTeamNumber}
                             value={teamNumber}
                             disabledOptions={scoutedTeams}
                         />
                     </div>
                 </div>
+
 
-
-
-
-                <div className='mb-8 flex items-center justify-center'>
+                <div className='mb-6 flex items-center justify-center'>
                     <div className='flex h-72 w-2/4 flex-col items-center justify-center rounded-lg border-4 border-[#2f3646] bg-[#2f3646] '>
-                        <h1 className='text-center text-white'>
+                        <h1 className='text-center text-white text-3xl'>
                             Number of Batteries?
                         </h1>
                         <input
@@ -141,6 +150,31 @@ function PitApp() {
                             placeholder='0'></input>
                     </div>
                 </div>
+                <div className='mb-8 flex items-center justify-center'>  
+
+                    <div className='grid h-72 w-2/4 grid-cols-4 items-center justify-center rounded-lg border-4 border-[#2f3646] bg-[#2f3646] text-3xl'>
+                    <div className='col-span-4'>
+                    <h1 className='text-center text-4xl text-white font-bold'>
+                            Intake
+                        </h1>
+                    </div>
+
+                    <div className='col-span-2 place-items-center justify-center'>
+                        <h1 className='text-left text-white mr-2 '>
+                            Hopper
+                        </h1>
+                        <input type='checkbox' className='form-checkbox h-12 w-12 text-blue-600'/>
+                    </div>
+                    <div className='col-span-2 place-items-center justify-center'>
+                        <h1 className= 'text-left text-white'>
+                            Funnel/Coral Intakes
+                        </h1>
+                        <input type='checkbox' className='form-checkbox h-12 w-12 text-blue-600'/>
+                    </div>
+
+                    </div>
+
+                </div>
 
                 <h1 className='my-2 text-center text-white '>Robot Image</h1>
                 <ImageUploader value={robotImage} onChange={setRobotImage} />

diff --git a/client/src/apps/score_calculator/ScoreCalculator.tsx b/client/src/apps/score_calculator/ScoreCalculator.tsx
@@ -47,7 +47,7 @@ function ScoreCalculator() {
     const [Deep, setDeep] = useState(0);
     const [Shallow, setShallow] = useState(0);
 
-    const autoPoints = autoLeave * 3 ;
+    const autoPoints = autoLeave * 3 + autoCoral1 * 3 + autoCoral2 * 4 + autoCoral3 * 6 + autoCoral4 * 7 + autoAlgaeProcessor * 6 + autoAlgaeNet *4;
     const CoralPoints =
         autoCoral1 * 3 + autoCoral2 * 4 + autoCoral3 * 6 + autoCoral4 * 7 + teleCoral1 * 2 + teleCoral2 * 3 + teleCoral3 * 4 + teleCoral4 * 5;
     const AlgaePoints = 
@@ -59,6 +59,9 @@ function ScoreCalculator() {
         CoralPoints + 
         AlgaePoints +
         cagePoints ;
+    const autoCoralTotal = autoCoral1 * 3 + autoCoral2 * 4 + autoCoral3 * 6 + autoCoral4 * 7;
+    const teleCoralTotal = teleCoral1 * 2 + teleCoral2 * 3 + teleCoral3 * 4 + teleCoral4 * 5;
+    const teleopPoints = teleCoralTotal + cagePoints + teleAlgaeNet * 4 + teleAlgaeProcessor * 6;
 
     const handleReset = () => {
         setAutoLeave(0);
@@ -186,36 +189,39 @@ function ScoreCalculator() {
 
                     </div>
                 </div>
+
+                <div className='grid grid-cols-12 justify-center py-2 bg-gray-800 text-black-100 text-xl'>
+                <p className='col-span-3 border-green-800 border-4 bg-green-400 px-3 py-2 text-center'>Auto Leave</p>
+                    <p className='col-span-9 border-green-800 border-4 bg-green-300 px-3 py-2 text-center'>Points: {autoLeave*3}</p>
+                <p className='col-span-3 border-green-800 border-4 bg-green-500 px-3 py-2 text-center'>Auto Coral</p>
+                    <p className='col-span-1 border-green-800 border-4 bg-green-400 px-3 py-2'>L1: {autoCoral1}</p>
+                    <p className='col-span-1 border-green-800 border-4 bg-green-400 px-3 py-2'>L2: {autoCoral2}</p>
+                    <p className='col-span-1 border-green-800 border-4 bg-green-400 px-3 py-2'>L3: {autoCoral3}</p>
+                    <p className='col-span-1 border-green-800 border-4 bg-green-400 px-3 py-2'>L4: {autoCoral4}</p>
+                    <p className='col-span-5 border-green-800 border-4 bg-green-400 px-3 py-2 text-center'>Points: {autoCoralTotal}</p>
+                <p className='col-span-3 border-green-900 border-4 bg-green-400 px-3 py-2 text-center font-bold'>Total Auto</p>
+                    <p className='col-span-9 border-green-900 border-4 bg-green-300 px-3 py-2 text-center font-bold'>Points: {autoPoints}</p>
+                    <p className='col-span-3 border-green-800 border-4 bg-green-500 px-3 py-2 text-center'>Teleop Coral</p>
+                    <p className='col-span-1 border-green-800 border-4 bg-green-400 px-3 py-2'>L1: {teleCoral1+autoCoral1}</p>
+                    <p className='col-span-1 border-green-800 border-4 bg-green-400 px-3 py-2'>L2: {teleCoral2+autoCoral2}</p>
+                    <p className='col-span-1 border-green-800 border-4 bg-green-400 px-3 py-2'>L3: {teleCoral3+autoCoral3}</p>
+                    <p className='col-span-1 border-green-800 border-4 bg-green-400 px-3 py-2'>L4: {teleCoral4+autoCoral4}</p>
+                    <p className='col-span-5 border-green-800 border-4 bg-green-400 px-3 py-2 text-center'>Points: {teleCoralTotal}</p>
+                <p className='col-span-3 border-green-800 border-4 bg-green-400 px-3 py-2 text-center'>Algae</p>
+                    <p className='col-span-2 border-green-800 border-4 bg-green-300 px-3 py-2'>Net: {teleAlgaeNet+autoAlgaeNet}</p>
+                    <p className='col-span-2 border-green-800 border-4 bg-green-300 px-3 py-2'>Processor: {teleAlgaeProcessor+autoAlgaeProcessor}</p>
+                    <p className='col-span-5 border-green-800 border-4 bg-green-300 px-3 py-2 text-center'>Points: {AlgaePoints}</p>
+                <p className='col-span-3 border-green-800 border-4 bg-green-500 px-3 py-2 text-center'>Barge</p>
+                <div className='col-span-4 flex'>
+                    <p className='border-green-800 border-4 bg-green-400 px-3 py-2 w-80'>Park: {park}</p>
+                    <p className='border-green-800 border-4 bg-green-400 px-3 py-2 w-80'>Deep: {Deep}</p>
+                    <p className='border-green-800 border-4 bg-green-400 px-3 py-2 w-80'>Shallow: {Shallow}</p>
+                </div>
+                    <p className='col-span-5 border-green-800 border-4 bg-green-400 px-3 py-2 text-center'>Points: {cagePoints}</p>
+                <p className='col-span-3 border-green-900 border-4 bg-green-400 px-3 py-2 text-center font-bold'>Total Teleop</p>
+                    <p className='col-span-9 border-green-900 border-4 bg-green-300 px-3 py-2 text-center font-bold'>Points: {teleopPoints}</p>
 
-                <div className='col-span-2 grid grid-cols-2 justify-center gap-2 py-2 bg-gray-800'>
-                    <p className='text-black-100 text-md rounded-md border-green-800 bg-green-400 px-3 py-2 text-center'>
-                        Leave:{' '}
-                        <span className='rounded-lg bg-black/15 p-2 py-1'>
-                            {autoPoints}
-                        </span>
-                    </p>
-
-                    <p
-                        className={` text-black-100 text-md rounded-md border-green-800 bg-green-400 px-3 py-2 text-center`}>
-                        Coral:{' '}
-                        <span className='rounded-lg bg-black/15 p-2 py-1'>
-                            {CoralPoints}
-                        </span>
-                    </p>
-
-                    <p className='text-black-100 text-md rounded-md border-green-800 bg-green-400 px-3 py-2 text-center'>
-                        Algae:{' '}
-                        <span className='rounded-lg bg-black/15 p-2 py-1'>
-                            {AlgaePoints}
-                        </span>
-                    </p>
-
-                    <p className='text-black-100 text-md rounded-md border-green-800 bg-green-400 px-3 py-2 text-center'>
-                        Barge:{' '}
-                        <span className='rounded-lg bg-black/15 p-2 py-2'>
-                            {cagePoints}
-                        </span>
-                    </p>
+
                 </div>
                 <p className='text-black-100 text-md rounded-md border-green-800 bg-green-400/70 px-3 py-2 text-center font-black'>
                         Total:{' '}

diff --git a/client/src/apps/super/SuperApp.tsx b/client/src/apps/super/SuperApp.tsx
@@ -210,14 +210,14 @@ function SuperApp() {
             </h1>
 
             <div className='fixed left-4 top-4 z-20 flex flex-row gap-3 rounded-md bg-slate-200 p-1'>
-                <LinkButton link='/' className='snap-none'>
+                <LinkButton link='/'>
                     <MaterialSymbol
                         icon='home'
                         size={60}
                         fill
                         grade={200}
                         color='green'
-                        className='snap-none'
+
                     />
                 </LinkButton>
 
@@ -234,7 +234,7 @@ function SuperApp() {
                                     scouterName && superPosition
                                         ? 'text-green-400'
                                         : 'text-gray-400'
-                                } snap-none`}
+                                }`}
                             />
                         </button>
                     )}>
@@ -252,14 +252,14 @@ function SuperApp() {
 
                 <button
                     onClick={undoHistoryCount}
-                    className='z-10 aspect-square snap-none rounded bg-[#f07800]  p-1  font-bold text-black '>
+                    className='z-10 aspect-square rounded bg-[#f07800]  p-1  font-bold text-black '>
                     <MaterialSymbol
                         icon='undo'
                         size={60}
                         fill
                         grade={200}
                         color='black'
-                        className='snap-none'
+
                     />
                 </button>
             </div>

diff --git a/client/src/apps/super/components/CannedComments.tsx b/client/src/apps/super/components/CannedComments.tsx
@@ -22,6 +22,8 @@ const commentOptions: SelectOption<CommentValues>[] = [
     { label: 'good driving', value: 'good_driving', color: '#50a1c7' },
     { label: 'source only', value: 'source_only', color: '#c78450' },
     { label: 'knock pieces', value: 'knock_pieces', color: '#c107f0' },
+    { label: 'coral stuck', value: 'coral stuck', color: '#c107f0' },
+    { label: 'algae stuck', value: 'algae stuck', color: '#c107f0' },
     { label: 'clogging', value: 'clogging', color: '#c78450' },
     {
         label: 'effective defense',
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		VITE_SCOUT_VERSION=2025
		VITE_SCOUT_VERSION=PORT_HUENEME