From 47375e6400b4dc68f5c73cc66ead791304b3052a Mon Sep 17 00:00:00 2001 From: Jonas Braathen Date: Sat, 23 Feb 2019 23:17:51 +0100 Subject: [PATCH] Prettier --- gatsby-config.js | 28 ++++++------- gatsby-node.js | 31 ++++++++------ src/components/EventList.js | 53 ++++++++++++------------ src/components/Footer.js | 13 +++++- src/components/PostList.js | 15 +++---- src/templates/author.js | 9 ++-- src/templates/category.js | 4 +- src/templates/event-program.js | 4 +- src/templates/event-type.js | 2 +- src/templates/event.js | 64 ++++++++++++++++------------- src/templates/post.js | 75 +++++++++++++++++++--------------- src/wordpress.js | 11 ++--- 12 files changed, 170 insertions(+), 139 deletions(-) diff --git a/gatsby-config.js b/gatsby-config.js index be516c9..8a7c1cd 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -1,4 +1,4 @@ -const { neufNormalizer } = require('./src/wordpress') +const { neufNormalizer } = require('./src/wordpress') module.exports = { siteMetadata: { @@ -22,21 +22,21 @@ module.exports = { // Set to true to debug endpoints on 'gatsby build' verboseOutput: true, includedRoutes: [ - "**/*/*/categories", - "**/*/*/events", - "**/*/*/event_types", - "**/*/*/posts", - "**/*/*/pages", - "**/*/*/media", - "**/*/*/tags", - "**/*/*/taxonomies", - "**/*/*/users", + '**/*/*/categories', + '**/*/*/events', + '**/*/*/event_types', + '**/*/*/posts', + '**/*/*/pages', + '**/*/*/media', + '**/*/*/tags', + '**/*/*/taxonomies', + '**/*/*/users', ], excludedRoutes: [ - "/yoast/**", - "**/*/*/comments", - "**/*/*/settings", - "**/*/*/users/me", + '/yoast/**', + '**/*/*/comments', + '**/*/*/settings', + '**/*/*/users/me', ], normalizer: neufNormalizer, }, diff --git a/gatsby-node.js b/gatsby-node.js index bb542f2..6d2dd41 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -184,16 +184,19 @@ exports.createPages = ({ actions, graphql }) => { const eventTypeTemplate = path.resolve(`./src/templates/event-type.js`) - _.each(result.data.allWordpressWpEventTypes.edges, ({ node: event_type }) => { - createPage({ - path: event_type.fields.link, - component: eventTypeTemplate, - context: { - name: event_type.name, - slug: event_type.slug, - }, - }) - }) + _.each( + result.data.allWordpressWpEventTypes.edges, + ({ node: event_type }) => { + createPage({ + path: event_type.fields.link, + component: eventTypeTemplate, + context: { + name: event_type.name, + slug: event_type.slug, + }, + }) + } + ) }) .then(() => { return graphql(` @@ -312,9 +315,11 @@ exports.onCreateNode = ({ node, actions, getNode }) => { }) } - if ((node.internal.type === 'wordpress__POST') || - (node.internal.type === 'wordpress__wp_events') || - (node.internal.type === 'wordpress__wp_event_types')) { + if ( + node.internal.type === 'wordpress__POST' || + node.internal.type === 'wordpress__wp_events' || + node.internal.type === 'wordpress__wp_event_types' + ) { const link = new URL(node.link).pathname createNodeField({ node, diff --git a/src/components/EventList.js b/src/components/EventList.js index e1736ba..a9b87d8 100644 --- a/src/components/EventList.js +++ b/src/components/EventList.js @@ -3,38 +3,43 @@ import PropTypes from 'prop-types' import { Link, graphql } from 'gatsby' import Img from 'gatsby-image' -import moment from 'moment'; +import moment from 'moment' import 'moment/locale/nb' moment.locale('nb') export default class EventList extends React.Component { render_event(event) { return ( - +
- {event.featured_media && event.featured_media.localFile && - } + {event.featured_media && event.featured_media.localFile && ( + + )}
-

- {event.title} -

+

{event.title}

- {moment(event.start_time).format('HH:mm')} - - {moment(event.start_time).format('dddd')} - {moment(event.start_time).format('D.')} - {moment(event.start_time).format('MMMM')} - {/* Only specify year if different. */} - {!moment(event.start_time).isSame(new Date(), 'year') && - {moment(event.start_time).format('YYYY')} - } + + {moment(event.start_time).format('HH:mm')} - {event.event_types && event.event_types.length && + + + {moment(event.start_time).format('dddd')}{' '} + + + {moment(event.start_time).format('D.')}{' '} + + + {moment(event.start_time).format('MMMM')}{' '} + + {/* Only specify year if different. */} + {!moment(event.start_time).isSame(new Date(), 'year') && ( + + {moment(event.start_time).format('YYYY')}{' '} + + )} + + {event.event_types && event.event_types.length && (
    {event.event_types.map(type => ( @@ -49,7 +54,7 @@ export default class EventList extends React.Component { ))}
- } + )}
@@ -63,9 +68,7 @@ export default class EventList extends React.Component {

{title}

- {events.map(({ node: event }) => ( - this.render_event(event) - ))} + {events.map(({ node: event }) => this.render_event(event))}
) diff --git a/src/components/Footer.js b/src/components/Footer.js index cf738fc..5f96759 100644 --- a/src/components/Footer.js +++ b/src/components/Footer.js @@ -3,8 +3,17 @@ import { Link, graphql } from 'gatsby' const Footer = () => ( ) diff --git a/src/components/PostList.js b/src/components/PostList.js index 79a6524..883bdac 100644 --- a/src/components/PostList.js +++ b/src/components/PostList.js @@ -11,17 +11,14 @@ export default class IndexPage extends React.Component {

{title}

{posts.map(({ node: post }) => ( - - + +
-

- {post.title} -

+

{post.title}

{/*
{post.date}
*/}
diff --git a/src/templates/author.js b/src/templates/author.js index a6125fb..7272e24 100644 --- a/src/templates/author.js +++ b/src/templates/author.js @@ -14,9 +14,12 @@ const Author = props => { // The `authored_wordpress__POST` returns a simple array instead of an array // of edges / nodes. We therefore need to convert the array here. - const posts = (totalCount === 0) ? [] : authored_wordpress__POST.map(post => ({ - node: post, - })) + const posts = + totalCount === 0 + ? [] + : authored_wordpress__POST.map(post => ({ + node: post, + })) return ( diff --git a/src/templates/category.js b/src/templates/category.js index af8b8e6..6fb5be6 100644 --- a/src/templates/category.js +++ b/src/templates/category.js @@ -30,7 +30,9 @@ export const pageQuery = graphql` title } } - allWordpressPost(filter: { categories: { elemMatch: { slug: { eq: $slug } } } }) { + allWordpressPost( + filter: { categories: { elemMatch: { slug: { eq: $slug } } } } + ) { totalCount edges { node { diff --git a/src/templates/event-program.js b/src/templates/event-program.js index 83341dc..18bdaec 100644 --- a/src/templates/event-program.js +++ b/src/templates/event-program.js @@ -27,9 +27,7 @@ EventProgram.propTypes = { export const pageQuery = graphql` query { - allWordpressWpEvents( - sort: { fields: date, order: DESC } - ) { + allWordpressWpEvents(sort: { fields: date, order: DESC }) { edges { node { ...EventListFields diff --git a/src/templates/event-type.js b/src/templates/event-type.js index 1039e79..a4bb68b 100644 --- a/src/templates/event-type.js +++ b/src/templates/event-type.js @@ -34,7 +34,7 @@ export const pageQuery = graphql` } } allWordpressWpEvents( - filter: { event_types: { elemMatch: { slug: { eq: $slug } } } }, + filter: { event_types: { elemMatch: { slug: { eq: $slug } } } } sort: { fields: date, order: DESC } ) { totalCount diff --git a/src/templates/event.js b/src/templates/event.js index 2152f02..374c8ff 100644 --- a/src/templates/event.js +++ b/src/templates/event.js @@ -9,7 +9,7 @@ import moment from 'moment' import 'moment/locale/nb' moment.locale('nb') -const formatPrices = (regular, student) => { +const formatPrices = (regular, student) => { let cc = '' if (regular && regular != 0) { cc += regular @@ -31,61 +31,67 @@ export const EventTemplate = ({ ticketUrl, priceStudent, priceRegular, - eventTypes + eventTypes, }) => { return (
-

- {title} -

+

{title}

-
- i {venue} -
+
i {venue}
Dag:{' '} - {moment(startTime).format('dddd')} - {moment(startTime).format('D.')} - {moment(startTime).format('MMMM')} + + {moment(startTime).format('dddd')}{' '} + + + {moment(startTime).format('D.')}{' '} + + + {moment(startTime).format('MMMM')}{' '} + {/* Only specify year if different. */} - {!moment(startTime).isSame(new Date(), 'year') && - {moment(startTime).format('YYYY')} - } + {!moment(startTime).isSame(new Date(), 'year') && ( + + {moment(startTime).format('YYYY')}{' '} + + )}
- Start: {moment(startTime).format('HH:mm')} + Start: {moment(startTime).format('HH:mm')}
{/* TODO: make the API stop assuming event duration is 2 hours when unspecified? */} - {endTime && + {endTime && (
Slutt: {moment(endTime).format('HH:mm')}
- } + )}
- Pris: {formatPrices(priceRegular, priceStudent)} + Pris: {formatPrices(priceRegular, priceStudent)}
- {ticketUrl && - Kjøp billetter - } - {facebookUrl && - Se Facebook-event - } - {eventTypes && eventTypes.length && + {ticketUrl && ( + + Kjøp billetter + + )} + {facebookUrl && ( + + Se Facebook-event + + )} + {eventTypes && eventTypes.length && (

Konsept

    {eventTypes.map(type => (
  • - - {type.name} - + {type.name}
    • ))}
- } + )}
diff --git a/src/templates/post.js b/src/templates/post.js index 01eadc9..82e2849 100644 --- a/src/templates/post.js +++ b/src/templates/post.js @@ -16,49 +16,56 @@ export const BlogPostTemplate = ({ featuredMedia, }) => { return ( -
+
-

- {title} -

+

{title}

{date} av {author.name}

- {hasFeaturedMedia &&
- -
} + {hasFeaturedMedia && ( +
+ +
+ )}
-
- {categories && categories.length ? ( -
-

Categories

-
    - {categories.map(category => ( -
  • - - {category.name} - -
    • - ))} -
-
- ) : null} - {tags && tags.length ? ( -
-

Tags

-
    - {tags.map(tag => ( -
  • - {tag.name} -
    • - ))} -
-
- ) : null} +
+ {categories && categories.length ? ( +
+

Categories

+
    + {categories.map(category => ( +
  • + + {category.name} + +
    • + ))} +
+
+ ) : null} + {tags && tags.length ? ( +
+

Tags

+
    + {tags.map(tag => ( +
  • + {tag.name} +
    • + ))} +
+
+ ) : null}
) } diff --git a/src/wordpress.js b/src/wordpress.js index d929168..cc88778 100644 --- a/src/wordpress.js +++ b/src/wordpress.js @@ -1,6 +1,6 @@ -const Entities = require('html-entities').AllHtmlEntities; +const Entities = require('html-entities').AllHtmlEntities -const htmlEntities = new Entities(); +const htmlEntities = new Entities() const neufNormalizer = ({ entities }) => { entities = decodeTitles(entities) @@ -9,7 +9,7 @@ const neufNormalizer = ({ entities }) => { } exports.neufNormalizer = neufNormalizer - + const decodeTitles = entities => { return entities.map(e => { if (e.title) { @@ -20,12 +20,13 @@ const decodeTitles = entities => { } const mapEventsToEventTypes = entities => { - const eventTaxonomies = [`wordpress__wp_event_types`, ] + const eventTaxonomies = [`wordpress__wp_event_types`] const eventTypes = entities.filter(e => eventTaxonomies.includes(e.__type)) return entities.map(e => { // Replace event types with links to their nodes. - let eventHasType = e.event_types && Array.isArray(e.event_types) && e.event_types.length + let eventHasType = + e.event_types && Array.isArray(e.event_types) && e.event_types.length if (eventTypes.length && eventHasType) { e.event_types___NODE = e.event_types.map( t =>