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

pulling latest #18

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

pulling latest #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91e9b86
Merge pull request #3 from khelif96/master
Nov 12, 2017
67bc60a
Merge pull request #4 from khelif96/master
Nov 12, 2017
911d3b1
made changes to divs
testuserdot1 Nov 12, 2017
52afa7a
fixed bug in Title
testuserdot1 Nov 12, 2017
a5d4b13
Merge pull request #5 from khelif96/master
Nov 12, 2017
d6efcdb
added My Account Information and added profile picture
testuserdot1 Nov 12, 2017
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
79 changes: 46 additions & 33 deletions commu-nyc/src/Scenes/PostPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class PostPage extends Component {
marginRight: 70,
marginTop: 40,
borderRadius: 8,
boxShadow: '4px 4px 4px #D3D3D3',
boxShadow: '3px 3px 3px #888888',
alignContent: 'center',
paddingBottom: 15
}
Expand All @@ -26,7 +26,7 @@ class PostPage extends Component {
borderTopRightRadius: 8,
boxShadow: '2px 2px 2px gray'
}
var styleJobCardParagraph = {
var styleVolunCardParagraph = {
padding: 30
}
var styleBigHeader = {
Expand All @@ -36,12 +36,12 @@ class PostPage extends Component {
}
var styleMediumHeader = {
color: 'white',
fontSize: 20,
fontSize: 15,
textAlign: 'left'
}
var styleSmallHeader = {
color : 'black',
fontSize : 20,
fontSize : 10,
textAlign : 'left'
}
var styleParagraph = {
Expand All @@ -62,63 +62,76 @@ class PostPage extends Component {
borderRadius: 4
}
var styleBackButton = {
background: 'gray',
color: 'white',
background: '#D3D3D3',
color: 'black',
float: 'right',
paddingLeft: 15,
paddingRight: 15,
paddingBottom: 5,
marginRight: 7,
paddingTop: 5,
border: 0,
boxShadow: '2px 2px 2px gray',
borderRadius: 4
}
return (
<div>
<div style = {styleVolunCard}>
<div style = {styleVolunCard} class="VolunCards">

<div style = {styleVolunCardHeader} class="VolunCard">
<div style = {styleVolunCardHeader} class="VolunHeaderCard">
<div style = {styleBigHeader} id="VolunTitle" > <p><b>Volunteer Title</b></p> </div>
<div style = {styleMediumHeader} id="VolunOrgName"> <p>By: Organization Name </p> </div>
<div style = {styleMediumHeader} id="VolunDatePosted"> <p>Posted: November 11, 2017 at 11:45AM</p></div>
</div>

<div style = {styleJobCardParagraph}>
<div><p style = {styleParagraph}><b> Description:</b> </p></div>
<p style ={styleParagraph}>
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
</p>
<div style = {styleVolunCardParagraph} class="VolunParaCards">
<div class="VolunParaDescripCard">
<div id="VolunParaDescrip">
<p style = {styleParagraph}><b> Description:</b> </p>
</div>
<div id="VolunParaD">
<p style ={styleParagraph}>
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
</p>
</div>
</div>

<br></br>

<p style = {styleParagraph}><b> Requirements:</b> </p>
<p style ={styleParagraph}>
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
</p>
<div class="VolunParaReqCard">
<div id="VolunParaReq">
<p style = {styleParagraph}><b>Requirements:</b> </p>
</div>
<div id="VolunParaR">
<p style ={styleParagraph}>
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ducimus, vero obcaecati, aut error consectetur adipiscing eli
</p>
</div>
</div>

<br></br>

<div>
<button style = {styleAcceptButton} class="mdc-button">
<i class="material-icons mdc-button"></i>
ACCEPT
<button style = {styleAcceptButton} class="mdc-button">
<i class="material-icons mdc-button"></i>
ACCEPT
</button>
</div>

<div>
<button style = {styleBackButton} class="mdc-button">
<i class="material-icons mdc-button"></i>
BACK
<button style = {styleBackButton} class="mdc-button">
<i class="material-icons mdc-button"></i>
BACK TO VOLUNTEER PAGE
</button>
</div>
</div>

</div>
</div>
</div>
Expand Down
40 changes: 35 additions & 5 deletions commu-nyc/src/Scenes/myAccount.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ class MyAccount extends Component {
first: "",
last: ""
},
email: ""
email: "",
userType: ""
}

// this.handleChange = this.handleChange.bind(this);
Expand All @@ -34,7 +35,8 @@ class MyAccount extends Component {
first :account.name.first,
last : account.name.last,
},
email: account.email
email: account.email,
userType: account.userType
});
})
.catch( (error) => { localStorage.setItem('api_token',"");
Expand All @@ -45,11 +47,39 @@ class MyAccount extends Component {
// event.preventDefault();
}
render() {
var styleApiToken = {
color: 'white',
fontSize: 15,
textAlign: 'center',
padding: 20
}
var styleName = {
color: 'white',
fontSize: 15,
textAlign: 'center',
padding: 20
}
var styleApiName = {
background: 'gray',
margin: 140,
borderRadius: 8,
boxShadow: '3px 3px 3px #888888'
}
var styleProfImage2 = {
width: 100,
borderRadius: 8,
paddingBottom: 10
}
this.getAccountInfo();
return(
<div>
<h1> {this.state.api_token}</h1>
<b> {this.state.name.first}</b>
<div style = {styleApiName} class="styleApiName">
<div style = {styleName}>
<center><img style = {styleProfImage2} src={ require('./profile.jpg') } /></center>
<p> Welcome to your account, <b> {this.state.name.first}</b></p>
<h1 style = {styleApiToken}> This is your token: <b>{this.state.api_token}</b></h1>
<p> Your email is: <b> {this.state.email}</b></p>
<p> You are a: <b> {this.state.userType}</b></p>
</div>
</div>
);
}
Expand Down
Binary file added commu-nyc/src/Scenes/profile.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.