Merge branch 'dev' into 73-Bug-Batch-3

ctc-uci · Apr 16, 2024 · f5f5ec9 · f5f5ec9
2 parents 77d9420 + 6ba6138
commit f5f5ec9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/src/App.css b/src/App.css
@@ -0,0 +1,3 @@
+.Windows-PSOption {
+    color: black;
+}
diff --git a/src/components/Events/DailyEvent.jsx b/src/components/Events/DailyEvent.jsx
@@ -2,9 +2,13 @@ import PropTypes from 'prop-types';
 import { Box, Flex, Text, Grid, Button, Spacer } from '@chakra-ui/react';
 import { useState } from 'react';
 import { NPOBackend } from '../../utils/auth_utils.js';
+import AUTH_ROLES from '../../utils/auth_config.js';
+import { useAuthContext } from '../../common/AuthContext.jsx';
+const { USER_ROLE } = AUTH_ROLES.AUTH_ROLES;
 
 const DailyEvent = ({ id, startTime, endTime, eventTitle, confirmed, description }) => {
   const [confirmEvent, setConfirmEvent] = useState(confirmed);
+  const {currentUser} = useAuthContext();
 
   let border_color = '#2B93D1';
   let background_color = '#F7FAFC';
@@ -55,7 +59,7 @@ const DailyEvent = ({ id, startTime, endTime, eventTitle, confirmed, description
             <Grid gap={2}>
               <div></div>
               <div></div>
-              <Button bg="#FBD38D" textColor="#2D3748" size="sm" onClick={handleConfirm}>
+              <Button bg="#FBD38D" textColor="#2D3748" size="sm" onClick={handleConfirm} visibility={currentUser.type == USER_ROLE ? 'hidden' : 'visible'}>
                 Confirm
               </Button>
             </Grid>

diff --git a/src/components/Events/EventInfo.jsx b/src/components/Events/EventInfo.jsx
@@ -4,11 +4,15 @@ import { DeleteIcon } from '@chakra-ui/icons';
 import { LuPen } from 'react-icons/lu';
 import PlannerModal from '../Planner/PlannerModal';
 import { NPOBackend } from '../../utils/auth_utils';
+import AUTH_ROLES from '../../utils/auth_config.js';
+import { useAuthContext } from '../../common/AuthContext.jsx';
+const { USER_ROLE } = AUTH_ROLES.AUTH_ROLES;
 
 const EventInfo = ({ dayId, eventDate, day, startTime, endTime, location, notes, setShouldDataRevalidate }) => {
   const { isOpen: isOpenPlanner, onOpen: onOpenPlanner, onClose: onClosePlanner } = useDisclosure();
   const { isOpen: isOpenDelete, onOpen: onOpenDelete, onClose: onCloseDelete } = useDisclosure();
   const toast = useToast();
+  const {currentUser} = useAuthContext();
 
   const handlePlannerClose = () => {
     setShouldDataRevalidate(true);
@@ -49,10 +53,10 @@ const EventInfo = ({ dayId, eventDate, day, startTime, endTime, location, notes,
       <Text whiteSpace="pre-wrap" mb="2rem">{notes ? notes : 'No notes.'}</Text>
 
       <HStack mt="auto">
-        <IconButton bg="white" onClick={onOpenPlanner}>
+        <IconButton bg="white" onClick={onOpenPlanner} visibility={currentUser.type == USER_ROLE ? 'hidden' : 'visible'}>
           <LuPen color='#A0AEC0'/>
         </IconButton>
-        <IconButton bg="white" onClick={onOpenDelete}>
+        <IconButton bg="white" onClick={onOpenDelete} visibility={currentUser.type == USER_ROLE ? 'hidden' : 'visible'}>
           <DeleteIcon color='#A0AEC0'/>
         </IconButton>
       </HStack>

diff --git a/src/pages/PublishedSchedule/PublishedSchedule.jsx b/src/pages/PublishedSchedule/PublishedSchedule.jsx
@@ -76,10 +76,13 @@ const PublishedSchedule = () => {
         textColor="transparent"
         onChange={(e) => setSelectedSeason(e.target.value)}
         width="23%"
+        visibility={currentUser.type == USER_ROLE ? 'hidden' : 'visible'}
       >
         { currentUser.type === ADMIN_ROLE &&
           allSeasons.map(item => (
-            <option key={item} value={item}>{item}</option>
+            <option key={item} value={item} className={navigator.userAgent.includes('Windows') ? 'Windows-PSOption' : 'Unix-PSOption'}>
+              {item}
+            </option>
           ))
         }
       </Select>