Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

fixes db deployment issue on heroku. production db value needs to be set... #1

Merged
merged 19 commits into from
Mar 27, 2014
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Replacing ngRoute with UI-Router
amoshaviv committed Feb 20, 2014
commit 311605a4e2165256a7b54532fa0b14bfe8b530dd
2 changes: 1 addition & 1 deletion app/views/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'layout.html' %}

{% block content %}
<section data-ng-view></section>
<section data-ui-view></section>
{% endblock %}
2 changes: 1 addition & 1 deletion app/views/layout.html
Original file line number Diff line number Diff line change
@@ -58,14 +58,14 @@

<!--AngularJS-->
<script type="text/javascript" src="/lib/angular/angular.js"></script>
<script type="text/javascript" src="/lib/angular-route/angular-route.js"></script>
<script type="text/javascript" src="/lib/angular-resource/angular-resource.js"></script>
<script type="text/javascript" src="/lib/angular-cookies/angular-cookies.js"></script>
<script type="text/javascript" src="/lib/angular-animate/angular-animate.js"></script>

<!--Angular UI-->
<script type="text/javascript" src="/lib/angular-bootstrap/ui-bootstrap.js"></script>
<script type="text/javascript" src="/lib/angular-ui-utils/ui-utils.js"></script>
<script type="text/javascript" src="/lib/angular-ui-router/release/angular-ui-router.js"></script>

<!--AngularJS Application Init-->
<script type="text/javascript" src="/js/config.js"></script>
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -5,12 +5,12 @@
"dependencies": {
"bootstrap": "latest",
"angular": "latest",
"angular-route": "latest",
"angular-cookies": "latest",
"angular-resource": "latest",
"angular-animate": "latest",
"angular-mocks": "latest",
"angular-bootstrap": "latest",
"angular-ui-utils": "latest"
"angular-ui-utils": "latest",
"angular-ui-router": "#master"
}
}
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
@@ -21,9 +21,9 @@ module.exports = function(config) {
'public/lib/angular-mocks/angular-mocks.js',
'public/lib/angular-cookies/angular-cookies.js',
'public/lib/angular-resource/angular-resource.js',
'public/lib/angular-route/angular-route.js',
'public/lib/angular-bootstrap/ui-bootstrap.js',
'public/lib/angular-ui-utils/ui-utils.js',
'public/lib/angular-ui-router/release/angular-ui-router.js',
'public/js/config.js',
'public/js/application.js',
].concat(modulesJSFiles),
2 changes: 1 addition & 1 deletion public/js/config.js
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
var ApplicationConfiguration = (function() {
// Init module configuration options
var applicationModuleName = 'mean';
var applicationModuleVendorDependencies = ['ngRoute', 'ngResource', 'ngCookies', 'ngAnimate', 'ui.bootstrap', 'ui.utils'];
var applicationModuleVendorDependencies = ['ngResource', 'ngCookies', 'ngAnimate', 'ui.router', 'ui.bootstrap', 'ui.utils'];

// Add a new vertical module
var registerModule = function(moduleName) {
37 changes: 21 additions & 16 deletions public/modules/articles/config/routes.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
'use strict';

//Setting up route
angular.module('mean.articles').config(['$routeProvider',
function($routeProvider) {
$routeProvider.
when('/articles', {
templateUrl: 'modules/articles/views/list.html'
}).
when('/articles/create', {
templateUrl: 'modules/articles/views/create.html'
}).
when('/articles/:articleId', {
templateUrl: 'modules/articles/views/view.html'
}).
when('/articles/:articleId/edit', {
templateUrl: 'modules/articles/views/edit.html'
});
}
angular.module('mean.articles').config(['$stateProvider',
function($stateProvider) {
// Articles state routing
$stateProvider.
state('listArticles', {
url: '/articles',
templateUrl: 'modules/articles/views/list.html'
}).
state('createArticle', {
url: '/articles/create',
templateUrl: 'modules/articles/views/create.html'
}).
state('viewArticle', {
url: '/articles/:articleId',
templateUrl: 'modules/articles/views/view.html'
}).
state('editArticle', {
url: '/articles/:articleId/edit',
templateUrl: 'modules/articles/views/edit.html'
});
}
]);
6 changes: 3 additions & 3 deletions public/modules/articles/controllers/articles.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

angular.module('mean.articles').controller('ArticlesController', ['$scope', '$routeParams', '$location', 'Authentication', 'Articles',
function($scope, $routeParams, $location, Authentication, Articles) {
angular.module('mean.articles').controller('ArticlesController', ['$scope', '$stateParams', '$location', 'Authentication', 'Articles',
function($scope, $stateParams, $location, Authentication, Articles) {
$scope.authentication = Authentication;

$scope.create = function() {
@@ -53,7 +53,7 @@ angular.module('mean.articles').controller('ArticlesController', ['$scope', '$ro

$scope.findOne = function() {
Articles.get({
articleId: $routeParams.articleId
articleId: $stateParams.articleId
}, function(article) {
$scope.article = article;
});
8 changes: 4 additions & 4 deletions public/modules/articles/tests/articles.spec.js
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
var ArticlesController,
scope,
$httpBackend,
$routeParams,
$stateParams,
$location;

// The $resource service augments the response object with methods for updating and deleting the resource.
@@ -36,12 +36,12 @@
// The injector ignores leading and trailing underscores here (i.e. _$httpBackend_).
// This allows us to inject a service but then attach it to a variable
// with the same name as the service.
beforeEach(inject(function($controller, $rootScope, _$location_, _$routeParams_, _$httpBackend_) {
beforeEach(inject(function($controller, $rootScope, _$location_, _$stateParams_, _$httpBackend_) {
// Set a new global scope
scope = $rootScope.$new();

// Point global variables to injected services
$routeParams = _$routeParams_;
$stateParams = _$stateParams_;
$httpBackend = _$httpBackend_;
$location = _$location_;

@@ -80,7 +80,7 @@
});

// Set the URL parameter
$routeParams.articleId = '525a8422f6d0f87f0e407a33';
$stateParams.articleId = '525a8422f6d0f87f0e407a33';

// Set GET response
$httpBackend.expectGET(/articles\/([0-9a-fA-F]{24})$/).respond(sampleArticle);
19 changes: 12 additions & 7 deletions public/modules/core/config/routes.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
'use strict';

// Setting up route
angular.module('mean.core').config(['$routeProvider',
function($routeProvider) {
$routeProvider.
when('/', {
templateUrl: 'modules/core/views/home.html'
});
}
angular.module('mean.core').config(['$stateProvider', '$urlRouterProvider',
function($stateProvider, $urlRouterProvider) {
// Redirect to home view when route not found
$urlRouterProvider.otherwise('/');

// Home state routing
$stateProvider.
state('home', {
url: '/',
templateUrl: 'modules/core/views/home.html'
});
}
]);
23 changes: 13 additions & 10 deletions public/modules/users/config/routes.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
'use strict';

// Setting up route
angular.module('mean.users').config(['$routeProvider',
function($routeProvider) {
$routeProvider.
when('/signup', {
templateUrl: 'modules/users/views/signup.html'
}).
when('/signin', {
templateUrl: 'modules/users/views/signin.html'
});
}
angular.module('mean.users').config(['$stateProvider',
function($stateProvider) {
// Users state routing
$stateProvider.
state('signup', {
url: '/signup',
templateUrl: 'modules/users/views/signup.html'
}).
state('signin', {
url: '/signin',
templateUrl: 'modules/users/views/signin.html'
});
}
]);