From 70ac07a77e2a8ccf010b0257bf39826b807bb104 Mon Sep 17 00:00:00 2001 From: Tiago Garcia Date: Sat, 2 May 2020 08:00:28 +0200 Subject: [PATCH 1/7] Attempt to fix prod issue with RW LP assets --- microservice/register.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/microservice/register.json b/microservice/register.json index 6eb941a..e7504f6 100644 --- a/microservice/register.json +++ b/microservice/register.json @@ -25,7 +25,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/rw-lp/*.js" + "path": "/*.js" } ] }, @@ -37,7 +37,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/rw-lp/*.css" + "path": "/*.css" } ] }, @@ -49,7 +49,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/rw-lp/*.png" + "path": "/*.png" } ] }, @@ -61,7 +61,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/rw-lp/*.jpg" + "path": "/*.jpg" } ] }, @@ -73,7 +73,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/rw-lp/*.svg" + "path": "/*.svg" } ] }, @@ -85,7 +85,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/rw-lp/*.ico" + "path": "/*.ico" } ] }, @@ -97,7 +97,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/rw-lp/*.txt" + "path": "/*.txt" } ] }, @@ -109,7 +109,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/rw-lp/*.json" + "path": "/*.json" } ] } From 82c44c26d2b06968fbee9ed62043ec705596358c Mon Sep 17 00:00:00 2001 From: Tiago Garcia Date: Tue, 23 Jun 2020 11:54:59 +0200 Subject: [PATCH 2/7] Text updates on landing page --- app/index.html | 40 ++++------------------------------------ 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/app/index.html b/app/index.html index f84df34..c386aea 100644 --- a/app/index.html +++ b/app/index.html @@ -117,7 +117,7 @@

Several sources_ Same interface_

-

It doesn’t matter if the data is in CARTO, CSV, ArcGIS, JSON, or GEE format because we’ve used SQL and feature service, both standard languages, to query the data and reveal the information that is sought. Whatever system you use, you’ll be able to use it, avoiding any lengthy and difficult discussions about standards and compatibility. We’ve done the hard work so you don’t have to.

+

It doesn’t matter if the data is in CARTO, CSV, ArcGIS, JSON, or GEE. We use SQL to query the data and reveal the information that is sought, no matter where it's stored. Whatever system you use, you’ll be able to use it, avoiding any lengthy and difficult discussions about standards and compatibility. We’ve done the hard work so you don’t have to.

Swagger Docs API Docs
@@ -138,8 +138,8 @@

Several sources_ Same interface_

Production_ Ready_

-

In case you want to upload your own data to the platform you can request us to create your own user. However all data is actually available to use in any application or research project.

- Go to the console +

Want to host your own data on the RW API? No problem! Simply sign up for a free account, and you can upload your own data, to power your own application and share it with the world.

+ Login or Register
@@ -199,38 +199,6 @@

Loading ...

- -
-
-
-
-
-

Most requested Endpoints Performance

-

Loading ...

- - - - - - - - - - - - - - - -
#EndpointAvg Response Time
{{1+$index}}{{item._id.sourceMethod}}: {{item._id.endpointPath}}{{item.sum.toFixed(2)}} ms -
-
-
-
-
-
- -
@@ -256,7 +224,7 @@

-

Resource Watch 2017

+

Resource Watch 2020

From 90ff51c30937b28cda58a7081c5be3c0c3439d2c Mon Sep 17 00:00:00 2001 From: Tiago Garcia Date: Tue, 23 Jun 2020 12:01:03 +0200 Subject: [PATCH 3/7] Remove controller code that populated the recently removed statistics page section --- app/rw-lp/scripts/app.js | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/app/rw-lp/scripts/app.js b/app/rw-lp/scripts/app.js index dd556ca..44ab050 100644 --- a/app/rw-lp/scripts/app.js +++ b/app/rw-lp/scripts/app.js @@ -3,7 +3,6 @@ angular.module('app', []); angular.module('app').controller('StatusController', ['$http', StatusController]); - angular.module('app').controller('PerformanceController', ['$http', PerformanceController]); function StatusController($http) { var vm = this; @@ -24,24 +23,4 @@ } - function PerformanceController($http) { - var vm = this; - - vm.statistics = null; - - $http({ - method: 'GET', - url: '//production-api.globalforestwatch.org/api/v1/stadistic/avgByRequest?'+Date.now() - }).then(function successCallback(response) { - vm.statistics = response.data; - // this callback will be called asynchronously - // when the response is available - }, function errorCallback(response) { - // called asynchronously if an error occurs - // or server returns response with an error status. - }); - - } - - })(); From 93edbb10ce6865277894ddb659e66f21ba0be975 Mon Sep 17 00:00:00 2001 From: Tiago Garcia Date: Tue, 30 Jun 2020 14:53:59 +0200 Subject: [PATCH 4/7] Revert "Attempt to fix prod issue with RW LP assets" This reverts commit 70ac07a77e2a8ccf010b0257bf39826b807bb104. --- microservice/register.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/microservice/register.json b/microservice/register.json index e7504f6..6eb941a 100644 --- a/microservice/register.json +++ b/microservice/register.json @@ -25,7 +25,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/*.js" + "path": "/rw-lp/*.js" } ] }, @@ -37,7 +37,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/*.css" + "path": "/rw-lp/*.css" } ] }, @@ -49,7 +49,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/*.png" + "path": "/rw-lp/*.png" } ] }, @@ -61,7 +61,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/*.jpg" + "path": "/rw-lp/*.jpg" } ] }, @@ -73,7 +73,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/*.svg" + "path": "/rw-lp/*.svg" } ] }, @@ -85,7 +85,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/*.ico" + "path": "/rw-lp/*.ico" } ] }, @@ -97,7 +97,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/*.txt" + "path": "/rw-lp/*.txt" } ] }, @@ -109,7 +109,7 @@ { "method": "GET", "baseUrl": "#(service.uri)", - "path": "/*.json" + "path": "/rw-lp/*.json" } ] } From f49a90608b3c2174cb73a612955a1ae7bc5d62bf Mon Sep 17 00:00:00 2001 From: Tiago Garcia Date: Tue, 30 Jun 2020 15:55:04 +0200 Subject: [PATCH 5/7] Attempt to fix the landing page --- app/index.html | 4 ++-- microservice/register.json | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/index.html b/app/index.html index c386aea..fb4070d 100644 --- a/app/index.html +++ b/app/index.html @@ -22,14 +22,14 @@ - + - + diff --git a/microservice/register.json b/microservice/register.json index 6eb941a..706ddca 100644 --- a/microservice/register.json +++ b/microservice/register.json @@ -18,7 +18,7 @@ ] }, { - "url": "/v1/*.js", + "url": "/v1/rw-lp/*.js", "authenticated": false, "method": "GET", "endpoints": [ @@ -30,7 +30,7 @@ ] }, { - "url": "/v1/*.css", + "url": "/v1/rw-lp/*.css", "authenticated": false, "method": "GET", "endpoints": [ @@ -42,7 +42,7 @@ ] }, { - "url": "/v1/*.png", + "url": "/v1/rw-lp/*.png", "authenticated": false, "method": "GET", "endpoints": [ @@ -54,7 +54,7 @@ ] }, { - "url": "/v1/*.jpg", + "url": "/v1/rw-lp/*.jpg", "authenticated": false, "method": "GET", "endpoints": [ @@ -66,7 +66,7 @@ ] }, { - "url": "/v1/*.svg", + "url": "/v1/rw-lp/*.svg", "authenticated": false, "method": "GET", "endpoints": [ @@ -78,7 +78,7 @@ ] }, { - "url": "/v1/*.ico", + "url": "/v1/rw-lp/*.ico", "authenticated": false, "method": "GET", "endpoints": [ @@ -90,7 +90,7 @@ ] }, { - "url": "/v1/*.txt", + "url": "/v1/rw-lp/*.txt", "authenticated": false, "method": "GET", "endpoints": [ @@ -102,7 +102,7 @@ ] }, { - "url": "/v1/*.json", + "url": "/v1/rw-lp/*.json", "authenticated": false, "method": "GET", "endpoints": [ From 1da77fa26237cb5f72fb1951d4b2f7259989dd1d Mon Sep 17 00:00:00 2001 From: Tiago Garcia Date: Mon, 13 Jul 2020 17:26:46 +0100 Subject: [PATCH 6/7] Identify MS dependencies on README --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 2453930..ddc93af 100644 --- a/README.md +++ b/README.md @@ -1 +1,5 @@ # RW API Landing page + +Dependencies on other Microservices: + +- [Control Tower](https://github.com/resource-watch/control-tower) From 4ef8d6760c39be1ef4a633320a9c780b54e80aa9 Mon Sep 17 00:00:00 2001 From: Logan Byers <5625411+loganbyers@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:31:22 -0700 Subject: [PATCH 7/7] Change main doc links to API Docs & Tutorial. Remove swagger docs link (https://api.resourcewatch.org/documentation/) and replace with link to tutorials. --- app/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/index.html b/app/index.html index fb4070d..e9460ce 100644 --- a/app/index.html +++ b/app/index.html @@ -118,8 +118,8 @@

Several sources_ Same interface_

It doesn’t matter if the data is in CARTO, CSV, ArcGIS, JSON, or GEE. We use SQL to query the data and reveal the information that is sought, no matter where it's stored. Whatever system you use, you’ll be able to use it, avoiding any lengthy and difficult discussions about standards and compatibility. We’ve done the hard work so you don’t have to.

- Swagger Docs API Docs + Tutorials

@@ -250,4 +250,4 @@

- + \ No newline at end of file