Skip to content

Removed unused variables and imports #2017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

Removed unused variables and imports #2017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
599b32f
Removed unused variables and imports
Simmigon-flagg Oct 7, 2025
96c022c
Typo in styles boxshadow
Simmigon-flagg Oct 7, 2025
e1047bb
Merge branch 'development' into 1704-update-html-components-to-mui-sr…
Simmigon-flagg Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 72 additions & 59 deletions client/src/components/ChangesModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
import React from 'react'
import {
Modal,
Box,
Typography,
Grid
} from '@mui/material'
import { StyledButton } from './ProjectForm';
import { Link } from 'react-router-dom';
import WarningAmberRoundedIcon from '@mui/icons-material/WarningAmberRounded';
import { Modal, Box, Typography, Grid, Button } from '@mui/material';
import { Link } from 'react-router-dom';
import WarningAmberRoundedIcon from '@mui/icons-material/WarningAmberRounded';


const style = {
const style = {
position: 'absolute',
top: '50%',
left: '50%',
Expand All @@ -22,52 +14,73 @@ import {
p: 4,
};

export default function ChangesModal({
open,
onClose,
handleClose,
destination,
}) {
return (
<Modal
open={open}
onClose={onClose}
aria-labelledby="modal-modal-title"
aria-describedby="modal-modal-description"
>
<Box sx={style}>
<Typography
sx={{ textAlign: 'center' }}
id="modal-modal-title"
variant="h4"
component="h3"
>
<WarningAmberRoundedIcon fontSize="large" color="error" />
</Typography>

export default function ChangesModal({open, onClose, handleClose, destination }) {
return (

<Modal
open={open}
onClose={onClose}
aria-labelledby="modal-modal-title"
aria-describedby="modal-modal-description"
>
<Box sx={style}>
<Typography sx={{textAlign: 'center'}} id="modal-modal-title" variant="h4" component="h3">
<WarningAmberRoundedIcon fontSize="large" color="error" />
</Typography>

<Typography sx={{textAlign: 'center'}} id="modal-modal-title" variant="h4" component="h4">
Wait! You made some changes.
</Typography>
<Typography id="modal-modal-description" sx={{ mt: 2, textAlign: 'center' }}>
Are you sure you want to exit without saving?
</Typography>
<Grid direction="column" spacing={3} container alignContent="center" sx={{ my: 3 }}>
<Grid item xs="auto">
<StyledButton
component={Link}
to={destination}
variant="secondary"
cursor="pointer"

>
Yes
</StyledButton>
</Grid>
<Grid item xs="auto">
<StyledButton
type="submit"
form="project-form"
cursor="pointer"
variant="contained"
onClick={handleClose}
>
No
</StyledButton>
</Grid>
<Typography
sx={{ textAlign: 'center' }}
id="modal-modal-title"
variant="h4"
component="h4"
>
Wait! You made some changes.
</Typography>
<Typography
id="modal-modal-description"
sx={{ mt: 2, textAlign: 'center' }}
>
Are you sure you want to exit without saving?
</Typography>
<Grid
direction="column"
spacing={3}
container
alignContent="center"
sx={{ my: 3 }}
>
<Grid item xs="auto">
<Button
component={Link}
to={destination}
variant="secondary"
style={{ width: '150px', cursor: 'pointer' }}
>
Yes
</Button>
</Grid>
<Grid item xs="auto">
<Button
type="submit"
form="project-form"
style={{ width: '150px', cursor: 'pointer' }}
variant="contained"
onClick={handleClose}
>
No
</Button>
</Grid>
</Box>
</Modal>
)
}
</Grid>
</Box>
</Modal>
);
}
64 changes: 29 additions & 35 deletions client/src/components/ProjectForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState } from 'react';
import { useState } from 'react';
import { useHistory } from 'react-router-dom';
import { useForm, useFormState } from 'react-hook-form';
import {
Expand All @@ -12,7 +12,6 @@ import {
FormControlLabel,
RadioGroup,
} from '@mui/material';
import { styled } from '@mui/material/styles';

import useAuth from '../hooks/useAuth';
import ProjectApiService from '../api/ProjectApiService';
Expand All @@ -28,22 +27,6 @@ import ChangesModal from './ChangesModal';
* -the rest are inline
*/

export const StyledButton = styled(Button)(({ theme }) => ({
width: '150px',
}));

const StyledFormControlLabel = styled(FormControlLabel)(({ theme }) => ({
width: 'max-content',
'& .MuiFormControlLabel-label': {
fontSize: '14px',
},
}));

const StyledRadio = styled(Radio)(({ theme }) => ({
padding: '0px 0px 0px 0px',
marginRight: '.5rem',
}));

/**Project Form Component
* -renders a form for creating and updating a project

Expand Down Expand Up @@ -145,11 +128,12 @@ export default function ProjectForm({

// Handles the location radio button change.
const handleRadioChange = (event) => {
alert(event.target.value);
setLocationType(event.target.value);
};

// Toggles the project view to edit mode change.
const handleEditMode = (event) => {
const handleEditMode = () => {
setEditMode(!editMode);
// React hook form method to reset data back to original values. Triggered when Edit Mode is cancelled.
reset({
Expand Down Expand Up @@ -211,16 +195,16 @@ export default function ProjectForm({
onChange={handleRadioChange}
sx={{ mb: 0.5 }}
>
<StyledFormControlLabel
<FormControlLabel
value="remote"
control={<StyledRadio size="small" />}
control={<Radio size="small" />}
label="Remote"
disabled={isEdit ? !editMode : false}
/>
<Box sx={{ width: '10px' }} />
<StyledFormControlLabel
<FormControlLabel
value="in-person"
control={<StyledRadio size="small" />}
control={<Radio size="small" />}
label="In-Person"
disabled={isEdit ? !editMode : false}
/>
Expand All @@ -241,7 +225,8 @@ export default function ProjectForm({
badge={isEdit ? editIcon() : addIcon()}
expandable={true}
>
<form
<Box
component="form"
id="project-form"
onSubmit={handleSubmit((data) => {
isEdit ? submitEditProject(data) : submitNewProject(data);
Expand All @@ -267,40 +252,49 @@ export default function ProjectForm({
aria-describedby="modal-modal-description"
handleClose={handleClose}
/>
</form>{' '}
</Box>{' '}
<Grid container justifyContent="space-evenly" sx={{ my: 3 }}>
<Grid item xs="auto">
<StyledButton
<Button
type="submit"
form="project-form"
variant={
!isEdit ? 'secondary' : !editMode ? 'contained' : 'secondary'
}
cursor="pointer"
sx={{
width: '150px',
cursor: 'pointer',
}}
disabled={isEdit && isLoading ? !editMode : false}
>
{isLoading ? <CircularProgress /> : 'Save'}
</StyledButton>
</Button>
</Grid>
<Grid item xs="auto">
<StyledButton
<Button
variant="contained"
cursor="pointer"
sx={{
width: '150px',
cursor: 'pointer',
}}
onClick={
!editMode || Object.keys(dirtyFields).length === 0
? checkFields
: handleOpen
}
>
Close
</StyledButton>
</Button>
</Grid>
</Grid>
</TitledBox>
) : (
<TitledBox title={'Project Information'} expandable={true}>
{' '}
<form
<TitledBox title={'Project Information'}>
<Typography sx={{ p: 1, fontSize: '14px', fontWeight: '600' }}>
Project Information
</Typography>{' '}
<Box
component="form"
id="project-form"
onSubmit={handleSubmit((data) => {
isEdit ? submitEditProject(data) : submitNewProject(data);
Expand All @@ -326,7 +320,7 @@ export default function ProjectForm({
aria-describedby="modal-modal-description"
handleClose={handleClose}
/>
</form>
</Box>
{''}
</TitledBox>
)}
Expand Down
Loading