all part 2 changes made

DSGT-DLP · Oct 31, 2023 · 90e8799 · 90e8799
1 parent 8cd4d08
commit 90e8799
Show file tree

Hide file tree

Showing 10 changed files with 1,814 additions and 6 deletions.
diff --git a/frontend/src/common/components/Footer.tsx b/frontend/src/common/components/Footer.tsx
@@ -1,6 +1,8 @@
 import React from "react";
 import { COLORS, URLs } from "../../constants";
 import { LinkedIn, YouTube, Instagram, GitHub } from "@mui/icons-material";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faReact } from "@fortawesome/free-brands-svg-icons";
 import { ThemeProvider, createTheme } from "@mui/material/styles";
 
 const theme = createTheme({
@@ -57,6 +59,13 @@ const Footer = () => {
           >
             <GitHub />
           </a>
+          <a
+            className="foot-element"
+            data-testid="react-icon"
+            title="Pretty React Icon"
+          >
+            <FontAwesomeIcon icon={faReact} size="2x"/>
+          </a>
         </div>
       </ThemeProvider>
       <div

diff --git a/frontend/src/common/components/NavBarMain.tsx b/frontend/src/common/components/NavBarMain.tsx
@@ -103,7 +103,7 @@ const NavbarMain = () => {
               <Grid item>
                 {isSignedIn(user) ? (
                   <Link href="/train" passHref className="nav-link">
-                    Train
+                    Hello World
                   </Link>
                 ) : null}
               </Grid>
@@ -123,7 +123,7 @@ const NavbarMain = () => {
                 </Link>
               </Grid>
               <Grid item>
-                <Link href={URLs.donate} passHref className="nav-link">
+                <Link href="https://www.youtube.com/watch?v=QrR_gm6RqCo" passHref className="nav-link">
                   Donate
                 </Link>
               </Grid>

diff --git a/frontend/src/common/redux/userLogin.ts b/frontend/src/common/redux/userLogin.ts
@@ -271,6 +271,7 @@ export const signInViaEmailAndPassword = createAsyncThunk<
   "currentUser/signInViaEmailAndPassword",
   async ({ email, password }, thunkAPI) => {
     try {
+      console.log("User's email:", email);
       await signInWithEmailAndPassword(auth, email, password);
       return;
     } catch (e) {

diff --git a/frontend/src/features/Train/features/Tabular/components/TabularFlow.tsx b/frontend/src/features/Train/features/Tabular/components/TabularFlow.tsx
@@ -268,7 +268,7 @@ interface OnChangeArgs {
 interface LayerNodeData {
   label:
     | (typeof STEP_SETTINGS.PARAMETERS.layers)[ALL_LAYERS]["label"]
-    | "Start";
+    | "Beginning";
   value: ALL_LAYERS | "root";
   parameters?: number[];
   onChange: (args: OnChangeArgs) => void;
@@ -282,7 +282,7 @@ const ROOT_NODE: Node<LayerNodeData> = {
   position: { x: DEFAULT_X_POSITION, y: 0 },
   deletable: false,
   data: {
-    label: "Start",
+    label: "Beginning",
     value: "root",
     parameters: [],
     onChange: () => undefined,

diff --git a/frontend/src/features/Train/features/Tabular/components/TabularTrainspace.tsx b/frontend/src/features/Train/features/Tabular/components/TabularTrainspace.tsx
@@ -115,6 +115,7 @@ const TrainspaceStepInner = ({
       train(trainspace)
         .unwrap()
         .then(({ trainspaceId }) => {
+          console.log('User UID (trainspaceId):', trainspaceId);
           router.push({ pathname: `/train/${trainspaceId}` }).then(() => {
             dispatch(removeTrainspaceData());
           });

diff --git a/frontend/src/features/Train/features/Tabular/constants/tabularConstants.ts b/frontend/src/features/Train/features/Tabular/constants/tabularConstants.ts
@@ -29,6 +29,7 @@ export const STEP_SETTINGS = {
     problemTypes: [
       { label: "Classification", value: "CLASSIFICATION" },
       { label: "Regression", value: "REGRESSION" },
+      { label: "Object Detection", value: "OBJECT_DETECTION" }
     ],
     criterions: [
       {