TG-119 Merge branch 'master' of https://git.rdrive.ovh/Project_OLA/OLA

frontend/app/index.html

@@ -52,7 +52,7 @@
         <!-- build:js({.tmp,app}) scripts/scripts.js -->
         <script src="scripts/app.js"></script>
         <script src="scripts/controllers/login.js"></script>
-        <script src="scripts/controllers/userSpace.js"></script>
+        <script src="scripts/controllers/studentSpace.js"></script>
         <!-- endbuild -->
 </body>
 </html>

frontend/app/scripts/app.js

@@ -32,9 +32,9 @@ app.config(function ($stateProvider, $urlRouterProvider) {
             controller: 'LoginCtrl'
         })
         
-        .state('userspace', {
+        .state('studentSpace', {
             url: '/espace-etudiant',
-            templateUrl: 'views/userSpace.html',
-            controller: 'UserSpaceCtrl'
+            templateUrl: 'views/studentSpace.html',
+            controller: 'StudentSpaceCtrl'
         });
     });

frontend/app/scripts/controllers/login.js

@@ -18,7 +18,7 @@
       function login() {
         console.log('login');
 
-        $state.go('userspace');
+        $state.go('studentSpace');
       }
 
       // Private methods ------------------

frontend/app/scripts/controllers/studentSpace.js

@@ -2,7 +2,7 @@
     'use strict';
 
     angular.module('clientApp')
-        .controller('UserSpaceCtrl', ['$scope', '$state',
+        .controller('StudentSpaceCtrl', ['$scope', '$state',
             function ($scope, $state) {
 
                 $scope.toggleAccordion = toggleAccordion;