Start removing old views. Hide unauthed panels. Fixup voting/flagging.

OpenUserJS · Jun 5, 2014 · df552c7 · df552c7
1 parent 4e182b3
commit df552c7
Show file tree

Hide file tree

Showing 24 changed files with 63 additions and 290 deletions.
diff --git a/controllers/script.js b/controllers/script.js
@@ -118,9 +118,10 @@ var getScriptPageTasks = function(options) {
 
   // Setup the voting UI
   tasks.push(function (callback) {
-    var voteUrl = script.url + '/vote/';
-    options.voteUpUrl = voteUrl + 'up';
-    options.voteDownUrl = voteUrl + 'down';
+    var voteUrl = '/vote' + script.scriptPageUrl;
+    options.voteUpUrl = voteUrl + '/up';
+    options.voteDownUrl = voteUrl + '/down';
+    options.unvoteUrl = voteUrl + '/unvote';
 
     options.voteable = false;
     options.votedUp = false;
@@ -141,10 +142,8 @@ var getScriptPageTasks = function(options) {
       if (voteModel) {
         if (voteModel.vote) {
           options.votedUp = true;
-          options.voteUpUrl = voteUrl + 'unvote';
         } else {
           options.votedDown = true;
-          options.voteDownUrl = voteUrl + 'unvote';
         }
       }
 

diff --git a/controllers/user.js b/controllers/user.js
@@ -31,12 +31,13 @@ var setupFlagUserUITask = function(options) {
   return function(callback) {
     var flagUrl = '/flag/users/' + user.name;
 
-    // Can't flag when not logged in or when user owns the script.
-    if (!user || options.isOwner) {
+    // Can't flag when not logged in or when is authedUser.
+    if (!authedUser || options.isYou) {
       callback();
       return;
     }
     flagLib.flaggable(User, user, authedUser, function (canFlag, author, flag) {
+      console.log(canFlag, author, flag);
       if (flag) {
         flagUrl += '/unflag';
         options.flagged = true;

diff --git a/libs/flag.js b/libs/flag.js
@@ -8,10 +8,9 @@ var maxKarma = 10;
 // This is heavily commented so that my logic and
 // reasoning is documented for myself and others.
 function flaggable (model, content, user, callback) {
-  // Not logged in or role is above moderator
-  // No one above a moderator is part of the moderation system
-  // since they can just remove content directly
-  if (!user || user.role < 3) { return callback(false); }
+  // Not logged in.
+  if (!user) { return callback(false); }
+
 
   // You can't flag yourself
   // Only someone less than an admin can be flagged
@@ -69,7 +68,7 @@ function getThreshold (model, content, author, callback) {
   var threshold = thresholds[model.modelName] * (author.role < 4 ? 2 : 1);
 
   // Calculate karma and add it to the threshold
-  getKarma(author, maxKarma, function (karma) { 
+  getKarma(author, maxKarma, function (karma) {
     return callback(threshold + karma);
   });
 }

diff --git a/libs/modelParser.js b/libs/modelParser.js
@@ -73,8 +73,8 @@ exports.parseScript = function(scriptData) {
   var script = scriptData.toObject ? scriptData.toObject() : scriptData;
 
   // Script Good/Bad bar.
-  // script.votes = upvotes
-  // script.flags = downvotes + flags?
+  // script.votes = count(upvotes) + count(downvotes)
+  // script.flags = flags - count(upvotes)
   var sumVotesAndFlags = script.votes + script.flags;
   var votesRatio = sumVotesAndFlags > 0 ? script.votes / sumVotesAndFlags : 0;
   var flagsRatio = sumVotesAndFlags > 0 ? script.flags / sumVotesAndFlags : 0;

diff --git a/libs/modelQuery.js b/libs/modelQuery.js
@@ -116,20 +116,28 @@ var parseUserSearchQuery = function(userListQuery, query) {
 exports.parseCommentSearchQuery = parseCommentSearchQuery;
 
 
-var applyHideFlaggedFromModelListQuery = function(modelListQuery, options) {
+var applyModelListQueryFlaggedFilter = function(modelListQuery, options, flaggedQuery) {
   // Only list flagged items if authedUser >= moderator or if authedUser owns the item.
   if (options.isYou || options.isMod) {
-    // Show
+    // Mod
+    if (flaggedQuery) {
+      if (flaggedQuery == 'true') {
+        modelListQuery.find({flagged: true});
+      } else if (flaggedQuery == false) {
+        modelListQuery.find({flagged: {$ne: true}});
+      }
+    }
   } else {
+    // Hide
     // Script.flagged is undefined by default.
-    modelListQuery.find({flagged: {$ne: true}}); 
+    modelListQuery.find({flagged: {$ne: true}});
   }
 };
-exports.applyHideFlaggedFromModelListQuery = applyHideFlaggedFromModelListQuery;
+exports.applyModelListQueryFlaggedFilter = applyModelListQueryFlaggedFilter;
 
 var applyModelListQueryDefaults = function(modelListQuery, options, req, defaultOptions) {
   // flagged
-  applyHideFlaggedFromModelListQuery(modelListQuery, options);
+  applyModelListQueryFlaggedFilter(modelListQuery, options, req.query.flagged);
 
   // Search
   if (req.query.q) {

diff --git a/views/404.html b/views/404.html
diff --git a/views/apiAdmin.html b/views/apiAdmin.html
diff --git a/views/commentsList.html b/views/commentsList.html
diff --git a/views/discussion.html b/views/discussion.html
diff --git a/views/discussionCreate.html b/views/discussionCreate.html
diff --git a/views/discussions.html b/views/discussions.html
diff --git a/views/discussionsList.html b/views/discussionsList.html
diff --git a/views/includes/flagModelSnippet.html b/views/includes/flagModelSnippet.html
@@ -0,0 +1,14 @@
+<div class="form-horizontal">
+  <div class="form-group">
+    <label class="col-sm-4 control-label">Flags</label>
+    <div class="col-sm-8">
+      <p class="form-control-static">{{flags}}</p>
+    </div>
+  </div>
+  <div class="form-group">
+    <label class="col-sm-4 control-label">Threshold</label>
+    <div class="col-sm-8">
+      <p class="form-control-static">{{#threshold}}{{threshold}}{{/threshold}}</p>
+    </div>
+  </div>
+</div>
diff --git a/views/includes/scriptAdminToolsPanel.html b/views/includes/scriptAdminToolsPanel.html
@@ -0,0 +1,2 @@
+{{#isAdmin}}
+{{/isAdmin}}
diff --git a/views/includes/scriptAuthorToolsPanel.html b/views/includes/scriptAuthorToolsPanel.html
@@ -1,11 +1,13 @@
+{{#isOwner}}
 <div class="panel panel-default">
   <div class="panel-heading">
     <div class="panel-title">Author Tools</div>
   </div>
   <div class="panel-body">
     <ul class="nav nav-pills nav-justified">
-      <li><a href="{{{scriptEditMetadataPageUrl}}}" class=""><i class="fa fa-edit"></i> Edit Script Info</a></li>
-      <li><a href="{{{scruptEditSourcePageUrl}}}" class=""><i class="fa fa-file-text"></i> Edit Script</a></li>
+      <li><a href="{{{script.scriptEditMetadataPageUrl}}}" class=""><i class="fa fa-edit"></i> Edit Script Info</a></li>
+      <li><a href="{{{script.scriptEditSourcePageUrl}}}" class=""><i class="fa fa-file-text"></i> Edit Script</a></li>
     </ul>
   </div>
 </div>
+{{/isOwner}}
diff --git a/views/includes/scriptModToolsPanel.html b/views/includes/scriptModToolsPanel.html
@@ -1,10 +1,10 @@
+{{#isMod}}
 <div class="panel panel-default">
   <div class="panel-heading">
     <div class="panel-title">Mod Tools</div>
   </div>
   <div class="panel-body">
-    <ul class="nav nav-pills nav-justified">
-      <li><a href="#" class="disabled"><i class="fa fa-trash-o"></i> Spam</a></li>
-    </ul>
+    {{> includes/flagModelSnippet.html }}
   </div>
 </div>
+{{/isMod}}
diff --git a/views/includes/scriptSidePanel.html b/views/includes/scriptSidePanel.html
@@ -1,6 +1,4 @@
-{{#script}}
 {{> includes/scriptUserToolsPanel.html }}
 {{> includes/scriptAuthorToolsPanel.html }}
 {{> includes/scriptModToolsPanel.html }}
 {{> includes/scriptAdminToolsPanel.html }}
-{{/script}}
diff --git a/views/includes/scriptUserToolsPanel.html b/views/includes/scriptUserToolsPanel.html
@@ -2,13 +2,13 @@
   <div class="panel-body">
     <div class="row">
         <div class="pull-left vote-area">
-          <a href="{{{voteUpUrl}}}" class="btn-vote {{^voteable}}disabled{{/voteable}} {{#votedUp}}active{{/votedUp}}"><i class="fa fa-2x fa-caret-up"></i></a>
-          <a href="{{{voteDownUrl}}}" class="btn-vote {{^voteable}}disabled{{/voteable}} {{#votedDown}}active{{/votedDown}}"><i class="fa fa-2x fa-caret-down"></i></a>
+          <a href="{{^votedUp}}{{{voteUpUrl}}}{{/votedUp}}{{#votedUp}}{{{unvoteUrl}}}{{/votedUp}}" class="btn-vote {{^voteable}}disabled{{/voteable}} {{#votedUp}}active{{/votedUp}}"><i class="fa fa-2x fa-caret-up"></i></a>
+          <a href="{{^votedDown}}{{{voteDownUrl}}}{{/votedDown}}{{#votedDown}}{{{unvoteUrl}}}{{/votedDown}}" class="btn-vote {{^voteable}}disabled{{/voteable}} {{#votedDown}}active{{/votedDown}}"><i class="fa fa-2x fa-caret-down"></i></a>
         </div>
-        <p><i class="fa fa-fw fa-signal"></i> <b>Rating:</b> {{rating}}</p>
+        <p><i class="fa fa-fw fa-signal"></i> <b>Rating:</b> {{script.rating}}</p>
         <div class="progress">
-          <div style="width: {{votesPercent}}%" class="progress-bar progress-bar-good">{{#votes}}{{votes}}<i class="fa fa-fw fa-caret-up"></i>{{/votes}}</div>
-          <div style="width: {{flagsPercent}}%" class="progress-bar progress-bar-danger">{{#flags}}{{flags}}<i class="fa fa-fw fa-caret-down"></i>{{/flags}}</div>
+          <div style="width: {{script.votesPercent}}%" class="progress-bar progress-bar-good">{{#script.votes}}{{script.votes}}<i class="fa fa-fw fa-caret-up"></i>{{/script.votes}}</div>
+          <div style="width: {{script.flagsPercent}}%" class="progress-bar progress-bar-danger">{{#script.flags}}{{script.flags}}<i class="fa fa-fw fa-caret-down"></i>{{/script.flags}}</div>
         </div>
     </div>
     <ul class="nav nav-pills nav-justified">

diff --git a/views/includes/userModToolsPanel.html b/views/includes/userModToolsPanel.html
@@ -7,9 +7,7 @@
     </div>
   </div>
   <div class="panel-body">
-    <ul class="nav nav-pills nav-justified">
-      <li><a href="{{{flagUrl}}}" class="{{^canFlag}}disabled{{/canFlag}}"><i class="fa fa-flag{{^flagged}}-o{{/flagged}}"></i> {{#flagged}}Unflag{{/flagged}}{{^flagged}}Flag{{/flagged}}</a></a></li>
-    </ul>
+    {{> includes/flagModelSnippet.html }}
   </div>
 </div>
 {{/modTools}}
diff --git a/views/includes/userSidePanel.html b/views/includes/userSidePanel.html
@@ -1,3 +1,4 @@
 {{> includes/userToolsPanel.html }}
+{{> includes/userUserToolsPanel.html }}
 {{> includes/userModToolsPanel.html }}
 {{> includes/userAdminToolsPanel.html }}
diff --git a/views/includes/userUserToolsPanel.html b/views/includes/userUserToolsPanel.html
@@ -0,0 +1,7 @@
+<div class="panel panel-default">
+  <div class="panel-body">
+    <ul class="nav nav-pills nav-justified">
+      <li><a href="{{{flagUrl}}}" class="{{^canFlag}}disabled{{/canFlag}}"><i class="fa fa-flag{{^flagged}}-o{{/flagged}}"></i> {{#flagged}}Unflag{{/flagged}}{{^flagged}}Flag{{/flagged}}</a></a></li>
+    </ul>
+  </div>
+</div>
diff --git a/views/index.html b/views/index.html