fixes

kscalelabs · Jun 12, 2024 · f7c2c58 · f7c2c58
1 parent 61ddb15
commit f7c2c58
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 83 deletions.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -6,7 +6,6 @@ import { AlertQueue, AlertQueueProvider } from "hooks/alerts";
 import { AuthenticationProvider } from "hooks/auth";
 import { ThemeProvider } from "hooks/theme";
 import About from "pages/About";
-import EditPartForm from "pages/EditPartForm";
 import EditRobotForm from "pages/EditRobotForm";
 import Home from "pages/Home";
 import Login from "pages/Login";

diff --git a/frontend/src/pages/Home.tsx b/frontend/src/pages/Home.tsx
@@ -43,86 +43,88 @@ const Home: React.FC = () => {
           </Card>
         </Col>
       </Row>
-      {isAuthenticated && <>
-        <Row className="row-two">
-          <Col md={6} sm={12}>
-            <Button
-              variant={theme === "dark" ? "outline-light" : "outline-dark"}
-              size="lg"
-              style={{
-                backgroundColor: "light-purple",
-                borderColor: "secondary",
-                padding: "10px",
-                width: "100%",
-              }}
-              onClick={() => {
-                navigate("/robots/your/");
-              }}
-            >
-              View Your Robots
-            </Button>
-          </Col>
-          <Col md={6} sm={12}>
-            <Button
-              variant={theme === "dark" ? "outline-light" : "outline-dark"}
-              size="lg"
-              style={{
-                backgroundColor: "dark-purple",
-                borderColor: "secondary",
-                padding: "10px",
-                width: "100%",
-              }}
-              onClick={() => {
-                navigate("/parts/your/");
-              }}
-            >
-              View Your Parts
-            </Button>
-          </Col>
-        </Row>
-        <Row className="row-two">
-          <Col md={6} sm={12}>
-            <Button
-              variant="outline-primary"
-              size="lg"
-              style={{
-                color: isHoveredR ? colors.text_color : colors.buttonBorder,
-                backgroundColor: isHoveredR ? colors.buttonBorder : "",
-                borderColor: colors.buttonBorder,
-                padding: "10px",
-                width: "100%",
-              }}
-              onMouseEnter={handleMouseEnterR}
-              onMouseLeave={handleMouseLeaveR}
-              onClick={() => {
-                navigate("/robots/add");
-              }}
-            >
-              Make a Robot
-            </Button>
-          </Col>
-          <Col md={6} sm={12}>
-            <Button
-              variant="outline-primary"
-              size="lg"
-              style={{
-                color: isHoveredL ? colors.text_color : colors.buttonBorder,
-                backgroundColor: isHoveredL ? colors.buttonBorder : "",
-                borderColor: colors.buttonBorder,
-                padding: "10px",
-                width: "100%",
-              }}
-              onMouseEnter={handleMouseEnterL}
-              onMouseLeave={handleMouseLeaveL}
-              onClick={() => {
-                navigate("/parts/add");
-              }}
-            >
-              Make a Part
-            </Button>
-          </Col>
-        </Row>
-        </>}
+      {isAuthenticated && (
+        <>
+          <Row className="row-two">
+            <Col md={6} sm={12}>
+              <Button
+                variant={theme === "dark" ? "outline-light" : "outline-dark"}
+                size="lg"
+                style={{
+                  backgroundColor: "light-purple",
+                  borderColor: "secondary",
+                  padding: "10px",
+                  width: "100%",
+                }}
+                onClick={() => {
+                  navigate("/robots/your/");
+                }}
+              >
+                View Your Robots
+              </Button>
+            </Col>
+            <Col md={6} sm={12}>
+              <Button
+                variant={theme === "dark" ? "outline-light" : "outline-dark"}
+                size="lg"
+                style={{
+                  backgroundColor: "dark-purple",
+                  borderColor: "secondary",
+                  padding: "10px",
+                  width: "100%",
+                }}
+                onClick={() => {
+                  navigate("/parts/your/");
+                }}
+              >
+                View Your Parts
+              </Button>
+            </Col>
+          </Row>
+          <Row className="row-two">
+            <Col md={6} sm={12}>
+              <Button
+                variant="outline-primary"
+                size="lg"
+                style={{
+                  color: isHoveredR ? colors.text_color : colors.buttonBorder,
+                  backgroundColor: isHoveredR ? colors.buttonBorder : "",
+                  borderColor: colors.buttonBorder,
+                  padding: "10px",
+                  width: "100%",
+                }}
+                onMouseEnter={handleMouseEnterR}
+                onMouseLeave={handleMouseLeaveR}
+                onClick={() => {
+                  navigate("/robots/add");
+                }}
+              >
+                Make a Robot
+              </Button>
+            </Col>
+            <Col md={6} sm={12}>
+              <Button
+                variant="outline-primary"
+                size="lg"
+                style={{
+                  color: isHoveredL ? colors.text_color : colors.buttonBorder,
+                  backgroundColor: isHoveredL ? colors.buttonBorder : "",
+                  borderColor: colors.buttonBorder,
+                  padding: "10px",
+                  width: "100%",
+                }}
+                onMouseEnter={handleMouseEnterL}
+                onMouseLeave={handleMouseLeaveL}
+                onClick={() => {
+                  navigate("/parts/add");
+                }}
+              >
+                Make a Part
+              </Button>
+            </Col>
+          </Row>
+        </>
+      )}
     </div>
   );
 };

diff --git a/store/app/routers/part.py b/store/app/routers/part.py
@@ -42,9 +42,10 @@ async def get_part(part_id: str, crud: Annotated[Crud, Depends(Crud.get)]) -> Pa
 
 @parts_router.get("/user/")
 async def current_user(
-    crud: Annotated[Crud, Depends(Crud.get)], data: Annotated[ApiKeyData, Depends(get_api_key)]
+    crud: Annotated[Crud, Depends(Crud.get)],
+    token: Annotated[str, Depends(get_session_token)],
 ) -> str | None:
-    user_id = await crud.get_user_id_from_api_key(data.api_key)
+    user_id = await crud.get_user_id_from_session_token(token)
     return str(user_id)