diff --git a/src/components/Layout.js b/src/components/Layout.js index 5275147..9820328 100644 --- a/src/components/Layout.js +++ b/src/components/Layout.js @@ -1,17 +1,14 @@ import React from 'react' import PropTypes from 'prop-types' -import Helmet from 'react-helmet' import classNames from 'classnames' import Navbar from './Navbar' import Footer from './Footer' +import Meta from './Meta' import '../css/main.scss' const TemplateWrapper = ({ children, classes }) => (
- +
{children}
)} {homepage && ( @@ -51,6 +52,10 @@ const AssociationPage = ({ data }) => { return ( + { return ( - + ) diff --git a/src/templates/blog.js b/src/templates/blog.js index 78faa00..e626643 100644 --- a/src/templates/blog.js +++ b/src/templates/blog.js @@ -1,7 +1,7 @@ import React from 'react' import PropTypes from 'prop-types' -import Helmet from 'react-helmet' import { graphql } from 'gatsby' +import Meta from '../components/Meta' import Layout from '../components/Layout' import PostList from '../components/PostList' import Pagination from '../components/Pagination' @@ -13,7 +13,7 @@ export default class BlogPage extends React.Component { return ( - + diff --git a/src/templates/category.js b/src/templates/category.js index dddd96c..4b3fdd3 100644 --- a/src/templates/category.js +++ b/src/templates/category.js @@ -1,6 +1,6 @@ import React from 'react' -import Helmet from 'react-helmet' import { graphql } from 'gatsby' +import Meta from '../components/Meta' import Layout from '../components/Layout' import PostList from '../components/PostList' @@ -14,7 +14,7 @@ const Category = props => { return ( - + ) diff --git a/src/templates/event-organizer.js b/src/templates/event-organizer.js index 85f817a..3290c8e 100644 --- a/src/templates/event-organizer.js +++ b/src/templates/event-organizer.js @@ -1,10 +1,10 @@ import React from 'react' import PropTypes from 'prop-types' -import Helmet from 'react-helmet' import { graphql, Link } from 'gatsby' import moment from 'moment' import 'moment/locale/nb' +import Meta from '../components/Meta' import Layout from '../components/Layout' import EventList from '../components/EventList' @@ -18,7 +18,7 @@ export default class EventOrganizerPage extends React.Component { return ( - + - + ) diff --git a/src/templates/event.js b/src/templates/event.js index 8644574..e742ad9 100644 --- a/src/templates/event.js +++ b/src/templates/event.js @@ -1,11 +1,11 @@ import React from 'react' import PropTypes from 'prop-types' -import Helmet from 'react-helmet' import { graphql, Link } from 'gatsby' import Img from 'gatsby-image' import moment from 'moment' import 'moment/locale/nb' +import Meta from '../components/Meta' import Layout from '../components/Layout' moment.locale('nb') @@ -120,11 +120,11 @@ export const EventTemplate = ({ {featuredMedia.localFile.childImageSharp ? ( ) : ( - {featuredMedia.caption - )} + {featuredMedia.caption + )} {/* {featuredMedia.caption && (
{ return ( - + { @@ -16,11 +16,11 @@ export const PageTemplate = ({ title, content, featuredMedia }) => { {featuredMedia.localFile.childImageSharp ? ( ) : ( - {featuredMedia.caption - )} + {featuredMedia.caption + )}
{featuredMedia.caption && (
{ return ( - +
@@ -44,11 +44,11 @@ export const BlogPostTemplate = ({ {featuredMedia.localFile.childImageSharp ? ( ) : ( - {featuredMedia.caption - )} + {featuredMedia.caption + )} {featuredMedia.caption && (
{ return ( - + { return ( - + ) diff --git a/src/templates/venue.js b/src/templates/venue.js index f24f517..3151b61 100644 --- a/src/templates/venue.js +++ b/src/templates/venue.js @@ -1,9 +1,9 @@ import React from 'react' import PropTypes from 'prop-types' -import Helmet from 'react-helmet' import { graphql, Link } from 'gatsby' import Img from 'gatsby-image' import classNames from 'classnames' +import Meta from '../components/Meta' import Layout from '../components/Layout' import Map from '../components/Map' @@ -49,8 +49,8 @@ export class VenueTemplate extends React.Component { {featuredMedia.localFile.childImageSharp ? ( ) : ( - {title} - )} + {title} + )}
)}
@@ -178,7 +178,10 @@ const VenuePage = ({ data }) => { return ( - +