Merge branch 'master' into jane/api-sandbox

COVID19Tracking · Apr 30, 2020 · 608408f · 608408f
2 parents 11bf472 + d0042d2
commit 608408f
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 77 deletions.
diff --git a/functions/api-proxy.js b/functions/api-proxy.js
diff --git a/gatsby-node.js b/gatsby-node.js
@@ -67,18 +67,6 @@ exports.createPages = async ({ graphql, actions }) => {
       component: path.resolve(`./src/templates/state.js`),
       context: node,
     })
-
-    createRedirect({
-      fromPath: `/api/states state=${node.state}`,
-      toPath: `/api/v1/states/${node.state.toLowerCase()}/current.json`,
-      isPermanent: true,
-    })
-
-    createRedirect({
-      fromPath: `/api/states/daily.csv state=${node.state}`,
-      toPath: `/api/v1/states/${node.state.toLowerCase()}/current.csv`,
-      isPermanent: true,
-    })
   })
 
   result.data.allContentfulBlogPost.edges.forEach(({ node }) => {
@@ -88,18 +76,6 @@ exports.createPages = async ({ graphql, actions }) => {
       context: node,
     })
   })
-
-  createRedirect({
-    fromPath: `/api/states* `,
-    toPath: `/.netlify/functions/api-proxy/states:splat`,
-    isPermanent: true,
-  })
-
-  createRedirect({
-    fromPath: `/api/us* `,
-    toPath: `/.netlify/functions/api-proxy/us:splat`,
-    isPermanent: true,
-  })
 }
 
 exports.onCreateWebpackConfig = ({ stage, actions, loaders, getConfig }) => {

diff --git a/netlify.toml b/netlify.toml
@@ -1,7 +1,6 @@
 [build]
   publish = "public"
   command = "npm run build"
-  functions = "functions"
 
 [context.production]
   command = "npm run build"

diff --git a/static/_redirects b/static/_redirects
@@ -1,25 +1,6 @@
 /api/v1/us.json                               /api/v1/us/current.json
 /api/v1/states.json                           /api/v1/states/current.json
-/api/states.csv                               /api/v1/states/current.csv
-/api/states/current.json                      /api/v1/states/current.json
-/api/urls                                     /api/v1/urls.json
-/api/urls.csv                                 /api/v1/urls.csv
-/api/urls.html                                /api/v1/urls.html
-/api/screenshots                              /api/v1/screenshots.json
-/api/screenshots.csv                          /api/v1/screenshots.csv
-/api/screenshots.html                         /api/v1/screenshots.html
-/api/press                                    /api/v1/press.json
-/api/press.csv                                /api/v1/press.csv
-/api/press.html                               /api/v1/press.html
-/api/counties                                 /api/v1/counties.json
-/api/counties.csv                             /api/v1/counties.csv
-/api/counties.html                            /api/v1/counties.html
-/api/us.csv                                   /api/v1/us/current.csv
-/api/us/daily                                 /api/v1/us/daily.json
-/api/us/daily.csv                             /api/v1/us/daily.csv
-/api/v1/states                                /api/v1/states/current.json
-
-/api/graphql                                  /404
+/api/*                                        https://covid.cape.io/:splat  200
 
 /charts/dash                                  http://35.212.27.3:8050/
 /graphql                                      /api/graphql