Merge branch 'helio-3193-second' into 'preview'

HELIO-3193

See merge request !30

gatsby-config.js

@@ -5,6 +5,15 @@ module.exports = {
     author: `Lever Press`,
   },
   plugins: [
+    {
+      // keep as first gatsby-source-filesystem plugin for gatsby image support
+      // for netlify
+      resolve: 'gatsby-source-filesystem',
+      options: {
+        path: `${__dirname}/static/assets`,
+        name: 'assets',
+      },
+    },
     {
       resolve: `gatsby-plugin-google-analytics`,
       options: {
@@ -31,15 +40,6 @@ module.exports = {
         modulePath: `${__dirname}/src/cms/cms.js`,
       }
     },
-    {
-      // keep as first gatsby-source-filesystem plugin for gatsby image support
-      // for netlify
-      resolve: 'gatsby-source-filesystem',
-      options: {
-        path: `${__dirname}/static/assets`,
-        name: 'assets',
-      },
-    },
     {
       resolve: `gatsby-source-filesystem`,
       options: {

gatsby-node.js

@@ -56,9 +56,26 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
 const { fmImagesToRelative } = require('gatsby-remark-relative-images');
 
 exports.onCreateNode = ({ node, actions, getNode }) => {
-  const { createNodeField } = actions;
+  fmImagesToRelative(node);
 
+  const { createNodeField } = actions;
   if (node.internal.type === `MarkdownRemark`) {
+
+    // HELIO-3193
+    // frontmatter cover paths need to be corrected
+    if (node.frontmatter.cover) {
+      console.log("OLDPATH", node.frontmatter.cover)
+      console.log("FIXPATH", node.frontmatter.cover.replace(/^.*assets/, "/assets"))
+      createNodeField({
+        node,
+        name: `cover`,
+        //value: path.join("/", node.frontmatter.cover)
+        //value: node.frontmatter.cover
+        value: node.frontmatter.cover.replace(/^.*assets/, "/assets")
+      })
+    }
+    // end HELIO-3193
+
     const value = createFilePath({ node, getNode });
     createNodeField({
       name: `slug`,
@@ -66,6 +83,4 @@ exports.onCreateNode = ({ node, actions, getNode }) => {
       value,
     });
   }
-
-  fmImagesToRelative(node);
 }

package.json

@@ -22,7 +22,7 @@
     "gatsby-source-filesystem": "^2.1.33",
     "gatsby-transformer-remark": "^2.6.30",
     "gatsby-transformer-sharp": "^2.2.23",
-    "netlify-cms-app": "^2.9.7",
+    "netlify-cms-app": "2.11.27",
     "node-sass": "^4.13.0",
     "prop-types": "^15.7.2",
     "react": "^16.10.2",

src/components/books/bookCard.js

 import React from "react"
-import Img from "gatsby-image"
+// import Img from "gatsby-image"
 
-const Book = ({book}) => {
+const Book = ({cover, book}) => {
   const {
     title,
     author,
     readLink,
     buyLink,
     description,
-    cover
   } = book
 
   return (
     <div className="card mb-3 book-card">
       <div className="row no-gutters">
         <div className="col-md-4">
-          <Img fluid={cover.childImageSharp.fluid}
-             alt={`cover of ${title}`}
-            className="card-img"
-          />
+          <img src={cover} alt={`cover of ${title}`} className="card-img" />
         </div>
         <div className="col-md-8">
           <div className="card-body">

src/components/books/bookList.js

@@ -11,7 +11,7 @@ const BookList = ({books}) => {
           books.map(({node}) => {
             if (node.frontmatter.orderOnPage === 1 || node.frontmatter.orderOnPage === 2) {
               return (
-                <BookCard key={node.id} book={node.frontmatter} />
+                <BookCard key={node.id} cover={node.fields.cover} book={node.frontmatter} />
               )
             } else {
               return null

src/components/events/eventList.js

@@ -5,7 +5,7 @@ const EventList = ({events, cardStyle}) => {
   return (
     <section className="event-card-list">
       <h2>Events</h2>
-      <p class="scala-sans">Lever representatives will be attending the following events. <a href="mailto:info@leverpress.org">Email us</a> if you'd like to meet up.</p>
+      <p className="scala-sans">Lever representatives will be attending the following events. <a href="mailto:info@leverpress.org">Email us</a> if you'd like to meet up.</p>
       <ul className="list-unstyled">
       {
         events.map(({node}) => {

src/content/events/2020-01-31-association-of-university-presses-june-13-15.md

@@ -3,6 +3,6 @@ templateKey: event
 title: 'Association of University Presses, June 13-15'
 summary: Lever Press staff will be in Seattle for 2020's AUP Meeting
 date: 2020-01-31T17:40:01.813Z
-image: assets/AUP_logo_RGB.jpg
+image: /assets/AUP_logo_RGB.jpg
 ---
 Connect with us in Seattle this year at the annual [Association of University Presses](http://www.aupresses.org/events-a-conferences/annual-meeting/aupresses-2020) meeting.

src/content/events/2020-01-31-college-art-association-feb-12-15.md

@@ -3,6 +3,6 @@ templateKey: event
 title: 'College Art Association, Feb. 12-15'
 summary: Meet up with us at the 108th Annual CAA Conference
 date: 2020-01-31T17:13:45.280Z
-image: assets/Screen Shot 2020-01-31 at 1.09.24 PM.png
+image: /assets/screen-shot-2020-01-31-at-1.09.25-pm.png
 ---
 From February 12th-15th, Lever Press representatives will be in Chicago and available to meet with you at the [College Art Association Conference](https://www.collegeart.org/programs/conference/conference2020/). Send an email to [info@leverpress.org](mailto:info@leverpress.org) if you'd like to schedule a meeting.

src/content/news/2019-09-24-update-from-the-lever-press-annual-meeting.md

@@ -6,7 +6,6 @@ summary: >-
   come together in person with staff for a two-day meeting at the University of
   Michigan, hosted by our partners, Michigan Publishing.
 date: 2019-09-24T14:23:41.310Z
-image: ''
 ---
 Lever Press conducts much of the business of governance virtually since our leaders and operations are scattered across North America. The Editorial Board and the Oversight Committee each meet monthly via Zoom, supplemented by copious e-mail, phone traffic, and online document editing (not to mention the annual membership meeting in the Fall). But once a year in late summer, the Board and the Committee come together in person with staff for a two-day meeting at the University of Michigan, hosted by our partners, Michigan Publishing. This year we met on August 13th and 14th.
 
@@ -16,6 +15,6 @@ The two days are organized into separate and joint meetings of the two groups so
 
 ![](/assets/screen-shot-2019-11-18-at-11.41.57-am.png)
 
-## 
+##
 
 ![](/assets/img_2984.jpeg)

src/content/news/2020-01-15-lever-press-an-overdue-update-on-our-progress.md

@@ -7,7 +7,6 @@ summary: >-
   that Lever Press lives in a dynamic open access ecosystem where its funders
   and authors are not the only stakeholders.
 date: 2019-05-07T18:40:01.238Z
-image: ''
 ---
 A [Twitter thread over the weekend from our colleagues at Punctum Books](https://threadreaderapp.com/thread/1124456090991616002.html), another library-supported publisher of open access books, was a good reminder that Lever Press lives in a dynamic open access ecosystem where its funders and authors are not the only stakeholders. Over the last six months, we’ve had our heads down commissioning books, producing our first titles, and managing a transition of leadership from inaugural director Mark Edington to our dynamic acquisitions lead Beth Bouloukos. We have been working intensively with our Oversight Committee, representing the funding institutions, and Editorial Board, the faculty leadership group that determines what we publish and oversees its quality, but we have been much less good at communicating our progress more publicly.
 

src/content/news/2020-01-15-new-faces-at-lever.md

@@ -4,9 +4,8 @@ title: New Faces at Lever
 summary: >-
   Lever Press is pleased to welcome new members of the Editorial Board and the
   Oversight Committee, along with staff support from the University of Michigan
-  for our communication efforts. 
+  for our communication efforts.
 date: 2019-09-20T18:22:27.334Z
-image: ''
 ---
 
 ![](/assets/new-faces.jpeg)

src/content/news/2020-01-16-inside-higher-ed-story-on-lever-press-progress.md

@@ -5,7 +5,6 @@ summary: >-
   Inside Higher Ed features an article today by Lindsay McKenzie on Lever's
   progress and the year ahead
 date: 2018-01-19T05:50:11.005Z
-image: ''
 ---
 [Lever Press Sets Gears in Motion](https://www.insidehighered.com/news/2018/01/19/lever-press-gets-ready-publish-first-digital-scholarship-books)
 

src/content/news/2020-01-16-lever-editorial-board-issues-peer-review-commitments-guidelines.md

@@ -5,7 +5,6 @@ summary: >-
   The Lever Press Editorial Board releases a document making clear its
   commitment to strong and consistent peer review.
 date: 2017-03-21T04:56:00.000Z
-image: ''
 ---
 Open access publishing fights against the perception that there is an inherent link between forms of access (paywall or open access?) and the rigor of review. Not incidentally, publishers with strong interests in maintaining the revenue generated from pay-for-access are anxious to encourage that notion—not least to protect the status quo.
 

src/content/news/2020-01-16-lever-press-releases-its-statement-of-values.md

@@ -5,7 +5,6 @@ summary: >-
   Lever Press begins 2018 by publishing its Statement of Values, a clear
   statement of the values grounding its work as a scholarly publisher.
 date: 2018-01-08T05:53:57.747Z
-image: ''
 ---
 Lever Press has opened 2018 by publishing its “[Statement of Values](https://www.leverpress.org/about#values),” a clear statement of the values grounding its work as a scholarly publisher. “As we’ve grown from imagining what a sustainable open-access press might be to establishing a press and signing contracts with authors, we began to focus on the values that we want to be sure inform our work,” said Mike Roy, Dean of Libraries at Middlebury College and chair of Lever’s governing Oversight Committee. “Because this is a values-driven initiative, it is important to us that we articulate those values in a transparent way.”
 

src/content/news/2020-02-07-news-from-beth-bouloukos-director-of-lever-press-winter-2020.md

@@ -5,7 +5,6 @@ summary: >-
   Beth Bouloukos, Director of Lever Press, gives an update on the latest Lever
   Press publication, as well as past and upcoming conference attendance
 date: 2020-02-07T14:47:45.679Z
-image: ''
 ---
 As we move into our second phase here at Lever Press, we are delighted to announce that our new website is now live. You should find it easier to access information and updates, which aligns with our goal of greater transparency and communication. We are also excited to announce that our latest book, *[Elizabeth Bishop and the Literary Archive ](https://www.fulcrum.org/concern/monographs/2b88qd97w)*is live on Fulcrum. This project was born out of the poet’s archive at Vassar College and was edited by a scholar at Williams College. It is also our first title to include numerous embedded images and will serve as an example for others who are hoping to bring the archive alive with the tools allotted to us from Fulcrum. We will publish a book every month from now until June, so stay on the lookout for new titles!
 

src/pages/events.js

@@ -12,8 +12,8 @@ const Events = ({data}) => {
       <SEO title="Events" />
       <div className="container page-container">
       <div className="row text-right">
-          <div className="col-md-12"> 
-            <p class="social scala-sans">Connect with us  <a href="https://www.facebook.com/LeverPress/"><svg width="24px" height="24px" viewBox="0 0 24 24" className="social-link fb" aria-hidden="false"><title>Facebook</title><path d="M20.9,2H3.1A1.1,1.1,0,0,0,2,3.1V20.9A1.1,1.1,0,0,0,3.1,22h9.58V14.25h-2.6v-3h2.6V9a3.64,3.64,0,0,1,3.88-4,20.26,20.26,0,0,1,2.33.12v2.7h-1.6c-1.25,0-1.49.59-1.49,1.47v1.92h3l-.39,3H15.8V22h5.1A1.1,1.1,0,0,0,22,20.9V3.1A1.1,1.1,0,0,0,20.9,2Z"></path></svg></a>
+          <div className="col-md-12">
+            <p className="social scala-sans">Connect with us  <a href="https://www.facebook.com/LeverPress/"><svg width="24px" height="24px" viewBox="0 0 24 24" className="social-link fb" aria-hidden="false"><title>Facebook</title><path d="M20.9,2H3.1A1.1,1.1,0,0,0,2,3.1V20.9A1.1,1.1,0,0,0,3.1,22h9.58V14.25h-2.6v-3h2.6V9a3.64,3.64,0,0,1,3.88-4,20.26,20.26,0,0,1,2.33.12v2.7h-1.6c-1.25,0-1.49.59-1.49,1.47v1.92h3l-.39,3H15.8V22h5.1A1.1,1.1,0,0,0,22,20.9V3.1A1.1,1.1,0,0,0,20.9,2Z"></path></svg></a>
               <a href="https://twitter.com/lever_press"><svg width="24px" height="24px" viewBox="0 0 24 24" className="social-link tw" aria-hidden="false"><title>Twitter</title><path d="M22,5.8a8.6,8.6,0,0,1-2.36.65,4.07,4.07,0,0,0,1.8-2.27,8.1,8.1,0,0,1-2.6,1A4.1,4.1,0,0,0,11.75,8a4.73,4.73,0,0,0,.09.93A11.6,11.6,0,0,1,3.39,4.62,4.2,4.2,0,0,0,2.83,6.7a4.09,4.09,0,0,0,1.82,3.4A4,4,0,0,1,2.8,9.6v0a4.11,4.11,0,0,0,3.29,4A4.2,4.2,0,0,1,5,13.81a4,4,0,0,1-.78-.07,4.14,4.14,0,0,0,3.83,2.85A8.22,8.22,0,0,1,3,18.34a6.37,6.37,0,0,1-1-.06,11.48,11.48,0,0,0,6.29,1.84A11.58,11.58,0,0,0,20,8.46c0-.18,0-.36,0-.53A8.31,8.31,0,0,0,22,5.8Z"></path></svg></a>
             </p>
           </div>

src/pages/index.js

@@ -54,6 +54,9 @@ query {
   ) {
     edges {
       node {
+        fields {
+          cover
+        }
         id
         frontmatter {
           title
@@ -62,13 +65,6 @@ query {
           readLink
           buyLink
           orderOnPage
-          cover {
-            childImageSharp {
-              fluid {
-                ...GatsbyImageSharpFluid
-              }
-            }
-          }
         }
       }
     }
@@ -93,7 +89,7 @@ query {
         frontmatter {
           title
           summary
-          date(formatString:"MMMM Do, YYYY")          
+          date(formatString:"MMMM Do, YYYY")
         }
       }
     }

src/pages/news.js

@@ -12,8 +12,8 @@ const News = ({data}) => {
       <SEO title="News" />
       <div className="container page-container">
         <div className="row text-right">
-          <div className="col-md-12"> 
-            <p class="social scala-sans">Connect with us  <a href="https://www.facebook.com/LeverPress/"><svg width="24px" height="24px" viewBox="0 0 24 24" className="social-link fb" aria-hidden="false"><title>Facebook</title><path d="M20.9,2H3.1A1.1,1.1,0,0,0,2,3.1V20.9A1.1,1.1,0,0,0,3.1,22h9.58V14.25h-2.6v-3h2.6V9a3.64,3.64,0,0,1,3.88-4,20.26,20.26,0,0,1,2.33.12v2.7h-1.6c-1.25,0-1.49.59-1.49,1.47v1.92h3l-.39,3H15.8V22h5.1A1.1,1.1,0,0,0,22,20.9V3.1A1.1,1.1,0,0,0,20.9,2Z"></path></svg></a>
+          <div className="col-md-12">
+            <p className="social scala-sans">Connect with us  <a href="https://www.facebook.com/LeverPress/"><svg width="24px" height="24px" viewBox="0 0 24 24" className="social-link fb" aria-hidden="false"><title>Facebook</title><path d="M20.9,2H3.1A1.1,1.1,0,0,0,2,3.1V20.9A1.1,1.1,0,0,0,3.1,22h9.58V14.25h-2.6v-3h2.6V9a3.64,3.64,0,0,1,3.88-4,20.26,20.26,0,0,1,2.33.12v2.7h-1.6c-1.25,0-1.49.59-1.49,1.47v1.92h3l-.39,3H15.8V22h5.1A1.1,1.1,0,0,0,22,20.9V3.1A1.1,1.1,0,0,0,20.9,2Z"></path></svg></a>
               <a href="https://twitter.com/lever_press"><svg width="24px" height="24px" viewBox="0 0 24 24" className="social-link tw" aria-hidden="false"><title>Twitter</title><path d="M22,5.8a8.6,8.6,0,0,1-2.36.65,4.07,4.07,0,0,0,1.8-2.27,8.1,8.1,0,0,1-2.6,1A4.1,4.1,0,0,0,11.75,8a4.73,4.73,0,0,0,.09.93A11.6,11.6,0,0,1,3.39,4.62,4.2,4.2,0,0,0,2.83,6.7a4.09,4.09,0,0,0,1.82,3.4A4,4,0,0,1,2.8,9.6v0a4.11,4.11,0,0,0,3.29,4A4.2,4.2,0,0,1,5,13.81a4,4,0,0,1-.78-.07,4.14,4.14,0,0,0,3.83,2.85A8.22,8.22,0,0,1,3,18.34a6.37,6.37,0,0,1-1-.06,11.48,11.48,0,0,0,6.29,1.84A11.58,11.58,0,0,0,20,8.46c0-.18,0-.36,0-.53A8.31,8.31,0,0,0,22,5.8Z"></path></svg></a>
             </p>
           </div>

src/templates/event.js

@@ -2,15 +2,10 @@ import React from 'react'
 import SEO from "../components/seo"
 import Layout from '../components/layout'
 import {graphql} from "gatsby"
-import Img from "gatsby-image"
 
 const Event = ({data}) => {
   const { html } = data.markdownRemark
   const { title, summary } = data.markdownRemark.frontmatter
-  //var showImage;
-  //if (image) {
-  //  showImage = <Img fluid={image.childImageSharp.fluid} />
-  //}
 
   return (
     <Layout>
@@ -24,10 +19,6 @@ const Event = ({data}) => {
             </div>
           </div>
         </div>
-        <div className="row justify-content-md-center">
-          <div className="col-md-10 post-image">
-          </div>
-        </div>
         <div className="row justify-content-md-center">
           <div className="col-md-8">
             <div dangerouslySetInnerHTML={{ __html: html }} />

src/templates/news.js

@@ -2,15 +2,10 @@ import React from 'react'
 import SEO from "../components/seo"
 import Layout from '../components/layout'
 import {graphql} from "gatsby"
-import Img from "gatsby-image"
 
 const News = ({data}) => {
   const { html } = data.markdownRemark
   const { title, summary, date } = data.markdownRemark.frontmatter
-  //var showImage;
-  //if (image) {
-   // showImage = <Img fluid={image.childImageSharp.fluid} />
-  //}
 
   return (
     <Layout>
@@ -25,10 +20,6 @@ const News = ({data}) => {
             </div>
           </div>
         </div>
-        <div className="row justify-content-md-center">
-          <div className="col-md-10 post-image">        
-          </div>
-        </div>
         <div className="row justify-content-md-center">
           <div className="col-md-8">
             <div dangerouslySetInnerHTML={{ __html: html }} />