diff --git a/couchdb/data/shards/00000000-7fffffff/utah_fr.1648095988.couch b/couchdb/data/shards/00000000-7fffffff/utah_fr.1648095988.couch index 9e07279..9d14797 100644 Binary files a/couchdb/data/shards/00000000-7fffffff/utah_fr.1648095988.couch and b/couchdb/data/shards/00000000-7fffffff/utah_fr.1648095988.couch differ diff --git a/couchdb/data/shards/80000000-ffffffff/utah_fr.1648095988.couch b/couchdb/data/shards/80000000-ffffffff/utah_fr.1648095988.couch index f3eafc0..271af20 100644 Binary files a/couchdb/data/shards/80000000-ffffffff/utah_fr.1648095988.couch and b/couchdb/data/shards/80000000-ffffffff/utah_fr.1648095988.couch differ diff --git a/docker-compose.couch.yml b/docker-compose.couch.yml index 82a3786..915a29d 100644 --- a/docker-compose.couch.yml +++ b/docker-compose.couch.yml @@ -29,4 +29,4 @@ services: # - DOMAIN=10.43.88.1 # - TARGET_PORT=5984 # - TARGET_HOST=scouting-couchdb - # - SSL_PORT:5985 \ No newline at end of file + # - SSL_PORT:5985 diff --git a/start_couch.sh b/start_couch.sh index db252b0..c496b70 100644 --- a/start_couch.sh +++ b/start_couch.sh @@ -1 +1 @@ -docker-compose -f docker-compose.couch.yml up -d --build \ No newline at end of file +docker-compose -f docker-compose.couch.yml up -d --build --remove-orphans diff --git a/start_dev.sh b/start_dev.sh index 59787c0..b0e7320 100644 --- a/start_dev.sh +++ b/start_dev.sh @@ -1 +1 @@ -docker-compose up -d --build +docker-compose up -d --build --remove-orphans diff --git a/webserver/package.json b/webserver/package.json index adc926c..374c109 100644 --- a/webserver/package.json +++ b/webserver/package.json @@ -4,8 +4,6 @@ "private": true, "dependencies": { "@blueprintjs/core": "^3.52.0", - "@data-driven-forms/blueprint-component-mapper": "^3.16.1", - "@data-driven-forms/react-form-renderer": "^3.16.1", "@testing-library/jest-dom": "^5.16.1", "@testing-library/react": "^12.1.2", "@testing-library/user-event": "^13.5.0", @@ -41,8 +39,8 @@ "workbox-streams": "^5.1.4" }, "scripts": { - "start": "react-scripts start", - "build": "react-scripts build", + "start": "react-scripts --max_old_space_size=4096 start", + "build": "react-scripts --max_old_space_size=4096 build", "test": "react-scripts test", "eject": "react-scripts eject" }, diff --git a/webserver/src/Pages/DevPage.jsx b/webserver/src/Pages/DevPage.jsx index bfec512..6698aa3 100644 --- a/webserver/src/Pages/DevPage.jsx +++ b/webserver/src/Pages/DevPage.jsx @@ -75,8 +75,8 @@ const DevPage = () => { const updateScheduleDoc = useCallback(() => { //gets the matches list from the blue alliance api superagent - .get("https://www.thebluealliance.com/api/v3" + "/event/2022code/matches") - // .get("https://www.thebluealliance.com/api/v3" + "/event/2022utwv/matches") + //.get("https://www.thebluealliance.com/api/v3" + "/event/2022code/matches") + .get("https://www.thebluealliance.com/api/v3" + "/event/2022utwv/matches") // .get("https://www.thebluealliance.com/api/v3" + "/event/2022cala/matches") // .get("https://www.thebluealliance.com/api/v3" + "/events/2022/keys") .set("X-TBA-Auth-Key", "6aXgVYCAcyy4O7FwCGLqj5ATcima5k25smssLqUuHAHTCvGtCWXX7aoM9xNWfaSm") diff --git a/webserver/src/Pages/TeamPage.jsx b/webserver/src/Pages/TeamPage.jsx index 04e3c06..f32621b 100644 --- a/webserver/src/Pages/TeamPage.jsx +++ b/webserver/src/Pages/TeamPage.jsx @@ -15,9 +15,9 @@ const TeamPage = () => { let panel_sx = { display: "flex", - flexDirection: { xs: "column", md: "row" }, - alignItems: { xs: "center", sm: "center" }, - justifyContent: { xs: "flex-start", sm: "center" }, + flexDirection: "column", + alignItems: "center", + justifyContent: "flex-start", bgcolor: "background.paper", p: 2, m: 1, @@ -52,6 +52,9 @@ const TeamPage = () => { drive_motors: "", wheels: "", climb_level: "", + which_hub: "", + shooter_type: "", + alignment_strategy: "", misc_design: "", }; if (typeof res[team] !== "undefined") { @@ -74,6 +77,9 @@ const TeamPage = () => { + + +