Skip to content
This repository was archived by the owner on Jul 31, 2019. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"env": {
"node": true,
"browser": true
},

"rules": {
"indent": ["error", 2]
},

"parserOptions": {
"ecmaVersion": 6
}

}
13 changes: 12 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,21 @@ module.exports = function( grunt ) {
]
}
}
},
eslint: {
src: [
"public/homepage/**/*.js",
"public/resources/remix/index.js",
"!public/homepage/scripts/google-analytics.js",
"!public/editor/scripts/google-analytics.js",
"server/**/*.js",
"scripts/*.js",
"*.js"
]
}
});

grunt.registerTask("test", [ "jshint:server", "jshint:frontend", "lesslint" ]);
grunt.registerTask("test", [ "jshint:server", "jshint:frontend", "lesslint", "eslint" ]);
grunt.registerTask("build", [ "test", "requirejs:dist" ]);
grunt.registerTask("default", [ "test" ]);
};
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"grunt-contrib-jshint": "^0.11.2",
"grunt-contrib-less": "^1.4.0",
"grunt-contrib-requirejs": "^1.0.0",
"grunt-eslint": "^19.0.0",
"grunt-execute": "0.2.2",
"grunt-git": "^0.3.4",
"grunt-lesslint": "^1.1.14",
Expand Down
6 changes: 3 additions & 3 deletions server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let homepageVideoLink = "https://www.youtube.com/embed/JecFOjD9I3k";
/*
* Local server variables
*/
server.locals.APP_HOSTNAME = env.get("APP_HOSTNAME");
server.locals.APP_HOSTNAME = env.get("APP_HOSTNAME");
server.locals.GA_ACCOUNT = env.get("GA_ACCOUNT");
server.locals.GA_DOMAIN = env.get("GA_DOMAIN");
server.locals.node_path = "node_modules";
Expand Down Expand Up @@ -111,7 +111,7 @@ server.use("/resources/remix", express.static(path.join(root, "public/resources/
* L10N
*/
localize(server, Object.assign(env.get("L10N"), {
excludeLocaleInUrl: [ "/projects/remix-bar" ]
excludeLocaleInUrl: [ "/projects/remix-bar" ]
}));


Expand All @@ -130,4 +130,4 @@ server.use(HttpError.notFound);
/*
* export the server object
*/
module.exports = server;
module.exports = server;
4 changes: 2 additions & 2 deletions server/lib/middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ module.exports = function middlewareConstructor() {
return function(req, res, next) {
req.errorMessageKey = typeof errorMessageKey === "function" ? errorMessageKey(req) : errorMessageKey;
next();
};
},
};
},

/**
* Check whether the requesting user has been authenticated.
Expand Down
2 changes: 1 addition & 1 deletion server/routes/projects/read.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ module.exports = function(config, req, res, next) {

//Sort projects in ascending order by last updated
projects.sort(function(project1, project2) {
return new Date(project2.date_updated).getTime() - new Date(project1.date_updated).getTime();
return new Date(project2.date_updated).getTime() - new Date(project1.date_updated).getTime();
});

var options = {
Expand Down
2 changes: 1 addition & 1 deletion server/routes/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ function updateProject(config, user, data, callback) {

var project;
try {
project = JSON.parse(JSON.stringify(data));
project = JSON.parse(JSON.stringify(data));
} catch(e) {
callback({
message: "Project sent by calling function was in an invalid format. Failed to run `JSON.parse`",
Expand Down