New 0.4 version

meanjs · Nov 10, 2014 · ab81d61 · ab81d61
1 parent ad87029
commit ab81d61
Show file tree

Hide file tree

Showing 153 changed files with 2,606 additions and 2,066 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -33,4 +33,4 @@ indent_style = tab
 
 # Standard at: 
 [Makefile]
-indent_style = tab
+indent_style = tab
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,5 @@
 npm-debug.log
 node_modules/
 public/lib
-app/tests/coverage/
 .bower-*/
 .idea/
-config/sslcert/*.pem
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/README.md b/README.md
@@ -2,21 +2,20 @@
 
 [![Build Status](https://travis-ci.org/meanjs/mean.svg?branch=master)](https://travis-ci.org/meanjs/mean)
 [![Dependencies Status](https://david-dm.org/meanjs/mean.svg)](https://david-dm.org/meanjs/mean)
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/meanjs/mean?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 MEAN.JS is a full-stack JavaScript open-source solution, which provides a solid starting point for [MongoDB](http://www.mongodb.org/), [Node.js](http://www.nodejs.org/), [Express](http://expressjs.com/), and [AngularJS](http://angularjs.org/) based applications. The idea is to solve the common issues with connecting those frameworks, build a robust framework to support daily development needs, and help developers use better practices while working with popular JavaScript components. 
 
 ## Before You Begin 
 Before you begin we recommend you read about the basic building blocks that assemble a MEAN.JS application: 
 * MongoDB - Go through [MongoDB Official Website](http://mongodb.org/) and proceed to their [Official Manual](http://docs.mongodb.org/manual/), which should help you understand NoSQL and MongoDB better.
-* Express - The best way to understand express is through its [Official Website](http://expressjs.com/), which has a [Getting Started](http://expressjs.com/starter/installing.html) guide, as well as an [ExpressJS Guide](http://expressjs.com/guide/error-handling.html) guide for general express topics. You can also go through this [StackOverflow Thread](http://stackoverflow.com/questions/8144214/learning-express-for-node-js) for more resources.
+* Express - The best way to understand express is through its [Official Website](http://expressjs.com/), particularly [The Express Guide](http://expressjs.com/guide.html); you can also go through this [StackOverflow Thread](http://stackoverflow.com/questions/8144214/learning-express-for-node-js) for more resources.
 * AngularJS - Angular's [Official Website](http://angularjs.org/) is a great starting point. You can also use [Thinkster Popular Guide](http://www.thinkster.io/), and the [Egghead Videos](https://egghead.io/).
 * Node.js - Start by going through [Node.js Official Website](http://nodejs.org/) and this [StackOverflow Thread](http://stackoverflow.com/questions/2353818/how-do-i-get-started-with-node-js), which should get you going with the Node.js platform in no time.
 
 
 ## Prerequisites
 Make sure you have installed all these prerequisites on your development machine.
-* Node.js - [Download & Install Node.js](http://www.nodejs.org/download/) and the npm package manager, if you encounter any problems, you can also use this [GitHub Gist](https://gist.github.com/isaacs/579814) to install Node.js.
+* Node.js - [Download & Install Node.js](http://www.nodejs.org/download/) and the npm package manager, if you encounter any problems, you can also use this [Github Gist](https://gist.github.com/isaacs/579814) to install Node.js.
 * MongoDB - [Download & Install MongoDB](http://www.mongodb.org/downloads), and make sure it's running on the default port (27017).
 * Bower - You're going to use the [Bower Package Manager](http://bower.io/) to manage your front-end packages, in order to install it make sure you've installed Node.js and npm, then install bower globally using npm:
 
@@ -44,7 +43,7 @@ $ git clone https://github.com/meanjs/mean.git meanjs
 This will clone the latest version of the MEAN.JS repository to a **meanjs** folder.
 
 ### Downloading The Repository Zip File
-Another way to use the MEAN.JS boilerplate is to download a zip copy from the [master branch on GitHub](https://github.com/meanjs/mean/archive/master.zip). You can also do this using `wget` command:
+Another way to use the MEAN.JS boilerplate is to download a zip copy from the [master branch on github](https://github.com/meanjs/mean/archive/master.zip). You can also do this using `wget` command:
 ```
 $ wget https://github.com/meanjs/mean/archive/master.zip -O meanjs.zip; unzip meanjs.zip; rm meanjs.zip
 ```
@@ -64,7 +63,7 @@ $ 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 installcommand 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:
@@ -98,20 +97,12 @@ $
 
 * To enable live reload forward 35729 port and mount /app and /public as volumes:
 ```bash
-$ docker run -p 3000:3000 -p 35729:35729 -v /Users/mdl/workspace/mean-stack/mean/public:/home/mean/public -v /Users/mdl/workspace/mean-stack/mean/app:/home/mean/app --link db:db_1 mean
+$ docker run -p 3000:3000 -p 35729:35729 -v /Users/mdl/workspace/mean-stack/mean/public:/home/mean/public -v /Users/mdl/workspa/mean-stack/mean/app:/home/mean/app --link db:db_1 mean
 ```
 
-## Running in a secure environment
-To run your application in a secure manner you'll need to use OpenSSL and generate a set of self-signed certificates. Unix-based users can use the following commnad: 
-```
-$ sh generate-ssl-certs.sh
-```
-Windows users can follow instructions found [here](http://www.websense.com/support/article/kbarticle/How-to-use-OpenSSL-and-Microsoft-Certification-Authority)
-To generate the key and certificate and place them in the *config/sslcert* folder.
-
 ## Getting Started With MEAN.JS
-You have your application running but there are a lot of stuff to understand, we recommend you'll go over the [Official Documentation](http://meanjs.org/docs.html). 
-In the docs we'll try to explain both general concepts of MEAN components and give you some guidelines to help you improve your development process. We tried covering as many aspects as possible, and will keep update it by your request, you can also help us develop the documentation better by checking out the *gh-pages* branch of this repository.
+You have your application running but there are a lot of stuff to understand, we recommend you'll go over the [Offical Documentation](http://meanjs.org/docs.html). 
+In the docs we'll try to explain both general concepts of MEAN components and give you some guidelines to help you improve your development procees. We tried covering as many aspects as possible, and will keep update it by your request, you can also help us develop the documentation better by checking out the *gh-pages* branch of this repository.
 
 ## Community
 * Use to [Offical Website](http://meanjs.org) to learn about changes and the roadmap.

diff --git a/app/controllers/core.server.controller.js b/app/controllers/core.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,15 +1,16 @@
 {
 	"name": "meanjs",
-	"version": "0.3.2",
+	"version": "0.4.0",
 	"description": "Fullstack JavaScript with MongoDB, Express, AngularJS, and Node.js.",
 	"dependencies": {
 		"bootstrap": "~3",
 		"angular": "~1.2",
 		"angular-resource": "~1.2",
 		"angular-animate": "~1.2",
 		"angular-mocks": "~1.2",
-		"angular-bootstrap": "~0.11.2",
+		"angular-bootstrap": "~0.11.0",
 		"angular-ui-utils": "~0.1.1",
-		"angular-ui-router": "~0.2.11" 
+		"angular-ui-router": "~0.2.10",
+		"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'
+	}
+};
diff --git a/config/assets/development.js b/config/assets/development.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+	// Development assets
+};
diff --git a/config/assets/production.js b/config/assets/production.js
@@ -0,0 +1,23 @@
+'use strict';
+
+module.exports = {
+	client: {
+		lib: {
+			css: [
+				'public/lib/bootstrap/dist/css/bootstrap.min.css',
+				'public/lib/bootstrap/dist/css/bootstrap-theme.min.css',
+			],
+			js: [
+				'public/lib/angular/angular.min.js',
+				'public/lib/angular-resource/angular-resource.min.js',
+				'public/lib/angular-animate/angular-animate.min.js',
+				'public/lib/angular-ui-router/release/angular-ui-router.min.js',
+				'public/lib/angular-ui-utils/ui-utils.min.js',
+				'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js',
+				'public/lib/angular-file-upload/angular-file-upload.min.js'
+			]
+		},
+		css: 'public/dist/application.min.css',
+		js: 'public/dist/application.min.js'
+	}
+};
diff --git a/config/assets/test.js b/config/assets/test.js
@@ -0,0 +1,9 @@
+'use strict';
+
+module.exports = {
+	tests: {
+		client: ['modules/*/tests/client/**/*.js'],
+		server: ['modules/*/tests/server/**/*.js'],
+		e2e: ['modules/*/tests/e2e/**/*.js']
+	}
+};