Merge pull request #3754 from ONRR/dev

Dev-->Master
DOI-ONRR · Mar 6, 2019 · 58dcf40 · 58dcf40
2 parents 32fe6a9 + 85bb620
commit 58dcf40
Show file tree

Hide file tree

Showing 57 changed files with 13,904 additions and 436 deletions.
diff --git a/_config.yml b/_config.yml
@@ -8,7 +8,7 @@ url: https://revenuedata.doi.gov
 
 # app version number
 
-version: v4.3.5
+version: v4.3.6
 
 exclude:
   # top-level log

diff --git a/_downloads/disbursements.md b/_downloads/disbursements.md
@@ -38,7 +38,7 @@ tag:
 Download fiscal year data:
 
 <ul class="downloads-download_links list-unstyled">
-  <li><a href="{{site.baseurl}}/downloads/disbursements_FY2003-2018_by_type.xlsx">{% include svg/icon-download.svg %}Disbursements data by state, county, and type (xlsx, 78.9 KB)</a></li>
+  <li><a href="{{site.baseurl}}/downloads/disbursements_FY2003-2018_by_type.xlsx">{% include svg/icon-download.svg %}Disbursements data by state, county, and type (xlsx, 64 KB)</a></li>
 </ul>
 
 The documentation that follows is for the funds overview dataset. We also have [notes on this data](https://github.com/onrr/doi-extractives-data/wiki/Data-Catalog#disbursements) from the web development team as they built the interactions on this site.

diff --git a/_how-it-works/the-process/minerals.html b/_how-it-works/the-process/minerals.html
diff --git a/_how-it-works/the-process/offshore-renewables.html b/_how-it-works/the-process/offshore-renewables.html
diff --git a/_how-it-works/the-process/onshore-renewables.html b/_how-it-works/the-process/onshore-renewables.html
diff --git a/_reconciliation/2015.md b/_reconciliation/2015.md
diff --git a/_reconciliation/2016.md b/_reconciliation/2016.md
diff --git a/downloads/disbursements_FY2003-2018_by_type.xlsx b/downloads/disbursements_FY2003-2018_by_type.xlsx
diff --git a/gatsby-site/gatsby-browser.js b/gatsby-site/gatsby-browser.js
@@ -77,20 +77,68 @@ exports.onClientEntry = () => {
   else if(path.includes("/about")){
     loader.addPagesArray([{"componentChunkName":"component---src-pages-about-index-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"about.json","path": path}]);
   }
+  else if(path.includes("/downloads")){
+    loader.addPagesArray([{"componentChunkName":"component---src-templates-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"downloads.json","path": path}]);
+  }
   else if(path.includes("/how-it-works") && !lastFourteen.includes("default-page")){
 
     if(path.includes("/native-american-ownership-governance") && !lastFourteen.includes("default-page")){
       loader.addPagesArray([{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-native-american-ownership-governance.json","path":path}]);
     }
+    else if(path.includes("/reconciliation/2015") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-reconciliation-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-reconciliation-2015.json","path":path}]);
+    }
+    else if(path.includes("/reconciliation/2016") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-reconciliation-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-reconciliation-2016.json","path":path}]);
+    }
+    else if(path.includes("/aml-reclamation-program") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([,{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-aml-reclamation-program.json","path":path}]);
+    }
+    else if(path.includes("/revenues") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-revenues.json","path":path}]);
+    }
+    else if(path.includes("/minerals") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-minerals.json","path":path}]);
+    }
+    else if(path.includes("/onshore-renewables") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-onshore-renewables.json","path":path}]);
+    }
+    else if(path.includes("/offshore-renewables") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-offshore-renewables.json","path":path}]);
+    }
+    else if(path.includes("/minerals") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-minerals.json","path":path}]);
+    }
+    else if(path.includes("/federal-revenue-by-company/2017") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2017.json","path":path}]);
+    }
+    else if(path.includes("/federal-revenue-by-company/2016") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2016.json","path":path}]);
+    }
+    else if(path.includes("/federal-revenue-by-company/2015") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2015.json","path":path}]);
+    }
+    else if(path.includes("/federal-revenue-by-company/2014") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2014.json","path":path}]);
+    }
+    else if(path.includes("/federal-revenue-by-company/2013") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-revenue-by-company-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-federal-revenue-by-company-2013.json","path":path}]);
+    }
     else if(path.includes("/offshore-oil-gas") && !lastFourteen.includes("default-page")){
       loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-offshore-oil-gas.json","path":path}]);
     }
     else if(path.includes("/onshore-oil-gas") && !lastFourteen.includes("default-page")){
       loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-onshore-oil-gas.json","path":path}]);
     }
-    else if(path.includes("/coal") && !lastFourteen.includes("default-page")){
+    else if(path.includes("/coal") && !path.includes("/coal-excise-tax")){
       loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-process-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-coal.json","path":path}]);
     }
+    else if(path.includes("/disbursements") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-disbursements.json","path":path}]);
+    }
+    else if(path.includes("/coal-excise-tax") && !lastFourteen.includes("default-page")){
+      loader.addPagesArray([{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-coal-excise-tax.json","path":path}]);
+    }
     else if(path.includes("/state-laws-and-regulations") && !lastFourteen.includes("default-page")){
       loader.addPagesArray([{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-state-laws-and-regulations.json","path":path}]);
     }

diff --git a/gatsby-site/gatsby-config.js b/gatsby-site/gatsby-config.js
@@ -19,7 +19,7 @@ module.exports = {
   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: 'v4.3.5',
+    version: 'v4.3.6',
     googleAnalyticsId: GOOGLE_ANALYTICS_ID,
   },
   plugins: [