[Community] Move "Interested in Rating an App section.

BIDMCDigitalPsychiatry · Oct 12, 2024 · 7524daa · 7524daa
1 parent e9aaacf
commit 7524daa
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 39 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app-map-db",
-  "version": "2.1.21",
+  "version": "2.1.22",
   "private": true,
   "homepage": "https://mindapps.org",
   "enableLogRocket": true,

diff --git a/src/components/layout/LeftDrawer/LeftDrawerContent.tsx b/src/components/layout/LeftDrawer/LeftDrawerContent.tsx
@@ -9,10 +9,7 @@ import Logo from '../Logo';
 import { useFullScreen } from '../../../hooks';
 import FilterCount from './FilterCount';
 import TourStep from '../../pages/Tour/TourStep';
-import { publicUrl } from '../../../helpers';
-import ArrowButton from '../../general/ArrowButton';
 import { useHandleChangeRoute } from '../hooks';
-import grey from '@mui/material/colors/grey';
 
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({
@@ -63,19 +60,6 @@ export default function LeftDrawerContent({ setLeftDrawer = undefined }) {
       <TourStep id={7} onOpen={handleOpen} onPrev={handleClose} onNext={handleClose} onClose={handleClose}>
         <FilterContentLeftDrawer />
       </TourStep>
-      <Box ml={1} mr={1} mb={1}>
-        <Divider />
-      </Box>
-      <Box p={1} sx={{ backgroundColor: grey[100] }}>
-        <Grid container alignItems='center' spacing={1}>
-          <Grid item xs={12}>
-            <Typography sx={{ color: 'primary.main', textAlign: 'left', fontSize: 22, fontWeight: 700 }}>Interested in rating an app?</Typography>
-          </Grid>
-          <Grid item xs={12} style={{ textAlign: 'right' }}>
-            <ArrowButton label='Rate an App' onClick={handleChangeRoute(publicUrl('/RateAnApp'))} />
-          </Grid>
-        </Grid>
-      </Box>
     </>
   );
 }
diff --git a/src/components/pages/Community/CommunityToolbar.tsx b/src/components/pages/Community/CommunityToolbar.tsx
@@ -2,6 +2,7 @@ import { Button, Grid, Toolbar, Typography } from '@mui/material';
 import createStyles from '@mui/styles/createStyles';
 import makeStyles from '@mui/styles/makeStyles';
 import { useUserEmail } from '../../layout/hooks';
+import InterestedRateApp from './InterestedRateApp';
 
 const spacing = 3;
 
@@ -15,7 +16,7 @@ const useStyles = makeStyles(({ palette }) =>
   })
 );
 
-const CommunityToolbar = ({ title = undefined, subtitle = undefined, showGreeting = false, buttons = [] }) => {
+const CommunityToolbar = ({ title = undefined, subtitle = undefined, showGreeting = false, buttons = [], showInterested = false }) => {
   const email = useUserEmail();
   const classes = useStyles();
 
@@ -32,31 +33,38 @@ const CommunityToolbar = ({ title = undefined, subtitle = undefined, showGreetin
   return (
     <>
       {showToolbar && (
-        <Toolbar disableGutters style={{ marginTop: 16, paddingBottom: 16 }}>
-          <Grid alignItems='center' container justifyContent='space-between' spacing={spacing}>
-            <Grid item>
-              {title && (
-                <Typography color='textPrimary' variant='h4' className={classes.primaryHeaderText}>
-                  {title}
-                </Typography>
+        <>
+          <Toolbar disableGutters style={{ marginTop: 16, paddingBottom: 16 }}>
+            <Grid alignItems='center' container justifyContent='space-between' spacing={spacing}>
+              {showInterested && (
+                <Grid item xs={12} sx={{ mt: 1 }}>
+                  <InterestedRateApp />
+                </Grid>
               )}
-              {SubTitle}
-            </Grid>
-            <Grid item>
-              <Grid container spacing={spacing}>
-                {buttons.map(
-                  ({ label, color = 'primary', size = 'large', startIcon = undefined, variant = 'outlined', onClick = undefined, ...other }: any) => (
-                    <Grid item key={label}>
-                      <Button color={color} size={size} startIcon={startIcon} onClick={onClick} variant='outlined' {...other}>
-                        {label}
-                      </Button>
-                    </Grid>
-                  )
+              <Grid item>
+                {title && (
+                  <Typography color='textPrimary' variant='h4' className={classes.primaryHeaderText}>
+                    {title}
+                  </Typography>
                 )}
+                {SubTitle}
+              </Grid>
+              <Grid item>
+                <Grid container spacing={spacing}>
+                  {buttons.map(
+                    ({ label, color = 'primary', size = 'large', startIcon = undefined, variant = 'outlined', onClick = undefined, ...other }: any) => (
+                      <Grid item key={label}>
+                        <Button color={color} size={size} startIcon={startIcon} onClick={onClick} variant='outlined' {...other}>
+                          {label}
+                        </Button>
+                      </Grid>
+                    )
+                  )}
+                </Grid>
               </Grid>
             </Grid>
-          </Grid>
-        </Toolbar>
+          </Toolbar>
+        </>
       )}
     </>
   );

diff --git a/src/components/pages/Community/InterestedRateApp.tsx b/src/components/pages/Community/InterestedRateApp.tsx
@@ -0,0 +1,24 @@
+import { Box, Grid, Typography } from '@mui/material';
+import ArrowButton from '../../general/ArrowButton';
+import grey from '@mui/material/colors/grey';
+import { useHandleChangeRoute } from '../../layout/hooks';
+import { publicUrl } from '../../../helpers';
+
+const InterestedRateApp = () => {
+  const handleChangeRoute = useHandleChangeRoute();
+
+  return (
+    <Box p={0} sx={{ backgroundColor: grey[100], borderRadius: 0, pl: 2, pr: 1 }}>
+      <Grid container alignItems='center' spacing={1}>
+        <Grid item xs={12}>
+          <Typography sx={{ color: 'primary.main', textAlign: 'left', fontSize: 22, fontWeight: 700 }}>Interested in rating an app?</Typography>
+        </Grid>
+        <Grid item xs={12} style={{ textAlign: 'right' }}>
+          <ArrowButton label='Rate an App' onClick={handleChangeRoute(publicUrl('/RateAnApp'))} />
+        </Grid>
+      </Grid>
+    </Box>
+  );
+};
+
+export default InterestedRateApp;
diff --git a/src/components/pages/Team/TeamList.tsx b/src/components/pages/Team/TeamList.tsx
@@ -71,6 +71,7 @@ const TeamList = () => {
       <CommunityToolbar
         title='Team Members'
         subtitle='Meet our team'
+        showInterested={true}
         buttons={
           isAdmin
             ? [