Merge branch 'master' of https://github.com/suissa/mean-seed

Conflicts:
	.gitignore
	back/app.js
	package.json

README.md

@@ -15,16 +15,102 @@ That is it! Now go to [http://mean-$namespace.getup.io](#) and follow the instru
 ##To populate Mongo
     GET /api/beers/populate
 
-##A API
+##To see running
+
+    http://localhost:3000/beers
+
+##The API
 
 > GET /api/beers
+
 > GET /api/beers/populate
+
 > GET /api/beers/\_id/:id
+
 > POST /api/beers/
+
 > PUT /api/beers/\_id/:id
+
 > DELETE /api/beers/\_id/:id
 
 
+#Directory Layout
+    back/
+      bin/
+      config/
+        db.js
+      modules/
+        main/
+        expose/
+        {{entity}}/
+          api/
+            controller.js
+            routes.js
+          views/
+            create.jade
+            edit.jade
+            list.jade
+            remove.jade
+            show.jade
+          controller.js
+          model.js
+          routes.js
+
+    front/
+      bower_components/
+      css/
+      js/
+        lib/
+        modules/
+          {{entity}}/
+            controllers.js
+            services.js
+            directives.js
+            filters.js
+
+
+#Nomenclature
+##AngularJs
+
+###Angularjs - Modules
+Name:
+>{Entity}{Action}Controller
+
+Folder:
+>/public/js/modules/{{entity}}
+
+###Angularjs - Controllers
+Name:
+>{Entity}{Action}Controller
+
+Folder:
+>/public/js/modules/{{entity}}/controllers.js
+
+###Angularjs - Services
+Name:
+>{Entity}{Service|Factory}
+
+Folder:
+>/public/js/modules/{{entity}}/services.js
+
+###Angularjs - Filters
+Name:
+>{Entity}{FilterName}
+
+Folder:
+>/public/js/modules/{{entity}}/services.js
+
+###Angularjs - Directives
+Name:
+>{Entity}{DirectiveName}
+
+Folder:
+>/public/js/modules/{{entity}}/directives.js
+
+
+**Wait for the Atomic Design**
+
+
 MEAN-seed is based in Angular Express Seed, you can see more about below.
 
 # Angular Express Seed
@@ -108,3 +194,9 @@ your friends.
 
 ## License
 MIT
+
+
+
+
+
+

app.js → back/app.js

@@ -8,33 +8,32 @@ var express = require('express'),
   methodOverride = require('method-override'),
   errorHandler = require('errorhandler'),
   morgan = require('morgan'),
-  routes = require('./routes'),
-  partials = require('./routes/partials'),
-  expose = require('./routes/expose'),
-  db = require('./models/db'),
+  routes = require('./modules/main/routes'),
+  partials = require('./modules/expose/partials'),
+  expose = require('./modules/expose/index'),
+  db = require('./config/db'),
   http = require('http'),
   path = require('path');
 
 var app = module.exports = express();
 
 var api = {};
-api.name = require('./routes/api/name');
-api.beers = require('./routes/api/beers');
+api.beers = require('./modules/beers/api/routes');
 
 /**
  * Configuration
  */
 
 // all environments
-app.set('addr', process.env.OPENSHIFT_NODEJS_IP || process.env.ADDD || '127.0.0.1');
+app.set('addr', process.env.OPENSHIFT_NODEJS_IP || process.env.ADDR || '127.0.0.1');
 app.set('port', process.env.OPENSHIFT_NODEJS_PORT || process.env.PORT || 3000);
-app.set('views', __dirname + '/views');
+app.set('views', __dirname + '/modules');
 app.set('view engine', 'jade');
 app.use(morgan('dev'));
 app.use(bodyParser.urlencoded({extended: true}));
 app.use(bodyParser.json());
 app.use(methodOverride());
-app.use(express.static(path.join(__dirname, 'public')));
+app.use(express.static(path.join(__dirname, '../front')));
 
 var env = process.env.NODE_ENV || 'development';
 
@@ -62,11 +61,10 @@ app.use('/expose', expose);
 
 // JSON API
 app.use('/api/beers', api.beers);
-app.use('/api/name', api.name);
 
 // redirect all others to the index (HTML5 history)
 app.get('*', function(req, res, next) {
-  res.render('index');
+  res.render('main/views/index');
 });
 
 

models/db.js → back/config/db.js

@@ -37,5 +37,5 @@ process.on('SIGINT', function() {
 });
 
 // BRING IN YOUR SCHEMAS & MODELS
-require('./beer');
+require('../modules/beers/model');
 

controllers/api/beers.js → back/modules/beers/api/controller.js

@@ -1,4 +1,4 @@
-var Beer = require('../../models/beer');
+var Beer = require('../model');
 var http = require('http');
 var msg = '';
 

routes/api/beers.js → back/modules/beers/api/routes.js

@@ -1,6 +1,6 @@
 var express = require('express');
 var router = express.Router();
-var _beer = require('../../controllers/api/beers');
+var _beer = require('./controller');
 
 var cb = function(err, data, res){
   if (err){
@@ -14,7 +14,6 @@ var cb = function(err, data, res){
 }
 
 router.get('/', function(req, res) {
-  console.log('get --------------');
   _beer.retrieve(req, res, cb);
 });
 

controllers/beers.js → back/modules/beers/controller.js

@@ -1,4 +1,4 @@
-var Beer = require('../models/beer');
+var Beer = require('./model');
 var msg = '';
 
 module.exports = {

routes/beers.js → back/modules/beers/routes.js

@@ -1,6 +1,6 @@
 var express = require('express');
 var router = express.Router();
-var _beer = require('../controllers/beers');
+var _beer = require('./controller');
 
 var cb = function(err, data, res, view, message){
   if (err){

back/modules/beers/views/create.jade

@@ -0,0 +1,35 @@
+section.pure-g
+  article.pure-u-1-3
+  article.pure-u-1-3
+    h3.title Create Beer
+    p {{message}}
+
+    form.pure-form.pure-form-stacked
+      div.pure-control-group      
+        label(for='name') Name: 
+        input.form-control(name='name',
+                          data-ng-model='beer.name')
+      div.pure-control-group
+        label(for='category') Category: 
+        input.form-control(name='category',
+                          data-ng-model='beer.category')
+      div.pure-control-group
+        label(for='abv') ABV: 
+        input.form-control(name='abv', type='number', min=0, step=1,
+                          data-ng-model='beer.abv')
+      div.pure-control-group
+        label(for='brewery') Brewery: 
+        input.form-control(name='brewery',
+                          data-ng-model='beer.brewery.name')
+      div.pure-control-group
+        label(for='description') Description: 
+        textarea.form-control(name='description',
+                          data-ng-model='beer.description')
+
+      button.btn.btn-lg(data-ng-click='create(beer)') Create
+  article.pure-u-1-3
+
+
+
+
+

back/modules/beers/views/list.jade

@@ -0,0 +1,24 @@
+section.pure-g
+  article.pure-u-1-3
+  article.pure-u-1-3
+    h3.title List of Beers
+    p.message {{ message }}
+
+    table
+      thead
+        tr
+          th 
+      tbody
+        tr(data-ng-repeat='beer in beers') 
+          td
+            a(href='/beers/{{beer._id}}') 
+              | {{beer.name}}
+          td
+            a(href='/beers/{{beer._id}}/edit') 
+              | EDIT
+          td 
+            span(data-ng-controller='RemoveBeer')
+              button(data-ng-click='remove(beer)') REMOVER
+
+  article.pure-u-1-3
+

routes/expose.js → back/modules/expose/index.js

@@ -1,10 +1,10 @@
 var express = require('express');
 var router = express.Router();
 
-router.get('/:dir/:name', function(req, res) {
-  var dir = req.params.dir;
+router.get('/:module/:name', function(req, res) {
+  var module = req.params.module;
   var name = req.params.name;
-  res.render(dir + '/' + name);
+  res.render(module + '/views/' + name);
 });
 
 module.exports = router;

routes/index.js → back/modules/main/routes.js

@@ -3,7 +3,8 @@ var router = express.Router();
 
 /* GET home page. */
 router.get('/', function(req, res) {
-  res.render('index');
+  // res.render('/main/views/index');
+  res.redirect('/beers');
 });
 
 module.exports = router;

back/modules/main/views/index.jade

@@ -0,0 +1,14 @@
+extends layout
+
+block body
+  section.pure-u-4-4(data-ng-controller='AppController')
+    h2 {{name}}
+    include menu
+
+    section(data-ng-view)
+
+    footer
+      | MEAN seed app: v
+      span(app-version)
+
+  include js

back/modules/main/views/js.jade

@@ -0,0 +1,2 @@
+script(src='js/lib/angular/angular.js')
+script(src='js/all.min.js')

views/layout.jade → back/modules/main/views/layout.jade

@@ -3,7 +3,7 @@ html(ng-app="myApp")
   head
     meta(charset='utf8')
     base(href='/')
-    title Angular Express Seed App
-    link(rel='stylesheet', href='/css/app.css')
+    title MEAN Seed App
+    include stylesheets
   body
     block body

back/modules/main/views/menu.jade

@@ -0,0 +1,6 @@
+nav(role='”navigation”')
+  ul.menu(role='menubar')
+    li(role='presentation')
+      a(role='menuitem', href='beers') List
+    li(role='presentation')
+      a(role='menuitem', href='beers/create') Add

back/modules/main/views/stylesheets.jade

@@ -0,0 +1,2 @@
+link(rel='stylesheet', href='/css/app.css')
+link(rel='stylesheet', href='http://yui.yahooapis.com/pure/0.5.0/pure-min.css')

public/js/app.js → front/js/app.js

@@ -1,20 +1,19 @@
+(function(angular){
 'use strict';
 
-// Declare app level module which depends on filters, and services
-
 angular.module('myApp', [
   'myApp.controllers',
   'myApp.filters',
   'myApp.services',
   'myApp.directives'
 ]).
-config(function ($routeProvider, $locationProvider) {
+config(['$routeProvider', '$locationProvider', function ($routeProvider, $locationProvider) {
   $routeProvider.
     when('/beers', {
       templateUrl: 'expose/beers/list',
       controller: 'BeerListController'
     }).
-    when('/beers/add', {
+    when('/beers/create', {
       templateUrl: 'expose/beers/create',
       controller: 'BeerCreateController'
     }).
@@ -33,14 +32,6 @@ config(function ($routeProvider, $locationProvider) {
     otherwise({
       redirectTo: '/beers'
     });
-
-    // when('/beers', {
-    //   templateUrl: 'expose/beers/list',
-    //   controller: 'BeerListController'
-    // }).
-    // when('/beers/add', {
-    //   templateUrl: 'expose/beers/create',
-    //   controller: 'BeerCreateController'
-    // }).
   $locationProvider.html5Mode(true);
-});
+}]);
+})(angular);