Merge pull request #60 from back4app/update-version

Update version

Author: rsouzas

.travis.yml

@@ -1,8 +1,8 @@
 language: node_js
 node_js:
-- '4.4'
-- '5.7'
-- '6.1'
+- '6.11'
+- '8.8'
+before_script: ./scripts/before_script.sh
 cache:
   directories:
     - node_modules

CHANGELOG.md

@@ -4,6 +4,15 @@
 
 * _Contributing to this repo? Add info about your change here to be included in next release_
 
+### 1.2.0
+* Fix: Filtering with a 1-digit number (#831), thanks to [Pascal Giguère](https://github.com/pgiguere1)
+* Fix: Databrowser shows correct count of filtered objects, thanks to [Tom Engelbrecht](https://github.com/engel)
+* Feature: Add primaryBackgroundColor and secondaryBackgroundColor in AppCard, thanks to [AreyouHappy](https://github.com/AreyouHappy)
+* Improvement: Removes forcing sort on createdAt (#796), thanks to [Florent Vilmart](https://github.com/flovilmart)
+* Fix: Broken Learn More link to cloud code documentation page (#828), thanks to [Stefan Trauth](https://github.com/funkenstrahlen)
+* Fix: Add `_PushStatus` add to SpecialClasses (#701), thanks to [Dongwoo Gim](https://github.com/gimdongwoo)
+* Fix: Include PushAudience query (#795), thanks to [marvelm](https://github.com/marvelm)
+
 ### 1.1.2
 
 * Fix: An issue introduced when using readOnlyMasterKey would make all users readOnly after one has logged in.

Parse-Dashboard/parse-dashboard-config.json

@@ -1,19 +1,3 @@
 {
-  "apps": [
-    {
-      "apiKey": "d49d9171-44ab-4903-ad48-8583bbd71ceb",
-      "appId": "btziWLgauIatUgdmWDYFHx0pqTnSoEcfNtJHZR5i",
-      "appName": "Android app",
-      "appNameForURL": "53d10528-9d77-41b3-9d3e-3fbe3c438d2b",
-      "clientKey": "i3wX3QTodhcPwUi03lLUlMaMY36qf6kBQCS6FErX",
-      "feedbackEmail": "[email protected]",
-      "javascriptKey": "6BRNN5R0tOyrAAS3U74NX7q1cTESzyDDVISYzUX2",
-      "masterKey": "9fhEU3de6jH5HraCeKAWvMR7l62aODM7DZlYRmh8",
-      "production": true,
-      "restKey": "cjLSL2KvBhneFU2nfP0jvXmdslO2Tlv2MNxhSbZq",
-      "serverURL": "https://parseapi.back4app.com",
-      "webhookKey": "XEQLleEHliYjJrK26z3Gzv3hGpL1Q3oApRq4IvPk",
-      "windowsKey": "udHVnp9l91VAmdKXM0MyOVD2w9z0TLaQOOzORZXT"
-    }
-  ]
+  "apps": []
 }

README.md

@@ -1,5 +1,7 @@
 # Parse Dashboard
 
+[![Greenkeeper badge](https://badges.greenkeeper.io/parse-community/parse-dashboard.svg)](https://greenkeeper.io/)
+
 [![Build Status](https://img.shields.io/travis/parse-community/parse-dashboard/master.svg?style=flat)](https://travis-ci.org/parse-community/parse-dashboard)
 [![npm version](https://img.shields.io/npm/v/parse-dashboard.svg?style=flat)](https://www.npmjs.com/package/parse-dashboard)
 
@@ -8,14 +10,25 @@ Parse Dashboard is a standalone dashboard for managing your Parse apps. You can
 * [Getting Started](#getting-started)
 * [Local Installation](#local-installation)
   * [Configuring Parse Dashboard](#configuring-parse-dashboard)
+    * [File](#file)
+    * [Environment variables](#environment-variables)
+      * [Multiple apps](#multiple-apps)
+      * [Single app](#single-app)
   * [Managing Multiple Apps](#managing-multiple-apps)
+  * [App Icon Configuration](#app-icon-configuration)
+  * [App Background Color Configuration](#app-background-color-configuration)
   * [Other Configuration Options](#other-configuration-options)
 * [Running as Express Middleware](#running-as-express-middleware)
 * [Deploying Parse Dashboard](#deploying-parse-dashboard)
   * [Preparing for Deployment](#preparing-for-deployment)
   * [Security Considerations](#security-considerations)
     * [Configuring Basic Authentication](#configuring-basic-authentication)
     * [Separating App Access Based on User Identity](#separating-app-access-based-on-user-identity)
+  * [Use Read-Only masterKey](#use-read-only-masterKey)
+    * [Making an app read-only for all users](#making-an-app-read-only-for-all-users)
+    * [Makings users read-only](#makings-users-read-only)
+    * [Making user's apps readOnly](#making-users-apps-readonly)
+  * [Configuring Localized Push Notifications](#configuring-localized-push-notifications)
   * [Run with Docker](#run-with-docker)
 * [Contributing](#contributing)
 
@@ -100,7 +113,7 @@ Managing multiple apps from the same dashboard is also possible.  Simply add add
 
 You can manage self-hosted [Parse Server](https://github.com/ParsePlatform/parse-server) apps, *and* apps that are hosted on [Parse.com](http://parse.com/) from the same dashboard. In your config file, you will need to add the `restKey` and `javascriptKey` as well as the other paramaters, which you can find on `dashboard.parse.com`. Set the serverURL to `http://api.parse.com/1`:
 
-```js
+```json
 {
   "apps": [
     {
@@ -141,6 +154,33 @@ Parse Dashboard supports adding an optional icon for each app, so you can identi
 }
 ```
 
+## App Background Color Configuration
+
+Parse Dashboard supports adding an optional background color for each app, so you can identify them easier in the list. To do so, you *must* use the configuration file, define an `primaryBackgroundColor` and `secondaryBackgroundColor` in it, parameter for each app. It is `CSS style`. To visualize what it means, in the following example `backgroundColor` is a configuration file:
+
+```json
+{
+  "apps": [
+    {
+      "serverURL": "http://localhost:1337/parse",
+      "appId": "myAppId",
+      "masterKey": "myMasterKey",
+      "appName": "My Parse Server App",
+      "primaryBackgroundColor": "#FFA500", // Orange
+      "secondaryBackgroundColor": "#FF4500" // OrangeRed
+    },
+    {
+      "serverURL": "http://localhost:1337/parse",
+      "appId": "myAppId",
+      "masterKey": "myMasterKey",
+      "appName": "My Parse Server App [2]",
+      "primaryBackgroundColor": "rgb(255, 0, 0)", // Red
+      "secondaryBackgroundColor": "rgb(204, 0, 0)" // DarkRed
+    }
+  ]
+}
+```
+
 ## Other Configuration Options
 
 You can set `appNameForURL` in the config file for each app to control the url of your app within the dashboard. This can make it easier to use bookmarks or share links on your dashboard.
@@ -151,7 +191,7 @@ To change the app to production, simply set `production` to `true` in your confi
 
 Instead of starting Parse Dashboard with the CLI, you can also run it as an [express](https://github.com/expressjs/express) middleware.
 
-```
+```javascript
 var express = require('express');
 var ParseDashboard = require('parse-dashboard');
 
@@ -177,20 +217,20 @@ httpServer.listen(4040);
 
 If you want to run both [Parse Server](https://github.com/ParsePlatform/parse-server) and Parse Dashboard on the same server/port, you can run them both as express middleware:
 
-```
+```javascript
 var express = require('express');
 var ParseServer = require('parse-server').ParseServer;
 var ParseDashboard = require('parse-dashboard');
 
-var allowInsecureHTTP = false
-
 var api = new ParseServer({
 	// Parse Server settings
 });
 
+var options = { allowInsecureHTTP: false };
+
 var dashboard = new ParseDashboard({
 	// Parse Dashboard settings
-}, allowInsecureHTTP);
+}, options);
 
 var app = express();
 
@@ -215,7 +255,7 @@ In order to securely deploy the dashboard without leaking your apps master key,
 
 The deployed dashboard detects if you are using a secure connection. If you are deploying the dashboard behind a load balancer or front-facing proxy, then the app won't be able to detect that the connection is secure. In this case, you can start the dashboard with the `--trustProxy=1` option (or set the PARSE_DASHBOARD_TRUST_PROXY config var to 1) to rely on the X-Forwarded-* headers for the client's connection security.  This is useful for hosting on services like Heroku, where you can trust the provided proxy headers to correctly determine whether you're using HTTP or HTTPS.  You can also turn on this setting when using the dashboard as [express](https://github.com/expressjs/express) middleware:
 
-```
+```javascript
 var trustProxy = true;
 var dashboard = new ParseDashboard({
   "apps": [
@@ -300,7 +340,7 @@ Start your `parse-server` with
 
 Then in your dashboard configuration:
 
-```
+```javascript
 var trustProxy = true;
 var dashboard = new ParseDashboard({
   "apps": [
@@ -317,41 +357,72 @@ var dashboard = new ParseDashboard({
 
 ### Makings users read-only
 
+Make sure you specify the `readOnlyMasterKey` for the apps that you want to use read-only feature in "apps" configuration.
 You can mark a user as a read-only user:
 
 ```json
 {
-  "apps": [{"...": "..."}],
+  "apps": [
+    {
+      "appId": "myAppId1",
+      "masterKey": "myMasterKey1",
+      "readOnlyMasterKey": "myReadOnlyMasterKey1",
+      "serverURL": "myURL1",      
+      "port": 4040,
+      "production": true
+    },
+    {
+      "appId": "myAppId2",
+      "masterKey": "myMasterKey2",
+      "readOnlyMasterKey": "myReadOnlyMasterKey2",
+      "serverURL": "myURL2",      
+      "port": 4041,
+      "production": true
+    }
+  ],
   "users": [
-     {
-       "user":"user1",
-       "pass":"pass1",
-       "readOnly": true,
-       "apps": [{"appId": "myAppId1"}, {"appId": "myAppId2"}]
-     },
-     {
-       "user":"user2",
-       "pass":"pass2",
-       "apps": [{"appId": "myAppId1"}]
-     }  ]
+    {
+      "user":"user1",
+      "pass":"pass1",
+      "readOnly": true,
+      "apps": [{"appId": "myAppId1"}, {"appId": "myAppId2"}]
+    },
+    {
+      "user":"user2",
+      "pass":"pass2",
+      "apps": [{"appId": "myAppId1"}]
+    }
+  ]
 }
 ```
 
 This way `user1` will have a readOnly access to `myAppId1` and `myAppId2`
 
 ### Making user's apps readOnly
 
+Make sure you specify the `readOnlyMasterKey` for the apps that you want to use read-only feature in "apps" configuration.
 You can give read only access to a user on a per-app basis:
 
 ```json
 {
-  "apps": [{"...": "..."}],
+  "apps": [
+    {
+      "appId": "myAppId1",
+      "masterKey": "myMasterKey1",
+      "readOnlyMasterKey": "myReadOnlyMasterKey1",
+      "serverURL": "myURL",      
+      "port": 4040,
+      "production": true
+    },
+    {"...": "..."}
+  ],
   "users": [
-     {
-       "user":"user1",
-       "pass":"pass1",
-       "apps": [{"appId": "myAppId1", "readOnly": true}, {"appId": "myAppId2"}]
-     } ]
+    {
+      "user":"user",
+      "pass":"pass",
+      "apps": [{"appId": "myAppId", "readOnly": true}, {"appId": "myAppId2"}]
+    }
+  ]
 }
 ```
 

deploy-homolog.sh

@@ -8,5 +8,5 @@ pem=AppContainers.pem
 
 branch=$(git symbolic-ref --short HEAD)
 git='~/bin/git-parse-dashboard'
-ssh -t -i $b4a_certs_path/$pem $user@$host "sudo su back4app -c '. ~/.nvm/nvm.sh && nvm use 9 && cd ~/scm/parse-dashboard && $git reset --hard && $git remote update && $git checkout $branch && $git merge origin/$branch && yarn install && npm run prepublish && npm run build'"
+ssh -t -i $b4a_certs_path/$pem $user@$host "sudo su back4app -c '. ~/.nvm/nvm.sh && nvm use 9 && cd ~/scm/parse-dashboard && $git reset --hard && $git remote update && $git checkout $branch && $git merge origin/$branch && npm install && npm run prepublish && npm run build'"
 #ssh -t aws_B4ANFS_Homolog "sudo su back4app -c '. ~/.nvm/nvm.sh && nvm use 9 && cd ~/scm/back4app-site && yarn install && npm run build && pm2 reload site'"