Skip to content

Update 5 components to their latest versions #15

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
bit-dev-bot wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update 5 components to their latest versions #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9529209
chore(deps): update 5 bit components:
bit-dev-bot[bot] Oct 22, 2020
66f45f6
chore(deps): update bit component guya-ltd.gcss/molecules/navbar
bit-dev-bot[bot] Dec 13, 2020
9cad66a
chore(deps): update bit component guya-ltd.gcss/templates/xpresshome
bit-dev-bot[bot] Dec 14, 2020
0fd7c6e
chore(deps): update bit component guya-ltd.gcss/molecules/pricetable
bit-dev-bot[bot] Dec 16, 2020
eeb42bd
chore(deps): update bit component guya-ltd.gcss/molecules/pricetable
bit-dev-bot[bot] Dec 16, 2020
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
70 changes: 35 additions & 35 deletions .bitmap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,14 @@
"guya-ltd.gcss/molecules/hero@0.0.2": {
"files": [
{
"name": "Hero.js",
"relativePath": "src/components/molecules/Hero/Hero.js",
"test": false,
"name": "Hero.js"
"test": false
},
{
"name": "index.js",
"relativePath": "src/components/molecules/Hero/index.js",
"test": false,
"name": "index.js"
"test": false
}
],
"mainFile": "src/components/molecules/Hero/index.js",
Expand Down Expand Up @@ -323,62 +323,62 @@
"guya-ltd.gcss/molecules/nav@0.0.3": {
"files": [
{
"name": "Nav.js",
"relativePath": "src/components/molecules/Nav/Nav.js",
"test": false,
"name": "Nav.js"
"test": false
},
{
"name": "index.js",
"relativePath": "src/components/molecules/Nav/index.js",
"test": false,
"name": "index.js"
"test": false
}
],
"mainFile": "src/components/molecules/Nav/index.js",
"trackDir": "src/components/molecules/Nav",
"origin": "AUTHORED",
"exported": true
},
"guya-ltd.gcss/molecules/navbar@0.0.6": {
"guya-ltd.gcss/molecules/navbar@0.0.7": {
"files": [
{
"name": "Navbar.js",
"relativePath": "src/components/molecules/Navbar/Navbar.js",
"test": false,
"name": "Navbar.js"
"test": false
},
{
"name": "NavbarBrand.js",
"relativePath": "src/components/molecules/Navbar/__Brand/NavbarBrand.js",
"test": false,
"name": "NavbarBrand.js"
"test": false
},
{
"name": "NavbarBrandLarge.js",
"relativePath": "src/components/molecules/Navbar/__Brand/__Large/NavbarBrandLarge.js",
"test": false,
"name": "NavbarBrandLarge.js"
"test": false
},
{
"name": "NavbarBrandSmall.js",
"relativePath": "src/components/molecules/Navbar/__Brand/__Small/NavbarBrandSmall.js",
"test": false,
"name": "NavbarBrandSmall.js"
"test": false
},
{
"name": "NavbarMenu.js",
"relativePath": "src/components/molecules/Navbar/__Menu/NavbarMenu.js",
"test": false,
"name": "NavbarMenu.js"
"test": false
},
{
"name": "NavbarMenuLeft.js",
"relativePath": "src/components/molecules/Navbar/__Menu/__Left/NavbarMenuLeft.js",
"test": false,
"name": "NavbarMenuLeft.js"
"test": false
},
{
"name": "NavbarMenuRight.js",
"relativePath": "src/components/molecules/Navbar/__Menu/__Right/NavbarMenuRight.js",
"test": false,
"name": "NavbarMenuRight.js"
"test": false
},
{
"name": "index.js",
"relativePath": "src/components/molecules/Navbar/index.js",
"test": false,
"name": "index.js"
"test": false
}
],
"mainFile": "src/components/molecules/Navbar/index.js",
Expand Down Expand Up @@ -417,17 +417,17 @@
"origin": "AUTHORED",
"exported": true
},
"guya-ltd.gcss/molecules/pricetable@0.0.2": {
"guya-ltd.gcss/molecules/pricetable@0.0.4": {
"files": [
{
"name": "PriceTable.js",
"relativePath": "src/components/molecules/PriceTable/PriceTable.js",
"test": false,
"name": "PriceTable.js"
"test": false
},
{
"name": "index.js",
"relativePath": "src/components/molecules/PriceTable/index.js",
"test": false,
"name": "index.js"
"test": false
}
],
"mainFile": "src/components/molecules/PriceTable/index.js",
Expand Down Expand Up @@ -670,17 +670,17 @@
"origin": "AUTHORED",
"exported": true
},
"guya-ltd.gcss/templates/xpresshome@0.0.3": {
"guya-ltd.gcss/templates/xpresshome@0.0.4": {
"files": [
{
"name": "XpressHome.js",
"relativePath": "src/components/templates/XpressHome/XpressHome.js",
"test": false,
"name": "XpressHome.js"
"test": false
},
{
"name": "index.js",
"relativePath": "src/components/templates/XpressHome/index.js",
"test": false,
"name": "index.js"
"test": false
}
],
"mainFile": "src/components/templates/XpressHome/index.js",
Expand Down
2 changes: 1 addition & 1 deletion src/components/molecules/Navbar/Navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class Navbar extends Component {
{collapse.left}
</div>
<div class='col-xs'>
<div class='row end-xs'>
<div class='row end-md'>
<div class='navbar__collapse__search'>
{collapse.search}
</div>
Expand Down
42 changes: 28 additions & 14 deletions src/components/molecules/PriceTable/PriceTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,23 @@ import PropTypes from 'prop-types';

class PriceTable extends Component {
render() {
const{title, lists}=this.props;
const{
title,
lists,
sign,
locale,
weight_name,
weight_unit,
length_name,
length_unit,
width_name,
width_unit,
height_name,
height_unit,
href,
text,
per
}=this.props;
return(
<div id="generic_price_table" style={{background: "#eee"}}>
<section>
Expand Down Expand Up @@ -48,19 +64,20 @@ class PriceTable extends Component {
{/* HEADER START */}
<div className="head_bg" />
<div className="head">
<span>{list.name}</span>
<span>{list['name_' + locale]}</span>
</div>
{/* HEADER END */}
</div>
{/* HEADER CONTENT END */}

{/* PRICE START */}

<div className="generic_price_tag clearfix">
<span className="price">
<span className="sign">{list.sign && "Birr"}</span>
<span className="currency">{list.currency}</span>
<span className="cent">{list.cent}</span>
<span className="month">{list.per && "/Km"}</span>
<span className="sign">{sign && "Birr"}</span>
<span className="currency">{list.price.toString().split(".")[0]}</span>
<span className="cent">{list.price.toString().split(".")[1]}</span>
<span className="month">{per && "/Km"}</span>
</span>
</div>
{/* PRICE END */}
Expand All @@ -70,20 +87,17 @@ class PriceTable extends Component {
{/* FEATURE LIST START */}
<div className="generic_feature_list">
<ul>
{
list.features.map((feature) => {
return(
<li><span>{feature.value}</span> {feature.name}</li>
)
})
}
<li><span>{weight_name}</span> {list.weight}{weight_unit}</li>
<li><span>{length_name}</span> {list.length}{length_unit}</li>
<li><span>{width_name}</span> {list.width}{width_unit}</li>
<li><span>{height_name}</span> {list.height}{height_unit}</li>
</ul>
</div>
{/* FEATURE LIST END */}

{/* BUTTON START */}
<div className="generic_price_btn clearfix">
<a className="" href={list.href}>{list.text}</a>
<a className="" href={href}>{text}</a>
</div>
{/* BUTTON END */}
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/templates/XpressHome/XpressHome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { withNaming } from '@bem-react/classname';
class XpressHome extends Component {
render() {
/* Props */
const{bsPrefix, header, hero, track, footer, pricing} = this.props;
const{bsPrefix, header, hero, track, footer, children} = this.props;

return(
<div>
Expand All @@ -44,7 +44,7 @@ class XpressHome extends Component {
</div>
<div className="">
{/* Pricing Table */}
{pricing}
{children}
</div>
{footer}
</div>
Expand Down