Skip to content

order items error #66

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

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

order items error #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f280da
order items error
EmilyCMcCarthy Aug 2, 2017
0a7928f
added reviews again
EmilyCMcCarthy Aug 2, 2017
e7cfabb
added reviews back to deploy
EmilyCMcCarthy Aug 2, 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
2 changes: 1 addition & 1 deletion client/components/AllCharacters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AllCharacters extends Component {
onChange={this.handleChange}
value={inputValue}
className='form-control'
placeholder="Enter artist name"
placeholder="Enter Character name"
/>
</form>
<FlexParent>
Expand Down
3 changes: 1 addition & 2 deletions client/components/Main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ const Main = (props) => {
{/* The navbar will show these links after you log in */}
<StyledLink to="/">Home</StyledLink>
<StyledLink to="/cart">Cart</StyledLink>
<StyledLink to="/search">Search</StyledLink>
<StyledLink to="/" onClick={handleClick}>Logout</StyledLink>
</div> :
<div>
Expand All @@ -41,7 +40,7 @@ const Main = (props) => {
<StyledLink to="/login">Login</StyledLink>
<StyledLink to="/signup">Sign Up</StyledLink>
<StyledLink to="/cart">Cart</StyledLink>
<StyledLink to="/search">Search</StyledLink>

</div>
}
</Menu>
Expand Down
2 changes: 1 addition & 1 deletion client/components/SingleCharacter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class SingleCharacter extends Component {
</CharacterDetails>
</FlexParent >
<FlexParent>
{/* <Review reviews={this.props.reviews} characterId={character.id} /> */}
<Review reviews={this.props.reviews} characterId={character.id} />

</FlexParent>
</div>
Expand Down
Loading