Skip to content

Commit

Permalink
Revert "Subgenerators: controller, model, service, view, viewroute"
Browse files Browse the repository at this point in the history
This reverts commit 33854f5.
  • Loading branch information
wlepinski-rga committed Jul 26, 2013
1 parent 33854f5 commit 09facec
Show file tree
Hide file tree
Showing 21 changed files with 36 additions and 415 deletions.
Binary file removed .DS_Store
Binary file not shown.
30 changes: 15 additions & 15 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@ var MeanstackGenerator = module.exports = function MeanstackGenerator(args, opti

util.inherits(MeanstackGenerator, yeoman.generators.Base);

// MeanstackGenerator.prototype.askFor = function askFor() {
// var cb = this.async();
MeanstackGenerator.prototype.askFor = function askFor() {
var cb = this.async();

// // have Yeoman greet the user.
// console.log(this.yeoman);
// have Yeoman greet the user.
console.log(this.yeoman);

// var prompts = [{
// type: 'confirm',
// name: 'someOption',
// message: 'Would you like to enable this option?',
// default: true
// }];
var prompts = [{
type: 'confirm',
name: 'someOption',
message: 'Would you like to enable this option?',
default: true
}];

// this.prompt(prompts, function (props) {
// this.someOption = props.someOption;
this.prompt(prompts, function (props) {
this.someOption = props.someOption;

// cb();
// }.bind(this));
// };
cb();
}.bind(this));
};

MeanstackGenerator.prototype.app = function app() {
this.mkdir('public');
Expand Down
14 changes: 7 additions & 7 deletions app/templates/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->

<!-- build:css({.tmp,app}) styles/main.css -->
<link rel="stylesheet" href="/styles/main.css">
<link rel="stylesheet" href="styles/main.css">
<!-- endbuild -->
</head>
<body ng-app="<%= _.camelize(appname) %>App">
Expand All @@ -36,17 +36,17 @@
s.parentNode.insertBefore(g,s)}(document,'script'));
</script>

<script src="/bower_components/angular/angular.js"></script>
<script src="bower_components/angular/angular.js"></script>

<!-- build:js scripts/modules.js -->
<script src="/bower_components/angular-resource/angular-resource.js"></script>
<script src="/bower_components/angular-cookies/angular-cookies.js"></script>
<script src="/bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="bower_components/angular-resource/angular-resource.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
<!-- endbuild -->

<!-- build:js({.tmp,app}) scripts/scripts.js -->
<script src="/scripts/app.js"></script>
<script src="/scripts/controllers/main.js"></script>
<script src="scripts/app.js"></script>
<script src="scripts/controllers/main.js"></script>
<!-- endbuild -->
</body>
</html>
19 changes: 10 additions & 9 deletions app/templates/app/scripts/app.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
'use strict';

angular.module('<%= _.camelize(appname)%>App', [])
.config(function($routeProvider) {
$routeProvider.when('/', {
templateUrl: 'views/main.html',
controller: 'MainCtrl'
});
$routeProvider.otherwise({
redirectTo: '/'
});
});
.config(function ($routeProvider) {
$routeProvider
.when('/', {
templateUrl: 'views/main.html',
controller: 'MainCtrl'
})
.otherwise({
redirectTo: '/'
});
});
4 changes: 1 addition & 3 deletions app/templates/config/environments/development.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
var express = require('express'),
mongoose = require('mongoose'),
path = require('path');

var LIVERELOAD_PORT = 35729;
var lrSnippet = require('connect-livereload')({ port: LIVERELOAD_PORT });

module.exports = function (app) {
console.log(lrSnippet);
app.configure('development', function () {
mongoose.connect('mongodb://localhost/<%= _.slugify(appname) %>');

app.set('port', process.env.PORT || 9000);
app.set('views', path.join(app.directory, '/app'));
app.engine('html', require('ejs').renderFile);
Expand Down
3 changes: 0 additions & 3 deletions app/templates/config/environments/production.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
var express = require('express'),
mongoose = require('mongoose'),
path = require('path');

module.exports = function (app) {
app.configure('production', function () {
mongoose.connect(process.env.MONGODB_URL);

app.set('port', process.env.PORT || 9000);
app.set('views', path.join(app.directory, '/dist'));
app.engine('html', require('ejs').renderFile);
Expand Down
6 changes: 3 additions & 3 deletions app/templates/routes/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = function (app) {

// Default home route
app.get('/', function (req, res, next) {
res.render('index');
res.render('index', {
title: 'Express'
});
});
};
26 changes: 0 additions & 26 deletions controller/index.js

This file was deleted.

3 changes: 0 additions & 3 deletions controller/templates/controller.js

This file was deleted.

17 changes: 0 additions & 17 deletions model/index.js

This file was deleted.

7 changes: 0 additions & 7 deletions model/templates/model.js

This file was deleted.

28 changes: 0 additions & 28 deletions route/index.js

This file was deleted.

45 changes: 0 additions & 45 deletions route/templates/routes.js

This file was deleted.

39 changes: 0 additions & 39 deletions scaffold/index.js

This file was deleted.

26 changes: 0 additions & 26 deletions service/index.js

This file was deleted.

Loading

0 comments on commit 09facec

Please sign in to comment.