part 2 changes

DSGT-DLP · Oct 31, 2023 · b79e987 · b79e987
1 parent 13d1957
commit b79e987
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 6 deletions.
diff --git a/frontend/src/common/components/Footer.tsx b/frontend/src/common/components/Footer.tsx
@@ -2,6 +2,8 @@ import React from "react";
 import { COLORS, URLs } from "../../constants";
 import { LinkedIn, YouTube, Instagram, GitHub } from "@mui/icons-material";
 import { ThemeProvider, createTheme } from "@mui/material/styles";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faReact } from "@fortawesome/free-brands-svg-icons";
 
 const theme = createTheme({
   components: {
@@ -57,6 +59,7 @@ const Footer = () => {
           >
             <GitHub />
           </a>
+          <FontAwesomeIcon icon={faReact} size="3x"/>
         </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,8 +123,8 @@ const NavbarMain = () => {
                 </Link>
               </Grid>
               <Grid item>
-                <Link href={URLs.donate} passHref className="nav-link">
-                  Donate
+                <Link href="https://youtu.be/WxlSZJ2EXzo?si=S9P1Kl2YS4EMU_ck&t=1217" passHref className="nav-link">
+                  Custom Link
                 </Link>
               </Grid>
               {isSignedIn(user) ? (

diff --git a/frontend/src/features/Train/features/Image/components/ImageTrainspace.tsx b/frontend/src/features/Train/features/Image/components/ImageTrainspace.tsx
@@ -103,6 +103,7 @@ const TrainspaceStepInner = ({
       train(trainspace)
         .unwrap()
         .then(({ trainspaceId }) => {
+          console.log(trainspaceId);
           router.push({ pathname: `/train/${trainspaceId}` }).then(() => {
             dispatch(removeTrainspaceData());
           });
@@ -145,7 +146,6 @@ const TrainspaceStepInner = ({
               if (step === TRAINSPACE_SETTINGS.steps.length - 1) {
                 setIsButtonClicked(true);
               }
-
               handleSubmit(submitTrainspace)();
             }}
           >

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/TabularParametersStep.tsx b/frontend/src/features/Train/features/Tabular/components/TabularParametersStep.tsx
@@ -63,6 +63,7 @@ const TabularParametersStep = ({
         trainspace?.parameterData?.targetCol ?? (null as unknown as undefined),
       features: trainspace?.parameterData?.features ?? [],
       problemType: trainspace?.parameterData?.problemType ?? "CLASSIFICATION",
+      randomButton: trainspace?.parameterData?.randomButton ?? "OPTION_1",
       criterion: trainspace?.parameterData?.criterion ?? "CELOSS",
       optimizerName: trainspace?.parameterData?.optimizerName ?? "SGD",
       shuffle: trainspace?.parameterData?.shuffle ?? true,
@@ -189,6 +190,26 @@ const TabularParametersStep = ({
           )}
         />
       </FormControl>
+      <FormControl>
+        <FormLabel>Random MUI Radio Buttons (does nothing)</FormLabel>
+        <Controller
+          name="randomButton"
+          control={control}
+          rules={{ required: true }}
+          render={({ field: { onChange, value } }) => (
+            <RadioGroup row value={value} onChange={onChange}>
+              {STEP_SETTINGS["PARAMETERS"].randomButtons.map((randomButton) => (
+                <FormControlLabel
+                  key={randomButton.value}
+                  value={randomButton.value}
+                  control={<Radio />}
+                  label={randomButton.label}
+                />
+              ))}
+            </RadioGroup>
+          )}
+        />
+      </FormControl>
       <Controller
         name="criterion"
         control={control}

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(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
@@ -30,6 +30,10 @@ export const STEP_SETTINGS = {
       { label: "Classification", value: "CLASSIFICATION" },
       { label: "Regression", value: "REGRESSION" },
     ],
+    randomButtons: [
+      { label: "Option 1", value: "OPTION_1" },
+      { label: "Option 2", value: "OPTION_2" },
+    ],
     criterions: [
       {
         label: "L1 (Absolute Error) Loss",

diff --git a/frontend/src/features/Train/features/Tabular/types/tabularTypes.ts b/frontend/src/features/Train/features/Tabular/types/tabularTypes.ts
@@ -32,6 +32,7 @@ export interface ParameterData {
   targetCol: string;
   features: string[];
   problemType: (typeof STEP_SETTINGS)["PARAMETERS"]["problemTypes"][number]["value"];
+  randomButton: (typeof STEP_SETTINGS)["PARAMETERS"]["randomButtons"][number]["value"];
   criterion: (typeof STEP_SETTINGS)["PARAMETERS"]["criterions"][number]["value"];
   optimizerName: (typeof STEP_SETTINGS)["PARAMETERS"]["optimizers"][number]["value"];
   shuffle: boolean;

diff --git a/frontend/src/pages/login.tsx b/frontend/src/pages/login.tsx
@@ -252,6 +252,7 @@ const Login = () => {
   }
 
   if (user !== undefined) {
+    console.log(email);
     return <></>;
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -252,6 +252,7 @@ const Login = () => { @@
       }
       if (user !== undefined) {
+        console.log(email);
         return <></>;
       }
@@ Expand Down @@