Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/longmetal7127/scouting2024
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmurgolo
jmurgolo committed Mar 1, 2024
2 parents 75d94eb + 0e60734 commit b519288
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 69 deletions.
1 change: 1 addition & 0 deletions css/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ input, button {
margin-right: 1rem;
color: var(--dark);
font-size: 1.25rem;
font-family: monospace;
}

#new-team-input::placeholder {
Expand Down
28 changes: 26 additions & 2 deletions css/teams.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,25 @@
}

.basicinfo {
width: 30%;
margin-left: 50px;
width: 40%;
margin-left: 10px;
border-bottom-color: black;
border-top-color: var(--background);
border-left-color: var(--background);
border-right-color: var(--background);
border-style: dashed;
border-width: 1.5px;
}

.basicinfonumber {
width: 15%;
margin-left: 10px;
border-bottom-color: black;
border-top-color: var(--background);
border-left-color: var(--background);
border-right-color: var(--background);
border-style: dashed;
border-width: 1.5px;
}

.moreinfo {
Expand Down Expand Up @@ -76,6 +93,9 @@ label {

input {
margin-left: 30px;
font-family: inherit;
font-weight: inherit;
font-size: 12pt;
}

.ptext {
Expand All @@ -102,6 +122,10 @@ body {
font-size: 1.125rem;
}

.leftaligneddiv {
flex-direction: flex-start;
}

h1 {
text-align: center;
}
Expand Down
15 changes: 8 additions & 7 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<body>
<nav>
<div class = "heading">
<h1>Longmetal 7127 test</h1>
<h1>Longmetal 7127</h1>
</div>
<div class = "topnav">
<a href="index.html"> Teams </a>
Expand All @@ -37,13 +37,14 @@ <h1>Longmetal 7127 test</h1>
</div>
</nav>

<header>
<h1>Teams</h1>
<form id="new-team-form">
<input type="text" name="new-team-input" id="new-team-input" placeholder="Input Team Name" />
<input type="submit" id="new-team-submit" value="Add Team" />
</form>
<header>
<h1>Teams</h1>
<form id="new-team-form">
<input type="text" name="new-team-input" id="new-team-input" placeholder="Input Team Name" />
<input type="submit" id="new-team-submit" value="Add Team" />
</form>
</header>

<main>
<section class="team-list">

Expand Down
35 changes: 17 additions & 18 deletions pages/aboutus.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>About Us</title>
<link rel="stylesheet" href="teams.css" />
<link rel="stylesheet" href="../css/teams.css" />
<style>
/* CSS for centering */
body {
Expand Down Expand Up @@ -34,13 +34,13 @@
</style>

<script>
// Check that service workers are supported
if ("serviceWorker" in navigator) {
// Use the window load event to keep the page load performant
window.addEventListener("load", () => {
navigator.serviceWorker.register("./sw.js");
});
}
// Check that service workers are supported
if ("serviceWorker" in navigator) {
// Use the window load event to keep the page load performant
window.addEventListener("load", () => {
navigator.serviceWorker.register("./sw.js");
});
}
</script>

</head>
Expand All @@ -67,32 +67,31 @@ <h2>Our robot capabilities:</h2>
</div>
<!-- Space or new line between the box and the bullet list -->
<p class="indented"><strong>Autonomous</strong></p>

<ul>
<li class="bullet-list">prefer position ___ </li>
<li class="bullet-list">leaves position and shoots in ___ </li>
</ul>
<br>
</ul><br>

<p class="indented"><strong>TeleOp</strong></p>
<ul>
<li class="bullet-list">prefer scoring in ___ </li>
<li class="bullet-list">prefer intaking from ___ </li>
<li class="bullet-list">can hang with ___ </li>
</ul>
<br>
</ul><br>

<p class="indented"><strong>Human Player</strong></p>
<ul></ul>
<li class="bullet-list">prefer the coopertition button </li>
<li class="bullet-list">don't attempt the spotlight </li>
</ul>
<br>
</ul><br>

<div class="capability-box">
<h2>Our Stats:</h2>
</div>
<br>
<p class="indented"><strong>Current Ranking:</strong> <input type="text" class="ranking-input"></p>
<br>
<p class="indented"><strong>Average points scored:</strong> <input type="text" class="ranking-input"></p>
<br>
<p class="indented"><strong>Current Ranking:</strong> <input type="text" class="ranking-input"></p><br>
<p class="indented"><strong>Average points scored:</strong> <input type="text" class="ranking-input"></p><br>

<input type="submit" class="submit" value="Save">

Expand Down
70 changes: 28 additions & 42 deletions pages/teamdetails.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,37 +46,38 @@ <h1> Team Details v1</h1>
<div class="inner-container">
<!-- <form id="dataForm" class="teaminfo"> -->
<label for="teamname"> Name: </label>
<input type="text" class="basicinfo" name="teamname" id="teamname">

<br>
<input type="text" class="basicinfo" name="teamname" id="teamname"><br>

<label for="teamnumber"> Team Number: </label>
<input type="text" class="basicinfo" name="teamnumber" maxlength="4">


<br>
<input type="text" class="basicinfonumber" name="teamnumber" maxlength="4"><br>

<label for="teamschool"> Based In: </label>
<input type="text" class="basicinfo" name="teamschool">
<input type="text" class="basicinfo" name="teamschool"><br>

<br>
<label for="alliancescore"> Alliance Score: </label>
<input type="text" class="basicinfonumber" name="alliancescore"><label>/10</label>

<!-- </form> -->
</div>

<div class="inner-container">
<input type="file" name="team-image" accept="image/gif, image/jpeg, image/png, image/jpg">
</div>
<!--
<div class="inner-container">
input type="file" name="team-image" accept="image/gif, image/jpeg, image/png, image/jpg">
</div>
-->

</div> <br>

<label for="moreinfo"> More Info: </label>
<textarea class="moreinfo" name="moreinfo" rows="8" cols="50" placeholder="big fat textbox" style="resize: none;"></textarea> <br>
<textarea class="moreinfo" name="moreinfo" rows="10" cols="50" placeholder="big fat textbox" style="resize: none;"></textarea> <br>

<h2> Abilities </h2><br>

<!-- Autonomous Survey-->
<label for="Autonomous Starting position"> Autonomous Starting Position: </label>
<input type="text" class="moreinfo" name="startingpos" maxlength="100"><br>

<div class="leftaligneddiv">
<label for="Autonomous Starting position"> Autonomous Starting Position: </label>
<input type="text" class="moreinfo" name="startingpos" maxlength="100"><br><br>

<input type="checkbox" id="action1" name="Leaveszone" value="leaves">
<label for="action1"> Leaves zone</label><br>
Expand All @@ -89,7 +90,7 @@ <h2> Abilities </h2><br>
<input type="checkbox" id="action4.0" name="scores2amp" value="scores2amp">
<label for="action4.0"> Scores 2nd in amp</label><br>
<input type="checkbox" id="action4.1" name="scores2speaker" value="scores2speaker">
<label for="action4.1"> Scores 2nd in speaker</label><br><br>
<label for="action4.1"> Scores 2nd in speaker</label><br>


<br>
Expand All @@ -100,34 +101,19 @@ <h2> Abilities </h2><br>
<input type="radio" id="speaker" name="score" value="speaker">
<label for="css">Speaker</label><br>
<input type="radio" id="either" name="score" value="either">
<label for="either">Either</label>

<br>
<label for="either">Either</label><br><br>

<p class="ptext">Preferred Intake method:</p>
<label for="ground">Ground</label>
<input type="radio" class="radio" id="ground" name="intake" value="ground">
<input type="radio" class="radio" id="ground" name="intake" value="ground"><br>
<label for="human">Human Player</label>
<input type="radio" class="radio" id="human" name="intake" value="human">
<input type="radio" class="radio" id="human" name="intake" value="human"><br>
<label for="either">Either</label>
<input type="radio" class="radio" id="either" name="intake" value="either">

<br>
<input type="radio" class="radio" id="either" name="intake" value="either"><br><br>

<label for="prefintake"> Other: </label>
<input type="text" id="othertext" name="prefintake" maxlength="100">
<label for="prefintake"> Other: </label>
<input type="text" id="othertext" name="prefintake" maxlength="100"><br><br>

<br>

<p>Preferred scoring method:</p>
<input type="radio" id="amp" name="score" value="amp">
<label for="amp">Amp</label><br>
<input type="radio" id="speaker" name="score" value="speaker">
<label for="css">Speaker</label><br>
<input type="radio" id="either" name="score" value="either">
<label for="either">Either</label>

<p>Stage abilities:</p>
<p class="ptext">Stage abilities:</p>
<input type="checkbox" id="spotlight" name="spotlight" value="spotlight">
<label for="spotlight"> Enters stage</label><br>
Expand All @@ -138,23 +124,23 @@ <h2> Abilities </h2><br>
<input type="checkbox" id="another" name="another" value="another">
<label for="another"> Hangs with another </label><br>

<br>
<br>

<!-- Human Player Survey-->
<input type="checkbox" id="spotlight" name="spotlight" value="spotlight">
<label for="spotlight"> Attempts Spotlight</label><br>
<input type="checkbox" id="coop" name="coop" value="coop">
<label for="coop"> Favors coopertition button</label><br>

<br>

<br>
</div>
<!-- <h1>Team Details</h1>
<div id="team-details">
Team details will be displayed here
</div> -->

<input type="submit" class="submit" id="submitButton">
</form>
<input type="submit" class="submit" id="submitButton">
</form> <!-- This form tag has no opening tag-->

<!-- NOTE: add a "CANCEL" button if any changes are made to the text fields in case changes are not to be saved-->

Expand Down

0 comments on commit b519288

Please sign in to comment.