feat: inserted the reset advanced search and show hidden offers butto…

…ns inside of the advancedSearchContainer grid
NIAEFEUP · Nov 15, 2022 · ae6cec2 · ae6cec2
1 parent 20b5ff7
commit ae6cec2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/src/components/HomePage/SearchArea/AdvancedSearch/AdvancedSearchDesktop.js b/src/components/HomePage/SearchArea/AdvancedSearch/AdvancedSearchDesktop.js
@@ -103,28 +103,24 @@ const AdvancedSearchDesktop = () => {
                         className: "chip-wrapper",
                     }}
                 />
-            </Collapse>
-            {advancedOptions &&
-            <div className={classes.spaceBtwn}>
                 <div className={classes.resetBtnWrapper}>
-                    <Button
-                        {...ResetButtonProps}
-                        _id="reset_btn"
-                        color="primary"
-                        onClick={resetAdvancedSearch}
-                    >
-                        Reset Advanced Fields
-                    </Button>
-                    {sessionData?.isAdmin &&
+                        <Button
+                            {...ResetButtonProps}
+                            _id="reset_btn"
+                            color="primary"
+                            onClick={resetAdvancedSearch}
+                        >
+                            Reset Advanced Fields
+                        </Button>
+                </div>          
+                {sessionData?.isAdmin &&
                     <FormControlLabel
-                        className={classes.jobDurationSliderToggle}
+                        className={classes.jobHiddenSliderToggle}
                         control={<Switch {...JobDurationSwitchProps} />}
                         label={JobHiddenSwitchLabel}
                     />
-                    }
-                </div>
-            </div>
-            }
+                }
+            </Collapse>
         </React.Fragment>
     );
 };

diff --git a/src/components/HomePage/SearchArea/searchAreaStyle.js b/src/components/HomePage/SearchArea/searchAreaStyle.js
@@ -24,7 +24,7 @@ export default makeStyles((theme) => ({
     advancedSearchContainer: {
         display: "grid",
         gridTemplateColumns: "1fr 1fr",
-        gridTemplateRows: "1fr 0.7fr auto",
+        gridTemplateRows: "1fr 0.7fr 1fr 0.7fr",
         alignItems: "center",
         gridGap: "1em",
     },
@@ -82,15 +82,20 @@ export default makeStyles((theme) => ({
         gridColumnStart: 2,
     },
     resetBtnWrapper: {
-        display: "flex",
+        gridRowStart: 4,
+        gridColumnStart: 1,
         "& > *": {
             marginTop: theme.spacing(2),
             marginLeft: theme.spacing(-1),
         },
-    },
-    spaceBtwn: {
-        "& > *": {
-            justifyContent: "space-between",
+        "& .chip-wrapper": {
+            gridColumnStart: 2,
+            gridRowStart: 4,
         },
     },
+    jobHiddenSliderToggle: {
+        gridRowStart: 4,
+        gridColumnStart: 2,
+
+    },
 }));