More Naming Fixes, articles cleanup

meanjs · Apr 20, 2014 · edd549d · edd549d
1 parent 8ad4728
commit edd549d
Show file tree

Hide file tree

Showing 38 changed files with 48 additions and 26 deletions.
diff --git a/app/controllers/articles.server.controller.js b/app/controllers/articles.server.controller.js
@@ -6,6 +6,29 @@
 var mongoose = require('mongoose'),
 	Article = mongoose.model('Article'),
 	_ = require('lodash');
+/**
+ * Get the error message from error object
+ */
+var getErrorMessage = function(err) {
+	var message = '';
+
+	if (err.code) {
+		switch (err.code) {
+			case 11000:
+			case 11001:
+				message = 'Unique already exists';
+				break;
+			default:
+				message = 'Something went wrong';
+		}
+	} else {
+		for (var errName in err.errors) {
+			if (err.errors[errName].message) message = err.errors[errName].message;
+		}
+	}
+
+	return message;
+};
 
 /**
  * Create a article
@@ -16,9 +39,8 @@ exports.create = function(req, res) {
 
 	article.save(function(err) {
 		if (err) {
-			return res.send('users/signup', {
-				errors: err.errors,
-				article: article
+			return res.send(400, {
+				message: getErrorMessage(err)
 			});
 		} else {
 			res.jsonp(article);
@@ -43,8 +65,8 @@ exports.update = function(req, res) {
 
 	article.save(function(err) {
 		if (err) {
-			res.render('error', {
-				status: 500
+			return res.send(400, {
+				message: getErrorMessage(err)
 			});
 		} else {
 			res.jsonp(article);
@@ -60,8 +82,8 @@ exports.delete = function(req, res) {
 
 	article.remove(function(err) {
 		if (err) {
-			res.render('error', {
-				status: 500
+			return res.send(400, {
+				message: getErrorMessage(err)
 			});
 		} else {
 			res.jsonp(article);
@@ -75,8 +97,8 @@ exports.delete = function(req, res) {
 exports.list = function(req, res) {
 	Article.find().sort('-created').populate('user', 'displayName').exec(function(err, articles) {
 		if (err) {
-			res.render('error', {
-				status: 500
+			return res.send(400, {
+				message: getErrorMessage(err)
 			});
 		} else {
 			res.jsonp(articles);

diff --git a/app/controllers/core.server.controller.js b/app/controllers/core.server.controller.js
@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 exports.index = function(req, res) {
-	res.render('index.html', {
+	res.render('index.server.view.html', {
 		user: req.user || null
 	});
 };
diff --git a/app/views/404.html → app/views/404.server.view.html b/app/views/404.html → app/views/404.server.view.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'layout.server.view.html' %}
 
 {% block content %}
 <h1>Page Not Found</h1>

diff --git a/app/views/500.html → app/views/500.server.view.html b/app/views/500.html → app/views/500.server.view.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'layout.server.view.html' %}
 
 {% block content %}
 <h1>Server Error</h1>

diff --git a/app/views/index.html → app/views/index.server.view.html b/app/views/index.html → app/views/index.server.view.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'layout.server.view.html' %}
 
 {% block content %}
 	<section data-ui-view></section>

diff --git a/app/views/layout.html → app/views/layout.server.view.html b/app/views/layout.html → app/views/layout.server.view.html
@@ -43,7 +43,7 @@
 </head>
 
 <body class="ng-cloak">
-	<header data-ng-include="'/modules/core/views/header.html'" class="navbar navbar-fixed-top navbar-inverse"></header>
+	<header data-ng-include="'/modules/core/views/header.client.view.html'" class="navbar navbar-fixed-top navbar-inverse"></header>
 	<section class="content">
 		<section class="container">
 			{% block content %}{% endblock %}

diff --git a/config/express.js b/config/express.js
@@ -115,14 +115,14 @@ module.exports = function(db) {
 		console.error(err.stack);
 
 		// Error page
-		res.status(500).render('500.html', {
+		res.status(500).render('500.server.view.html', {
 			error: err.stack
 		});
 	});
 
 	// Assume 404 since no middleware responded
 	app.use(function(req, res) {
-		res.status(404).render('404.html', {
+		res.status(404).render('404.server.view.html', {
 			url: req.originalUrl,
 			error: 'Not Found'
 		});

diff --git a/public/modules/articles/articles.module.js → ...odules/articles/articles.client.module.js b/public/modules/articles/articles.module.js → ...odules/articles/articles.client.module.js
diff --git a/...odules/articles/config/articles.config.js → ...articles/config/articles.client.config.js b/...odules/articles/config/articles.config.js → ...articles/config/articles.client.config.js
diff --git a/...odules/articles/config/articles.routes.js → ...articles/config/articles.client.routes.js b/...odules/articles/config/articles.routes.js → ...articles/config/articles.client.routes.js
@@ -7,19 +7,19 @@ angular.module('articles').config(['$stateProvider',
 		$stateProvider.
 		state('listArticles', {
 			url: '/articles',
-			templateUrl: 'modules/articles/views/list.html'
+			templateUrl: 'modules/articles/views/list.client.view.html'
 		}).
 		state('createArticle', {
 			url: '/articles/create',
-			templateUrl: 'modules/articles/views/create.html'
+			templateUrl: 'modules/articles/views/create.client.view.html'
 		}).
 		state('viewArticle', {
 			url: '/articles/:articleId',
-			templateUrl: 'modules/articles/views/view.html'
+			templateUrl: 'modules/articles/views/view.client.view.html'
 		}).
 		state('editArticle', {
 			url: '/articles/:articleId/edit',
-			templateUrl: 'modules/articles/views/edit.html'
+			templateUrl: 'modules/articles/views/edit.client.view.html'
 		});
 	}
 ]);
diff --git a/...ticles/controllers/articles.controller.js → ...controllers/articles.client.controller.js b/...ticles/controllers/articles.controller.js → ...controllers/articles.client.controller.js
diff --git a/...les/articles/services/articles.service.js → ...icles/services/articles.client.service.js b/...les/articles/services/articles.service.js → ...icles/services/articles.client.service.js
diff --git a/...rticles/tests/articles.controller.test.js → .../tests/articles.client.controller.test.js b/...rticles/tests/articles.controller.test.js → .../tests/articles.client.controller.test.js
diff --git a/public/modules/articles/views/create.html → ...es/articles/views/create.client.view.html b/public/modules/articles/views/create.html → ...es/articles/views/create.client.view.html
diff --git a/public/modules/articles/views/edit.html → ...ules/articles/views/edit.client.view.html b/public/modules/articles/views/edit.html → ...ules/articles/views/edit.client.view.html
diff --git a/public/modules/articles/views/list.html → ...ules/articles/views/list.client.view.html b/public/modules/articles/views/list.html → ...ules/articles/views/list.client.view.html
diff --git a/public/modules/articles/views/view.html → ...ules/articles/views/view.client.view.html b/public/modules/articles/views/view.html → ...ules/articles/views/view.client.view.html
diff --git a/public/modules/core/config/core.routes.js → ...modules/core/config/core.client.routes.js b/public/modules/core/config/core.routes.js → ...modules/core/config/core.client.routes.js
@@ -10,7 +10,7 @@ angular.module('core').config(['$stateProvider', '$urlRouterProvider',
 		$stateProvider.
 		state('home', {
 			url: '/',
-			templateUrl: 'modules/core/views/home.html'
+			templateUrl: 'modules/core/views/home.client.view.html'
 		});
 	}
 ]);
diff --git a/...les/core/controllers/header.controller.js → ...e/controllers/header.client.controller.js b/...les/core/controllers/header.controller.js → ...e/controllers/header.client.controller.js
diff --git a/...dules/core/controllers/home.controller.js → ...ore/controllers/home.client.controller.js b/...dules/core/controllers/home.controller.js → ...ore/controllers/home.client.controller.js
diff --git a/public/modules/core/core.module.js → public/modules/core/core.client.module.js b/public/modules/core/core.module.js → public/modules/core/core.client.module.js
diff --git a/...ic/modules/core/services/menus.service.js → ...les/core/services/menus.client.service.js b/...ic/modules/core/services/menus.service.js → ...les/core/services/menus.client.service.js
diff --git a/...ules/core/tests/header.controller.test.js → ...re/tests/header.client.controller.test.js b/...ules/core/tests/header.controller.test.js → ...re/tests/header.client.controller.test.js
diff --git a/...odules/core/tests/home.controller.test.js → ...core/tests/home.client.controller.test.js b/...odules/core/tests/home.controller.test.js → ...core/tests/home.client.controller.test.js
diff --git a/public/modules/core/views/header.html → ...odules/core/views/header.client.view.html b/public/modules/core/views/header.html → ...odules/core/views/header.client.view.html
diff --git a/public/modules/core/views/home.html → .../modules/core/views/home.client.view.html b/public/modules/core/views/home.html → .../modules/core/views/home.client.view.html
diff --git a/public/modules/users/config/users.config.js → ...dules/users/config/users.client.config.js b/public/modules/users/config/users.config.js → ...dules/users/config/users.client.config.js
diff --git a/public/modules/users/config/users.routes.js → ...dules/users/config/users.client.routes.js b/public/modules/users/config/users.routes.js → ...dules/users/config/users.client.routes.js
@@ -7,23 +7,23 @@ angular.module('users').config(['$stateProvider',
 		$stateProvider.
 		state('profile', {
 			url: '/settings/profile',
-			templateUrl: 'modules/users/views/settings/profile.html'
+			templateUrl: 'modules/users/views/settings/profile.client.view.html'
 		}).
 		state('password', {
 			url: '/settings/password',
-			templateUrl: 'modules/users/views/settings/password.html'
+			templateUrl: 'modules/users/views/settings/password.client.view.html'
 		}).
 		state('accounts', {
 			url: '/settings/accounts',
-			templateUrl: 'modules/users/views/settings/accounts.html'
+			templateUrl: 'modules/users/views/settings/accounts.client.view.html'
 		}).
 		state('signup', {
 			url: '/signup',
-			templateUrl: 'modules/users/views/signup.html'
+			templateUrl: 'modules/users/views/signup.client.view.html'
 		}).
 		state('signin', {
 			url: '/signin',
-			templateUrl: 'modules/users/views/signin.html'
+			templateUrl: 'modules/users/views/signin.client.view.html'
 		});
 	}
 ]);
diff --git a/.../controllers/authentication.controller.js → ...llers/authentication.client.controller.js b/.../controllers/authentication.controller.js → ...llers/authentication.client.controller.js
diff --git a/.../users/controllers/settings.controller.js → ...controllers/settings.client.controller.js b/.../users/controllers/settings.controller.js → ...controllers/settings.client.controller.js
diff --git a/.../users/services/authentication.service.js → ...services/authentication.client.service.js b/.../users/services/authentication.service.js → ...services/authentication.client.service.js
diff --git a/...c/modules/users/services/users.service.js → ...es/users/services/users.client.service.js b/...c/modules/users/services/users.service.js → ...es/users/services/users.client.service.js
diff --git a/public/modules/users/users.module.js → public/modules/users/users.client.module.js b/public/modules/users/users.module.js → public/modules/users/users.client.module.js
diff --git a/...odules/users/views/settings/accounts.html → .../views/settings/accounts.client.view.html b/...odules/users/views/settings/accounts.html → .../views/settings/accounts.client.view.html
diff --git a/...odules/users/views/settings/password.html → .../views/settings/password.client.view.html b/...odules/users/views/settings/password.html → .../views/settings/password.client.view.html
diff --git a/...modules/users/views/settings/profile.html → ...s/views/settings/profile.client.view.html b/...modules/users/views/settings/profile.html → ...s/views/settings/profile.client.view.html
diff --git a/public/modules/users/views/signin.html → ...dules/users/views/signin.client.view.html b/public/modules/users/views/signin.html → ...dules/users/views/signin.client.view.html
diff --git a/public/modules/users/views/signup.html → ...dules/users/views/signup.client.view.html b/public/modules/users/views/signup.html → ...dules/users/views/signup.client.view.html