Skip to content

fixed teamTask assigned task and centered searchbar #322

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

Merged
ivonanicetin merged 2 commits into from
Apr 2, 2025
Merged

fixed teamTask assigned task and centered searchbar #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc32410
fixed teamTask assigned task and centered searchbar
JamesBirni Apr 2, 2025
3290c7a
teamTaskCSS
JamesBirni Apr 2, 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
4 changes: 2 additions & 2 deletions frontend/react-app/src/components/AddToTeam.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default function AddToTeam({teamId, allTeamMembers, currentMembers, setTe
};

return(
<form onSubmit={handleSubmit(onSubmit)} className ='rowFlexbox 'style={{justifyContent: 'stretch', width: '50%'}}>
<form onSubmit={handleSubmit(onSubmit)} className ='rowFlexbox 'style={{justifyContent: 'stretch', marginLeft:'0', marginRight: '0', alignItems: 'center', gap: '0'}}>
<Controller
control={control}
className='Select'
Expand All @@ -67,7 +67,7 @@ export default function AddToTeam({teamId, allTeamMembers, currentMembers, setTe
styles={customStyles}
/>)}
/>
<button type="submit" className='smallImportButton'>Add To Team</button>
<button type="submit" className='importButton' style={{marginLeft: '10px'}}>Add To Team</button>
</form>
)

Expand Down
1 change: 1 addition & 0 deletions frontend/react-app/src/css/TaskList.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ thead th{
padding: 3px;
display: flex;
margin-top: 5px;
align-items: center;
}
.search-form {
display: flex;
Expand Down
6 changes: 4 additions & 2 deletions frontend/react-app/src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,13 @@ li.logo a{
margin-bottom: 20px;
border: none;
border-radius: 10px;
color: white;
background-color: #3f5d8b;
cursor: pointer;
}
.smallImportButton{
padding-left: 5px;
padding-right: 5px;
padding-left: 10px;
padding-right: 10px;
padding-top: 3px;
padding-bottom: 3px;
font-size: 1em;
Expand All @@ -99,5 +100,6 @@ li.logo a{
border: none;
border-radius: 10px;
background-color: #3f5d8b;
color: white;
cursor: pointer;
}
10 changes: 5 additions & 5 deletions frontend/react-app/src/pages/TeamTasks.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,26 +194,26 @@ console.log(teamLead)
<div className='pageContainer'>
<Header/>
<div className='pageBody'>
<h2>{team.teamName}</h2>
<h2 style={{marginBottom: '0', marginTop: '40px'}}>{team.teamName}</h2>
{tasksToDoData.length > 0 ? (
<TaskList
dataToUse={tasksToDoData}
headersAndAccessors={headerAndAccessors}
/>
) : (
<p>No tasks to do</p>
<p style={{marginTop: '10px', marginBottom: '30px'}}>No tasks to do</p>
)}


<a href="/create-task"><button className="create-task-btn">Create Task</button></a>
<h2>Completed Tasks</h2>
<a href="/create-task"><button className="create-task-btn" style={{marginBottom:'20px'}}>Create Task</button></a>
<h2 style={{marginBottom: '0'}}>Completed Tasks</h2>
{tasksCompletedData.length > 0 ? (
<TaskList
dataToUse={tasksCompletedData}
headersAndAccessors={headerAndAccessorsComplete}
/>
) : (
<h2>No tasks completed</h2>
<h2 style={{marginTop: '10px', marginBottom: '30px'}}>No tasks completed</h2>
)}


Expand Down