Skip to content

Mili roxana #4

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/modules/serverCall/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import axios from 'axios'
import qs from 'qs'
import paypalConfig from '../../configs/paypalConfig'

const URL = 'https://zack-ecommerce-nodejs.herokuapp.com'
// const URL = 'http://localhost:4000'
//const URL = 'https://zack-ecommerce-nodejs.herokuapp.com'
const URL = 'http://localhost:4000'

const serverCall = (config) => {
//header authorization
Expand Down
10 changes: 5 additions & 5 deletions src/pages/dashboard/components/Filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export default class Filter extends Component {
super(props)
this.FILTER_CONFIG = {
order: ['Ascending', 'Descending'],
department: ['Men', 'Women'],
price: ['Less Than $29', '$29 - $39', '$39 - $49', '$49 - $89', 'Greater Than $89']
department: ['Varones', 'Mujeres'],
price: ['Menor que S/.29', 'S/.29 - S/.39', 'S/.39 - S/.49', 'S/.49 - S/.89', 'Mayor que S/.89']
}
this.initialState = {}
this.state = this.initialState
Expand Down Expand Up @@ -92,7 +92,7 @@ export default class Filter extends Component {
{/* department */}
<div className={styles.block}>
<div className={styles.sub_title}>
DEPARTMENT
DEPARTAMENTO
</div>
{this.FILTER_CONFIG['department'].map(n =>
<Checkbox
Expand All @@ -107,7 +107,7 @@ export default class Filter extends Component {
{/* price */}
<div className={styles.block}>
<div className={styles.sub_title}>
PRICE
PRECIO
</div>
{this.FILTER_CONFIG['price'].map(n =>
<Checkbox
Expand All @@ -121,7 +121,7 @@ export default class Filter extends Component {
</div>
</div>
<div className={styles.clear_btn} onClick={this.clearAllFilter}>
<button>Clear All</button>
<button>Limpiar Todo</button>
</div>
{/* filter tags */}
<div className={styles.tags}>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/dashboard/utils/generateFilterString.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ export default (state) => {
if (name === 'price') {
let _price_str_arr = []
for (let p of state[name]) {
if (p.match(/less/i)) {
if (p.match(/menor/i)) {
p = p.replace(/[\D]+/i, '0 - ')
}
if (p.match(/greater/i)) {
if (p.match(/mayor/i)) {
p = p.replace(/[\D]+/i, '').concat(' - 999')
}
_price_str_arr = _price_str_arr.concat(p.match(/[\d]+/g))
Expand Down
4 changes: 2 additions & 2 deletions src/pages/productOverview/ProductOverview.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ export default class ProductOverview extends Component {
/>
</div>
<div className={styles.btns}>
<Button className={styles.btn} onClick={this.addToBag} variant="outline-primary">Add to Bag</Button>
<Button className={styles.btn} variant="outline-danger">Buy Now</Button>
<Button className={styles.btn} onClick={this.addToBag} variant="outline-primary">Agregar a la bolsa</Button>
<Button className={styles.btn} variant="outline-danger">Comprar Ahora</Button>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/productOverview/components/Variants.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function Variants({ color, size, variants, selectedSize, handleCl
return (
<div>
<div className={styles.color_title}>
COLOUR:
COLOR:
</div>
<div className={styles.color_name}>
{color}
Expand All @@ -19,7 +19,7 @@ export default function Variants({ color, size, variants, selectedSize, handleCl
</div>
<div className={styles.sizes}>
<div className={styles.size_title}>
SIZES:
TALLAS:
</div>
<div className={styles.size_name}>
<Sizes
Expand Down