Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Playground #1464

Merged
merged 29 commits into from
Feb 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
93f2fc1
* chore(package): update lockfile package-lock.json
MutterPedro Dec 5, 2019
f5e156a
added id tho the code editor props
Dec 13, 2019
76a6f82
Merge branch 'master' of github.com:parse-community/parse-dashboard i…
MutterPedro Dec 24, 2019
6108838
Merge branch 'playground' of github.com:MutterPedro/parse-dashboard i…
MutterPedro Dec 24, 2019
ea1bd42
added playground to dashboard
MutterPedro Dec 24, 2019
105ac0c
added react-json dependency to show playground results
MutterPedro Jan 11, 2020
bc6413a
added saving code feature and fixed multiline run feature
MutterPedro Feb 1, 2020
473a1f0
update changelog
MutterPedro Feb 1, 2020
04e767b
Merge branch 'master' into playground
MutterPedro Feb 3, 2020
c2e405e
Merge branch 'master' into playground
MutterPedro Feb 6, 2020
772c15f
fix playground button CSS spacing and update risky dependencies
Feb 7, 2020
3fd2e9d
Merge branch 'master' into playground
Feb 7, 2020
767afb2
Merge branch 'master' into playground
davimacedo Feb 8, 2020
892528e
fix(React life-cycle): fixes requested on PR #1464 review
Feb 10, 2020
de395c3
Merge branch 'master' of github.com:parse-community/parse-dashboard i…
Feb 10, 2020
9594f6e
Merge branch 'playground' of github.com:MutterPedro/parse-dashboard i…
Feb 10, 2020
c2c4e59
feat(Playground): update CodeEditor component and show result just in…
Feb 15, 2020
ca7a6d7
feat(Playground): update CodeEditor component and show result just in…
Feb 15, 2020
6a2ba91
fix(Playground): fix conflicts
Feb 15, 2020
0262c9f
fix(Playground): fix erron in test of CodeEditor component
Feb 15, 2020
078454b
Update parse-dashboard-config.json
MutterPedro Feb 16, 2020
d9c7fb6
fix(Playground): implemented requested changes and put Playground int…
Feb 17, 2020
00be77f
Merge branch 'master' into playground
MutterPedro Feb 17, 2020
457337f
fix(Playground): fix double quotes and change JS Console playground
Feb 18, 2020
adde42b
fix(Playground): fix merge conflicts
Feb 18, 2020
e7cd71a
fix(Playground): fix merge conflicts
Feb 18, 2020
cd71380
fix(Playground): fix merge conflicts
Feb 18, 2020
c954d73
Merge branch 'playground' of github.com:MutterPedro/parse-dashboard i…
Feb 18, 2020
1a60ed7
fix(Playground): fix missing dependency
Feb 18, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 22 additions & 23 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
{
"env": {
"es6": true,
"node": true,
"browser": true
"env": {
"es6": true,
"node": true,
"browser": true
},
"parser": "babel-eslint",
"extends": "eslint:recommended",
"parserOptions": {
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
},
"parser": "babel-eslint",
"extends": "eslint:recommended",
"parserOptions": {
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
},
"sourceType": "module"
},
"plugins": [
"react"
],
"rules": {
"react/jsx-uses-vars": 1,
"react/jsx-uses-react": 1,
"react/react-in-jsx-scope": 1,
"no-console": 0,
"no-case-declarations": 0
}
"sourceType": "module"
},
"plugins": ["react"],
"rules": {
"react/jsx-uses-vars": 1,
"react/jsx-uses-react": 1,
"react/react-in-jsx-scope": 1,
"no-console": 0,
"no-case-declarations": 0,
"quotes": ["error", "single"]
}
}
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
### master
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.0.4...master)

* _Contributing to this repo? Add info about your change here to be included in next release_
* Feature: added JS Console feature to run custom queries
* Feature: added save button on JS Console feature to save the custom query on the local storage
### 2.0.5
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.0.4...2.0.5)
* Fix: delete and regenerate package-lock to fix broken build
Expand Down
2 changes: 1 addition & 1 deletion Parse-Dashboard/Authentication.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"use strict";
'use strict';
var bcrypt = require('bcryptjs');
var csrf = require('csurf');
var passport = require('passport');
Expand Down
8 changes: 4 additions & 4 deletions Parse-Dashboard/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ function checkIfIconsExistForApps(apps, iconsFolder) {
for (var i in apps) {
var currentApp = apps[i];
var iconName = currentApp.iconName;
var path = iconsFolder + "/" + iconName;
var path = iconsFolder + '/' + iconName;

fs.stat(path, function(err) {
if (err) {
if ('ENOENT' == err.code) {// file does not exist
console.warn("Icon with file name: " + iconName +" couldn't be found in icons folder!");
console.warn('Icon with file name: ' + iconName +' couldn\'t be found in icons folder!');
} else {
console.log(
'An error occurd while checking for icons, please check permission!');
Expand Down Expand Up @@ -162,8 +162,8 @@ module.exports = function(config, options) {
}
} catch (e) {
// Directory doesn't exist or something.
console.warn("Iconsfolder at path: " + config.iconsFolder +
" not found!");
console.warn('Iconsfolder at path: ' + config.iconsFolder +
' not found!');
}
}

Expand Down
4 changes: 2 additions & 2 deletions Parse-Dashboard/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* the root directory of this source tree.
*/
// Command line tool for npm start
"use strict"
'use strict'
const path = require('path');
const jsonFile = require('json-file-plus');
const express = require('express');
Expand Down Expand Up @@ -40,7 +40,7 @@ const trustProxy = program.trustProxy || process.env.PARSE_DASHBOARD_TRUST_PROXY
const dev = program.dev;

if (trustProxy && allowInsecureHTTP) {
console.log("Set only trustProxy *or* allowInsecureHTTP, not both. Only one is needed to handle being behind a proxy.");
console.log('Set only trustProxy *or* allowInsecureHTTP, not both. Only one is needed to handle being behind a proxy.');
process.exit(-1);
}

Expand Down
20 changes: 11 additions & 9 deletions Parse-Dashboard/parse-dashboard-config.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
MutterPedro marked this conversation as resolved.
Show resolved Hide resolved
"apps": [{
"serverURL": "http://localhost:1338/parse",
"appId": "hello",
"masterKey": "world",
"appName": "",
"iconName": "",
"primaryBackgroundColor": "",
"secondaryBackgroundColor": ""
}],
"apps": [
{
"serverURL": "http://localhost:1338/parse",
"appId": "hello",
"masterKey": "world",
"appName": "",
"iconName": "",
"primaryBackgroundColor": "",
"secondaryBackgroundColor": ""
}
],
"iconsFolder": "icons"
}
Loading