diff --git a/public/js/app.js b/public/js/app.js index 54f05be..ddda9d9 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -1,4 +1,4 @@ -angular.module('ciApp', ['ngAnimate', 'ngRoute', 'ConnectCtrl', 'MembreCtrl', 'ForumDirCtrl', 'ForumConvCtrl', 'SessionsCtrl']).config(function ($routeProvider, $locationProvider) { +angular.module('ciApp', ['ngAnimate', 'ngRoute', 'ConnectCtrl', 'MembreCtrl', 'ForumDirCtrl', 'ForumConvCtrl', 'SessionsCtrl', 'ProfileCtrl']).config(function ($routeProvider, $locationProvider) { $routeProvider .when('/', { templateUrl: 'views/home.html' @@ -22,6 +22,10 @@ angular.module('ciApp', ['ngAnimate', 'ngRoute', 'ConnectCtrl', 'MembreCtrl', 'F templateUrl: 'views/connect.html', controller: 'ConnectCtrl' }) + .when('/profile', { + templateUrl: 'views/profile.html', + controller: 'ProfileCtrl' + }) .otherwise({ redirectTo: '/' }); diff --git a/public/js/controllers/NavbarCtrl.js b/public/js/controllers/NavbarCtrl.js new file mode 100644 index 0000000..6b1695b --- /dev/null +++ b/public/js/controllers/NavbarCtrl.js @@ -0,0 +1,11 @@ +angular.module('SessionsCtrl', ['SessionsServ']) + .controller('NavbarCtrl', function ($scope, SessionServ) { + $scope.isCollapsed = false; + $scope.session = SessionServ.cur; + SessionServ.onChange(function () { + $scope.session = SessionServ.cur; + }); + // $scope.$on("$destroy", function () { + // // TODO + // }) + }); diff --git a/public/js/controllers/ProfileCtrl.js b/public/js/controllers/ProfileCtrl.js new file mode 100644 index 0000000..7f0043e --- /dev/null +++ b/public/js/controllers/ProfileCtrl.js @@ -0,0 +1,10 @@ +angular.module('ProfileCtrl', ['SessionsServ', 'ApiServ']) + .controller('ProfileCtrl', function ($scope, SessionServ, ApiServ) { + $scope.session = SessionServ.cur; + SessionServ.onChange(function () { + $scope.session = SessionServ.cur; + }); + $scope.disconnect = function () { + SessionServ.disconnect(); + }; + }); diff --git a/public/js/controllers/SessionCtrl.js b/public/js/controllers/SessionCtrl.js deleted file mode 100644 index 4421e3f..0000000 --- a/public/js/controllers/SessionCtrl.js +++ /dev/null @@ -1,14 +0,0 @@ -angular.module('SessionsCtrl', ['SessionsServ']) - .controller('SessionCtrl', function ($scope, SessionServ) { - $scope.isCollapsed = false; - $scope.session = SessionServ.cur; - $scope.disconnect = function () { - SessionServ.disconnect(); - }; - SessionServ.onChange(function () { - $scope.session = SessionServ.cur; - }); - // $scope.$on("$destroy", function () { - // // TODO - // }) - }); diff --git a/public/views/index.html b/public/views/index.html index d9b2ddc..e4be1e4 100644 --- a/public/views/index.html +++ b/public/views/index.html @@ -28,16 +28,17 @@ - + + -