Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Dependency Updates #116

Open
wants to merge 9 commits into from

2 participants

@AntJanus

Some updates:

  • Bootstrap 3.0 update
  • update to AngularJS 1.2
  • using Angular-route for router
  • update demo to work with angular router, angularjs 1.2, and bootstrap 3
  • fix tests
@AntJanus

@ericclemmons I'm almost done updating genesis-skeleton to, well, the new versions of everything including Angular with Angular UI router. Would you want to merge this down (once I figure out the tests) at any point or are you gonna go ahead and proceed with the genesis/skeleton project instead?

@ericclemmons

Yes, let's merge it down, then I'll push it to genesis/angular & setup a redirect for this project!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 15, 2013
  1. @AntJanus
  2. @AntJanus
Commits on Apr 11, 2014
  1. @AntJanus
  2. @AntJanus

    NPM dependencies update

    AntJanus authored
Commits on Apr 13, 2014
  1. @AntJanus
  2. @AntJanus
Commits on Apr 14, 2014
  1. @AntJanus

    Bumping travis node version

    AntJanus authored
Commits on Apr 15, 2014
  1. @AntJanus

    Jshintrc

    AntJanus authored
  2. @AntJanus

    Editor config for styles

    AntJanus authored
This page is out of date. Refresh to see the latest.
View
7 .editorconfig
@@ -0,0 +1,7 @@
+# editorconfig.org
+root = true
+
+# Indentation override for all JS
+[*.js]
+indent_style = space
+indent_size = 2
View
38 .jshintrc
@@ -0,0 +1,38 @@
+{
+ "bitwise": true,
+ "browser": true,
+ "camelcase": false,
+ "curly": true,
+ "eqeqeq": true,
+ "esnext": true,
+ "globalstrict": true,
+ "immed": true,
+ "indent": 2,
+ "latedef": true,
+ "loopfunc": true,
+ "newcap": true,
+ "noarg": true,
+ "node": true,
+ "noempty": false,
+ "nonew": false,
+ "plusplus": false,
+ "quotmark": true,
+ "undef": true,
+ "unused": true,
+ "strict": false,
+ "trailing": true,
+ "white": false,
+ "es5": false,
+ "globals": {
+ "$": false,
+ "afterEach": false,
+ "angular": false,
+ "beforeEach": false,
+ "browser": false,
+ "describe": false,
+ "expect": false,
+ "inject": false,
+ "it": false,
+ "repeater": false
+ }
+}
View
2  .travis.yml
@@ -1,6 +1,6 @@
language: node_js
node_js:
- - 0.8
+ - 0.10
before_install:
- npm install -g bower
- bower install --quiet
View
3  Gruntfile.coffee
@@ -102,8 +102,7 @@ module.exports = (grunt)->
files: [ '<%= SERVER_DIR + JS_FILES %>'
'<%= CLIENT_DIR + JS_FILES %>' ]
options:
- es5: true
- laxcomma: true # Common in Express-derived libraries
+ jshintrc: '.jshintrc'
# Browser-based testing
karma:
View
8 bower.json
@@ -2,11 +2,9 @@
"name": "genesis-skeleton",
"version": "0.0.1",
"dependencies": {
- "angular": "~1.0.7",
- "angular-mocks": "~1.0.7",
- "angular-scenario": "~1.0.7",
- "angular-strap": "~0.7.4",
- "bootstrap": "~2.3.2",
+ "angular": "~1.2",
+ "angular-ui-router": "0.2.x",
+ "bootstrap": "~3.x",
"html5shiv-dist": "~3.6.2",
"modernizr": "~2.6.2"
}
View
16 client/app/scripts/app.js
@@ -1,11 +1,13 @@
angular
- .module('app', [])
- .config(['$routeProvider', function($router) {
- $router
- .when('/', {
- controller: 'homeController',
- templateUrl: 'app/templates/home.html'
+ .module('app', ['ui.router'])
+ .config(function($stateProvider, $urlRouterProvider) {
+ $urlRouterProvider.otherwise('/');
+ $stateProvider
+ .state('home', {
+ url: '/',
+ controller: 'app:controllers.home',
+ templateUrl: 'app/templates/home.html'
})
;
- }])
+ })
;
View
9 client/app/scripts/controllers/home.js
@@ -1,16 +1,19 @@
angular
.module('app')
- .controller('homeController', [
+ .controller('app:controllers.home', [
'$rootScope',
'$scope',
'apiService',
function($rootScope, $scope, api) {
api.server.then(function(response) {
$rootScope.version = response.data.version;
+ $scope.server = response;
+ });
+
+ api.client.then(function(response) {
+ $scope.client = response;
});
- $scope.client = api.client;
- $scope.server = api.server;
}
])
;
View
63 client/app/templates/home.html
@@ -9,39 +9,40 @@
</section>
<hr>
+<div class="container">
+ <div class="row">
+ <div class="npm packages col-md-6">
+ <h3><a href="https://npmjs.org/">NPM</a> Packages</h3>
-<div class="row-fluid">
- <div class="npm packages span6">
- <h3><a href="https://npmjs.org/">NPM</a> Packages</h3>
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <tbody>
+ <tr ng-repeat="(module, version) in server.data.dependencies | orderBy:module">
+ <th>
+ <a ng-href="https://npmjs.org/package/{{ module }}">{{ module }}</a>
+ </th>
+ <td class="text-right">
+ {{ version }}
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
- <table class="table table-striped table-bordered table-hover table-condensed">
- <tbody>
- <tr ng-repeat="(module, version) in server.data.dependencies | orderBy:module">
- <th>
- <a ng-href="https://npmjs.org/package/{{ module }}">{{ module }}</a>
- </th>
- <td class="text-right">
- {{ version }}
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-
- <div class="bower packages span6">
- <h3><a href="http://bower.io/">Bower</a> Packages</h3>
+ <div class="bower packages col-md-6">
+ <h3><a href="http://bower.io/">Bower</a> Packages</h3>
- <table class="table table-striped table-bordered table-hover table-condensed">
- <tbody>
- <tr ng-repeat="(module, version) in client.data.dependencies">
- <th>
- {{ module }}
- </th>
- <td class="text-right">
- {{ version }}
- </td>
- </tr>
- </tbody>
- </table>
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <tbody>
+ <tr ng-repeat="(module, version) in client.data.dependencies">
+ <th>
+ {{ module }}
+ </th>
+ <td class="text-right">
+ {{ version }}
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</div>
</div>
View
5 client/index.html
@@ -25,7 +25,7 @@
<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
<![endif]-->
- <div class="container-fluid">
+ <div class="container">
<header class="masthead">
<h3>
<a href="http://genesis-skeleton.com/" class="muted">Genesis Skeleton</a> <small>v{{ version }}</small>
@@ -38,7 +38,7 @@
Please enable Javascript to experience this site :)
</noscript>
- <div ng-view></div>
+ <div ui-view></div>
<hr>
@@ -49,6 +49,7 @@
<!-- build:js app/scripts/all.min.js -->
<script src="bower_components/angular/angular.js"></script>
+ <script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
<script src="bower_components/modernizr/modernizr.js"></script>
<script src="app/scripts/app.js"></script>
View
34 package.json
@@ -21,8 +21,8 @@
}
],
"engines": {
- "node": "0.8.x",
- "npm": "1.2.x"
+ "node": "0.10.x",
+ "npm": "1.4.x"
},
"scripts": {
"prestart": "./node_modules/.bin/grunt build optimize",
@@ -31,22 +31,22 @@
"test": "./node_modules/.bin/grunt test"
},
"dependencies": {
- "bower": "~0.10.0",
- "express": "~3.3.1",
- "grunt-angular-templates": "~0.3.9",
- "grunt-cli": "~0.1.9",
- "grunt-contrib-clean": "~0.4.1",
- "grunt-contrib-concat": "~0.1.3",
- "grunt-contrib-copy": "~0.4.1",
- "grunt-contrib-jshint": "~0.1.1",
- "grunt-contrib-less": "~0.5.2",
- "grunt-contrib-mincss": "~0.4.0-rc7",
- "grunt-contrib-uglify": "~0.1.2",
- "grunt-contrib-watch": "~0.4.4",
- "grunt-express-server": "~0.3.1",
- "grunt-usemin": "~0.1.12"
+ "bower": "~1.3.x",
+ "express": "~3.5.x",
+ "grunt-angular-templates": "~0.5.x",
+ "grunt-cli": "~0.1.x",
+ "grunt-contrib-clean": "~0.4.x",
+ "grunt-contrib-concat": "~0.4.x",
+ "grunt-contrib-copy": "~0.5.x",
+ "grunt-contrib-jshint": "~0.10.x",
+ "grunt-contrib-less": "~0.11.x",
+ "grunt-contrib-mincss": "~0.4.x",
+ "grunt-contrib-uglify": "~0.4.x",
+ "grunt-contrib-watch": "~0.6.x",
+ "grunt-express-server": "~0.4.x",
+ "grunt-usemin": "~2.1.x"
},
"devDependencies": {
- "grunt-karma": "~0.4.5"
+ "grunt-karma": "~0.8.x"
}
}
View
1  server/lib/api/index.js
@@ -1,7 +1,6 @@
var express = require('express');
var app = module.exports = express();
var fs = require('fs');
-var path = require('path');
app.get('/api/bower', function(req, res) {
res.send(fs.readFileSync(__dirname + '/../../../bower.json'));
View
2  server/server.js
@@ -1,5 +1,5 @@
var app = require('./app');
module.exports = app.listen(app.get('port'), function() {
- console.log("Express server listening on port " + app.get('port'));
+ console.log('Express server listening on port ' + app.get('port'));
});
Something went wrong with that request. Please try again.