update web version

JayAgra · Mar 18, 2024 · b74e454 · b74e454
1 parent f893256
commit b74e454
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 11 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -572,7 +572,6 @@ async fn game_get_cards_by_username(db: web::Data<Databases>, req: HttpRequest)
         .json(game_api::get_owned_cards_by_user(&db.auth, req.match_info().get("user").unwrap().parse().unwrap()).await?))
 }
 
-
 // get random team from scouted teams
 async fn game_open_lootbox(req: HttpRequest, db: web::Data<Databases>, user: db_auth::User) -> Result<HttpResponse, AWError> {
     Ok(HttpResponse::Ok()
@@ -1001,6 +1000,10 @@ async fn main() -> io::Result<()> {
                 web::resource("/api/v1/game/owned_cards/{user}")
                     .route(web::get().to(game_get_cards_by_username)),
             )
+            .service(
+                web::resource("/api/v1/game/my_owned_cards")
+                    .route(web::get().to(game_get_cards)),
+            )
             .service(
                 web::resource("/api/v1/game/team_data/{season}/{event}/{team}")
                     .route(web::get().to(game_get_team)),

diff --git a/static/blackjack.html b/static/blackjack.html
@@ -19,7 +19,7 @@ <h1 id="title" style="font-family: 'raleway-300'">bearTracks<br><span class="gam
                 <select id="deck">
                     <option value="static/assets/stdcards/" selected>Default Cards</option>
                     <option value="static/assets/progcards/">Programming Cards</option>
-                    <option value="static/assets/gruvcards/">Gruvbox Cards (beta i guess)</option>
+                    <!--<option value="static/assets/gruvcards/">Gruvbox Cards (beta i guess)</option>-->
                 </select><br><br>
                 <button class="uiButton actionButton" onclick="startBlackjack()">Play</button><br><button  class="uiButton returnButton" onclick="window.location.href='/points'">Back</button>
             </div>

diff --git a/static/main.html b/static/main.html
@@ -47,6 +47,18 @@ <h1 class="w3">bearTracks<br><span class="gametitle">CRESCENDO</span></h1>
                                 </optgroup>
                             </select>
                         </fieldset><br>
+                        <fieldset>
+                            <label>Preloaded notes handled</label><br><input type="tel" name="auto_preload" style="width: 60vw;">
+                        </fieldset>
+                        <fieldset>
+                            <label>Wing notes handled</label><br><input type="tel" name="auto_wing" style="width: 60vw;">
+                        </fieldset>
+                        <fieldset>
+                            <label>Neutral zone notes handled</label><br><input type="tel" name="auto_neutral" style="width: 60vw;">
+                        </fieldset>
+                        <fieldset>
+                            <label>Scores</label><br><input type="tel" name="auto_scores" style="width: 60vw;">
+                        </fieldset>
                     </div>
                     <button type="button" class="continue_button" disabled><h2>continue</h2></button>
                 </div>

diff --git a/static/public/js/main/main.js b/static/public/js/main/main.js
@@ -103,7 +103,6 @@ var cycle_data = [];
 function end_cycle(type) {
     if (timer_times[0] != 0 || timer_times[1] != 0 || timer_times[2] != 0) {
         cycle_data.push({
-            id: cycle_data.length,
             score_type: type,
             intake: Math.round(timer_times[0] * 10) / 10,
             travel: Math.round(timer_times[1] * 10) / 10,
@@ -146,9 +145,13 @@ function submit() {
     document.getElementById("submit_page").style.display = "block";
     var submit_text = document.getElementById("submit_text"), submit_progress = document.getElementById("submit_progress"), continue_button = document.getElementById("scout_again"), success_seal = document.getElementById("success_seal"), failure_seal = document.getElementById("failure_seal");
     submit_text.innerText = "Submitting...";
-    cycle_data.push({ id: cycle_data.length, score_type: 2, intake: Number(document.querySelector("[name=trap_note]").checked), travel: Number(document.querySelector("[name=trap_note]").checked), outtake: Number(document.querySelector("[name=trap_note]").checked) });
-    cycle_data.push({ id: cycle_data.length, score_type: 3, intake: Number(document.querySelector("[name=climb]").checked), travel: Number(document.querySelector("[name=climb]").checked), outtake: Number(document.querySelector("[name=climb]").checked) });
-    cycle_data.push({ id: cycle_data.length, score_type: 4, intake: Number(document.querySelector("[name=buddy_climb]").checked), travel: Number(document.querySelector("[name=buddy_climb]").checked), outtake: Number(document.querySelector("[name=buddy_climb]").checked) });
+    cycle_data.push({ score_type: 2, intake: Number(document.querySelector("[name=trap_note]").checked), travel: Number(document.querySelector("[name=trap_note]").checked), outtake: Number(document.querySelector("[name=trap_note]").checked) });
+    cycle_data.push({ score_type: 3, intake: Number(document.querySelector("[name=climb]").checked), travel: Number(document.querySelector("[name=climb]").checked), outtake: Number(document.querySelector("[name=climb]").checked) });
+    cycle_data.push({ score_type: 4, intake: Number(document.querySelector("[name=buddy_climb]").checked), travel: Number(document.querySelector("[name=buddy_climb]").checked), outtake: Number(document.querySelector("[name=buddy_climb]").checked) });
+    cycle_data.push({ score_type: 5, intake: Number(document.querySelector("[name=auto_neutral]").checked), travel: Number(document.querySelector("[name=auto_neutral]").checked), outtake: Number(document.querySelector("[name=auto_neutral]").checked) });
+    cycle_data.push({ score_type: 6, intake: Number(document.querySelector("[name=auto_wing]").checked), travel: Number(document.querySelector("[name=auto_wing]").checked), outtake: Number(document.querySelector("[name=auto_wing]").checked) });
+    cycle_data.push({ score_type: 7, intake: Number(document.querySelector("[name=auto_preload]").checked), travel: Number(document.querySelector("[name=auto_preload]").checked), outtake: Number(document.querySelector("[name=auto_preload]").checked) });
+    cycle_data.push({ score_type: 8, intake: Number(document.querySelector("[name=auto_scores]").checked), travel: Number(document.querySelector("[name=auto_scores]").checked), outtake: Number(document.querySelector("[name=auto_scores]").checked) });
     const data = {
         season: 2024,
         event: getEventCookie(),