Merge pull request #3534 from ONRR/fix-blog-analytics

Fix blog analytics
DOI-ONRR · Jan 31, 2019 · 9aeb36c · 9aeb36c
2 parents 9e84bd5 + 5c9a7c3
commit 9aeb36c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/blog-site/gatsby-config.js b/blog-site/gatsby-config.js
@@ -14,6 +14,7 @@ module.exports = {
     author: 'Ryan Johnson',
     description: 'Our blog about data, design, and innovation at the Department of the Interior',
     siteUrl: 'https://revenuedata.doi.gov/',
+    googleAnalyticsId: GOOGLE_ANALYTICS_ID,
   },
   pathPrefix: `${BASEURL}/blog`,
   mapping: {

diff --git a/blog-site/src/pages/index.js b/blog-site/src/pages/index.js
@@ -14,6 +14,7 @@ class BlogIndex extends React.Component {
       this,
       'props.data.site.siteMetadata.description'
     )
+    const siteAnalytics = get(this, 'props.data.site.siteMetadata.googleAnalyticsId')
     const posts = get(this, 'props.data.allMarkdownRemark.edges')
 
     return (
@@ -23,7 +24,16 @@ class BlogIndex extends React.Component {
           meta={[{ name: 'description', content: siteDescription }]}
           title={siteTitle}
           link={[{ rel: 'shortcut icon', type: 'image/png', href: `${favicon}` }]}
-        />
+        >
+          {/* Digital Analytics Program roll-up, see the data at https://analytics.usa.gov */}
+          <script src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js" id="_fed_an_ua_tag"></script>
+          {siteAnalytics &&
+            <script>
+              {"(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');ga('create', '"+siteAnalytics+"', 'auto');ga('set', 'anonymizeIp', true);ga('set', 'forceSSL', true);ga('send', 'pageview');"}
+            </script>
+          }
+        </Helmet>  
+
         {posts.map(({ node }) => {
           const title = get(node, 'frontmatter.title') || node.fields.slug
           return (
@@ -72,6 +82,7 @@ export const pageQuery = graphql`
       siteMetadata {
         title
         description
+        googleAnalyticsId
       }
     }
     allMarkdownRemark(sort: { fields: [frontmatter___date], order: DESC }) {

diff --git a/blog-site/src/templates/blog-post.js b/blog-site/src/templates/blog-post.js
@@ -8,6 +8,7 @@ import { rhythm, scale } from '../utils/typography'
 
 class BlogPostTemplate extends React.Component {
   render() {
+    const siteAnalytics = get(this.props, 'data.site.siteMetadata.googleAnalyticsId')
     const post = this.props.data.markdownRemark
     const siteTitle = get(this.props, 'data.site.siteMetadata.title')
     const siteDescription = post.excerpt
@@ -19,7 +20,16 @@ class BlogPostTemplate extends React.Component {
           htmlAttributes={{ lang: 'en' }}
           meta={[{ name: 'description', content: siteDescription }]}
           title={`${post.frontmatter.title} | ${siteTitle}`}
-        />
+        >
+          {/* Digital Analytics Program roll-up, see the data at https://analytics.usa.gov */}
+          <script src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js" id="_fed_an_ua_tag"></script>
+          {siteAnalytics &&
+            <script>
+              {"(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');ga('create', '"+siteAnalytics+"', 'auto');ga('set', 'anonymizeIp', true);ga('set', 'forceSSL', true);ga('send', 'pageview');"}
+            </script>
+          }
+        </Helmet>
+
         <h1
           style={{
             ...scale(1.3),