0.4.0 branch merged into master

meanjs · Jul 2, 2015 · 67e96a4 · 67e96a4
2 parents 88a89f2 + 6003085
commit 67e96a4
Show file tree

Hide file tree

Showing 156 changed files with 2,710 additions and 1,564 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,25 +1,36 @@
 # EditorConfig is awesome: http://EditorConfig.org
 
-# How-to with your editor: http://editorconfig.org/#download
+# Howto with your editor: http://editorconfig.org/#download
+#   Sublime: https://github.com/sindresorhus/editorconfig-sublime
 
 # top-most EditorConfig file
 root = true
 
 # Unix-style newlines with a newline ending every file
-[*]
+[**]
 end_of_line = lf
-indent_style = tab
 insert_final_newline = true
 
-[{Dockerfile,Procfile}]
-trim_trailing_whitespace = true
-
-# Standard at: https://github.com/felixge/node-style-guide
-[{*.js,*.json}]
+# Standard at: https://github.com/felixge/node-style-guide 
+[**.js, **.json]
 trim_trailing_whitespace = true
+indent_style = tab
 quote_type = single
 curly_bracket_next_line = false
 spaces_around_operators = true
 space_after_control_statements = true
 space_after_anonymous_functions = false
 spaces_in_brackets = false
+
+# No Standard.  Please document a standard if different from .js
+[**.yml, **.html, **.css]
+trim_trailing_whitespace = true
+indent_style = tab
+
+# No standard.  Please document a standard if different from .js
+[**.md]
+indent_style = tab
+
+# Standard at: 
+[Makefile]
+indent_style = tab
diff --git a/.gitignore b/.gitignore
@@ -22,6 +22,9 @@ app/tests/coverage/
 config/sslcerts/*.pem
 access.log
 public/dist/
+uploads
+modules/users/client/img/profile/uploads
+*.pem
 
 # Sublime editor
 # ==============

diff --git a/.jshintrc b/.jshintrc
@@ -1,5 +1,7 @@
 {
 	"node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
+	"mocha": true, // Enable globals available when code is running inside of the Mocha tests.
+	"jasmine": true, // Enable globals available when code is running inside of the Jasmine tests.
 	"browser": true, // Standard browser globals e.g. `window`, `document`.
 	"esnext": true, // Allow ES.next specific features such as `const` and `let`.
 	"bitwise": false, // Prohibit bitwise operators (&, |, ^, etc.).
@@ -18,25 +20,17 @@
 	"trailing": true, // Prohibit trailing whitespaces.
 	"smarttabs": false, // Suppresses warnings about mixed tabs and spaces
 	"globals": { // Globals variables.
-		"jasmine": true,
 		"angular": true,
+		"io": true,
 		"ApplicationConfiguration": true
 	},
 	"predef": [ // Extra globals.
-		"define",
-		"require",
-		"exports",
-		"module",
-		"describe",
-		"before",
-		"beforeEach",
-		"after",
-		"afterEach",
-		"it",
 		"inject",
-		"expect"
+		"by",
+		"browser",
+		"element"
 	],
 	"indent": 4, // Specify indentation spacing
 	"devel": true, // Allow development statements e.g. `console.log();`.
 	"noempty": true // Prohibit use of empty blocks.
-}
+}
diff --git a/.slugignore b/.slugignore
@@ -1 +1 @@
-/app/tests
+/app/tests
diff --git a/Procfile b/Procfile
diff --git a/README.md b/README.md
@@ -64,12 +64,12 @@ $ npm install
 This command does a few things:
 * First it will install the dependencies needed for the application to run.
 * If you're running in a development environment, it will then also install development dependencies needed for testing and running your application.
-* Finally, when the install process is over, npm will initiate a bower install command to install all the front-end modules needed for the application.
+* Finally, when the install process is over, npm will initiate a bower install command to install all the front-end modules needed for the application
 
 ## Running Your Application
-After the install process is over, you'll be able to run your application using Grunt. Just run grunt default task:
+After the install process is over, you'll be able to run your application using Grunt, just run grunt default task:
 
-```bash
+```
 $ grunt
 ```
 

diff --git a/app/controllers/core.server.controller.js b/app/controllers/core.server.controller.js
diff --git a/app/controllers/users/users.authorization.server.controller.js b/app/controllers/users/users.authorization.server.controller.js
diff --git a/app/controllers/users/users.profile.server.controller.js b/app/controllers/users/users.profile.server.controller.js
diff --git a/app/routes/articles.server.routes.js b/app/routes/articles.server.routes.js
diff --git a/app/routes/core.server.routes.js b/app/routes/core.server.routes.js
diff --git a/app/routes/users.server.routes.js b/app/routes/users.server.routes.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "meanjs",
-	"version": "0.3.2",
+	"version": "0.4.0",
 	"description": "Fullstack JavaScript with MongoDB, Express, AngularJS, and Node.js.",
 	"dependencies": {
 		"bootstrap": "~3",
@@ -9,8 +9,8 @@
 		"angular-animate": "~1.2",
 		"angular-mocks": "~1.2",
 		"angular-bootstrap": "~0.11.2",
-		"angular-bootstrap": "~0.12.0",
 		"angular-ui-utils": "~0.1.1",
-		"angular-ui-router": "~0.2.11"
+		"angular-ui-router": "~0.2.11",
+		"angular-file-upload": "~1.1.5"
 	}
-}
+}
diff --git a/config/assets/default.js b/config/assets/default.js
@@ -0,0 +1,47 @@
+'use strict';
+
+module.exports = {
+	client: {
+		lib: {
+			css: [
+				'public/lib/bootstrap/dist/css/bootstrap.css',
+				'public/lib/bootstrap/dist/css/bootstrap-theme.css'
+			],
+			js: [
+				'public/lib/angular/angular.js',
+				'public/lib/angular-resource/angular-resource.js',
+				'public/lib/angular-animate/angular-animate.js',
+				'public/lib/angular-ui-router/release/angular-ui-router.js',
+				'public/lib/angular-ui-utils/ui-utils.js',
+				'public/lib/angular-bootstrap/ui-bootstrap-tpls.js',
+				'public/lib/angular-file-upload/angular-file-upload.js'
+			],
+			tests: ['public/lib/angular-mocks/angular-mocks.js']
+		},
+		css: [
+			'modules/*/client/css/*.css'
+		],
+		less: [
+			'modules/*/client/less/*.less'
+		],
+		sass: [
+			'modules/*/client/scss/*.scss'
+		],
+		js: [
+			'modules/core/client/app/config.js',
+			'modules/core/client/app/init.js',
+			'modules/*/client/*.js',
+			'modules/*/client/**/*.js'
+		],
+		views: ['modules/*/client/views/**/*.html']
+	},
+	server: {
+		allJS: ['gruntfile.js', 'server.js', 'config/**/*.js', 'modules/*/server/**/*.js'],
+		models: 'modules/*/server/models/**/*.js',
+		routes: ['modules/!(core)/server/routes/**/*.js', 'modules/core/server/routes/**/*.js'],
+		sockets: 'modules/*/server/sockets/**/*.js',
+		config: 'modules/*/server/config/*.js',
+		policies: 'modules/*/server/policies/*.js',
+		views: 'modules/*/server/views/*.html'
+	}
+};