Skip to content

Commit

Permalink
Merge pull request #98 from marzeelabs/release/1.2.0
Browse files Browse the repository at this point in the history
Release/1.2.0
  • Loading branch information
Quicksaver authored Feb 27, 2019
2 parents df437f9 + 2235407 commit d04d7ea
Show file tree
Hide file tree
Showing 136 changed files with 7,147 additions and 2,290 deletions.
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "airbnb",

"globals": {
"netlifyIdentity": true,
"CMS": true,
"MutationObserver": true,
"document": true,
Expand Down
2 changes: 1 addition & 1 deletion BesugoComponent.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ renderBlock() {
return (
<div>
<div className="blog-post__header" style={{ backgroundImage: `url(${data.image})` }}>
<div className="blog-post__header-title__wrapper">
<div className="blog-post__header-title-wrapper">
<h1 className="blog-post__header-title">{ data.title }</h1>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Below are listed the versions used in Netlify to create the live, preview and br
- If after running the above command it complains that *xcode alone is not sufficient on sierra*, try running `xcode-select --install`. Note that **macOS Sierra 10.12.6 or higher and XCode 9.2 are required.**


1. [hugo](https://gohugo.io/) v0.47.1 - builds the structure of the website based on the content setup, although we're phasing it out in favor of a fully JS/React solution. Any version over 0.27.1 should still work though.
1. [hugo](https://gohugo.io/) v0.53 - builds the structure of the website based on the content setup, although we're phasing it out in favor of a fully JS/React solution. Any version over 0.27.1 should still work though.
- Install:
```sh
Expand All @@ -30,7 +30,7 @@ Below are listed the versions used in Netlify to create the live, preview and br
brew update && brew upgrade hugo
```
2. [yarn](https://yarnpkg.com/) v1.10.0 - package/dependency manager. Any version of yarn above 0.27.5 should still work though.
2. [yarn](https://yarnpkg.com/) v1.12.3 - package/dependency manager. Any version of yarn above 0.27.5 should still work though.
- Install:
```sh
Expand All @@ -46,7 +46,7 @@ Below are listed the versions used in Netlify to create the live, preview and br
```
- Switch between yarn versions (global change):
```sh
brew switch yarn 1.10.0
brew switch yarn 1.12.3
```
3. [nvm](https://github.com/creationix/nvm) v0.33.11 - (not used by Netlify), very useful to manage your locale Node.js versions.
Expand All @@ -61,7 +61,7 @@ Below are listed the versions used in Netlify to create the live, preview and br
source ~/.bash_profile
```
4. [Node.js](https://nodejs.org/en/) v8.11.3 LTS (lts/carbon) - our JavaScript runtime, we need it, for everything. Any Node v8.x.x or even v6.x.x (lts/boron) should still work though.
4. [Node.js](https://nodejs.org/en/) v8.12.0 LTS (lts/carbon) - our JavaScript runtime, we need it, for everything. Any Node v8.x.x or even v6.x.x (lts/boron) should still work though.
- Install or update:
```sh
Expand Down
40 changes: 29 additions & 11 deletions components/App.jsx
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,30 +1,48 @@
import BesugoComponent from 'Besugo';

import Previews from 'Previews';
import SVGElements from 'partials/SVGElements';
import TopHeader from 'partials/TopHeader';

import EndFooter from 'partials/EndFooter';
import MoreArrow from 'partials/MoreArrow';
import ReservationSlider from 'partials/Reservation/Slider';
import SlideShow from 'partials/SlideShow';
import SocialIcons from 'partials/SocialIcons';
import MoreArrow from 'MoreArrow';
import SrcSet, { SrcSetBg } from 'SrcSet';
import PersonCard from 'people/Card';
import SrcSet, { SrcSetBg } from 'partials/SrcSet';
import SVGElements from 'partials/SVGElements';
import TopHeader from 'partials/TopHeader';

import Amenity from 'location/Amenity';
import BlogPost from 'blog/Post';
import BlogTeaser from 'blog/Teaser';
import Location from 'location/Location';
import PageSimple from 'page/Simple';
import Person from 'people/Person';
import BlogPost from 'blog/BlogPost';
import PersonCard from 'people/Card';
import Plan from 'pricing/Plan';
import Quotes from 'partials/Quotes';

[
Previews,
SVGElements,
TopHeader,

EndFooter,
MoreArrow,
ReservationSlider,
SlideShow,
SocialIcons,
MoreArrow,
SrcSet,
SrcSetBg,
PersonCard,
Person,
SVGElements,
TopHeader,

Amenity,
BlogPost,
BlogTeaser,
Location,
PageSimple,
Person,
PersonCard,
Plan,
Quotes,
].forEach((Comp) => {
Comp.initialize();
});
Expand Down
2 changes: 1 addition & 1 deletion components/Besugo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ export default class BesugoComponent extends React.Component {
static extraProps() {}

// What form should the component's container take; by default this returns a simple div.
// eslint-disable-next-line
// eslint-disable-next-line no-unused-vars
static buildContainer(parserUtils, props) {
return parserUtils.createNode('div');
}
Expand Down
2 changes: 1 addition & 1 deletion components/blog/BlogPost.jsx → components/blog/Post.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default class BlogPost extends BesugoComponent {
return (
<div>
<div className="blog-post__header" style={{ backgroundImage: `url(${data.image})` }}>
<div className="blog-post__header-title__wrapper">
<div className="blog-post__header-title-wrapper">
<h1 className="blog-post__header-title">
{ data.title }
</h1>
Expand Down
50 changes: 50 additions & 0 deletions components/blog/Teaser.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import React from 'react';
import BesugoComponent from 'Besugo';

import SrcSet from 'partials/SrcSet';

const cns = 'teaser-text-side';

export default class BlogTeaser extends BesugoComponent {
static config = {
tag: 'BlogTeaser',
}

static buildContainer(parserUtils) {
const li = parserUtils.createNode('li');
parserUtils.setAttribute(li, 'class', `${cns}__wrapper`);

return li;
}

renderBlock() {
const data = this.props;

return (
<div className={ `${cns}__container` }>
<div className={ `${cns}__image__wrapper` }>
<a href={ data.url }>
<SrcSet
classname={ `${cns}__image` }
src={ data.image }
sizes="
(max-width: 729px) 100vw,
(max-width: 1024px) 60vw,
705px"
/>
</a>
</div>

<div className={ `${cns}__text__wrapper` }>
<p className={ `${cns}__text` }>
{ data.title }
</p>

<span className={ `${cns}__text__link` }>
<a href={ data.url } className="link__button-black-secondary">{ data.more }</a>
</span>
</div>
</div>
);
}
}
30 changes: 30 additions & 0 deletions components/location/Amenity.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import React from 'react';
import BesugoComponent from 'Besugo';

const cns = 'location-amenity';

export default class Amenity extends BesugoComponent {
static config = {
tag: 'Amenity',
}

static buildContainer(parserUtils) {
const li = parserUtils.createNode('li');
parserUtils.setAttribute(li, 'class', `${cns}__wrapper`);

return li;
}

render() {
const data = this.props;

return (
<div key={data.title}>
<span className={ `icon icon-${data.icon}` } />
<span className={ `${cns}__title` }>
{ data.title }
</span>
</div>
);
}
}
Loading

0 comments on commit d04d7ea

Please sign in to comment.