Skip to content

Commit

Permalink
Merge pull request #1527 from bkmorgan3/1489/add-all-fields
Browse files Browse the repository at this point in the history
add new fields to edit project form
  • Loading branch information
trillium authored Oct 31, 2023
2 parents 822d161 + f0454da commit 65b0a03
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 5 deletions.
50 changes: 48 additions & 2 deletions client/src/components/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ export const simpleInputs = [
name: 'name',
type: 'text',
placeholder: 'Enter project name',
disabled: false
},
{
label: 'Project Description',
name: 'description',
type: 'textarea',
placeholder: 'Enter project description',
value: /^[a-zA-Z0-9].{0,250}$/,
errorMessage: 'Description must start with alphanumeric characters, 250 char limit'
errorMessage: 'Description must start with alphanumeric characters, 250 char limit',
disabled: false
},
{
label: 'Location',
Expand All @@ -23,35 +25,79 @@ export const simpleInputs = [
errorMessage: 'Please enter a valid Zoom URL',
addressValue: '',
addressError: 'Invalid address',
disabled: false
},
{
label: 'GitHub Identifier',
name: 'githubIdentifier',
type: 'text',
placeholder: 'Enter GitHub identifier',
disabled: false
},
{
label: 'GitHub URL',
name: 'githubUrl',
type: 'text',
placeholder: 'htttps://github.com/',
disabled: false
},
{
label: 'Slack Channel Link',
name: 'slackUrl',
type: 'text',
placeholder: 'htttps://slack.com/',
disabled: false
},
{
label: 'Google Drive URL',
name: 'googleDriveUrl',
type: 'text',
placeholder: 'htttps://drive.google.com/',
disabled: false
},
{
label: 'HFLA Website URL',
name: 'hflaWebsiteUrl',
type: 'text',
placeholder: 'htttps://hackforla.org/projects/',
disabled: false
},
];
];

export const additionalInputsForEdit = [
{
label: 'Partners',
name: 'partners',
type: 'text',
placeholder: 'partners',
disabled: false
},
{
label: 'Managed by Users',
name: 'managedByUsers',
type: 'text',
placeholder: 'Managed by Users',
disabled: false
},
{
label: 'Project Status',
name: 'projectStatus',
type: 'text',
placeholder: 'Project Status',
disabled: false
},
{
label: 'Google Drive ID',
name: 'googleDriveId',
type: 'text',
placeholder: 'htttps://drive.google.com/',
disabled: false
},
{
label: 'Created Date',
name: 'createdDate',
type: 'text',
placeholder: 'Created Date',
disabled: true
}
]
9 changes: 7 additions & 2 deletions client/src/components/manageProjects/editProject.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import EditMeetingTimes from './editMeetingTimes';
import CreateNewEvent from './createNewEvent';
import readableEvent from './utilities/readableEvent';
import ProjectForm from '../ProjectForm';
import { simpleInputs } from '../data';
import { simpleInputs, additionalInputsForEdit } from '../data';
import TitledBox from '../parts/boxes/TitledBox';

import { ReactComponent as EditIcon } from '../../svg/Icon_Edit.svg';
Expand Down Expand Up @@ -31,6 +31,11 @@ const EditProject = ({
slackUrl: projectToEdit.slackUrl,
googleDriveUrl: projectToEdit.googleDriveUrl,
hflaWebsiteUrl: projectToEdit.hflaWebsiteUrl,
partners: projectToEdit.partners,
managedByUsers: projectToEdit.managedByUsers,
projectStatus: projectToEdit.projectStatus,
googleDriveId: projectToEdit.googleDriveId,
createdDate: new Date(projectToEdit.createdDate)
});

// eslint-disable-next-line no-unused-vars
Expand Down Expand Up @@ -92,7 +97,7 @@ const EditProject = ({
/>
</div>
<ProjectForm
arr={simpleInputs}
arr={[...simpleInputs, ...additionalInputsForEdit]}
formData={formData}
projectToEdit={projectToEdit}
isEdit={true}
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/parts/form/ValidatedTextField.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function ValidatedTextField({
type={input.type}
placeholder={input.placeholder}
helperText={`${errors[input.name]?.message || ' '}`}
disabled={isEdit ? !editMode : undefined} // handles edit mode for EditProjcet form
disabled={isEdit ? !editMode || input.disabled : undefined} // handles edit mode for EditProjcet form
/>
</Box>
);
Expand Down

0 comments on commit 65b0a03

Please sign in to comment.