Skip to content
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

38 profile page editing #147

Merged
merged 22 commits into from
May 8, 2024
Merged

38 profile page editing #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
10c4443
Set container width to 100% in mobile
ryanyychen Feb 28, 2024
a63b0b8
Create preliminary profile edit page
ryanyychen Feb 28, 2024
0be6589
Remove unused styling
ryanyychen Feb 28, 2024
36cd668
Remove unused styling
ryanyychen Feb 28, 2024
18ec19c
Set up view method and API call
ryanyychen Feb 28, 2024
17b3b76
Fix bug not displaying group specific cards in edit profile page
ryanyychen Feb 28, 2024
103292b
Add comments for what to do next
ryanyychen Mar 1, 2024
b145d64
Merge branch '38-profile-page-editing' of https://github.com/HKN-UCSD…
andrewzpu Mar 8, 2024
598aca5
created backend route to update user info
andrewzpu Apr 8, 2024
d944439
added "other degree" and fixed preferred_name bug
andrewzpu Apr 8, 2024
bbef99a
Merge branch 'master' into 38-profile-page-editing
ryanyychen Apr 8, 2024
c448262
Added default display for "Other" major and degree in Edit Profile Page
andrewzpu Apr 10, 2024
79f52f3
Merge branch '38-profile-page-editing' of https://github.com/HKN-UCSD…
andrewzpu Apr 10, 2024
16418af
uncommented forms.py major and degree
andrewzpu Apr 10, 2024
277dcb9
fixed edit profile page
andrewzpu Apr 15, 2024
05f2bbc
Merge branch 'master' into 38-profile-page-editing
ryanyychen Apr 17, 2024
f0dc274
Add title
ryanyychen Apr 17, 2024
f7db0ea
Remove unneeded import
ryanyychen Apr 17, 2024
e1dac68
Added cancel edit profile button
andrewzpu Apr 23, 2024
e9bf030
Fixed minor bugs in edit profile
andrewzpu Apr 24, 2024
4c5c4e7
Updated edit profile cancellation to include any action leaving page …
andrewzpu Apr 24, 2024
1910720
Fixed save and cancel buttons
andrewzpu Apr 25, 2024
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/src/App.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import EventCreate from "./Pages/Events/EventCreate.svelte";
import EventRides from "./Pages/Events/EventRides.svelte"
import Profile from "./Pages/Profile.svelte";
//import ProfileEdit from "./Pages/ProfileEdit.svelte";
import ProfileEdit from "./Pages/ProfileEdit.svelte";
import Inductees from "./Pages/Inductees.svelte";
import Outreach from "./Pages/Outreach.svelte";

Expand Down Expand Up @@ -36,7 +36,7 @@
<Profile id={null}/>
</Route>
<Route path="/profile/edit">
<!--ProfileEdit /-->
<ProfileEdit />
</Route>

{#if adminStatus}
Expand Down
17 changes: 6 additions & 11 deletions frontend/src/Pages/Profile.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,16 @@

<svelte:head>
<title> HKN Portal | Profile </title>
<meta name="viewport" content="width=device-width, initial-sclae=1.0">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</svelte:head>

<Layout>
<main>
<div style="width: 95%; display: flex; align-items: center; justify-content: space-between;">
<h1 style="margin-left: 15px">Profile Page</h1>
<!-- {#if self}
{#if self}
<a id="editProfile" href="/profile/edit/"> Edit </a>
{/if} -->
{/if}
</div>
{#if userData}
<!-- Display basic information -->
Expand Down Expand Up @@ -304,16 +304,8 @@
width: 95%;
}

.multi-column {
display: flex;
flex-direction: row;
align-items: center;
margin: 10px 0px 10px 0px;
}

h2 {
margin: 0px 10px 0px 0px;

}

h3 {
Expand Down Expand Up @@ -349,5 +341,8 @@
width: 40%;
display: inline-block
}
.container {
width: 100%;
}
}
</style>
Loading
Loading