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

Project ground work #1

Merged
merged 11 commits into from Jul 24, 2016
4 changes: 4 additions & 0 deletions .eslintrc.js
@@ -0,0 +1,4 @@
module.exports = {
"extends": ["./node_modules/node-style-guide/.eslintrc"],
"installedESLint": true,
};
2 changes: 2 additions & 0 deletions .gitignore
@@ -1 +1,3 @@
node_modules/
.vscode/
typings/
22 changes: 22 additions & 0 deletions .jsbeautifyrc
@@ -0,0 +1,22 @@
{
"indent_size": 4,
"indent_char": " ",
"eol": "\n",
"indent_level": 0,
"indent_with_tabs": false,
"preserve_newlines": true,
"max_preserve_newlines": 2,
"jslint_happy": false,
"space_after_anon_function": false,
"brace_style": "collapse",
"keep_array_indentation": false,
"keep_function_indentation": false,
"space_before_conditional": true,
"break_chained_methods": false,
"eval_code": false,
"unescape_strings": false,
"wrap_line_length": 80,
"wrap_attributes": "auto",
"wrap_attributes_indent_size": 4,
"end_with_newline": false
}
3 changes: 3 additions & 0 deletions .jshintrc
@@ -0,0 +1,3 @@
{
"extends": "./node_modules/node-style-guide/.jshintrc"
}
45 changes: 45 additions & 0 deletions beautify-solution.js
@@ -0,0 +1,45 @@
var fs = require('fs');
var path = require('path');
var beautify = require('js-beautify').js;
var beautifyOptions = JSON.parse(fs.readFileSync(path.join(__dirname,
'.jsbeautifyrc'), 'utf8'));
var ignoreFolders = ['$Recycle.Bin', '.vscode', 'node_modules', 'typings',
'.git'
];
var ignoreFiles = ['bundle.js'];
/**
* Gets all files where the extions is `.js` and the filename
* does not start with a `.`. This method is recusive, so all
* child folders are included in the search too.
* @param {} dirPath
*/
var getJsFilesRecursive = function(dirPath) {
var files = [];
var dirContents = fs.readdirSync(dirPath);
for (var i = 0; i < dirContents.length; i++) {
var element = dirContents[i];
var elementStat = fs.statSync(path.join(dirPath, element));
if (elementStat.isDirectory()) {
if (ignoreFolders.indexOf(element) >= 0) {
continue;
}
files = files.concat(getJsFilesRecursive(path.join(dirPath, element)));
} else {
if (ignoreFiles.indexOf(element) >= 0) {
continue;
}
if (element.startsWith('.') || !element.endsWith('.js')) {
continue;
}
files.push(path.join(dirPath, element));
}
}
return files;
};
var files = getJsFilesRecursive(__dirname);
for (var i = 0; i < files.length; i++) {
var filePath = files[i];
var beautifiedFileContents = beautify(fs.readFileSync(filePath, 'utf8'),
beautifyOptions);
fs.writeFileSync(filePath, beautifiedFileContents, 'utf8');
}
16 changes: 16 additions & 0 deletions jsconfig.json
@@ -0,0 +1,16 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=759670
// for the documentation about the jsconfig.json format
"compilerOptions": {
"target": "es6",
"module": "commonjs",
"allowSyntheticDefaultImports": true
},
"exclude": [
"node_modules",
"bower_components",
"jspm_packages",
"tmp",
"temp"
]
}
16 changes: 8 additions & 8 deletions lib/MessageFactory.js
Expand Up @@ -15,17 +15,17 @@ var semver = require('semver') ;

var classes =
{
AssignTeamLeaderMessage: require('./message/AssignTeamLeaderMessage.js'),
ConfirmMessage: require('./message/ConfirmMessage.js'),
ConfirmNameMessage: require('./message/ConfirmNameMessage.js'),
ConfirmTeamLeaderMessage: require('./message/ConfirmTeamLeaderMessage.js'),
ConfirmTeamMessage: require('./message/ConfirmTeamMessage.js'),
//AssignTeamLeaderMessage: require('./message/AssignTeamLeaderMessage.js'),
//ConfirmMessage: require('./message/ConfirmMessage.js'),
//ConfirmNameMessage: require('./message/ConfirmNameMessage.js'),
//ConfirmTeamLeaderMessage: require('./message/ConfirmTeamLeaderMessage.js'),
//ConfirmTeamMessage: require('./message/ConfirmTeamMessage.js'),
CreateGameMessage: require('./message/CreateGameMessage.js'),
JoinGameMessage: require('./message/JoinGameMessage.js'),
JoinTeamMessage: require('./message/JoinTeamMessage.js'),
LeaveTeamMessage: require('./message/LeaveTeamMessage.js'),
//JoinTeamMessage: require('./message/JoinTeamMessage.js'),
//LeaveTeamMessage: require('./message/LeaveTeamMessage.js'),
RegisterNameMessage: require('./message/RegisterNameMessage.js'),
RegisterTeamMessage: require('./message/RegisterTeamMessage.js')
//RegisterTeamMessage: require('./message/RegisterTeamMessage.js')
} ;
//The following removed as doesn't work in browser with browserify
//var messageClasses = fs.readdirSync(__dirname+'/message') ;
Expand Down
12 changes: 8 additions & 4 deletions package.json
Expand Up @@ -6,11 +6,12 @@
"scripts": {
"test": "echo 'Error: no test specified' && exit 1",
"build": "browserify browser.js -t require-globify -o www/js/bundle.js",
"watch": "watchify browser.js -t require-globify -o www/js/bundle.js --debug --verbose"
"watch": "watchify browser.js -t require-globify -o www/js/bundle.js --debug --verbose",
"beautify-solution" : "node beautify-solution.js"
},
"author": "Damien Clark",
"author": "Damien Clark, Nick Andjelkovic, Wade Baglin",
"license": "GPL-3.0",
"private": "true",
"private": true,
"dependencies": {
"chance": "^0.7.*",
"compression": "^1.4.*",
Expand All @@ -23,7 +24,10 @@
},
"devDependencies": {
"browserify": "^11.0.0",
"eslint": "^3.1.1",
"node-style-guide": "^1.0.0",
"require-globify": "^1.2.1",
"watchify": "^3.3.0"
"watchify": "^3.3.0",
"jshint": "2.9.*"
}
}