This repository has been archived by the owner on Nov 1, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Add Profile Page #17
Open
bsakhuja
wants to merge
8
commits into
master
Choose a base branch
from
brian/make-profile-page
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add Profile Page #17
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
9437b72
Basic form implementation of profile page. No photo or option to upl…
bsakhuja fad319f
added shrek
bsakhuja ba8176d
fixed shrek cutoff (rm height from profile)
bsakhuja 846feac
changed units to rem, using flexbox now
bsakhuja acb6a5d
updated spacing between items
bsakhuja 106c86d
Merge branch 'master' into brian/make-profile-page
just-ma 893c60a
styling fixes
just-ma b1ad1af
Merge branch 'brian/make-profile-page' of https://github.com/uclaradi…
just-ma File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,19 @@ | ||
import * as React from 'react'; | ||
import { Div } from 'glamorous'; | ||
|
||
const Profile = () => <h1>Profile Page</h1>; | ||
import ProfileForm from './ProfileForm'; | ||
|
||
const Profile = () => ( | ||
<Div | ||
className="profile-form" | ||
display="flex" | ||
alignItems="center" | ||
justifyContent="center" | ||
> | ||
<Div className="profile"> | ||
<ProfileForm /> | ||
</Div> | ||
</Div> | ||
); | ||
|
||
export default Profile; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
import * as React from 'react'; | ||
import { Form } from 'glamorous'; | ||
|
||
import ProfileLabel from './ProfileLabel'; | ||
import ProfileSubmitButton from './ProfileSubmitButton'; | ||
import ProfileFormTextInput from './ProfileFormTextInput'; | ||
import ProfilePicture from './ProfilePicture'; | ||
|
||
const ProfileForm = () => ( | ||
<Form | ||
backgroundColor="rgba(255, 255, 255, 0.6)" | ||
padding="2rem 2rem" | ||
margin="2rem" | ||
display="flex" | ||
flexDirection="column" | ||
alignItems="center" | ||
spaceBetween="2rem" | ||
> | ||
<ProfilePicture /> | ||
<ProfileLabel> | ||
Full Name | ||
<ProfileFormTextInput type="text" name="name" /> | ||
</ProfileLabel> | ||
<ProfileLabel> | ||
DJ Name | ||
<ProfileFormTextInput type="text" name="djname" /> | ||
</ProfileLabel> | ||
<ProfileLabel> | ||
Email Address | ||
<ProfileFormTextInput type="text" name="email" /> | ||
</ProfileLabel> | ||
<ProfileLabel> | ||
Password | ||
<ProfileFormTextInput type="text" name="password" /> | ||
</ProfileLabel> | ||
|
||
<ProfileSubmitButton>Update</ProfileSubmitButton> | ||
</Form> | ||
); | ||
|
||
export default ProfileForm; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
import glamorous from 'glamorous'; | ||
|
||
const ProfileFormTextInput = glamorous.input({ | ||
backgroundColor: 'transparent', | ||
font: 'sans-serif', | ||
textAlign: 'left', | ||
fontSize: '20px', | ||
height: '2.5rem', | ||
width: '20rem', | ||
border: '0.2px solid black', | ||
borderRadius: '0.25rem', | ||
display: 'block', | ||
marginBottom: '0.5rem', | ||
transition: 'all .3s', | ||
textIndent: '5px', | ||
|
||
':focus': { | ||
backgroundColor: 'rgba(245, 245, 245, 1)', | ||
outline: 'none', | ||
boxShadow: 'rgba(245, 245, 245, 1)', | ||
}, | ||
}); | ||
|
||
export default ProfileFormTextInput; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
import glamorous from 'glamorous'; | ||
|
||
const ProfileLabel = glamorous.label({ | ||
fontFamily: 'sans-serif', | ||
fontSize: '15px', | ||
}); | ||
|
||
export default ProfileLabel; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import * as React from 'react'; | ||
import { Img } from 'glamorous'; | ||
|
||
const shrek = require('./classy-shrek.png'); | ||
|
||
const ProfilePicture = () => ( | ||
<Img src={shrek} height="260" width="260" borderRadius="50%" /> | ||
); | ||
|
||
export default ProfilePicture; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import glamorous from 'glamorous'; | ||
|
||
const SubmitButton = glamorous.button({ | ||
backgroundColor: '#BD10E0', | ||
border: 'none', | ||
color: 'white', | ||
font: 'sans-serif', | ||
textAlign: 'center', | ||
display: 'inline-block', | ||
fontSize: '15px', | ||
height: '2.5rem', | ||
width: '20rem', | ||
marginTop: '1rem', | ||
borderRadius: '0.25rem', | ||
}); | ||
|
||
export default SubmitButton; |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This image is missing a text alternative (
alt
attribute). This is a problem for people using screen readers.