Merge pull request #2098 from Northeastern-Electric-Racing/#1794-DaoHo-ticket

#1794: Allow Guests to browse without SlackId

Author: RChandler234

src/frontend/src/app/AppAuthenticated.tsx

@@ -25,12 +25,14 @@ import Sidebar from '../layouts/Sidebar/Sidebar';
 import { Box } from '@mui/system';
 import { Container } from '@mui/material';
 import ErrorPage from '../pages/ErrorPage';
+import { Role, isGuest } from 'shared';
 
 interface AppAuthenticatedProps {
   userId: number;
+  userRole: Role;
 }
 
-const AppAuthenticated: React.FC<AppAuthenticatedProps> = ({ userId }) => {
+const AppAuthenticated: React.FC<AppAuthenticatedProps> = ({ userId, userRole }) => {
   const { isLoading, isError, error, data: userSettingsData } = useSingleUserSettings(userId);
 
   if (isLoading || !userSettingsData) return <LoadingIndicator />;
@@ -43,7 +45,7 @@ const AppAuthenticated: React.FC<AppAuthenticatedProps> = ({ userId }) => {
     }
   }
 
-  return userSettingsData.slackId ? (
+  return userSettingsData.slackId || isGuest(userRole) ? (
     <AppContextUser>
       <Box display={'flex'}>
         <Sidebar />

src/frontend/src/app/AppPublic.tsx

@@ -23,7 +23,7 @@ const AppPublic: React.FC = () => {
         theme.toggleTheme();
       }
 
-      return <AppAuthenticated userId={auth.user.userId} />;
+      return <AppAuthenticated userId={auth.user.userId} userRole={auth.user.role} />;
     }
 
     // if we're on development and the userId is stored in localStorage,

src/frontend/src/pages/HomePage/Home.tsx

@@ -3,21 +3,18 @@
  * See the LICENSE file in the repository root folder for details.
  */
 
-import { Typography, Alert, Link } from '@mui/material';
-import { routes } from '../../utils/routes';
+import { Typography } from '@mui/material';
 import OverdueWorkPackageAlerts from './OverdueWorkPackageAlerts';
 import UsefulLinks from './UsefulLinks';
 import WorkPackagesByTimelineStatus from './WorkPackagesByTimelineStatus';
 import UpcomingDeadlines from './UpcomingDeadlines';
 import { useCurrentUser, useSingleUserSettings } from '../../hooks/users.hooks';
 import LoadingIndicator from '../../components/LoadingIndicator';
 import ErrorPage from '../ErrorPage';
-import { useHistory } from 'react-router-dom';
 import PageLayout from '../../components/PageLayout';
 
 const Home = () => {
   const user = useCurrentUser();
-  const history = useHistory();
   const { isLoading, isError, error, data: userSettingsData } = useSingleUserSettings(user.userId);
 
   if (isLoading || !userSettingsData) return <LoadingIndicator />;
@@ -28,15 +25,6 @@ const Home = () => {
       <Typography variant="h3" marginLeft="auto" sx={{ marginTop: 2, textAlign: 'center', pt: 3, padding: 0 }}>
         Welcome, {user.firstName}!
       </Typography>
-      {!userSettingsData?.slackId && (
-        <Alert variant="filled" severity="warning" onClose={() => history.push(routes.SETTINGS)}>
-          You don't have a slack id set! Without it, you won't be able to get important updates from us. You can set it{' '}
-          <Link href={routes.SETTINGS} sx={{ color: 'blue' }}>
-            here
-          </Link>
-          .
-        </Alert>
-      )}
       <OverdueWorkPackageAlerts />
       <UsefulLinks />
       <UpcomingDeadlines />

src/frontend/src/tests/app/AppAuthenticated.test.tsx

@@ -30,7 +30,7 @@ const renderComponent = (path?: string, route?: string) => {
   const RouterWrapper = routerWrapperBuilder({ path, route });
   return render(
     <RouterWrapper>
-      <AppAuthenticated userId={1} />
+      <AppAuthenticated userId={1} userRole={'GUEST'} />
     </RouterWrapper>
   );
 };