Notifications

Geoffrey PREUD'HOMME
1 parent 338930e1
Showing 7 changed files with 74 additions and 28 deletions Show diff stats
bower.json
public/css/style.css
public/js/app.js
public/js/controllers/MembreCtrl.js
public/js/services/NotifyServ.js
public/js/services/SessionServ.js
public/views/index.html
 {
-    "name": "ci-site",
-    "version": "0.0.1",
-    "dependencies": {
-        "font-awesome": "latest",
-        "angular": "latest",
-        "angular-route": "latest",
-        "bootswatch-dist": "3.3.2-cerulean",
-        "jsencrypt": "~2.1.0"
-    }
+  "name": "ci-site",
+  "version": "0.0.1",
+  "dependencies": {
+    "font-awesome": "latest",
+    "angular": "latest",
+    "angular-route": "latest",
+    "bootswatch-dist": "3.3.2-cerulean",
+    "jsencrypt": "~2.1.0",
+    "animate.css": "~3.2.6",
+    "remarkable-bootstrap-notify": "~3.0.0"
+  }
 }
@@ -9,3 +9,7 @@ body {
 #membre-list {
     width: 90%;
 }
+
+[data-notify="progressbar"] {
+    display: none;
+}
-angular.module('ciApp', ['ngRoute', 'appRoutes', 'EncryptServ', 'SessionsServ', 'SessionsCtrl', 'ConnectCtrl', 'MembreCtrl']);
+angular.module('ciApp', ['ngRoute', 'appRoutes', 'NotifyServ', 'EncryptServ', 'SessionsServ', 'SessionsCtrl', 'ConnectCtrl', 'MembreCtrl']);
-angular.module('MembreCtrl', []).controller('MembreCtrl', ['$scope', '$http', 'SessionServ',
-    function ($scope, $http, SessionServ) {
+angular.module('MembreCtrl', []).controller('MembreCtrl', ['$scope', '$http', 'SessionServ', 'NotifyServ',
+    function ($scope, $http, SessionServ, NotifyServ) {
         $scope.formData = {};
  
         $scope.session = SessionServ.cur;
@@ -10,21 +10,20 @@ angular.module(&#39;MembreCtrl&#39;, []).controller(&#39;MembreCtrl&#39;, [&#39;$scope&#39;, &#39;$http&#39;, &#39;S
         $http.get('/api/membres')
             .success(function (data) {
                 $scope.membres = data;
-                console.log(data);
             })
             .error(function (data) {
-                console.log('Error: ' + data);
+                NotifyServ.error("Impossible d'obtenir la liste des membres", data);
             });
  
         $scope.createMembre = function () {
-            console.log('Adding', $scope.formData);
             $http.post('/api/membres', $scope.formData)
                 .success(function (data) {
                     $scope.formData = {};
                     $scope.membres = data;
+                    NotifyServ.success("Membre ajouté");
                 })
                 .error(function (data) {
-                    console.log('Error: ' + data);
+                    NotifyServ.error("Impossible d'ajouter le membre", data);
                 });
         };
  
@@ -32,10 +31,10 @@ angular.module(&#39;MembreCtrl&#39;, []).controller(&#39;MembreCtrl&#39;, [&#39;$scope&#39;, &#39;$http&#39;, &#39;S
             $http.delete('/api/membres/' + id)
                 .success(function (data) {
                     $scope.membres = data;
-                    console.log(data);
+                    NotifyServ.success("Membre supprimé.");
                 })
                 .error(function (data) {
-                    console.log('Error: ' + data);
+                    NotifyServ.error("Impossible de supprimer le membre", data);
                 });
         };
  
@@ -0,0 +1,30 @@
+angular.module('NotifyServ', []).service('NotifyServ', [
+    function () {
+        return {
+            notify: function (type, message) {
+                $.notify({
+                    message: message
+                }, {
+                    type: type,
+                    animate: {
+                        enter: 'animated bounceInDown',
+                        exit: 'animated bounceOutUp'
+                    }
+                });
+            },
+            success: function (message) {
+                this.notify('success', message);
+            },
+            info: function (message) {
+                this.notify('info', message);
+            },
+            warn: function (message) {
+                this.notify('warning', message);
+            },
+            error: function (context, error) {
+                this.notify('danger', context);
+                console.error(context, error);
+            }
+        };
+    }
+]);
-angular.module('SessionsServ', []).service('SessionServ', ['$http', 'EncryptServ',
-    function ($http, EncryptServ) {
+angular.module('SessionsServ', []).service('SessionServ', ['$http', 'EncryptServ', 'NotifyServ',
+    function ($http, EncryptServ, NotifyServ) {
         a = {
             cur: false,
             changeHandlers: [],
@@ -12,9 +12,10 @@ angular.module(&#39;SessionsServ&#39;, []).service(&#39;SessionServ&#39;, [&#39;$http&#39;, &#39;EncryptServ
                 }
             },
             updateSessionInfos: function (data) {
-                console.log("Connection:", data);
                 if (typeof data === 'object') {
                     this.cur = data;
+                } else if (data === 'expired') {
+                    NotifyServ.warn("Votre session a expiré");
                 } else {
                     this.cur = false;
                 }
@@ -43,19 +44,26 @@ angular.module(&#39;SessionsServ&#39;, []).service(&#39;SessionServ&#39;, [&#39;$http&#39;, &#39;EncryptServ
                 EncryptServ.encrypt(data, function (dataCrypt) {
                     $http.post('/api/session', [dataCrypt]).success(function (body) {
                         _this.updateSessionInfos(body);
-                        if (cb) {
-                            if (this.logged) {
+                        if (_this.cur) {
+                            NotifyServ.info("Connecté en tant que <strong>" + _this.cur.nom + "</strong>");
+                            if (cb)
                                 cb(null);
-                            } else {
-                                cb(body);
+                        } else {
+                            if (body === 'invalid') {
+                                NotifyServ.warn("Identifiants invalides");
                             }
+                            if (cb)
+                                cb(body);
                         }
                     });
                 });
             },
             disconnect: function () {
-                this.updateSessionInfos(false);
-                $http.delete('/api/session');
+                _this = this;
+                $http.delete('/api/session').success(function () {
+                    _this.updateSessionInfos(false);
+                    NotifyServ.info("Déconnecté");
+                });
             }
         };
         a.get();
@@ -8,14 +8,17 @@
     <title>Club Informatique de Polytech Lille</title>
     <link rel="stylesheet" href="libs/bootswatch-dist/css/bootstrap.min.css">
     <link rel="stylesheet" href="css/style.css">
+    <link rel="stylesheet" href="libs/animate.css/animate.min.css">
     <script src="libs/jquery/dist/jquery.min.js"></script>
     <script src="libs/angular/angular.min.js"></script>
     <script src="libs/angular-route/angular-route.min.js"></script>
     <script src="libs/angular-bootstrap/ui-bootstrap.min.js"></script>
     <script src="libs/jsencrypt/bin/jsencrypt.min.js"></script>
-    <script src="js/controllers/MembreCtrl.js"></script>
+    <script src="libs/remarkable-bootstrap-notify/bootstrap-notify.min.js"></script>
+    <script src="js/services/NotifyServ.js"></script>
     <script src="js/services/EncryptServ.js"></script>
     <script src="js/services/SessionServ.js"></script>
+    <script src="js/controllers/MembreCtrl.js"></script>
     <script src="js/controllers/SessionCtrl.js"></script>
     <script src="js/controllers/ConnectCtrl.js"></script>
     <script src="js/appRoutes.js"></script>