Skip to content

Commit

Permalink
Reapply Prettier formatting to merged files
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeard87 committed Sep 4, 2018
1 parent 9ec63f8 commit 8e5b879
Show file tree
Hide file tree
Showing 25 changed files with 652 additions and 628 deletions.
101 changes: 26 additions & 75 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Client.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { Article } from './Models/article';
import { Brewer } from './Models/brewer';
import { Cafe } from './Models/cafe';
import { Coffee } from './Models/coffee';
import { FactAboutUs } from './Models/fact_about_us'
import { FactAboutUs } from './Models/fact_about_us';
import { Grinder } from './Models/grinder';
import { HeroUnit } from './Models/hero_unit';
import { Home } from './Models/home';
Expand Down
5 changes: 4 additions & 1 deletion src/Components/Brewers.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ class Brewers extends Component {
let name = brewer.productName.value;
let imageLink = brewer.image.value[0].url;
let status = renderProductStatus(brewer.productStatus);
let link = resolveContentLink({ type: 'brewer', urlSlug: brewer.urlPattern.value }, this.props.language);
let link = resolveContentLink(
{ type: 'brewer', urlSlug: brewer.urlPattern.value },
this.props.language
);

return (
<div className="col-md-6 col-lg-4" key={index}>
Expand Down
9 changes: 6 additions & 3 deletions src/Components/Coffees.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import Link from '../Components/LowerCaseUrlLink';
import { resolveContentLink } from '../Utilities/ContentLinks'
import { CoffeeStore } from "../Stores/Coffee";
import { resolveContentLink } from '../Utilities/ContentLinks';
import { CoffeeStore } from '../Stores/Coffee';

let getState = props => {
return {
Expand Down Expand Up @@ -66,7 +66,10 @@ class Coffees extends Component {
let name = coffee.productName.value;
let imageLink = coffee.image.value[0].url;
let status = renderProductStatus(coffee.productStatus);
let link = resolveContentLink({ type: 'coffee', urlSlug: coffee.urlPattern.value }, this.props.language);
let link = resolveContentLink(
{ type: 'coffee', urlSlug: coffee.urlPattern.value },
this.props.language
);

return (
<div className="col-md-6 col-lg-4" key={index}>
Expand Down
62 changes: 47 additions & 15 deletions src/Components/Metadata.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,58 @@
import React from 'react';
import { Helmet } from 'react-helmet';

const Metadata = (props) => {
const Metadata = props => {
return (
<Helmet>
{!props.title ? <title>Dancing Goat</title> : <title>{props.title.value.trim()}</title>}
{!props.description ? null : <meta name="description" content={props.description.value.trim()} />}
{!props.title ? (
<title>Dancing Goat</title>
) : (
<title>{props.title.value.trim()}</title>
)}
{!props.description ? null : (
<meta name="description" content={props.description.value.trim()} />
)}

{!props.ogTitle ? null : <meta property="og:title" content={props.ogTitle.value.trim()} />}
{!props.ogTitle ? null : (
<meta property="og:title" content={props.ogTitle.value.trim()} />
)}
{!props.ogTitle ? null : <meta property="og:type" content="website" />}
{!props.ogTitle ? null : <meta property="og:url" content={window.location.href} />}
{!props.ogImage ? null : <meta property="og:image" content={props.ogImage.value[0].url} />}
{!props.ogDescription ? null : <meta property="og:description" content={props.ogDescription.value} />}
{!props.ogTitle ? null : (
<meta property="og:url" content={window.location.href} />
)}
{!props.ogImage ? null : (
<meta property="og:image" content={props.ogImage.value[0].url} />
)}
{!props.ogDescription ? null : (
<meta property="og:description" content={props.ogDescription.value} />
)}

{!props.twitterTitle ? null : <meta name="twitter:title" content={props.twitterTitle.value.trim()} />}
{!props.twitterTitle ? null : <meta name="twitter:card" content="summary_large_image" />}
{!props.twitterSite ? null : <meta name="twitter:site" content={props.twitterSite.value.trim()} />}
{!props.twitterCreator ? null : <meta name="twitter:creator" content={props.twitterCreator.value.trim()} />}
{!props.twitterDescription ? null : <meta name="twitter:description" content={props.twitterDescription.value.trim()} />}
{!props.twitterImage ? null : <meta name="twitter:image" content={props.twitterImage.value[0].url} />}
{!props.twitterTitle ? null : (
<meta name="twitter:title" content={props.twitterTitle.value.trim()} />
)}
{!props.twitterTitle ? null : (
<meta name="twitter:card" content="summary_large_image" />
)}
{!props.twitterSite ? null : (
<meta name="twitter:site" content={props.twitterSite.value.trim()} />
)}
{!props.twitterCreator ? null : (
<meta
name="twitter:creator"
content={props.twitterCreator.value.trim()}
/>
)}
{!props.twitterDescription ? null : (
<meta
name="twitter:description"
content={props.twitterDescription.value.trim()}
/>
)}
{!props.twitterImage ? null : (
<meta name="twitter:image" content={props.twitterImage.value[0].url} />
)}
</Helmet>
);
}
};

export default Metadata;
export default Metadata;
109 changes: 54 additions & 55 deletions src/Models/Accessory.js
Original file line number Diff line number Diff line change
@@ -1,59 +1,58 @@

import { ContentItem } from 'kentico-cloud-delivery';
import { resolveContentLink } from '../Utilities/ContentLinks';

export class Accessory extends ContentItem {
constructor() {
super({
propertyResolver: ((fieldName) => {
if (fieldName === 'metadata__og_description') {
return 'metadataOgDescription';
}
if (fieldName === 'metadata__meta_title') {
return 'metadataMetaTitle';
}
if (fieldName === 'metadata__og_title') {
return 'metadataOgTitle';
}
if (fieldName === 'long_description') {
return 'longDescription';
}
if (fieldName === 'metadata__meta_description') {
return 'metadataMetaDescription';
}
if (fieldName === 'metadata__twitter_site') {
return 'metadataTwitterSite';
}
if (fieldName === 'metadata__twitter_image') {
return 'metadataTwitterImage';
}
if (fieldName === 'metadata__twitter_creator') {
return 'metadataTwitterCreator';
}
if (fieldName === 'url_pattern') {
return 'urlPattern';
}
if (fieldName === 'short_description') {
return 'shortDescription';
}
if (fieldName === 'metadata__twitter_title') {
return 'metadataTwitterTitle';
}
if (fieldName === 'metadata__twitter_description') {
return 'metadataTwitterDescription';
}
if (fieldName === 'metadata__og_image') {
return 'metadataOgImage';
}
if (fieldName === 'product_status') {
return 'productStatus';
}
if (fieldName === 'product_name') {
return 'productName';
}
return fieldName;
}),
linkResolver: (link) => resolveContentLink(link)
});
}
}
constructor() {
super({
propertyResolver: fieldName => {
if (fieldName === 'metadata__og_description') {
return 'metadataOgDescription';
}
if (fieldName === 'metadata__meta_title') {
return 'metadataMetaTitle';
}
if (fieldName === 'metadata__og_title') {
return 'metadataOgTitle';
}
if (fieldName === 'long_description') {
return 'longDescription';
}
if (fieldName === 'metadata__meta_description') {
return 'metadataMetaDescription';
}
if (fieldName === 'metadata__twitter_site') {
return 'metadataTwitterSite';
}
if (fieldName === 'metadata__twitter_image') {
return 'metadataTwitterImage';
}
if (fieldName === 'metadata__twitter_creator') {
return 'metadataTwitterCreator';
}
if (fieldName === 'url_pattern') {
return 'urlPattern';
}
if (fieldName === 'short_description') {
return 'shortDescription';
}
if (fieldName === 'metadata__twitter_title') {
return 'metadataTwitterTitle';
}
if (fieldName === 'metadata__twitter_description') {
return 'metadataTwitterDescription';
}
if (fieldName === 'metadata__og_image') {
return 'metadataOgImage';
}
if (fieldName === 'product_status') {
return 'productStatus';
}
if (fieldName === 'product_name') {
return 'productName';
}
return fieldName;
},
linkResolver: link => resolveContentLink(link)
});
}
}
119 changes: 59 additions & 60 deletions src/Models/Article.js
Original file line number Diff line number Diff line change
@@ -1,65 +1,64 @@

import { ContentItem } from 'kentico-cloud-delivery';
import { resolveContentLink } from '../Utilities/ContentLinks';

export class Article extends ContentItem {
constructor() {
super({
propertyResolver: ((fieldName) => {
if (fieldName === 'metadata__og_description') {
return 'metadataOgDescription';
}
if (fieldName === 'metadata__meta_title') {
return 'metadataMetaTitle';
}
if (fieldName === 'body_copy') {
return 'bodyCopy';
}
if (fieldName === 'metadata__og_title') {
return 'metadataOgTitle';
}
if (fieldName === 'metadata__meta_description') {
return 'metadataMetaDescription';
}
if (fieldName === 'metadata__twitter_site') {
return 'metadataTwitterSite';
}
if (fieldName === 'post_date') {
return 'postDate';
}
if (fieldName === 'meta_keywords') {
return 'metaKeywords';
}
if (fieldName === 'teaser_image') {
return 'teaserImage';
}
if (fieldName === 'metadata__twitter_image') {
return 'metadataTwitterImage';
}
if (fieldName === 'metadata__twitter_creator') {
return 'metadataTwitterCreator';
}
if (fieldName === 'metadata__twitter_title') {
return 'metadataTwitterTitle';
}
if (fieldName === 'metadata__twitter_description') {
return 'metadataTwitterDescription';
}
if (fieldName === 'meta_description') {
return 'metaDescription';
}
if (fieldName === 'metadata__og_image') {
return 'metadataOgImage';
}
if (fieldName === 'related_articles') {
return 'relatedArticles';
}
if (fieldName === 'url_pattern') {
return 'urlPattern';
}
return fieldName;
}),
linkResolver: (link) => resolveContentLink(link)
});
}
constructor() {
super({
propertyResolver: fieldName => {
if (fieldName === 'metadata__og_description') {
return 'metadataOgDescription';
}
if (fieldName === 'metadata__meta_title') {
return 'metadataMetaTitle';
}
if (fieldName === 'body_copy') {
return 'bodyCopy';
}
if (fieldName === 'metadata__og_title') {
return 'metadataOgTitle';
}
if (fieldName === 'metadata__meta_description') {
return 'metadataMetaDescription';
}
if (fieldName === 'metadata__twitter_site') {
return 'metadataTwitterSite';
}
if (fieldName === 'post_date') {
return 'postDate';
}
if (fieldName === 'meta_keywords') {
return 'metaKeywords';
}
if (fieldName === 'teaser_image') {
return 'teaserImage';
}
if (fieldName === 'metadata__twitter_image') {
return 'metadataTwitterImage';
}
if (fieldName === 'metadata__twitter_creator') {
return 'metadataTwitterCreator';
}
if (fieldName === 'metadata__twitter_title') {
return 'metadataTwitterTitle';
}
if (fieldName === 'metadata__twitter_description') {
return 'metadataTwitterDescription';
}
if (fieldName === 'meta_description') {
return 'metaDescription';
}
if (fieldName === 'metadata__og_image') {
return 'metadataOgImage';
}
if (fieldName === 'related_articles') {
return 'relatedArticles';
}
if (fieldName === 'url_pattern') {
return 'urlPattern';
}
return fieldName;
},
linkResolver: link => resolveContentLink(link)
});
}
}
Loading

0 comments on commit 8e5b879

Please sign in to comment.