GFW Map 3.0

.babelrc

@@ -6,7 +6,8 @@
           "mode": "remove",
           "removeImport": true,
           "ignoreFilenames": ["node_modules"]
-        }]
+        }],
+        "react-hot-loader/babel"
       ]
     }
   },
@@ -27,12 +28,13 @@
   ],
   "plugins": [
     "syntax-dynamic-import",
+    "transform-decorators-legacy",
     [
       "transform-class-properties",
       {
         "spec": true
       }
     ],
-    "transform-es2015-arrow-functions"
+    "universal-import"
   ]
 }

.env.prod.sample

@@ -0,0 +1,61 @@
+# Application
+[email protected]
+LAYER_SPEC=layerspec
+
+# GFW Links
+GFW_API=https://production-api.globalforestwatch.org
+GFW_API_OLD=https://api.globalforestwatch.org
+GFW_ASSETS_URL=https://gfw-assets.s3.amazonaws.com/static/gfw-assets.nightly.js
+GFW_BLOG_HOST=http://blog.globalforestwatch.org
+GFW_HOWTO_URL=http://vizzuality.github.io/gfw-howto
+GFW_DEVELOPERS_URL=http://vizzuality.github.io/gfw-atlas
+
+# External APIs
+CARTO_API=https://wri-01.carto.com/api/v2
+RESOURCE_WATCH_API=https://api.resourcewatch.org/v1
+CLIMATE_WATCH_API=https://climate-watch.vizzuality.com/api/v1
+
+# AWS
+AWS_HOST=/uploads
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_REGION=my-excellent-region
+S3_BUCKET_NAME=
+S3_DATA_BUCKET_NAME=
+
+# Google
+ANALYTICS_PROPERTY_ID=
+LANDSTAD_KEY=
+SENTINEL_KEY=
+GOOGLE_MAPS_API_KEY=
+GOOGLE_CUSTOM_SEARCH_CX=
+GOOGLE_SEARCH_API_KEY=
+
+# Bitly
+BITLY_API_URL=https://api-ssl.bitly.com/v3
+BITLY_USER=
+BITLY_API_KEY=
+
+# Datasets
+COUNTRIES_PAGE_DATASET=a20e9c0e-8d7d-422f-90f5-3b9bca355aaf
+GLAD_ISO_DATASET=391ca96d-303f-4aef-be4b-9cdb4856832c
+GLAD_ADM1_DATASET=c7a1d922-e320-4e92-8e4c-11ea33dd6e35
+GLAD_ADM2_DATASET=428db321-5ebb-4e86-a3df-32c63b6d3c83
+FIRES_ISO_DATASET=ff289906-aa83-4a89-bba0-562edd8c16c6
+FIRES_ADM1_DATASET=9b9e56fc-270e-486d-8db5-e0a839c9a1a9
+FIRES_ADM2_DATASET=0f24299d-2aaa-4afc-945c-b614028c12d1
+
+# Transifex
+TRANSIFEX_URL=https://www.transifex.com/api/2/project
+TRANSIFEX_PROJECT=
+TRANSIFEX_SLUG=
+TRANSIFEX_API_TOKEN=
+TRANSIFEX_RESOURCE_API_TOKEN=
+LOCALES_PATH=app/javascript/locales
+
+# SMTP
+SMTP_USERNAME=
+SMTP_PASSWORD=
+
+# CYPRESS
+CYPRESS_RECORD_KEY=

.env.sample

@@ -19,7 +19,7 @@ CLIMATE_WATCH_API=https://climate-watch.vizzuality.com/api/v1
 AWS_HOST=/uploads
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
-AWS_REGION=
+AWS_REGION=my-excellent-region
 S3_BUCKET_NAME=
 S3_DATA_BUCKET_NAME=
 
@@ -58,4 +58,4 @@ SMTP_USERNAME=
 SMTP_PASSWORD=
 
 # CYPRESS
-CYPRESS_RECORD_KEY=
+CYPRESS_RECORD_KEY=

.eslintrc.yml

@@ -37,6 +37,8 @@ rules:
   react/jsx-filename-extension: 0
   react/sort-comp: 0
   react/no-find-dom-node: 0
+  react/no-array-index-key: 0
+  react/no-danger: 0
   camelcase: 0
   no-mixed-operators: 0
   class-methods-use-this: 0

.gitignore

@@ -58,4 +58,3 @@ todo.todo
 /public/packs
 /public/packs-test
 /node_modules
-package-lock.json

.postcssrc

@@ -1,6 +1,7 @@
 {
   "plugins": {
     "postcss-cssnext": {
+      "warnForDuplicates": false,
       "browsers": ["> 1%", "last 2 versions", "Firefox ESR", "Safari >= 8", "IE >= 11"]
     }
   }

.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 node_js:
-  - 8.10.0
+  - 8.11.2
 
 rvm:
   - 2.4.0

Gemfile

@@ -33,7 +33,7 @@ gem 'rack-reverse-proxy', '~> 0.12.0', :require => 'rack/reverse_proxy'
 gem 'aws-sdk', '~> 3'
 
 #Webpacker
-gem 'webpacker', '~> 3.5'
+gem 'webpacker', '~> 3.5.5'
 
 # http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#responders
 gem 'responders', '~> 2.0'
@@ -71,4 +71,4 @@ end
 gem 'newrelic_rpm'
 gem 'puma'
 
-gem 'dotenv-rails', :groups => [:development, :test]
+gem 'dotenv-rails', :groups => [:development, :test, :production_local]

Gemfile.lock

@@ -1132,7 +1132,7 @@ DEPENDENCIES
   useragent
   vcr
   web-console (~> 2.0)
-  webpacker (~> 3.5)
+  webpacker (~> 3.5.5)
 
 RUBY VERSION
    ruby 2.4.0p0

Procfile.dev

@@ -1,4 +1,2 @@
-web: bundle exec rails s
-web: redis-server /usr/local/etc/redis.conf
-# watcher: ./bin/webpack-watcher
-webpacker: ./bin/webpack-dev-server
+web: bundle exec rails s -b 0.0.0.0
+webpacker: ./bin/webpack-dev-server --watch --colors --progress

README.md

@@ -56,11 +56,6 @@ $ rvm install 2.4.0
 $ rvm use 2.4.0
 ```
 
-Now let's install redis:
-```bash
-$ brew install redis
-```
-
 Now let's install Ruby on Rails:
 
 ```bash
@@ -83,16 +78,23 @@ $ brew install imagemagick@6 --force && brew link imagemagick@6 --force
 Installing front end dependencies:
 
 ```bash
-$ npm install
+$ yarn install
 ```
 
 Almost there! Final steps are to copy the `.env.sample` to `.env`, and start the server:
 
 ```bash
-$ npm start
+$ yarn start
 ```
 The app should now be accessible on [http://0.0.0.0:5000](http://0.0.0.0:5000).
 
+### REDIS
+We have a local redis server for caching in production. We dont run this locally by default but if you want to test or develop on this feature you will need to install redis and run it:
+
+```bash
+$ brew install redis
+$ yarn redis
+```
 
 ## Deployment
 
@@ -167,7 +169,7 @@ We use [BrowserStack](https://www.browserstack.com) to find and fix cross-browse
 
 # RW API Documentation for GFW
 
-Map layers and relevent datasets are stored in the [RW-API](http://api.resourcewatch.org/) and the `globalforestwatch.org/v2/map` utilises the [layer-manager](https://github.com/Vizzuality/layer-manager) to render them.
+Map layers and relevent datasets are stored in the [RW-API](http://api.resourcewatch.org/) and the `globalforestwatch.org/map` utilises the [layer-manager](https://github.com/Vizzuality/layer-manager) to render them.
 
 The schema used to style these layers, their legends, and define their interactions are specific to the *Global Forest Watch* platform.
 

app/assets/javascripts/map/views/LayersNavView.js

@@ -70,7 +70,7 @@ define(
       render: function() {
         this.$el.html('').append(
           this.template({
-            staging: window.gfw.config.RAILS_ENV !== 'production'
+            staging: window.gfw.config.FEATURE_ENV !== 'production'
           })
         );
         this.cache();

app/assets/javascripts/map/views/LegendView.js

@@ -392,7 +392,7 @@ define(
                     startYear: options.startYear,
                     layerTitle: layer.title,
                     layerSlug: layer.slug,
-                    staging: window.gfw.config.RAILS_ENV !== 'production'
+                    staging: window.gfw.config.FEATURE_ENV !== 'production'
                   },
                   subLayers
                 )

app/assets/stylesheets/global/_base.scss

@@ -81,3 +81,7 @@ h1,h2 {
     -ms-user-select: none;
     user-select: none;
 }
+
+#react-header {
+  height: 55px;
+}

app/assets/stylesheets/modules/_section-new.scss

@@ -167,6 +167,8 @@ $aside-width: 270px;
     svg {
       display: block;
       fill: $dark;
+      width: 20px;
+      height: 20px;
       &.-inactive {
         display: none;
       }

app/controllers/about_controller.rb

@@ -1,10 +1,3 @@
 class AboutController < ApplicationController
   layout 'application_react'
-
-  def index
-    @title = 'About'
-    @desc = 'Global Forest Watch (GFW) is an online platform that provides data and tools for monitoring forests. By harnessing cutting-edge technology, GFW allows anyone to access near real-time information about where and how forests are changing around the world.'
-    @keywords = 'GFW, about, global forest watch, about gfw, history, staff, world resources institute, wri, about gfw commodities, about gfw fires'
-  end
-
 end