Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 10 additions & 7 deletions frontend/react-app/src/components/EditTaskForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,18 @@ import { unassignTeamMemberFromTask } from '../api/isAssignedApi';
const customStyles = {
control: (provided) => ({
...provided,
width: '100%',
width: '560px;',
minWidth: '100px',
maxWidth: '100%',
minHeight: '30px',
maxHeight: '100%',
border: '2px solid grey',
border: '1.5px solid #2d2644',
borderRadius: '10px',
paddingLeft: '8px',
backgroundColor: '#BFCDE0',
margin: '10px 0px',
backgroundColor: 'white',
margin: 'auto',
marginTop: '0.5%',
marginBottom: '1%',
cursor: 'pointer'
}),
option: (provided, state) =>({
Expand Down Expand Up @@ -92,7 +94,7 @@ function EditTaskForm({task, team}){
<label className='majorLabel'>
Task Name
<div>
<input type="text" name="name" id="name" className='input' defaultValue={task.title}{...register("name", {
<input type="text" placeholder="Add task name" name="name" id="name" className='input' defaultValue={task.title}{...register("name", {
required:{
value: true,
message: 'Please set a Task Name'
Expand Down Expand Up @@ -147,7 +149,8 @@ function EditTaskForm({task, team}){
Description

<div>
<input type="text" name="input-description" id="description" className='input' defaultValue={task.description} {...register("description", { required: false })}/>
{/* <input type="text" name="input-description" id="description" className='input' defaultValue={task.description} {...register("description", { required: false })}/> */}
<textarea name="input-description" id="description" placeholder="Add description" className='input' defaultValue={task.description} {...register("description", { required: false })}/>
</div>
</label>
<label className='majorLabel'>
Expand All @@ -156,7 +159,7 @@ function EditTaskForm({task, team}){
<input type='date' name="input-dueDate" id="dueDate" className='input' defaultValue={task.dueDate} {...register("dueDate", { required: false })}/>
</div>
</label>
<input type="submit" value="Edit Task" id="button"/>
<input type="submit" value="Edit Task" id="editTaskButton"/>

</form>
)
Expand Down
4 changes: 4 additions & 0 deletions frontend/react-app/src/css/CreateTaskForm.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
width: 100%;
padding-top: 30px;
padding-bottom: 30px;
background-color: #e6e4f7;
margin-top: 3%;
margin-bottom: 3%;
border-radius: 20px;
}
.CreateTaskForm input {
width: 50%;
Expand Down
11 changes: 11 additions & 0 deletions frontend/react-app/src/css/EditTask.css
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,15 @@ select {

input[type="checkbox"]:disabled:after {
-webkit-filter: opacity(0.4);
}

#editTaskButton {
background-color: #3f5d8b;
width: 25%;
margin-left: 38%;
margin-top: 2%;
}

#editTaskButton:hover {
background-color: #24416c;
}