Skip to content

Changing profile page to match the rest of the website #328

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

Changing profile page to match the rest of the website #328

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
28 changes: 25 additions & 3 deletions frontend/react-app/src/css/Profile.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,31 @@
width: 100%;
box-sizing: border-box;
}


.profile-info-container {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}

.button-group {
display: flex;
flex-direction: column;
align-items: flex-end;
}

.sign-out-btn button {
background-color: #3B3355;
color: white;
font-size: 15px;
height: 35px;
padding: 10px;
}

.user-info {
display: flex;
align-items: left;
align-items: flex-start;
gap: 2rem;
margin-bottom: 2rem;
}
Expand Down Expand Up @@ -36,13 +57,14 @@
margin: 0;
font-size: 20px;
font-weight: 600;
}
}

.teams-grid {
display: flex;
flex-direction: column;
gap: 0px;
align-items: center;
width: 110%;
}

.logout-btn{
Expand Down
32 changes: 20 additions & 12 deletions frontend/react-app/src/pages/Profile.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,26 @@ function Profile(){
<div className='pageContainer'>
<Header/>
<div className='profile-page'>
<UserInfo
userInfo = {userData}/>
<h1>My Teams</h1>
<div className="teams-grid">
{teams.map((team) => (
<Teams team={team} key={team.teamId}/>
))}
</div>
<div>
<a href="/change-password"><button className="importButton">Change Password</button></a>
</div>
<SignOut/>
<div className="profile-info-container">
<UserInfo
userInfo = {userData}/>
<div className='button-group'>
<a href="/change-password"><button className="importButton" style={{margin: '0px', backgroundColor: '#3B3355', color: 'white', fontSize:'15px', padding: '10px', height: '35px'}}>Change Password</button></a>
<div className='sign-out-btn'>
<SignOut style={{backgroundColor:'#3B3355'}}/>
</div>
</div>
</div>
<div className="column-box" style={{width: '95%'}} >
<h1>My Teams</h1>
<div className="section-divider">
<div className="teams-grid">
{teams.map((team) => (
<Teams team={team} key={team.teamId}/>
))}
</div>
</div>
</div>
</div>
</div>

Expand Down