Skip to content

Commit

Permalink
feat: change location of routes folder
Browse files Browse the repository at this point in the history 
- update dependencies
  • Loading branch information
Andreas Krummsdorf committed Jul 8, 2014
1 parent 0ede376 commit bb98ab2
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 65 deletions.
7 changes: 5 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# generator-baboon
[![Build Status](https://secure.travis-ci.org/litixsoft/generator-baboon.svg?branch=master)](https://travis-ci.org/litixsoft/generator-baboon) [![david-dm](https://david-dm.org/litixsoft/generator-baboon.svg?theme=shields.io)](https://david-dm.org/litixsoft/generator-baboon/) [![david-dm](https://david-dm.org/litixsoft/generator-baboon/dev-status.svg?theme=shields.io)](https://david-dm.org/litixsoft/generator-baboon#info=devDependencies&view=table)
[![NPM version](https://badge.fury.io/js/generator-baboon.svg)](http://badge.fury.io/js/generator-baboon)
[![Build Status](https://secure.travis-ci.org/litixsoft/generator-baboon.svg?branch=master)](https://travis-ci.org/litixsoft/generator-baboon)
[![david-dm](https://david-dm.org/litixsoft/generator-baboon.svg?theme=shields.io)](https://david-dm.org/litixsoft/generator-baboon/)
[![david-dm](https://david-dm.org/litixsoft/generator-baboon/dev-status.svg?theme=shields.io)](https://david-dm.org/litixsoft/generator-baboon#info=devDependencies&view=table)

> A generator for [Yeoman](http://yeoman.io).
> A [Yeoman](http://yeoman.io) generator for a [baboon](https://github.com/litixsoft/baboon).
## Getting Started

Expand Down
4 changes: 2 additions & 2 deletions app/templates/Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module.exports = function (grunt) {
dist: '.dist',
jshint: {
files: [
'server/controllers/**/*.js',
'server/modules/**/*.js',
'client/app/**/*.js',
'client/common/**/*.js',
'test/**/*.js',
Expand All @@ -52,7 +52,7 @@ module.exports = function (grunt) {
'client/common/**/*.js'
],
server_files: [
'server/controllers/**/*.js',
'server/modules/**/*.js',
'test/server/**/*.js'
]
}
Expand Down
24 changes: 11 additions & 13 deletions app/templates/_bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
{
"name": "<%= _.slugify(baboon.app_name) %>",
"version": "0.0.1",
"version": "0.0.0",
"dependencies": {
"angular": "1.2.16",
"angular": "1.2.19",
"angular-bootstrap": "~0.11.0",
"angular-cookies": "1.2.16",
"angular-dynamic-locale": "0.1.12",
"angular-i18n": "1.2.16",
"angular-resource": "1.2.16",
"angular-route": "1.2.16",
"angular-sanitize": "1.2.16",
"angular-cookies": "1.2.19",
"angular-dynamic-locale": "0.1.17",
"angular-i18n": "1.2.19",
"angular-resource": "1.2.19",
"angular-route": "1.2.19",
"angular-sanitize": "1.2.19",
"angular-translate": "~2.2.0",
"angular-translate-loader-static-files": "~2.2.0",
"baboon-client": "~0.4.1",
"bootstrap": "~3.1.1",
"bootstrap": "~3.2.0",
"checklist-model": "~0.1.3",
"es5-shim": "~3.4.0",
"json3": "~3.3.1"
},
"devDependencies": {
"angular-mocks": "1.2.16",
"angular-scenario": "1.2.16"
},
"resolutions": {
"angular-mocks": "1.2.19",
"angular-scenario": "1.2.19"
}
}
88 changes: 44 additions & 44 deletions app/templates/_package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "<%= _.slugify(baboon.app_name) %>",
"description": "your project description",
"version": "0.0.1",
"version": "0.0.0",
"homepage": "your homepage",
"author": {
"name": "your name",
Expand All @@ -25,55 +25,55 @@
}
],
"dependencies": {
"async": "^0.7.0",
"baboon": "^0.4.1",
"express": "^4.0.0",
"async": "^0.9.0",
"baboon": "^0.4.4",
"express": "^4.5.1",
"lx-helpers": "^0.5.1",
"socket.io": "git+https://github.com/litixsoft/socket.io.git#0.9"
},
"devDependencies": {
"connect-livereload": "^0.4.0",
"grunt": "~0.4.3",
"grunt-autoprefixer": "~0.4.0",
"grunt-bg-shell": "~2.3.0",
"grunt-concurrent": "~0.4.1",
"grunt-contrib-clean": "~0.5.0",
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-copy": "~0.4.1",
"grunt-contrib-cssmin": "~0.7.0",
"grunt-contrib-htmlmin": "~0.1.3",
"grunt-contrib-imagemin": "~0.3.0",
"grunt-contrib-jshint": "~0.7.1",
"grunt-contrib-less": "~0.9.0",
"grunt-contrib-uglify": "~0.2.0",
"grunt-contrib-watch": "~0.5.2",
"grunt-express-server": "~0.4.5",
"grunt": "^0.4.5",
"grunt-autoprefixer": "^0.8.1",
"grunt-bg-shell": "^2.3.1",
"grunt-concurrent": "^0.5.0",
"grunt-contrib-clean": "^0.5.0",
"grunt-contrib-concat": "^0.4.0",
"grunt-contrib-copy": "^0.5.0",
"grunt-contrib-cssmin": "^0.10.0",
"grunt-contrib-htmlmin": "^0.3.0",
"grunt-contrib-imagemin": "^0.7.1",
"grunt-contrib-jshint": "^0.10.0",
"grunt-contrib-less": "^0.11.3",
"grunt-contrib-uglify": "^0.5.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-express-server": "^0.4.17",
"grunt-jasmine-node": "^0.2.1",
"grunt-karma": "~0.8.0",
"grunt-newer": "~0.5.4",
"grunt-ngmin": "~0.0.2",
"grunt-open": "~0.2.0",
"grunt-rev": "~0.1.0",
"grunt-shell": "~0.6.1",
"grunt-svgmin": "~0.2.0",
"grunt-usemin": "~2.0.0",
"istanbul": "~0.1.45",
"jpegtran-bin": "0.2.0",
"jshint-stylish": "~0.1.3",
"karma-coverage": "~0.2.0",
"karma-detect-browsers": "~0.1.2",
"karma-html2js-preprocessor": "~0.1.0",
"karma-jasmine": "~0.2.1",
"karma-junit-reporter": "~0.2.1",
"karma-mocha-reporter": "~0.2.2",
"karma-ng-html2js-preprocessor": "~0.1.0",
"karma-ng-scenario": "~0.1.0",
"karma-requirejs": "~0.2.1",
"karma-script-launcher": "~0.1.0",
"load-grunt-tasks": "~0.2.0",
"protractor": "~0.17.0",
"requirejs": "~2.1.10",
"time-grunt": "~0.2.1"
"grunt-karma": "^0.8.3",
"grunt-newer": "^0.7.0",
"grunt-ngmin": "^0.0.3",
"grunt-open": "^0.2.3",
"grunt-rev": "^0.1.0",
"grunt-shell": "^0.7.0",
"grunt-svgmin": "^0.4.0",
"grunt-usemin": "^2.2.0",
"istanbul": "^0.2.16",
"jpegtran-bin": "0.2.7",
"jshint-stylish": "^0.2.0",
"karma-coverage": "^0.2.4",
"karma-detect-browsers": "^0.1.2",
"karma-html2js-preprocessor": "^0.1.0",
"karma-jasmine": "^0.2.1",
"karma-junit-reporter": "^0.2.2",
"karma-mocha-reporter": "^0.2.7",
"karma-ng-html2js-preprocessor": "^0.1.0",
"karma-ng-scenario": "^0.1.0",
"karma-requirejs": "^0.2.2",
"karma-script-launcher": "^0.1.0",
"load-grunt-tasks": "^0.6.0",
"protractor": "^0.24.2",
"requirejs": "^2.1.14",
"time-grunt": "^0.3.2"
},
"engines": {
"node": ">=0.10.0"
Expand Down
0 app/templates/client/app/account/routes.js → ...ates/server/modules/app/account/routes.js
View file
File renamed without changes.
0 app/templates/client/app/admin/routes.js → ...plates/server/modules/app/admin/routes.js
View file
File renamed without changes.
0 app/templates/client/app/main/routes.js → ...mplates/server/modules/app/main/routes.js
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions app/templates/server/routes/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ function getRouteFiles (pathName) {
module.exports = function (baboon) {
var router = express.Router();

// Retrives all "routes.js" files in client/app folder and subfolder
var clientAppPath = path.join(baboon.config.path.root, 'client', 'app');
var clientRoutes = getRouteFiles(clientAppPath);
// Retrives all "routes.js" files in server/modules folder and subfolder
var routeFilesFolder = path.join(baboon.config.path.root, 'server', 'modules', 'app');
var routes = getRouteFiles(routeFilesFolder);

// Require all routes
clientRoutes.forEach(function(routeFile) {
routes.forEach(function(routeFile) {
router = require(routeFile)(baboon, router);
});

Expand Down

0 comments on commit bb98ab2

Please sign in to comment.