Merge branch 'master' into feature-374

wirmar · Oct 31, 2019 · cf165a5 · cf165a5
2 parents 8ef18e0 + f982a25
commit cf165a5
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 25 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "jquery-ui": "^1.12.1",
     "jquery-ui-dist": "^1.12.1",
     "merge-images": "^1.1.0",
-    "mongoose": "^5.7.4",
+    "mongoose": "^5.7.5",
     "mongoose-seed": "^0.6.0",
     "node-fetch": "^2.6.0",
     "node-schedule": "^1.3.2",

diff --git a/routes/cube_routes.js b/routes/cube_routes.js
@@ -2472,16 +2472,32 @@ router.get('/deck/:id', function(req, res) {
           req.flash('danger', 'Cube not found');
           res.status(404).render('misc/404', {});
         } else {
-          var owner_name = "Unknown";
-          var drafter_name = "Anonymous";
-          User.findById(deck.owner, function(err, drafter) {
-            if (drafter) {
-              drafter_name = drafter.username;
+          let owner = {
+            name: 'Unknown',
+            id: null,
+            profileUrl: null
+          };
+
+          let drafter = {
+            name: 'Anonymous',
+            id: null,
+            profileUrl: null
+          };
+
+          User.findById(deck.owner, function(err, deckUser) {
+            if (deckUser) {
+              drafter.name = deckUser.username;
+              drafter.id = deckUser._id;
+              drafter.profileUrl = `/user/view/${deckUser._id}`;
             }
-            User.findById(cube.owner, function(err, owner) {
-              if (owner) {
-                owner_name = owner.username;
+
+            User.findById(cube.owner, function(err, cubeUser) {
+              if (cubeUser) {
+                owner.name = cubeUser.username;
+                owner.id = cubeUser._id;
+                owner.profileUrl = `/user/view/${cubeUser._id}`;
               }
+
               var player_deck = [];
               var bot_decks = [];
               if (typeof deck.cards[deck.cards.length - 1][0] === 'object') {
@@ -2514,10 +2530,10 @@ router.get('/deck/:id', function(req, res) {
                   oldformat: true,
                   cube: cube,
                   cube_id: get_cube_id(cube),
-                  owner: owner_name,
+                  owner: owner,
                   activeLink: 'playtest',
-                  title: `${abbreviate(cube.name)} - ${drafter_name}'s deck`,
-                  drafter: drafter_name,
+                  title: `${abbreviate(cube.name)} - ${drafter.name}'s deck`,
+                  drafter: drafter,
                   cards: player_deck,
                   bot_decks: bot_decks,
                   bots: bot_names,
@@ -2559,10 +2575,10 @@ router.get('/deck/:id', function(req, res) {
                   oldformat: false,
                   cube: cube,
                   cube_id: get_cube_id(cube),
-                  owner: owner_name,
+                  owner: owner,
                   activeLink: 'playtest',
-                  title: `${abbreviate(cube.name)} - ${drafter_name}'s deck`,
-                  drafter: drafter_name,
+                  title: `${abbreviate(cube.name)} - ${drafter.name}'s deck`,
+                  drafter: drafter,
                   deck: JSON.stringify(deck.playerdeck),
                   bot_decks: bot_decks,
                   bots: bot_names,

diff --git a/src/components/TypeAnalysis.js b/src/components/TypeAnalysis.js
@@ -36,9 +36,16 @@ const TypeAnalysis = ({ typeByColor, ...props }) => (
           {types.map(type =>
             <tr>
               <th scope="row">{type}</th>
-              {colors.map(([name, path, _]) =>
-                <td>{typeByColor[type][path]}</td>
-              )}
+              {colors.map(([name, path, _]) => {
+                count = typeByColor[type][path];
+                color_total = typeByColor['Total'];
+                if (name !== 'Total' && path !== 'Total' && count > 1 && color_total > count) {
+                  percent = Number.parseFloat(count / color_total * 100.0).toFixed(1);
+                  return <td>{count}<span class="percent">{percent}%</span></td>;
+                } else {
+                  return <td>{count}</td>;
+                }
+              })}
             </tr>
           )}
         </tbody>

diff --git a/views/cube/cube_deck.pug b/views/cube/cube_deck.pug
@@ -6,7 +6,11 @@ block cube_content
   br
   if oldformat
     .container
-      h4 Drafted by #{drafter}
+      if drafter.profileUrl
+        h4 Drafted by 
+          a(href=drafter.profileUrl) #{drafter.name}
+      else
+        h4 Drafted by #{drafter.name}
       br
       .row
         each card, i in cards
@@ -15,7 +19,11 @@ block cube_content
   else
     .card.card-hover#deckhover
       .card-header
-        h4 Drafted by #{drafter}
+        if drafter.profileUrl
+          h4 Drafted by 
+            a(href=drafter.profileUrl) #{drafter.name}
+        else
+          h4 Drafted by #{drafter.name}
         span#customImageDisplayMenuItem
           input#customImageDisplayToggle(type='checkbox')
           label(for='customImageDisplayToggle') Show Custom Images

diff --git a/views/cube/cube_samplepack.pug b/views/cube/cube_samplepack.pug
@@ -9,8 +9,9 @@ block cube_content
         .row
           .col-md-6
             h5.card-title Sample Pack
-          .col-md-6
-            a.float-right(href=`/cube/samplepackimage/${cube_id}/${seed}`) Get Image
+          .col-md-6.text-right
+            a.btn.btn-success.mr-2(href=`/cube/samplepack/${cube_id}`) New Pack
+            a.btn.btn-success(href=`/cube/samplepackimage/${cube_id}/${seed}`) Get Image
       .card-body
         .samplepack.row
           if pack