Skip to content

Changed UI, added link to Tasks when hovering. #285

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 1 commit into from
Apr 2, 2025
Merged

Changed UI, added link to Tasks when hovering. #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
74 changes: 64 additions & 10 deletions frontend/react-app/src/css/home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,63 @@ td {
text-align: left;
padding: 10px;
}

.rowFlexbox {
display: flex;
justify-content: center;
align-items: flex-start;
gap: 40px;
width: 100%;
max-width: 1600px;
margin: 0 auto;
}

.column-box {
background-color: #e6e4f7;
border-radius: 16px;
padding: 24px;
box-shadow: 0 4px 24px rgba(0, 0, 0, 0.08);
min-width: 0;
}

#teamSection {
flex: 0 0 30%;
}

#taskSection {
flex: 1 1 40%;
}

.section-divider {
border: none;
border-top: 2px solid #3f5d8b;
margin-top: 8px;
margin-bottom: 16px;
width: 100%;
}

.teamButtonContainer {
display: flex;
width: 100%;
flex-direction: column;
gap: 12px;
align-items: center;
}

.teamButton {
width: 70%;
height: 100%;
min-width:fit-content;
padding: 15px 40px;
width: 85%;
height: 10px;
padding: 15px 40px 15px 20px;
line-height: 1;
border: none;
border-radius: 15px;
background-color:#3B3355;
background-color:#53789d;
color: white;
font-size: 1.5em;
font-size: 1em;
text-align: left;
display: flex;
align-items: center;
justify-content: flex-start;
}

.teamButton:hover {
Expand All @@ -79,6 +126,7 @@ td {
tbody {
width: 100%;
}

.miniButton {
padding: 3px 6px;
background-color:#3B3355;
Expand All @@ -95,10 +143,6 @@ tbody {
text-decoration: underline;
}

#taskSection h2 {
text-decoration: underline;
}

.pageContainer {
/* background-color: #f6edff; */
background-color: white;
Expand All @@ -124,4 +168,14 @@ tbody {
font-size: 1em;
padding-left: 1%;
border-radius: 10px;
}

.sectionLink {
color: inherit;
text-decoration: none;
}

.sectionLink:hover {
text-decoration: underline;
cursor: pointer;
}
17 changes: 9 additions & 8 deletions frontend/react-app/src/pages/Home.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ function setUpDataTasksToDo(obj){
id: taskItem.id,
name: taskItem.name,
team: taskItem.team,
dueDate: taskItem.dueDate

dueDate: taskItem.dueDate
}]

}
}
)
Expand Down Expand Up @@ -131,22 +129,25 @@ const Home = () => {

<main className='pageBody'>
<div className='rowFlexbox'>
<div id="teamSection">
<h2>My Teams</h2>
<div id="teamSection" className="column-box">
<h2>Teams</h2>
<hr className="section-divider" />

<div id="teamButtons" className='teamButtonContainer'>
{teams.map((team)=>(
<Link className="teamButton headerText1" to='/team-tasks' state={{ team: team}} key={team.teamId} >
{team.teamName}
</Link>

))}
</div>
</div>


<div id="taskSection">
<h2>My Tasks (Preview)</h2>
<div id="taskSection" className="column-box">
<h2>
<Link to="/my-tasks" className="sectionLink" title="My Tasks">Tasks</Link>
</h2>
<hr className="section-divider" />
{setUpData(tasksToDo).length > 0 ? (
<TaskList
dataToUse={setUpData(tasksToDo)}
Expand Down