Преглед на файлове

added toast message to feedback

Akira Laine преди 9 години
родител
ревизия
e3a36bed21
променени са 3 файла, в които са добавени 18 реда и са изтрити 14 реда
  1. 12 7
      app/client/scripts/events.js
  2. 4 5
      app/client/templates/feedback.html
  3. 2 2
      app/server/server.js

+ 12 - 7
app/client/scripts/events.js

@@ -226,13 +226,18 @@ Template.admin.events({
 
 Template.feedback.events({
     "click #feedback_submit": function(){
-        if($("#feedback_message").val().length !== 0 && $("#feedback_message").hasClass("invalid") === false){
-            Meteor.call("sendFeedback", $("#feedback_message").val());
-            $("#feedback_message").val("");
-            $("#modal1").closeModal()
-        } else{
-            var $toastContent = $('<span><strong>Feedback not sent.</strong> Possible reasons include:<ul><li>- Empty Feedback Message</li><li>- Feedback is more than 500 words</li></ul></span>');
-            Materialize.toast($toastContent, 8000);
+        if(Meteor.userId()){
+            if($("#feedback_message").val().length !== 0 && $("#feedback_message").hasClass("invalid") === false){
+                Meteor.call("sendFeedback", $("#feedback_message").val());
+                $("#feedback_message").val("");
+                $("#modal1").closeModal()
+            } else{
+                var $toastContent = $('<span><strong>Feedback not sent.</strong> Possible reasons include:<ul><li>- Empty Feedback Message</li><li>- Feedback is more than 500 words</li></ul></span>');
+                Materialize.toast($toastContent, 8000);
+            }
+        } else {
+            var $toastContent = $('<span><strong>Feedback not sent.</strong> You must be logged in.</span>');
+            Materialize.toast($toastContent, 4000);
         }
     },
     "click .upvote": function(){

+ 4 - 5
app/client/templates/feedback.html

@@ -2,11 +2,10 @@
     {{> header}}
     <main>
         <div class="center-align">
-        <h3 class="black-text thin">Feedback</h3>
-        <a class="waves-effect waves-light btn modal-trigger feedback-btn" href="#modal1">Send New Feedback</a>
-        <a id="editModal" class="modal-trigger" href="#editFeedback" style="display:none"></a>
+            <h3 class="black-text thin">Feedback</h3>
+            <a class="waves-effect waves-light btn modal-trigger feedback-btn" href="#modal1">Send New Feedback</a>
+            <a id="editModal" class="modal-trigger" href="#editFeedback" style="display:none"></a>
         </div>
-
         <div class="row">
             {{#each feedback}}
                 <div class="col s12 m4">
@@ -63,4 +62,4 @@
             $('.modal-trigger').leanModal();
         });
     </script>
-</template>
+</template>

+ 2 - 2
app/server/server.js

@@ -1229,8 +1229,8 @@ Meteor.methods({
                     Feedback.insert({
                         "username": Meteor.user().profile.username,
                         "message": message,
-                        upvotes: 0,
-                        upvotedBy: []
+                        "upvotes": 0,
+                        "upvotedBy": []
                     })
                 }
             });