From fea7039a2999f3ad6a6bb67675e15f3a73ee45e5 Mon Sep 17 00:00:00 2001
From: chandler <lcchrty@gmail.com>
Date: Mon, 3 Jun 2024 18:23:37 -0700
Subject: [PATCH 1/4] Fix display issue with TitledBox in Project Form Fixes
 #1646

---
 client/src/components/ProjectForm.js | 156 ++++++++++++++++-----------
 1 file changed, 94 insertions(+), 62 deletions(-)

diff --git a/client/src/components/ProjectForm.js b/client/src/components/ProjectForm.js
index 9ff63055..096be479 100644
--- a/client/src/components/ProjectForm.js
+++ b/client/src/components/ProjectForm.js
@@ -231,70 +231,102 @@ export default function ProjectForm({
         <TitledBox
           title={editMode ? 'Editing Project' : 'Project Information'}
           badge={isEdit ? editIcon() : addIcon()}
-        />
-      ) : (
-        <TitledBox title={'Project Information'} />
-      )}
-      <form
-        id="project-form"
-        onSubmit={handleSubmit((data) => {
-          isEdit ? submitEditProject(data) : submitNewProject(data);
-        })}
-      >
-        {arr.map((input) => (
-          <ValidatedTextField
-            key={input.name}
-            register={register}
-            isEdit={isEdit}
-            editMode={editMode}
-            locationType={locationType}
-            locationRadios={locationRadios}
-            errors={errors}
-            input={input}
-          />
-        ))}
-        <ChangesModal
-          open={isModalOpen}
-          onClose={handleClose}
-          destination={'/projects'}
-          aria-labelledby="modal-modal-title"
-          aria-describedby="modal-modal-description"
-          handleClose={handleClose}
-        />
-      </form>
-      {auth.user.accessLevel === 'admin' ? (
-        <Box>
-          <Grid container justifyContent="space-evenly" sx={{ my: 3 }}>
-            <Grid item xs="auto">
-              <StyledButton
-                type="submit"
-                form="project-form"
-                variant={
-                  !isEdit ? 'secondary' : !editMode ? 'contained' : 'secondary'
-                }
-                cursor="pointer"
-                disabled={isEdit ? !editMode : false}
-              >
-                Save
-              </StyledButton>
-            </Grid>
-            <Grid item xs="auto">
-              <StyledButton
-                variant="contained"
-                cursor="pointer"
-                onClick={
-                  !editMode || Object.keys(dirtyFields).length === 0
-                    ? checkFields
-                    : handleOpen
-                }
-              >
-                Close
-              </StyledButton>
+        >
+          {' '}
+          <form
+            id="project-form"
+            onSubmit={handleSubmit((data) => {
+              isEdit ? submitEditProject(data) : submitNewProject(data);
+            })}
+          >
+            {arr.map((input) => (
+              <ValidatedTextField
+                key={input.name}
+                register={register}
+                isEdit={isEdit}
+                editMode={editMode}
+                locationType={locationType}
+                locationRadios={locationRadios}
+                errors={errors}
+                input={input}
+              />
+            ))}
+            <ChangesModal
+              open={isModalOpen}
+              onClose={handleClose}
+              destination={'/projects'}
+              aria-labelledby="modal-modal-title"
+              aria-describedby="modal-modal-description"
+              handleClose={handleClose}
+            />
+          </form>
+          <Box>
+            <Grid container justifyContent="space-evenly" sx={{ my: 3 }}>
+              <Grid item xs="auto">
+                <StyledButton
+                  type="submit"
+                  form="project-form"
+                  variant={
+                    !isEdit
+                      ? 'secondary'
+                      : !editMode
+                      ? 'contained'
+                      : 'secondary'
+                  }
+                  cursor="pointer"
+                  disabled={isEdit && !isLoading ? !editMode : false}
+                >
+                  Save
+                </StyledButton>
+              </Grid>
+              <Grid item xs="auto">
+                <StyledButton
+                  variant="contained"
+                  cursor="pointer"
+                  onClick={
+                    !editMode || Object.keys(dirtyFields).length === 0
+                      ? checkFields
+                      : handleOpen
+                  }
+                >
+                  Close
+                </StyledButton>
+              </Grid>
             </Grid>
-          </Grid>
-        </Box>
+          </Box>
+        </TitledBox>
       ) : (
-        ''
+        <TitledBox title={'Project Information'}>
+          {' '}
+          <form
+            id="project-form"
+            onSubmit={handleSubmit((data) => {
+              isEdit ? submitEditProject(data) : submitNewProject(data);
+            })}
+          >
+            {arr.map((input) => (
+              <ValidatedTextField
+                key={input.name}
+                register={register}
+                isEdit={isEdit}
+                editMode={editMode}
+                locationType={locationType}
+                locationRadios={locationRadios}
+                errors={errors}
+                input={input}
+              />
+            ))}
+            <ChangesModal
+              open={isModalOpen}
+              onClose={handleClose}
+              destination={'/projects'}
+              aria-labelledby="modal-modal-title"
+              aria-describedby="modal-modal-description"
+              handleClose={handleClose}
+            />
+          </form>
+          {''}
+        </TitledBox>
       )}
     </Box>
   ) : (

From 65fe6a028bd53d8e6e8487877ce9747e753d50a3 Mon Sep 17 00:00:00 2001
From: chandler <lcchrty@gmail.com>
Date: Mon, 24 Jun 2024 19:43:30 -0700
Subject: [PATCH 2/4] removed isLoading from ternary statement

---
 client/src/components/ProjectForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/ProjectForm.js b/client/src/components/ProjectForm.js
index 096be479..51f59d83 100644
--- a/client/src/components/ProjectForm.js
+++ b/client/src/components/ProjectForm.js
@@ -274,7 +274,7 @@ export default function ProjectForm({
                       : 'secondary'
                   }
                   cursor="pointer"
-                  disabled={isEdit && !isLoading ? !editMode : false}
+                  disabled={isEdit ? !editMode : false}
                 >
                   Save
                 </StyledButton>

From acb2fd6f0876204c9150a6452cf937e0e575431e Mon Sep 17 00:00:00 2001
From: chandler <lcchrty@gmail.com>
Date: Tue, 24 Sep 2024 15:07:55 -0700
Subject: [PATCH 3/4] updated file ext

---
 client/src/components/{ProjectForm.js => ProjectForm.jsx} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/components/{ProjectForm.js => ProjectForm.jsx} (100%)

diff --git a/client/src/components/ProjectForm.js b/client/src/components/ProjectForm.jsx
similarity index 100%
rename from client/src/components/ProjectForm.js
rename to client/src/components/ProjectForm.jsx

From 439e99a23891bed87605bcaf5c02f710b56fa3a0 Mon Sep 17 00:00:00 2001
From: chandler <lcchrty@gmail.com>
Date: Tue, 24 Sep 2024 15:27:52 -0700
Subject: [PATCH 4/4] Fixes issue 1646, resolved merge conflicts, confirming
 checks still pass

---
 client/src/components/ProjectForm.jsx | 66 +++++++++++++--------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/client/src/components/ProjectForm.jsx b/client/src/components/ProjectForm.jsx
index 29dceb32..21571e7e 100644
--- a/client/src/components/ProjectForm.jsx
+++ b/client/src/components/ProjectForm.jsx
@@ -235,43 +235,41 @@ export default function ProjectForm({
       <Box sx={{ textAlign: 'center' }}>
         <Typography variant="h1">Project Management</Typography>
       </Box>
+      {/* ) : (
+      <TitledBox title={'Project Information'} />
+      )} */}
       {auth.user.accessLevel === 'admin' ? (
         <TitledBox
           title={editMode ? 'Editing Project' : 'Project Information'}
           badge={isEdit ? editIcon() : addIcon()}
-        />
-      ) : (
-        <TitledBox title={'Project Information'} />
-      )}
-      <form
-        id="project-form"
-        onSubmit={handleSubmit((data) => {
-          isEdit ? submitEditProject(data) : submitNewProject(data);
-        })}
-      >
-        {arr.map((input) => (
-          <ValidatedTextField
-            key={input.name}
-            register={register}
-            isEdit={isEdit}
-            editMode={editMode}
-            locationType={locationType}
-            locationRadios={locationRadios}
-            errors={errors}
-            input={input}
-          />
-        ))}
-        <ChangesModal
-          open={isModalOpen}
-          onClose={handleClose}
-          destination={'/projects'}
-          aria-labelledby="modal-modal-title"
-          aria-describedby="modal-modal-description"
-          handleClose={handleClose}
-        />
-      </form>
-      {auth.user.accessLevel === 'admin' ? (
-        <Box>
+        >
+          <form
+            id="project-form"
+            onSubmit={handleSubmit((data) => {
+              isEdit ? submitEditProject(data) : submitNewProject(data);
+            })}
+          >
+            {arr.map((input) => (
+              <ValidatedTextField
+                key={input.name}
+                register={register}
+                isEdit={isEdit}
+                editMode={editMode}
+                locationType={locationType}
+                locationRadios={locationRadios}
+                errors={errors}
+                input={input}
+              />
+            ))}
+            <ChangesModal
+              open={isModalOpen}
+              onClose={handleClose}
+              destination={'/projects'}
+              aria-labelledby="modal-modal-title"
+              aria-describedby="modal-modal-description"
+              handleClose={handleClose}
+            />
+          </form>{' '}
           <Grid container justifyContent="space-evenly" sx={{ my: 3 }}>
             <Grid item xs="auto">
               <StyledButton
@@ -300,7 +298,7 @@ export default function ProjectForm({
               </StyledButton>
             </Grid>
           </Grid>
-        </Box>
+        </TitledBox>
       ) : (
         <TitledBox title={'Project Information'}>
           {' '}