Skip to content
This repository has been archived by the owner on Jan 15, 2021. It is now read-only.

Update check out form to be editable and only visible to authenticated users #60

Merged
merged 4 commits into from
Jun 14, 2017
Merged

Update check out form to be editable and only visible to authenticated users #60

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f93ab02
Qualify calls to profileActions functions with the module name
mjrousos Jun 9, 2017
5223651
Wire up React event handlers to allow editing the checkout form
mjrousos Jun 9, 2017
e58a8cd
Update the right pane of the cart view to change contents based on wh…
mjrousos Jun 9, 2017
2257025
Fixed up a couple whitespace issues
mjrousos Jun 14, 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
6 changes: 3 additions & 3 deletions client/src/utils/api/auth-api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ import { request } from '../api';
export function getUserProfile() {

console.log('User profile requested.');
createGetUserProfileRequestAction();
profileActions.createGetUserProfileRequestAction();

request({url: 'users/auth/user_profile'},
(err, res) => {
if (err || !res.profile) {
console.log('Request for user profile failed.');
createGetUserProfileFailAction();
profileActions.createGetUserProfileFailAction();
return;
}
console.log('Request for user profile succeeded.');
createGetUserProfileSuccessAction(res.profile);
profileActions.createGetUserProfileSuccessAction(res.profile);
}
);
}
76 changes: 55 additions & 21 deletions client/src/views/normal-cart-view/normal-cart-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,65 @@ export default React.createClass({
userProfile: React.PropTypes.object
},

getInitialState() {
return {
fullName: this.props.userProfile != null && this.props.userProfile.isAuthenticated ? this.props.userProfile.fullName : '',
email: this.props.userProfile != null && this.props.userProfile.isAuthenticated ? this.props.userProfile.email : ''
};
},

onNameChanged(e) {
this.setState({ fullName: e.target.value });
},

onEmailChanged(e) {
this.setState({ email: e.target.value });
},

render() {
const items = this.props.items;
const fullName = this.props.userProfile != null && this.props.userProfile.isAuthenticated ? this.props.userProfile.fullName : '';
const email = this.props.userProfile != null && this.props.userProfile.isAuthenticated ? this.props.userProfile.email : '';

// TODO: items is an array of IDs, need to look up or convert to whole objects
const itemRows = items.map((item) => <ItemRow item={item} key={item.id} />);

var rightPane = null;
if (this.props.userProfile != null && this.props.userProfile.isAuthenticated) {
// If the user is logged in, include the checkout form in the right pane
rightPane =
<div className="gs-cartview-normal-rightpane">
<div className="gs-cartview-normal-rightpane-label">Name</div>
<input placeholder="required"
value={this.state.fullName}
onChange={this.onNameChanged}
className="gs-cartview-normal-rightpane-input" name="checkout-name" min="1"/>
<div className="gs-cartview-normal-rightpane-label">Email Address</div>
<input placeholder="required"
name="email"
value={this.state.email}
onChange={this.onEmailChanged}
className="gs-cartview-normal-rightpane-input" name="checkout-email" type="email" min="1"/>
<div className="gs-cartview-normal-rightpane-disclaimer">
*You will be able to pick up your stickers right after the order is processed. No physical address is required.
</div>
<div className="gs-cartview-normal-rightpane-submitcontainer">
<button type="submit" className="gs-cartview-normal-rightpane-submit">
<Icon className="gs-cartview-normal-rightpane-submit-icon" name="lock" size="lg" />
<div>Print my stickers</div>
</button>
</div>
</div>

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is all spaces.

} else {
// If the user is not logged in, provide a button to redirect to the login page
rightPane =
<div className="gs-cartview-normal-rightpane">
<div className="gs-cartview-normal-rightpane-label">Log In to Print Stickers</div>
<div className="gs-cartview-normal-rightpane-submitcontainer">
<a className="gs-cartview-normal-rightpane-submit" href="/users/auth?p=B2C_1_SignInAndSignUp">Log In</a>
</div>
</div>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are spaces at the end of this line.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

}

return (
<div className="gs-cartview-normal">

Expand All @@ -103,25 +155,7 @@ export default React.createClass({
<input type="hidden" name="token" value={token} />
</div>

<div className="gs-cartview-normal-rightpane">
<div className="gs-cartview-normal-rightpane-label">Name</div>
<input placeholder="required"
value={fullName}
className="gs-cartview-normal-rightpane-input" name="checkout-name" min="1"/>
<div className="gs-cartview-normal-rightpane-label">Email Address</div>
<input placeholder="required"
value={email}
className="gs-cartview-normal-rightpane-input" name="checkout-email" type="email" min="1"/>
<div className="gs-cartview-normal-rightpane-disclaimer">
*You will be able to pick up your stickers right after the order is processed. No physical address is required.
</div>
<div className="gs-cartview-normal-rightpane-submitcontainer">
<button type="submit" className="gs-cartview-normal-rightpane-submit">
<Icon className="gs-cartview-normal-rightpane-submit-icon" name="lock" size="lg" />
<div>Print my stickers</div>
</button>
</div>
</div>
{rightPane}
</form>

</div>
Expand Down