From 0951b79c28e695b60db147ad39e83581d362dde2 Mon Sep 17 00:00:00 2001
From: unknown <deepanshu.17220@knit.ac.in>
Date: Tue, 5 Apr 2022 01:39:13 +0530
Subject: [PATCH 1/4] Use same border radius for next and prev buttons

---
 .../js/styles/views/projects/projectsStyles.js       |  5 +++++
 .../zubhub/src/views/projects/Projects.jsx           | 12 ++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/zubhub_frontend/zubhub/src/assets/js/styles/views/projects/projectsStyles.js b/zubhub_frontend/zubhub/src/assets/js/styles/views/projects/projectsStyles.js
index 325dcc81e..6da85c81a 100644
--- a/zubhub_frontend/zubhub/src/assets/js/styles/views/projects/projectsStyles.js
+++ b/zubhub_frontend/zubhub/src/assets/js/styles/views/projects/projectsStyles.js
@@ -131,6 +131,11 @@ const styles = theme => ({
     maxWidth: '2000px',
     width: '100%',
   },
+  buttonGroupStyleAlternative: {
+    
+    padding: '7px 21px ' ,
+
+  },
   floatRight: {
     float: 'right',
   },
diff --git a/zubhub_frontend/zubhub/src/views/projects/Projects.jsx b/zubhub_frontend/zubhub/src/views/projects/Projects.jsx
index b76b2d80a..f5fbb7115 100644
--- a/zubhub_frontend/zubhub/src/views/projects/Projects.jsx
+++ b/zubhub_frontend/zubhub/src/views/projects/Projects.jsx
@@ -186,13 +186,15 @@ function Projects(props) {
               </Grid>
             ))}
           </Grid>
-          <ButtonGroup
+          <div
             aria-label={t('projects.ariaLabels.prevNxtButtons')}
             className={classes.buttonGroupStyle}
           >
             {prev_page ? (
               <CustomButton
-                className={classes.floatLeft}
+                // className={classes.floatLeft}
+
+                className={`${classes.floatLeft} ${classes.buttonGroupStyleAlternative}`}
                 size="large"
                 startIcon={<NavigateBeforeIcon />}
                 onClick={(e, page = prev_page.split('?')[1]) => {
@@ -206,7 +208,9 @@ function Projects(props) {
             ) : null}
             {next_page ? (
               <CustomButton
-                className={classes.floatRight}
+                // className={classes.floatRight}
+
+                className={`${classes.floatRight} ${classes.buttonGroupStyleAlternative}`}
                 size="large"
                 endIcon={<NavigateNextIcon />}
                 onClick={(e, page = next_page.split('?')[1]) => {
@@ -218,7 +222,7 @@ function Projects(props) {
                 {t('projects.next')}
               </CustomButton>
             ) : null}
-          </ButtonGroup>
+          </div>
         </Box>
       </Box>
     );

From b1157634b7301b94776439865aa32683042c2de9 Mon Sep 17 00:00:00 2001
From: unknown <deepanshu.17220@knit.ac.in>
Date: Thu, 7 Apr 2022 18:56:31 +0530
Subject: [PATCH 2/4] refactor button border radius code

---
 .../src/assets/js/styles/views/projects/projectsStyles.js | 6 ++----
 zubhub_frontend/zubhub/src/views/projects/Projects.jsx    | 8 ++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/zubhub_frontend/zubhub/src/assets/js/styles/views/projects/projectsStyles.js b/zubhub_frontend/zubhub/src/assets/js/styles/views/projects/projectsStyles.js
index 6da85c81a..b88f94ebc 100644
--- a/zubhub_frontend/zubhub/src/assets/js/styles/views/projects/projectsStyles.js
+++ b/zubhub_frontend/zubhub/src/assets/js/styles/views/projects/projectsStyles.js
@@ -132,10 +132,8 @@ const styles = theme => ({
     width: '100%',
   },
   buttonGroupStyleAlternative: {
-    
-    padding: '7px 21px ' ,
-
-  },
+     padding: '7px 21px ' ,
+ },
   floatRight: {
     float: 'right',
   },
diff --git a/zubhub_frontend/zubhub/src/views/projects/Projects.jsx b/zubhub_frontend/zubhub/src/views/projects/Projects.jsx
index f5fbb7115..df17aa4ca 100644
--- a/zubhub_frontend/zubhub/src/views/projects/Projects.jsx
+++ b/zubhub_frontend/zubhub/src/views/projects/Projects.jsx
@@ -192,9 +192,7 @@ function Projects(props) {
           >
             {prev_page ? (
               <CustomButton
-                // className={classes.floatLeft}
-
-                className={`${classes.floatLeft} ${classes.buttonGroupStyleAlternative}`}
+               className={clsx(classes.floatLeft, classes.buttonGroupStyleAlternative)}
                 size="large"
                 startIcon={<NavigateBeforeIcon />}
                 onClick={(e, page = prev_page.split('?')[1]) => {
@@ -208,9 +206,7 @@ function Projects(props) {
             ) : null}
             {next_page ? (
               <CustomButton
-                // className={classes.floatRight}
-
-                className={`${classes.floatRight} ${classes.buttonGroupStyleAlternative}`}
+                 className={clsx(classes.floatRight, classes.buttonGroupStyleAlternative)} 
                 size="large"
                 endIcon={<NavigateNextIcon />}
                 onClick={(e, page = next_page.split('?')[1]) => {

From f1575dbe2ae377e012f5e0c7322d1d0b9efe95ad Mon Sep 17 00:00:00 2001
From: unknown <deepanshu.17220@knit.ac.in>
Date: Tue, 19 Apr 2022 00:46:52 +0530
Subject: [PATCH 3/4] reverted master

---
 .../styles/views/projects/projectsStyles.js   |  5 --
 .../zubhub/src/views/projects/Projects.jsx    | 88 -------------------
 2 files changed, 93 deletions(-)

diff --git a/zubhub_frontend/zubhub/src/assets/js/styles/views/projects/projectsStyles.js b/zubhub_frontend/zubhub/src/assets/js/styles/views/projects/projectsStyles.js
index 4e96d9da4..912017a15 100644
--- a/zubhub_frontend/zubhub/src/assets/js/styles/views/projects/projectsStyles.js
+++ b/zubhub_frontend/zubhub/src/assets/js/styles/views/projects/projectsStyles.js
@@ -132,13 +132,8 @@ const styles = theme => ({
     width: '100%',
   },
   buttonGroupStyleAlternative: {
-<<<<<<< HEAD
-     padding: '7px 21px ' ,
- },
-=======
     padding: '7px 21px',
   },
->>>>>>> 3221337cb6f9df2e256f5d7622563825634b3288
   floatRight: {
     float: 'right',
   },
diff --git a/zubhub_frontend/zubhub/src/views/projects/Projects.jsx b/zubhub_frontend/zubhub/src/views/projects/Projects.jsx
index dd3eac4ce..6a34871c8 100644
--- a/zubhub_frontend/zubhub/src/views/projects/Projects.jsx
+++ b/zubhub_frontend/zubhub/src/views/projects/Projects.jsx
@@ -272,96 +272,8 @@ function Projects(props) {
                 </Box>
               </Container>
             </Box>
-<<<<<<< HEAD
-          </Box>
-        ) : null}
-        <Box className={classes.mainContainerStyle}>
-          {staff_picks &&
-            staff_picks.map(staff_pick => (
-              <StaffPick
-                key={staff_pick.id}
-                staff_pick={staff_pick}
-                updateProjects={res =>
-                  handleSetState(
-                    updateStaffPicks(res, staff_pick.id, props, toast),
-                  )
-                }
-                {...props}
-              />
-            ))}
-          <Grid container>
-            {staff_picks && staff_picks.length > 0 ? (
-              <Grid item xs={12}>
-                <Typography
-                  gutterBottom
-                  component="h2"
-                  variant="h6"
-                  color="textPrimary"
-                  className={classes.titleStyle}
-                >
-                  {t('projects.allProjects')}
-                </Typography>
-              </Grid>
-            ) : null}
-            {projects.map(project => (
-              <Grid
-                item
-                xs={12}
-                sm={6}
-                md={4}
-                align="center"
-                className={classes.projectGridStyle}
-              >
-                <Project
-                  project={project}
-                  key={project.id}
-                  updateProjects={res =>
-                    handleSetState(updateProjects(res, props, toast))
-                  }
-                  {...props}
-                />
-              </Grid>
-            ))}
-          </Grid>
-          <div
-            aria-label={t('projects.ariaLabels.prevNxtButtons')}
-            className={classes.buttonGroupStyle}
-          >
-            {prev_page ? (
-              <CustomButton
-               className={clsx(classes.floatLeft, classes.buttonGroupStyleAlternative)}
-                size="large"
-                startIcon={<NavigateBeforeIcon />}
-                onClick={(e, page = prev_page.split('?')[1]) => {
-                  handleSetState({ loading: true });
-                  handleSetState(fetchPage(page, props));
-                }}
-                primaryButtonStyle
-              >
-                {t('projects.prev')}
-              </CustomButton>
-            ) : null}
-            {next_page ? (
-              <CustomButton
-                 className={clsx(classes.floatRight, classes.buttonGroupStyleAlternative)} 
-                size="large"
-                endIcon={<NavigateNextIcon />}
-                onClick={(e, page = next_page.split('?')[1]) => {
-                  handleSetState({ loading: true });
-                  handleSetState(fetchPage(page, props));
-                }}
-                primaryButtonStyle
-              >
-                {t('projects.next')}
-              </CustomButton>
-            ) : null}
-          </div>
-        </Box>
-      </Box>
-=======
           )}
     </>
->>>>>>> 3221337cb6f9df2e256f5d7622563825634b3288
     );
   } else {
     return <ErrorPage error={t('projects.errors.unexpected')} />;

From 601271091dba09b78097274c6ab6e231e9c1ca7a Mon Sep 17 00:00:00 2001
From: unknown <deepanshu.17220@knit.ac.in>
Date: Thu, 21 Apr 2022 22:27:03 +0530
Subject: [PATCH 4/4]  fixed title shrinking issue in the recommendation bar

---
 .../js/styles/components/autocomplete/optionStyles.js    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/zubhub_frontend/zubhub/src/assets/js/styles/components/autocomplete/optionStyles.js b/zubhub_frontend/zubhub/src/assets/js/styles/components/autocomplete/optionStyles.js
index 0259286f9..80803453c 100644
--- a/zubhub_frontend/zubhub/src/assets/js/styles/components/autocomplete/optionStyles.js
+++ b/zubhub_frontend/zubhub/src/assets/js/styles/components/autocomplete/optionStyles.js
@@ -15,13 +15,14 @@ const styles = theme => ({
     display: 'flex',
     flexFlow: 'row nowrap',
     alignItems: 'center',
-    maxWidth: '50%',
+    maxWidth: '80%',
   },
   optionTitleWrapper: {
-    flex: '1 1 max-content',
     overflow: 'hidden',
     textOverflow: 'ellipsis',
     whiteSpace: 'nowrap',
+    flexShrink: '0',
+    maxWidth: '85%',
   },
   optionTitle: {
     display: 'inline',
@@ -31,6 +32,10 @@ const styles = theme => ({
     fontSize: '12px',
     color: 'gray',
     marginLeft: '10px',
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap',
+    minWidth: '15%',
   },
   optionImageWrapper: {
     display: 'flex',