Merge pull request #3931 from ONRR/dev

Dev-->Master
DOI-ONRR · Apr 15, 2019 · 7e0b95a · 7e0b95a
2 parents 84ba818 + f227697
commit 7e0b95a
Show file tree

Hide file tree

Showing 56 changed files with 5,898 additions and 6,938 deletions.
diff --git a/blog-site/package-lock.json b/blog-site/package-lock.json
diff --git a/blog-site/package.json b/blog-site/package.json
@@ -7,24 +7,24 @@
     "url": "https://github.com/ONRR/doi-extractives-data/issues"
   },
   "dependencies": {
-    "gatsby": "^2.0.72",
+    "gatsby": "^2.3.20",
     "gatsby-plugin-feed": "^2.0.11",
     "gatsby-plugin-google-analytics": "^2.0.8",
     "gatsby-plugin-manifest": "^2.0.12",
     "gatsby-plugin-offline": "^2.0.20",
     "gatsby-plugin-react-helmet": "^3.0.4",
-    "gatsby-plugin-sharp": "^2.0.15",
+    "gatsby-plugin-sharp": "^2.0.34",
     "gatsby-plugin-typography": "^2.2.2",
     "gatsby-remark-autolink-headers": "^2.0.12",
     "gatsby-remark-copy-linked-files": "^2.0.8",
     "gatsby-remark-images": "^2.0.6",
     "gatsby-remark-prismjs": "^3.1.4",
     "gatsby-remark-responsive-iframe": "^2.0.7",
     "gatsby-remark-smartypants": "^2.0.7",
-    "gatsby-source-filesystem": "^2.0.12",
+    "gatsby-source-filesystem": "^2.0.29",
     "gatsby-transformer-remark": "^2.1.17",
     "gatsby-transformer-sharp": "^2.1.9",
-    "gatsby-transformer-yaml": "^2.1.6",
+    "gatsby-transformer-yaml": "^2.1.11",
     "lodash": "^4.17.11",
     "pngquant-bin": "^5.0.1",
     "prismjs": "^1.15.0",

diff --git a/downloads/monthly_production_04-2019.xlsx b/downloads/monthly_production_04-2019.xlsx
diff --git a/downloads/monthly_revenue_03-2019.xlsx b/downloads/monthly_revenue_03-2019.xlsx
diff --git a/downloads/revenues/federal_revenue_acct-year_FY06-18_2018-12-13.xlsx b/downloads/revenues/federal_revenue_acct-year_FY06-18_2018-12-13.xlsx
diff --git a/downloads/revenues/~$federal_revenue_acct-year_FY06-18_2018-12-13.xlsx b/downloads/revenues/~$federal_revenue_acct-year_FY06-18_2018-12-13.xlsx
diff --git a/downloads/~$federal_revenue_onshore_acct-year_FY06-16_2017-04-21.xlsx b/downloads/~$federal_revenue_onshore_acct-year_FY06-16_2017-04-21.xlsx
diff --git a/gatsby-config.js b/gatsby-config.js
@@ -14,7 +14,7 @@ let config = {
   siteMetadata: {
     title: 'Natural Resources Revenue Data',
     description: 'This site provides open data about natural resource management on federal lands and waters in the United States, including oil, gas, coal, and other extractive industries.',
-    version: 'v5.0.0',
+    version: 'v5.1.0',
     googleAnalyticsId: GOOGLE_ANALYTICS_ID,
   },
   plugins: [
@@ -44,6 +44,13 @@ let config = {
         name: 'pages',
       },
     },
+    {
+      resolve: `gatsby-source-filesystem`,
+      options: {
+        name: `markdown-pages`,
+        path: `${__dirname}/src/markdown/`,
+      },
+    },    
     {
       resolve: `gatsby-source-filesystem`,
       options: {
@@ -54,8 +61,8 @@ let config = {
     {
       resolve: `gatsby-source-filesystem`,
       options: {
-        name: `markdown-pages`,
-        path: `${__dirname}/src/markdown/`,
+        name: `downloads`,
+        path: `${__dirname}/downloads/revenues`,
       },
     },
     'gatsby-transformer-excel',
@@ -81,7 +88,8 @@ let config = {
         types: [
           'ProductionVolumesXlsx__Sheet1',
           'DisbursementsXlsx__Data',
-          'RevenueMonthlyXlsx__MontlyRev']
+          'RevenueMonthlyXlsx__MontlyRev',
+          'FederalRevenueAcctYearFy061820181213Xlsx__FederalRevenuesFy06Fy18']
       }
     },
     `gatsby-plugin-meta-redirect`, // make sure to put last in the array
@@ -92,4 +100,4 @@ if(BASEURL) {
   config.pathPrefix = `${BASEURL}`;
 }
 
-module.exports = config;
+module.exports = config;