Merge branch 'firmegan'

flamingchickens1540 · Oct 16, 2024 · 9b068bf · 9b068bf
2 parents 9b08e53 + b93ef32
commit 9b068bf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/TBAData.py b/TBAData.py
@@ -14,7 +14,7 @@ def __init__(self):
         configuration = tbaapiv3client.Configuration(
             host="https://www.thebluealliance.com/api/v3",
             api_key={
-                "X-TBA-Auth-Key": "***REMOVED***"
+***REMOVED***
             },
         )
 

diff --git a/nexusData.py b/nexusData.py
@@ -7,7 +7,7 @@
 event_key = "demo8771"  # TESTING! change to the event key before using at events
 url = "https://frc.nexus/api/v1/event/" + event_key
 
-headers = {"Nexus-Api-Key": "***REMOVED***"}
+***REMOVED***
 
 
 def nexusData():

diff --git a/src/main.rs b/src/main.rs
@@ -8,9 +8,14 @@ use std::env;
 use tba_openapi_rust::apis::configuration::{ApiKey, Configuration};
 use tower_http::services::ServeFile;
 
-use hensight::{
-    get_event_predictions, get_event_rankings, get_pulse_data, get_slide, get_statbotics_data,
-    SlideData,
+mod model;
+mod query;
+
+use crate::{
+    model::SlideData,
+    query::{
+        get_event_predictions, get_event_rankings, get_pulse_data, get_slide, get_statbotics_data,
+    },
 };
 
 #[tokio::main]

diff --git a/src/lib.rs → src/query.rs b/src/lib.rs → src/query.rs
@@ -2,16 +2,15 @@
 // SPDX-FileCopyrightText: 2024 Finnegan Dion-Kuhn
 
 use chrono::{Datelike, Local, TimeZone};
-use model::PulseData;
 use rand::{seq::SliceRandom, thread_rng};
 use tba_openapi_rust::{
     apis::{configuration::Configuration, event_api},
     models::event_ranking_rankings_inner::EventRankingRankingsInner,
 };
 
-mod model;
-
-pub use model::{NexusEventStatus, NexusMatch, SlideData, StatboticsReturn, StatboticsTeamYear};
+pub use crate::model::{
+    NexusEventStatus, NexusMatch, PulseData, SlideData, StatboticsReturn, StatboticsTeamYear,
+};
 
 pub fn get_slide<'a>(
     slides: &'a Vec<impl Fn(&SlideData) -> Option<&'a str>>,