diff --git a/.csslintrc b/.csslintrc
new file mode 100644
index 00000000..0dab227e
--- /dev/null
+++ b/.csslintrc
@@ -0,0 +1,15 @@
+{
+ "adjoining-classes": false,
+ "box-model": false,
+ "box-sizing": false,
+ "floats": false,
+ "font-sizes": false,
+ "important": false,
+ "known-properties": false,
+ "overqualified-elements": false,
+ "qualified-headings": false,
+ "regex-selectors": false,
+ "unique-headings": false,
+ "universal-selector": false,
+ "unqualified-attributes": false
+}
diff --git a/app/controllers/articles.js b/app/controllers/articles.server.controller.js
similarity index 100%
rename from app/controllers/articles.js
rename to app/controllers/articles.server.controller.js
diff --git a/app/controllers/core.js b/app/controllers/core.server.controller.js
similarity index 100%
rename from app/controllers/core.js
rename to app/controllers/core.server.controller.js
diff --git a/app/controllers/users.js b/app/controllers/users.server.controller.js
similarity index 100%
rename from app/controllers/users.js
rename to app/controllers/users.server.controller.js
diff --git a/app/models/article.js b/app/models/article.server.model.js
similarity index 100%
rename from app/models/article.js
rename to app/models/article.server.model.js
diff --git a/app/models/user.js b/app/models/user.server.model.js
similarity index 93%
rename from app/models/user.js
rename to app/models/user.server.model.js
index b5cfdff3..6cfe08c2 100755
--- a/app/models/user.js
+++ b/app/models/user.server.model.js
@@ -68,6 +68,13 @@ var UserSchema = new Schema({
},
providerData: {},
additionalProvidersData: {},
+ roles: {
+ type: [{
+ type: String,
+ enum: ['user', 'admin']
+ }],
+ default: ['user']
+ },
updated: {
type: Date
},
@@ -114,8 +121,10 @@ UserSchema.statics.findUniqueUsername = function(username, suffix, callback) {
var _this = this;
var possibleUsername = username + (suffix || '');
- _this.findOne({username: possibleUsername}, function(err, user) {
- if(!err) {
+ _this.findOne({
+ username: possibleUsername
+ }, function(err, user) {
+ if (!err) {
if (!user) {
callback(possibleUsername);
} else {
diff --git a/app/routes/articles.js b/app/routes/articles.server.routes.js
similarity index 79%
rename from app/routes/articles.js
rename to app/routes/articles.server.routes.js
index c0d39095..249154c1 100644
--- a/app/routes/articles.js
+++ b/app/routes/articles.server.routes.js
@@ -3,8 +3,8 @@
/**
* Module dependencies.
*/
-var users = require('../../app/controllers/users'),
- articles = require('../../app/controllers/articles');
+var users = require('../../app/controllers/users.server.controller'),
+ articles = require('../../app/controllers/articles.server.controller');
module.exports = function(app) {
// Article Routes
diff --git a/app/routes/core.js b/app/routes/core.server.routes.js
similarity index 57%
rename from app/routes/core.js
rename to app/routes/core.server.routes.js
index ba232004..e6ddd285 100644
--- a/app/routes/core.js
+++ b/app/routes/core.server.routes.js
@@ -2,6 +2,6 @@
module.exports = function(app) {
// Root routing
- var core = require('../../app/controllers/core');
+ var core = require('../../app/controllers/core.server.controller');
app.get('/', core.index);
};
\ No newline at end of file
diff --git a/app/routes/users.js b/app/routes/users.server.routes.js
similarity index 95%
rename from app/routes/users.js
rename to app/routes/users.server.routes.js
index 23f8126b..a3ff21b9 100644
--- a/app/routes/users.js
+++ b/app/routes/users.server.routes.js
@@ -7,7 +7,7 @@ var passport = require('passport');
module.exports = function(app) {
// User Routes
- var users = require('../../app/controllers/users');
+ var users = require('../../app/controllers/users.server.controller');
app.get('/users/me', users.me);
app.put('/users', users.update);
app.post('/users/password', users.changePassword);
diff --git a/app/tests/articles.js b/app/tests/article.server.model.test.js
similarity index 100%
rename from app/tests/articles.js
rename to app/tests/article.server.model.test.js
diff --git a/app/tests/users.js b/app/tests/user.server.model.test.js
similarity index 100%
rename from app/tests/users.js
rename to app/tests/user.server.model.test.js
diff --git a/app/views/layout.html b/app/views/layout.html
index 62848d03..aebbb404 100644
--- a/app/views/layout.html
+++ b/app/views/layout.html
@@ -30,18 +30,11 @@
-
+
-
-
-
-
-
-
-
-
- {% for modulesCSSFile in modulesCSSFiles %}
- {% endfor %}
+
+ {% for cssFile in cssFiles %}
+ {% endfor %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {% for modulesJSFile in modulesJSFiles %}
-
+
+ {% for jsFile in jsFiles %}
{% endfor %}
{% if process.env.NODE_ENV === 'development' %}
-
-
+
+
{% endif %}