Skip to content

Commit b7efb40

Browse files
committed
Merge pull request #65 from ParsePlatform/flovilmart.Folders
Moves all sources to src/
2 parents 02a7a67 + 7547c41 commit b7efb40

File tree

517 files changed

+23
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

517 files changed

+23
-14
lines changed

Parse-Dashboard/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ var port = program.port || process.env.PORT;
2222
var allowInsecureHTTP = program.allowInsecureHTTP || process.env.PARSE_DASHBOARD_ALLOW_INSECURE_HTTP;
2323

2424
var basicAuth = require('basic-auth');
25+
var path = require('path');
2526
var jsonFile = require('json-file-plus');
2627
var express = require('express');
2728
var app = express();
2829

2930
// Serve public files.
30-
app.use(express.static('Parse-Dashboard/public'));
31+
app.use(express.static(path.join(__dirname,'public')));
3132

3233
app.get('/parse-dashboard-config.json', function(req, res) {
3334
jsonFile(configFile)

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@
3535
"webpack": "~1.12.0"
3636
},
3737
"scripts": {
38-
"dashboard": "node ./Parse-Dashboard/index.js & webpack --config build.config.js --progress --watch",
39-
"pig": "http-server ./PIG -p 4041 -s & webpack --config PIG.config.js --progress --watch",
40-
"build": "NODE_ENV=production webpack --config production.config.js && webpack --config PIG.config.js",
38+
"dashboard": "node ./Parse-Dashboard/index.js & webpack --config webpack/build.config.js --progress --watch",
39+
"pig": "http-server ./PIG -p 4041 -s & webpack --config webpack/PIG.config.js --progress --watch",
40+
"build": "NODE_ENV=production webpack --config webpack/production.config.js && webpack --config webpack/PIG.config.js",
4141
"test": "NODE_PATH=./node_modules jest",
4242
"generate": "node scripts/generate.js",
4343
"preinstall": "git update-index --skip-worktree Parse-Dashboard/parse-dashboard-config.json",
44-
"prestart": "webpack --config build.config.js --progress",
44+
"prestart": "webpack --config webpack/build.config.js --progress",
4545
"start": "node ./Parse-Dashboard/index.js"
4646
},
4747
"engines": {
4848
"node": ">=4.3"
4949
},
5050
"jest": {
5151
"testPathDirs": [
52-
"lib"
52+
"src/lib"
5353
],
5454
"scriptPreprocessor": "<rootDir>/testing/preprocessor.js",
5555
"testDirectoryName": "tests",

scripts/generate.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
const fs = require('fs');
1313
const path = require('path');
1414

15-
const rootDir = path.join(__dirname, '..', 'components');
16-
const pigDir = path.join(__dirname, '..', 'parse-interface-guide');
17-
const testDir = path.join(__dirname, '..', 'lib', 'tests');
15+
const rootDir = path.join(__dirname, '..', 'src','components');
16+
const pigDir = path.join(__dirname, '..', 'src','parse-interface-guide');
17+
const testDir = path.join(__dirname, '..', 'src','lib', 'tests');
1818

1919
function padding(length) {
2020
let space = [];
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)