save 2

thmslmr · Jun 22, 2016 · 2ce3843 · 2ce3843
1 parent bfcd7b7
commit 2ce3843
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 48 deletions.
diff --git a/client/animation/animation.js b/client/animation/animation.js
@@ -33,23 +33,6 @@ Template.inbox.uihooks({
 
 });
 
-// Template.inbox.uihooks({
-//
-//     '.message__layout *': {
-//         insert: function(node, next, tp1){
-//             conv = Router.current().url.indexOf('conversation') > -1 ? true : false
-//             $(node).insertBefore(next);
-//             if(conv){
-//                 $(node).velocity('transition.slideLeftBigIn',{
-//                     duration: 500
-//                 });
-//             }
-//         },
-//
-//         remove:
-//     }
-// })
-
 Template.conversation.uihooks({
     '.message__layout': {
         insert: function(node, next, tp1){

diff --git a/client/controllers/index.js b/client/controllers/index.js
@@ -1,7 +1,10 @@
 // Fonction exécutée au rendu du template index
 Template.index.onRendered(function(){
-    if( Meteor.userId() )
-    Meteor.subscribe('userData');
+    this.autorun(function(){
+        if( Meteor.userId() )
+        Meteor.subscribe('userData');
+    })
+
 
     // Initialisation de Google Maps (tout ce passe ici pour la map, aller voir dans js/googlemap.js)
     initGoogleMaps();

diff --git a/client/controllers/lesson.js b/client/controllers/lesson.js
@@ -12,7 +12,7 @@ Template.lesson.onRendered(function(){
         directionsService.route({
             origin : new google.maps.LatLng(Session.get('userLatLng')[0], Session.get('userLatLng')[1]),
             destination : new google.maps.LatLng(lessonLocation[1], lessonLocation[0]),
-            travelMode : google.maps.TravelMode.BICYCLING,
+            travelMode : google.maps.TravelMode.DRIVING,
         }, function(result, status) {
             if (status == google.maps.DirectionsStatus.OK) {
                 data = result.routes[0].legs[0];

diff --git a/client/controllers/profile.js b/client/controllers/profile.js
@@ -16,7 +16,6 @@ Template.profile.helpers({
 
     'userBadge' : function(){
         nb = Lessons.find({'private.owner' : this._id}).count();
-        console.log(nb);
         level = 1;
 
             if(nb>49){

diff --git a/client/controllers/register.js b/client/controllers/register.js
@@ -3,17 +3,13 @@ Template.register.events({
         Meteor.loginWithFacebook({loginStyle : 'redirect'}, function(err){
             if(err){
                 console.log(err.reason);
-            }else{
-                Meteor.subscribe('userData');
             }
         });
     },
     'click .js-google' : function(evt){
         Meteor.loginWithGoogle({loginStyle : 'redirect'}, function(err){
             if(err){
                 console.log(err.reason);
-            }else{
-                Meteor.subscribe('userData');
             }
         });
     }

diff --git a/client/template/profile.html b/client/template/profile.html
@@ -45,33 +45,42 @@ <h2 class="step-title">{{public.title}}</h2>
                 </div>
             </div>
             <div class="right-part">
-                {{#each userNotices.array}}
-                <div class="commentary">
-                    <div class="commentary__user">
-                        <div class="commentary__user--picture">
-                            <img src="{{userPicture user}}" />
+                {{#with userNotices _id}}
+                    {{#if noNotices}}
+                        <div class="nocommentary">
+                            <img src="/img/empty_commentary.svg"/>
                         </div>
-                        <p class="commentary__user--name">{{userName user}}</p>
-                    </div>
-                    <div class="commentary__content">
-                        <p class="commentary__content--paragraph">
-                            {{comment}}
-                        </p>
-                        <div class="commentary__content--footer">
-                            <p class="commentary__content--date">{{dateFromNow createdAt}}</p>
-                            <div class="commentary__content--rating">
-                                <p class="rating-mark">
-                                {{#with percentNotice}}
-                                        {{> notice}}
-                                {{/with}}
-                                {{grade}} / 5
+                    {{/if}}
+                {{/with}}
+                {{#with userNotices _id}}
+                    {{#each array}}
+                        <div class="commentary">
+                            <div class="commentary__user">
+                                <div class="commentary__user--picture">
+                                    <img src="{{userPicture user}}" />
+                                </div>
+                                <p class="commentary__user--name">{{userName user}}</p>
+                            </div>
+                            <div class="commentary__content">
+                                <p class="commentary__content--paragraph">
+                                    {{user}} {{comment}}
                                 </p>
+                                <div class="commentary__content--footer">
+                                    <p class="commentary__content--date">{{dateFromNow createdAt}}</p>
+                                    <div class="commentary__content--rating">
+                                        <p class="rating-mark">
+                                        {{#with percentNotice}}
+                                                {{> notice}}
+                                        {{/with}}
+                                        {{grade}} / 5
+                                        </p>
+                                    </div>
+                                </div>
+                                <div class="commentary__limit"></div>
                             </div>
                         </div>
-                        <div class="commentary__limit"></div>
-                    </div>
-                </div>
-                {{/each}}
+                    {{/each}}
+                {{/with}}
             </div>
         </div>
         <section class="profil__footer">