-
Notifications
You must be signed in to change notification settings - Fork 81
Adv-HW-2 done (with couple bugs) #52
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.
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
psc478
wants to merge
3
commits into
AustinCodingAcademy:master
Choose a base branch
from
psc478:master
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
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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 hidden or 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
This file contains hidden or 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,54 @@ | ||
| import React from "react"; | ||
|
|
||
| function Footer(props) { | ||
| return ( | ||
|
|
||
| <div className="footer"> | ||
| <div className="section group"> | ||
| <div className="col_1_of_4 span_1_of_4"> | ||
| <h3>INFORMATION</h3> | ||
| <ul> | ||
| <li><a href="#">About us</a></li> | ||
| <li><a href="#">Sitemap</a></li> | ||
| <li><a href="#">Contact</a></li> | ||
| <li><a href="#">Terms and conditions</a></li> | ||
| <li><a href="#">Legal Notice</a></li> | ||
| </ul> | ||
| </div> | ||
| <div className="col_1_of_4 span_1_of_4"> | ||
| <h3>OUR OFFERS</h3> | ||
| <ul> | ||
| <li><a href="#">New products</a></li> | ||
| <li><a href="#">top sellers</a></li> | ||
| <li><a href="#">Specials</a></li> | ||
| <li><a href="#">Products</a></li> | ||
| <li><a href="#">Comments</a></li> | ||
| </ul> | ||
| </div> | ||
| <div className="col_1_of_4 span_1_of_4"> | ||
| <h3>YOUR ACCOUNT</h3> | ||
| <ul> | ||
| <li><a href="#">Your Account</a></li> | ||
| <li><a href="#">Personal info</a></li> | ||
| <li><a href="#">Prices</a></li> | ||
| <li><a href="#">Address</a></li> | ||
| <li><a href="#">Locations</a></li> | ||
| </ul> | ||
| </div> | ||
| <div className="col_1_of_4 span_1_of_4 footer-lastgrid"> | ||
| <h3>Get in touch</h3> | ||
| <ul> | ||
| <li><a href="#"><img src="images/facebook.png" title="facebook" /></a></li> | ||
| <li><a href="#"><img src="images/twitter.png" title="Twiiter" /></a></li> | ||
| <li><a href="#"><img src="images/rss.png" title="Rss" /></a></li> | ||
| <li><a href="#"><img src="images/gpluse.png" title="Google+" /></a></li> | ||
| </ul> | ||
| <p>Design by <a href="#">W3layouts</a></p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| ); | ||
| } | ||
|
|
||
| export default Footer; |
This file contains hidden or 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,7 +1,33 @@ | ||
| import React from "react"; | ||
|
|
||
| function Header() { | ||
| return (<div />); | ||
| function Header(props) { | ||
| return ( | ||
|
|
||
| <div className="top-header"> | ||
| <div className="top-header-left"> | ||
| <ul> | ||
| <li className="active"><a href="#">Home</a></li> | ||
| <li><a href="#">Specials</a></li> | ||
| <li><a href="#">Delivery</a></li> | ||
| <li><a href="#">Contact</a></li> | ||
| </ul> | ||
| </div> | ||
| <div className="top-header-right"> | ||
| <ul> | ||
| <li><a href="#">CURRENCY:</a></li> | ||
| <li> | ||
| <select> | ||
| <option>Dollar</option> | ||
| <option>Euro</option> | ||
| <option>Pound</option> | ||
| </select> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div className="clear"> </div> | ||
| </div> | ||
|
|
||
| ); | ||
| } | ||
|
|
||
| export default Header; |
This file contains hidden or 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,19 @@ | ||
| import React from "react"; | ||
|
|
||
| function ImageSlider(props) { | ||
| return ( | ||
|
|
||
| <div className="image-slider"> | ||
|
|
||
| <ul className="rslides" id="slider1"> | ||
| <li><img src="images/slider1.jpg" alt="" /></li> | ||
| <li><img src="images/slider3.jpg" alt="" /></li> | ||
| <li><img src="images/slider1.jpg" alt="" /></li> | ||
| </ul> | ||
|
|
||
| </div> | ||
|
|
||
| ); | ||
| } | ||
|
|
||
| export default ImageSlider; |
This file contains hidden or 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 React from "react"; | ||
|
|
||
| function ProductDetail(props) { | ||
| return ( | ||
|
|
||
| <div className="col-sm-3 col-lg-3 col-md-3 grid_1_of_5 images_1_of_5"> | ||
| <img src={props.prod.imgUrl} /> | ||
| <h3>{props.prod.name}</h3> | ||
| <p>{props.prod.description}</p> | ||
| <h4>{props.prod.price}</h4> | ||
| <div className="button"><span><a href="singlepage.html">Read More</a></span></div> | ||
| </div> | ||
|
|
||
| ); | ||
| } | ||
|
|
||
| export default ProductDetail; |
This file contains hidden or 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 React from "react"; | ||
|
|
||
| function SubHeader(props) { | ||
| return ( | ||
|
|
||
| <div className="sub-header"> | ||
| <div className="logo"> | ||
| <a href="index.html"><img src="images/logo.png" title="logo" /></a> | ||
| </div> | ||
| <div className="sub-header-right"> | ||
| <ul> | ||
| <li><a href="#">log in</a></li> | ||
| <li><a href="#">Your account</a></li> | ||
| <li><a href="#">CART: (EMPTY) <img src="images/cart.png" title="cart" /></a></li> | ||
| </ul> | ||
| <input type="text" /><input type="submit" value="search" /> | ||
| </div> | ||
| <div className="clear"> </div> | ||
| </div> | ||
|
|
||
| ); | ||
| } | ||
|
|
||
| export default SubHeader; |
This file contains hidden or 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,53 @@ | ||
| import React from "react"; | ||
|
|
||
| function TopNav(props) { | ||
|
|
||
| function noHash(e){ | ||
| e.preventDefault(); | ||
| alert("hi"); | ||
| } | ||
|
|
||
| return ( | ||
|
|
||
| <div className="top-nav"> | ||
| <ul> | ||
| <li><a href="#" onClick={//()=>{ | ||
| //props.changeCategory("headlights"); | ||
| noHash | ||
| }>Car Lights</a></li> | ||
|
|
||
| <li><a href="#" onClick={()=>{ | ||
| props.changeCategory("tires"); | ||
| noHash; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. lines 20 -21 are inside an arrow function where you need to type only valid code |
||
| }}>Car Wheels</a></li> | ||
|
|
||
| <li><a href="#" onClick={()=>{ | ||
| props.changeCategory("bumpers"); | ||
| noHash; | ||
| }}>Car Bumpers</a></li> | ||
|
|
||
| <li><a href="#" onClick={()=>{ | ||
| props.changeCategory("audio"); | ||
| noHash; | ||
| }}>Car Audiosystem</a></li> | ||
|
|
||
| <li><a href="#" onClick={()=>{ | ||
| props.changeCategory("bumpers"); | ||
| noHash; | ||
| }}>Truck Bumpers</a></li> | ||
|
|
||
| <li><a href="contact.html">Feedback</a></li> | ||
| {/*<li><a href="carlights.html">car lights</a></li> | ||
| <li><a href="carwheels.html">Car wheels</a></li> | ||
| <li><a href="carbumpers.html">car bumpers</a></li> | ||
| <li><a href="caradsystem.html">car audiosystem</a></li> | ||
| <li><a href="truckbumpers.html">Truck bumpers</a></li> | ||
| <li><a href="contact.html">Feedback</a></li>*/} | ||
| <div className="clear"> </div> | ||
| </ul> | ||
| </div> | ||
|
|
||
| ); | ||
| } | ||
|
|
||
| export default TopNav; | ||
Oops, something went wrong.
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.
good job console logging to see what is going on