all features ready.... BOUYAAAAAA

TaskOverflow · Mar 15, 2017 · fed55bb · fed55bb
1 parent f0b9fab
commit fed55bb
Show file tree

Hide file tree

Showing 15 changed files with 511 additions and 170 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/app.js b/app/app.js
@@ -19,6 +19,7 @@ angular.module('TaskOverflowApp', [
     $rootScope.SERVER_URL="http://localhost:8080/";
     $rootScope.CONF_SERVER_URL="http://localhost:666/";
     $rootScope.FEATURES={};
+    $rootScope.HEALTHCHECK={};
 })
 
 .config(
@@ -86,7 +87,7 @@ angular.module('TaskOverflowApp', [
         badges_superman_desc: 'Get 100 points from gamification.',
         badges_hercule_desc: 'Get 50 points from gamification.',
         badges_nbone_desc: 'Write your first message.',
-
+        stupid_question: 'Do you like cats?',
         user_username_label: 'Username',
         user_password_label: 'Password',
 
@@ -159,7 +160,7 @@ angular.module('TaskOverflowApp', [
         myMessage_content_label: 'Contenu',
         answerMessage_content_label: 'Contenu',
         questionMessage_content_label: 'Contenu',
-
+        stupid_question: 'Aimez-vous les chats?',
         profile_firstname_label: 'Prénom',
         profile_lastname_label: 'Nom',
         profile_email_label: 'Email',
@@ -177,4 +178,13 @@ angular.module('TaskOverflowApp', [
     return function(items) {
             return items? items.slice().reverse() : [];
     };
-});
+})
+
+.filter('capitalize', function() {
+    return function(input, scope) {
+            if (input!=null)
+                    input = input.toLowerCase();
+            return input.substring(0,1).toUpperCase()+input.substring(1);
+    }
+})
+;
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -24,6 +24,12 @@
     height: auto;
 }
 
+
+.cat {
+    width: 100%;
+    height: auto;
+}
+
 .fix-image {
     height: 64px;
     width: auto;

diff --git a/app/badge/badge.html b/app/badge/badge.html
@@ -1,5 +1,5 @@
 <div class="container-fluid">
-    <section class="row">
+    <section class="row" ng-show="isAvailable('badge')">
         <h1 class="col-sm-offset-2 page-title">{{ "home_nav_badges" | translate }}</h1>
         <span ng-repeat="badge in badges | reverse" ng-include src="'/badge/displayBadge'"></span>
     </section>

diff --git a/app/badge/badge.js b/app/badge/badge.js
@@ -15,13 +15,17 @@ angular.module('TaskOverflowApp.badge', ['ngRoute'])
     ;
 }])
 
-.controller('BadgeCtrl', function ( $scope, $location, $rootScope ) {
+.controller('BadgeCtrl', function ( $scope, $location, $http, $rootScope, Features ) {
     $scope.bob = "Je m'appelle Bob.";
 
     $http.get($rootScope.SERVER_URL+'badge').
     then(function(response) {
         $scope.badges = response.data;
     });
+
+    $scope.isAvailable = function(feature) {
+        return Features.isAvailable(feature);
+    };
 })
 
 .controller('BadgeShowCtrl', function ( $scope, $location, $http, $routeParams, $rootScope ) {

diff --git a/app/index.html b/app/index.html
@@ -51,7 +51,7 @@
             <li><a href="/question" ng-show="session.isAvailable('question')" translate="home_nav_questions"></a></li>
             <li><a href="/tag" ng-show="session.isAvailable('tag')" translate="home_nav_tags"></a></li>
             <li><a href="/badge" ng-show="session.isAvailable('badge')" translate="home_nav_badges"></a></li>
-            <li><a href="/user" ng-show="session.isAvailable('user')" translate="home_nav_users"></a></li>
+            <li><a href="/user" translate="home_nav_users"></a></li>
 
             <li ng-if="!session.isLog()" ng-show="session.isAvailable('user')"><a href="/register" translate="home_nav_signin"></a></li>
             <li ng-if="!session.isLog()" ng-show="session.isAvailable('user')"><a href="/login" translate="home_nav_login"></a></li>

diff --git a/app/question/question.html b/app/question/question.html
@@ -5,7 +5,7 @@ <h1 class="col-sm-offset-1 col-xs-10">{{ 'home_welcome' | translate }}</h1>
         <p class="col-xs-12 col-sm-offset-1 col-sm-10 text-justify">{{ 'home_presentation' | translate }}</p>
 
         <h1 class="col-sm-offset-2 col-xs-8 page-title">{{ 'home_nav_questions' | translate }}</h1>
-        <div class="col-xs-offset-1 col-xs-10">
+        <div class="col-xs-offset-1 col-xs-10" ng-show="isAvailable('question')">
             <table class="table">
                 <thead>
                 <tr>
@@ -25,6 +25,10 @@ <h1 class="col-sm-offset-2 col-xs-8 page-title">{{ 'home_nav_questions' | transl
             </table>
             <div ></div>
         </div>
+        <div class="col-xs-offset-1 col-xs-10" ng-show="!isAvailable('question')">
+            <h2>{{'stupid_question'|translate}}</h2>
+            <img class="cat" src="http://thecatapi.com/api/images/get?format=src&type=gif"/>
+        </div>
 
     </section>
 </div>
diff --git a/app/question/question.js b/app/question/question.js
@@ -23,14 +23,18 @@ angular.module('TaskOverflowApp.question', ['ngRoute'])
         ;
     }])
 
-    .controller('QuestionCtrl', function ( $scope, $location, $http, $rootScope ) {
+    .controller('QuestionCtrl', function ( $scope, $location, $http, $rootScope, Features ) {
         $scope.bob = "Je m'appelle Bob.";
         $scope.questions = [];
 
         $http.get($rootScope.SERVER_URL+'question').
         then(function(response) {
             $scope.questions = response.data;
         });
+
+        $scope.isAvailable = function(feature) {
+            return Features.isAvailable(feature);
+        };
     })
 
     .controller('QuestionCreateCtrl', function ( $scope, $location, $http, $routeParams, $window, Session, $route, $rootScope ) {

diff --git a/app/session/session.js b/app/session/session.js
@@ -52,8 +52,19 @@ angular.module('TaskOverflowApp.session', ['ngRoute'])
             });
         }
     })
-    .controller('SessionCtrl', function ( $scope, $location, $http, $window, $rootScope, Features ) {
+    .controller('SessionCtrl', function ( $scope, $location, $http, $window, $rootScope, $interval, Features ) {
         var session = this;
+        var services = ['question','user','tag','badge'];
+
+        for(var i = 0 ; i < services.length ; ++i)
+            Features.check(services[i]);
+
+        $interval( function(services){
+            console.log("Service availability update");
+            for(var i = 0 ; i < services.length ; ++i)
+                Features.check(services[i]);
+
+        }.bind(null,services), 5000);
 
         session.userid = function () {
             return $window.sessionStorage.userid == undefined ? null : $window.sessionStorage.userid;
@@ -88,11 +99,6 @@ angular.module('TaskOverflowApp.session', ['ngRoute'])
             return Features.isAvailable(feature);
         };
 
-        session.debug = function () {
-            console.log("COUCOU");
-            console.log($rootScope.FEATURES);
-        }
-
     })
 
     .service('Session', function( $location, $http, $window ){

diff --git a/app/tag/tag.html b/app/tag/tag.html
@@ -1,5 +1,5 @@
 <div class="container-fluid">
-    <section class="row">
+    <section class="row" ng-show="isAvailable('tag')">
         <h1 class="col-sm-offset-2 page-title">{{ "home_nav_tags" | translate }}</h1>
 
         <div class="col-sm-offset-2 col-sm-4 col-xs-12">

diff --git a/app/tag/tag.js b/app/tag/tag.js
@@ -15,7 +15,7 @@ angular.module('TaskOverflowApp.tag', ['ngRoute'])
     ;
 }])
 
-.controller('TagCtrl', function ( $scope, $location, $http, $rootScope ) {
+.controller('TagCtrl', function ( $scope, $location, $http, $rootScope, Features ) {
     $scope.bob = "Je m'appelle Bob.";
 
     $scope.tags1 = [];
@@ -33,6 +33,10 @@ angular.module('TaskOverflowApp.tag', ['ngRoute'])
             side = !side;
         }
     });
+
+    $scope.isAvailable = function(feature) {
+        return Features.isAvailable(feature);
+    };
 })
 
 .controller('TagShowCtrl', function ( $scope, $location, $http, $routeParams, $rootScope ) {

diff --git a/app/user/displayRandomUser.html b/app/user/displayRandomUser.html
@@ -0,0 +1,10 @@
+<div class="jumbotron">
+    <div class="row">
+        <div class="col-xs-12 text-center">
+            <img class="profil-image" src="{{user.picture.medium}}" />
+        </div>
+        <div class="col-xs-12">
+            <h2 class="text-center">{{user.name.first | capitalize}} {{user.name.last | capitalize}}</h2>
+        </div>
+    </div>
+</div>
diff --git a/app/user/user.html b/app/user/user.html
@@ -1,8 +1,13 @@
 <div class="container-fluid">
-        <h1 class="col-sm-offset-2 page-title">{{'home_nav_users' | translate}}</h1>
-        <div class="col-sm-offset-2 col-xs-offset-1 col-sm-8 col-xs-10">
-            <div ng-repeat="user in users" class="col-sm-4 col-xs-12">
-                <div ng-include="'/user/displaySimpleUser'"></div>
-            </div>
+    <h1 class="col-sm-offset-2 page-title">{{'home_nav_users' | translate}}</h1>
+    <div class="col-sm-offset-2 col-xs-offset-1 col-sm-8 col-xs-10" ng-show="isAvailable('user')" >
+        <div ng-repeat="user in users" class="col-sm-4 col-xs-12">
+            <div ng-include="'/user/displaySimpleUser'"></div>
         </div>
+    </div>
+    <div class="col-sm-offset-2 col-xs-offset-1 col-sm-8 col-xs-10" ng-show="!isAvailable('user')" >
+        <div ng-repeat="user in randomUsers" class="col-sm-6 col-xs-12">
+            <div ng-include="'/user/displayRandomUser'"></div>
+        </div>
+    </div>
 </div>
diff --git a/app/user/user.js b/app/user/user.js
@@ -19,13 +19,21 @@ angular.module('TaskOverflowApp.user', ['ngRoute'])
         ;
     }])
 
-    .controller('UserCtrl', function ( $scope, $location, $http, Session, $rootScope ) {
+    .controller('UserCtrl', function ( $scope, $location, $http, Session, $rootScope, Features ) {
         $scope.bob = "Je m'appelle Bob.";
 
+        $scope.isAvailable = function(feature) {
+            return Features.isAvailable(feature);
+        };
+
         $http.get($rootScope.SERVER_URL+'user').
         then(function(response) {
             $scope.users = response.data;
         });
+        $http.get('https://api.randomuser.me/?results=6').
+        then(function(response) {
+            $scope.randomUsers = response.data.results;
+        });
     })
 
     .controller('UserShowCtrl', function ( $scope, $location, $http, $routeParams, $window, $route, Session, $rootScope ) {