Speed fixes (patch)

Alheimsins · Jun 16, 2018 · 50780ce · 50780ce
1 parent cc901d4
commit 50780ce
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 19 deletions.
diff --git a/components/Map.js b/components/Map.js
@@ -3,6 +3,7 @@ import { Component, Fragment } from 'react'
 import getConfig from 'next/config'
 import ReactMapGL, { Marker, Popup } from 'react-map-gl'
 import { FaCircle } from 'react-icons/lib/fa'
+import 'mapbox-gl/dist/mapbox-gl.css'
 import getData from '../lib/get-data'
 
 const { publicRuntimeConfig: { TOKEN, URL_STATIONS } } = getConfig()

diff --git a/components/alheimsins/Layout.js b/components/alheimsins/Layout.js
@@ -18,9 +18,7 @@ export default ({ title, theme = {}, children }) => (
       <meta name='twitter:image' content='https://bigfive-test.com/static/apple-icon.png' />
       <meta name='description' content='Se forurensning og luftkvalitet nær deg.' />
       <meta name='keywords' content='forurensning luftkvalitet luft astma' />
-      <link rel='stylesheet' href='/static/mapbox-gl.css' />
-      <link rel='stylesheet' href='/static/font-awesome-animation.min.css' />
-      <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' />
+      <link rel='stylesheet' href='/static/font-awesome-animation.min.css' media='none' />
       <script type='application/ld+json' dangerouslySetInnerHTML={{ __html: `{ "@context": "http://schema.org/", "@type": "WebSite", "name": "Luftstatus", "url": "https://luftstatus.no" }` }} />
       <link rel='icon' sizes='192x192' href='/static/android-icon-192x192.png' />
       <link rel='apple-touch-icon' href='/static/apple-icon-152x152.png' />

diff --git a/lib/get-data-areas.js b/lib/get-data-areas.js
diff --git a/next.config.js b/next.config.js
@@ -1,4 +1,5 @@
 const withOffline = require('next-offline')
+const withCSS = require('@zeit/next-css')
 
 module.exports = {
   useFileSystemPublicRoutes: false,
@@ -8,5 +9,6 @@ module.exports = {
     URL_AREAS: process.env.URL_AREAS || 'https://s3.eu-central-1.amazonaws.com/luftstatus/areas.json',
     TOKEN: process.env.TOKEN || '<INSERT-YOUR-MAPBOX-TOKEN>'
   },
-  ...withOffline()
+  ...withOffline(),
+  ...withCSS()
 }
diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
   "keywords": [],
   "license": "MIT",
   "dependencies": {
+    "@zeit/next-css": "^0.2.0",
     "axios": "0.18.0",
     "express": "4.16.3",
     "next": "6.0.3",

diff --git a/pages/index.js b/pages/index.js
@@ -3,7 +3,7 @@ import { geolocated } from 'react-geolocated'
 import { FaCircle } from 'react-icons/lib/fa'
 import { Layout, Loading, Link } from '../components/alheimsins'
 import getConfig from 'next/config'
-import getData from '../lib/get-data-areas'
+import getData from '../lib/get-data'
 const { publicRuntimeConfig: { URL_AREAS } } = getConfig()
 
 const ColorDescription = () => (

diff --git a/production.env b/production.env
@@ -1,2 +1,4 @@
 URL=https://s3.eu-central-1.amazonaws.com/luftstatus/data.json
+URL_STATIONS=https://s3.eu-central-1.amazonaws.com/luftstatus/stations.json
+URL_AREAS=https://s3.eu-central-1.amazonaws.com/luftstatus/areas.json
 TOKEN=@mapbox_token