Skip to content

Commit fd36544

Browse files
author
Joe Seifi
committed
start with button
1 parent c113dfb commit fd36544

File tree

9 files changed

+24
-24
lines changed

9 files changed

+24
-24
lines changed

01-react-css3/solution/components/AddToCartButton.js renamed to 01-react-css3/solution/components/ButtonAddToCart.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React, { Component, PropTypes } from 'react'
22
import { Button } from './index'
33
import '../../../public/workshop/css/button-icons.css'
4-
import '../../../public/workshop/css/add-to-cart-button.css'
4+
import '../../../public/workshop/css/button-add-to-cart.css'
55

6-
export class AddToCartButton extends Component {
6+
export class ButtonAddToCart extends Component {
77

88
state = {
99
depressed: false,
@@ -29,7 +29,7 @@ export class AddToCartButton extends Component {
2929

3030
return (
3131
<Button
32-
classNames="icon icon-add add_to_cart_button"
32+
classNames="icon icon-add button_add_to_cart"
3333
depressed={ depressed }
3434
disabled={ disabled }
3535
onClick={ this.onButtonClicked }

01-react-css3/solution/components/BuyNowButton.js renamed to 01-react-css3/solution/components/ButtonBuyNow.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { Component, PropTypes } from 'react'
22
import { Button } from './index'
3-
import '../../../public/workshop/css/buy-now-button.css'
3+
import '../../../public/workshop/css/button-buy-now.css'
44

5-
export class BuyNowButton extends Component {
5+
export class ButtonBuyNow extends Component {
66

77
state = {
88
depressed: false,
@@ -29,7 +29,7 @@ export class BuyNowButton extends Component {
2929

3030
return (
3131
<Button
32-
classNames="buy_now_button"
32+
classNames="button_buy_now"
3333
depressed={ depressed }
3434
disabled={ disabled }
3535
onClick={ this.onButtonClicked }

01-react-css3/solution/components/BuyStrip.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { Component, PropTypes } from 'react'
2-
import { BuyNowButton } from './index'
2+
import { ButtonBuyNow } from './index'
33
import numeral from 'numeral'
44
import '../../../public/workshop/css/buy-strip.css'
55

@@ -23,11 +23,11 @@ export class BuyStrip extends Component {
2323
) : (
2424
<aside className="buy">
2525
<div className="buy_title">Total:<span className="buy_total">{ formattedPrice }</span></div>
26-
<BuyNowButton
26+
<ButtonBuyNow
2727
onClick={ this.props.onBuy }
2828
disabled={ totalPrice === 0 }>
2929
Buy Now
30-
</BuyNowButton>
30+
</ButtonBuyNow>
3131
</aside>
3232
)
3333
}

01-react-css3/solution/components/FoodItem.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { Component, PropTypes } from 'react'
2-
import { AddToCartButton } from './index'
2+
import { ButtonAddToCart } from './index'
33
import numeral from 'numeral'
44
import '../../../public/workshop/css/food-item.css'
55

@@ -29,7 +29,7 @@ export class FoodItem extends Component {
2929
<li className="food_item">
3030
<figure className="food_item_figure"><img className="food_item_image" src={ photoPath } /></figure>
3131
<div className="food_item_name">{ name }<span className="food_item_price">{ numeral(price).format('$0.00') }</span></div>
32-
<AddToCartButton
32+
<ButtonAddToCart
3333
onClick={ this.addToCart.bind(this) }
3434
disabled={ disabled }
3535
/>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export { Button } from './Button'
22

3-
export { AddToCartButton } from './AddToCartButton'
4-
export { BuyNowButton } from './BuyNowButton'
3+
export { ButtonAddToCart } from './ButtonAddToCart'
4+
export { ButtonBuyNow } from './ButtonBuyNow'
55

66
export { FoodItem } from './FoodItem'
77
export { BuyStrip } from './BuyStrip'

public/workshop/css/all.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
@import url("./button.css");
44
@import url("./button-icons.css");
5-
@import url("./add-to-cart-button.css");
6-
@import url("./buy-now-button.css");
5+
@import url("./button-add-to-cart.css");
6+
@import url("./button-buy-now.css");
77

88
@import url("./food.css");
99
@import url("./food-item.css");
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Custom styling for Add to Cart Button */
22

3-
.add_to_cart_button {
3+
.button_add_to_cart {
44
min-width: 110px;
55
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/* Custom styling for Buy Now Button */
22

3-
.buy_now_button {
3+
.button_buy_now {
44
background-color: #fff;
55
color: #000;
66
box-shadow: 1px -1px 2px rgba(0, 0, 0, .2);
77
width: 110px;
88
}
99

10-
.buy_now_button:hover {
10+
.button_buy_now:hover {
1111
background-color: #000;
1212
color: #fff;
1313
}
1414

15-
.btn.buy_now_button.depressed {
15+
.btn.button_buy_now.depressed {
1616
box-shadow: 1px -1px 2px rgba(0, 0, 0, 0);
1717
}

public/workshop/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@ <h1 class="logo"><span>Taco Shack</span></h1>
2121
<li class="food_item">
2222
<figure class="food_item_figure"><img class="food_item_image" src="img/steak.jpg" /></figure>
2323
<div class="food_item_name">Carne Asada<span class="food_item_price">$3.00</span></div>
24-
<button class="btn depressed add_to_cart_button">Remove</button>
24+
<button class="btn depressed button_add_to_cart">Remove</button>
2525
</li>
2626
<li class="food_item">
2727
<figure class="food_item_figure"><img class="food_item_image" src="img/guacamole.jpg" /></figure>
2828
<div class="food_item_name">Guacamole<span class="food_item_price">$2.00</span></div>
29-
<button class="btn icon icon-add add_to_cart_button">Add</button>
29+
<button class="btn icon icon-add button_add_to_cart">Add</button>
3030
</li>
3131
<li class="food_item">
3232
<figure class="food_item_figure"><img class="food_item_image" src="img/fish.jpg" /></figure>
3333
<div class="food_item_name">Baja Fish<span class="food_item_price">$1.00</span></div>
34-
<button class="btn icon icon-add add_to_cart_button">Add</button>
34+
<button class="btn icon icon-add button_add_to_cart">Add</button>
3535
</li>
3636
<li class="food_item">
3737
<figure class="food_item_figure"><img class="food_item_image" src="img/chicken.jpg" /></figure>
3838
<div class="food_item_name">Chicken<span class="food_item_price">$0.50</span></div>
39-
<button class="btn icon icon-add add_to_cart_button">Add</button>
39+
<button class="btn icon icon-add button_add_to_cart">Add</button>
4040
</li>
4141
</ul>
4242
</div>
4343
</main>
4444
<aside class="buy">
45-
<div class="buy_title">Total:<span class="buy_total">$10.50</span></div><button class="btn buy_now_button">Buy Now</button>
45+
<div class="buy_title">Total:<span class="buy_total">$10.50</span></div><button class="btn button_buy_now">Buy Now</button>
4646
</aside>
4747
</section>
4848
<footer class="footer">

0 commit comments

Comments
 (0)