Skip to content

Commit

Permalink
Merge pull request ladisays#2 from andela-ladenusi/develop
Browse files Browse the repository at this point in the history
tried fixing a minor bug
  • Loading branch information
Ladi Adenusi committed Jul 9, 2015
2 parents f1be7d9 + 740d511 commit 9b5b39c
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion app/index.jade
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ html(lang="en" ng-app='Kanoevents')
title Kano Events
include shared/head
body
.wrapper(ng-view)
span Kano Events
2 changes: 1 addition & 1 deletion app/js/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ window.Kanoevents = angular.module('Kanoevents', [
'kanoevents.services'
]);

kanoevents.config(['$routeProvider','$locationProvider',
Kanoevents.config(['$routeProvider','$locationProvider',
function($routeProvider, $locationProvider) {
$locationProvider.html5Mode(true);
$routeProvider
Expand Down
7 changes: 3 additions & 4 deletions app/js/controllers/mainCtrl.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
angular.module('uberhack.controllers')
.controller('mainCtrl', ['Authentication', '$scope', '$rootScope', '$location',
function(Authentication, $scope, $rootScope, $location) {

angular.module('kanoevents.controllers')
.controller('mainCtrl', ['$scope', '$rootScope', '$location',
function($scope, $rootScope, $location) {
}
]);
2 changes: 1 addition & 1 deletion app/shared/head.jade
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ link(rel="stylesheet" href="/css/styles.css" type="text/css")
// CDN provided scripts
script(type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js")
script(type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js")
script(type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js")
script(type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-route.js")
script(type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js")
script(type="text/javascript" src="https://cdn.firebase.com/js/client/2.2.7/firebase.js")
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en" ng-app="Kanoevents"><head><title>Kano Events</title><meta name="HandheldFriendly" content="True"><meta name="MobileOptimized" content="320"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><base href="/"><!-- CDN provided--><link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css"><!--build:css /dist/style.css--><link rel="stylesheet" href="/css/styles.css" type="text/css"><!-- endbuild--><!-- CDN provided scripts--><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-route.js"></script><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js"></script><script type="text/javascript" src="https://cdn.firebase.com/js/client/2.2.7/firebase.js"></script><script type="text/javascript" src="https://cdn.firebase.com/libs/angularfire/1.1.2/angularfire.min.js"></script><!-- endcdn--><script type="text/javascript" src="/js/index.js"></script></head><body><div ng-view class="wrapper"></div></body></html>
<!DOCTYPE html><html lang="en" ng-app="Kanoevents"><head><title>Kano Events</title><meta name="HandheldFriendly" content="True"><meta name="MobileOptimized" content="320"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><base href="/"><!-- CDN provided--><link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css"><!--build:css /dist/style.css--><link rel="stylesheet" href="/css/styles.css" type="text/css"><!-- endbuild--><!-- CDN provided scripts--><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-route.js"></script><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js"></script><script type="text/javascript" src="https://cdn.firebase.com/js/client/2.2.7/firebase.js"></script><script type="text/javascript" src="https://cdn.firebase.com/libs/angularfire/1.1.2/angularfire.min.js"></script><!-- endcdn--><script type="text/javascript" src="/js/index.js"></script></head><body><span>Kano Events</span></body></html>
9 changes: 4 additions & 5 deletions public/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ window.Kanoevents = angular.module('Kanoevents', [
'kanoevents.services'
]);

kanoevents.config(['$routeProvider','$locationProvider',
Kanoevents.config(['$routeProvider','$locationProvider',
function($routeProvider, $locationProvider) {
$locationProvider.html5Mode(true);
$routeProvider
Expand All @@ -28,10 +28,9 @@ kanoevents.config(['$routeProvider','$locationProvider',
});
}]);
},{"./controllers/mainCtrl.js":2,"./services/refs.js":3}],2:[function(require,module,exports){
angular.module('uberhack.controllers')
.controller('mainCtrl', ['Authentication', '$scope', '$rootScope', '$location',
function(Authentication, $scope, $rootScope, $location) {

angular.module('kanoevents.controllers')
.controller('mainCtrl', ['$scope', '$rootScope', '$location',
function($scope, $rootScope, $location) {
}
]);

Expand Down
2 changes: 1 addition & 1 deletion public/shared/head.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<meta name="HandheldFriendly" content="True"/><meta name="MobileOptimized" content="320"/><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/><base href="/"/><!-- CDN provided--><link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css"/><!--build:css /dist/style.css--><link rel="stylesheet" href="/css/styles.css" type="text/css"/><!-- endbuild--><!-- CDN provided scripts--><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-route.js"></script><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js"></script><script type="text/javascript" src="https://cdn.firebase.com/js/client/2.2.7/firebase.js"></script><script type="text/javascript" src="https://cdn.firebase.com/libs/angularfire/1.1.2/angularfire.min.js"></script><!-- endcdn--><script type="text/javascript" src="/js/index.js"></script>
<meta name="HandheldFriendly" content="True"/><meta name="MobileOptimized" content="320"/><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/><base href="/"/><!-- CDN provided--><link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css"/><!--build:css /dist/style.css--><link rel="stylesheet" href="/css/styles.css" type="text/css"/><!-- endbuild--><!-- CDN provided scripts--><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-route.js"></script><script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js"></script><script type="text/javascript" src="https://cdn.firebase.com/js/client/2.2.7/firebase.js"></script><script type="text/javascript" src="https://cdn.firebase.com/libs/angularfire/1.1.2/angularfire.min.js"></script><!-- endcdn--><script type="text/javascript" src="/js/index.js"></script>

0 comments on commit 9b5b39c

Please sign in to comment.