another commit for issue #62

ontehfritz · Jun 25, 2014 · 9378841 · 9378841
1 parent cc65eee
commit 9378841
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 44 deletions.
diff --git a/src/www.mtgdb.info/www.mtgdb.info.userprefs b/src/www.mtgdb.info/www.mtgdb.info.userprefs
@@ -1,17 +1,24 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="www.mtgdb.info/Views/Deck/Deck.cshtml">
+  <MonoDevelop.Ide.Workbench ActiveDocument="www.mtgdb.info/Helpers/Render.cs">
     <Files>
-      <File FileName="www.mtgdb.info/Views/Card.cshtml" Line="24" Column="6" />
+      <File FileName="www.mtgdb.info/Views/Card.cshtml" Line="1" Column="1" />
       <File FileName="www.mtgdb.info/Views/Deck/Deck.cshtml" Line="28" Column="18" />
       <File FileName="www.mtgdb.info/Modules/DeckViewerModule.cs" Line="1" Column="1" />
-      <File FileName="www.mtgdb.info/Models/Views/DeckModel.cs" Line="7" Column="46" />
+      <File FileName="www.mtgdb.info/Models/Views/DeckModel.cs" Line="1" Column="1" />
       <File FileName="www.mtgdb.info/Models/Views/DecksModel.cs" Line="1" Column="1" />
-      <File FileName="www.mtgdb.info/Models/Deck.cs" Line="114" Column="14" />
-      <File FileName="www.mtgdb.info/Views/_Cards.cshtml" Line="1" Column="76" />
-      <File FileName="www.mtgdb.info/Views/Deck/_Cards.cshtml" Line="2" Column="1" />
+      <File FileName="www.mtgdb.info/Models/Deck.cs" Line="67" Column="53" />
+      <File FileName="www.mtgdb.info/Views/_Cards.cshtml" Line="1" Column="1" />
+      <File FileName="www.mtgdb.info/Views/Deck/_Cards.cshtml" Line="1" Column="1" />
       <File FileName="www.mtgdb.info/Views/_Sets.cshtml" Line="1" Column="1" />
-      <File FileName="www.mtgdb.info/Views/Book.cshtml" Line="50" Column="59" />
+      <File FileName="www.mtgdb.info/Views/Book.cshtml" Line="1" Column="1" />
+      <File FileName="www.mtgdb.info/Helpers/MtgFile.cs" Line="1" Column="1" />
+      <File FileName="www.mtgdb.info/Helpers/Html.cs" Line="1" Column="1" />
+      <File FileName="www.mtgdb.info/Helpers/ErrorUtility.cs" Line="1" Column="1" />
+      <File FileName="www.mtgdb.info/Helpers/Email.cs" Line="1" Column="1" />
+      <File FileName="www.mtgdb.info/Helpers/Bind.cs" Line="1" Column="1" />
+      <File FileName="www.mtgdb.info/Helpers/Render.cs" Line="1" Column="1" />
+      <File FileName="www.mtgdb.info/Content/css/mtgdb.css" Line="735" Column="21" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>

diff --git a/src/www.mtgdb.info/www.mtgdb.info/Content/javascript/mtgdb.info.js b/src/www.mtgdb.info/www.mtgdb.info/Content/javascript/mtgdb.info.js
@@ -108,7 +108,7 @@ $(document).ready(function() {
 
 	$('.label-legality, .set-tab a').tooltip();
 
-	$('.search-result, .binder-card, .my-card, .set-link').popover({trigger:'hover',html:true});
+	$('.search-result, .binder-card, .my-card, .set-link, .deck-card').popover({trigger:'hover',html:true});
 
 	$('#check-yes').change(function(){
 		$chk = $(this).is(':checked');

diff --git a/src/www.mtgdb.info/www.mtgdb.info/Models/Deck.cs b/src/www.mtgdb.info/www.mtgdb.info/Models/Deck.cs
@@ -54,16 +54,7 @@ public Deck ()
                 "Planeswalker"
             });
 
-            Types.Add("land", new List<string>(){
-                "Artifact Land",
-                "Basic Land",
-                "Basic Snow Land",
-                "Land",
-                "Legendary Land",
-                "Legendary Snow Land",
-                "Snow Land"
-            });
-
+
             Types.Add("instant", new List<string>(){
                 "Instant",
                 "Interrupt",
@@ -80,10 +71,35 @@ public Deck ()
                 "Enchant Creature",
                 "Enchant Player",
                 "Enchantment",
-                "Legendary Enchantment"
+                "Legendary Enchantment",
+                "Legendary Enchantment Artifact",
+                "Snow Enchantment",
+                "Tribal Enchantment",
+                "World Enchantment"
             });
 
+            Types.Add("artifact", new List<string>(){
+                "Artifact",
+                "Legendary Artifact",
+                "Snow Artifact",
+                "Tribal Artifact"
+            });
+
+            Types.Add("land", new List<string>(){
+                "Artifact Land",
+                "Basic Land",
+                "Basic Snow Land",
+                "Land",
+                "Legendary Land",
+                "Legendary Snow Land",
+                "Snow Land"
+            });
 
+            Types.Add("other", new List<string>(){
+                "Conspiracy",
+                "Eaturecray",
+                "Scariest Creature You'll Ever See"
+            });
         }
 
         public void SetCards(int [] mvids)
@@ -102,7 +118,6 @@ public void SetCards(int [] mvids)
                 }
             }
 
-
             Cards = deckCard.Select(c => new DeckCard { 
                 MultiverseId = c.Key, Amount = c.Value 
             }).ToList();
@@ -124,8 +139,7 @@ public void SetSideBar(int [] mvids)
                     deckCard.Add(mvid,1);
                 }
             }
-
-
+
             SideBar = deckCard.Select(c => new DeckCard { 
                 MultiverseId = c.Key, Amount = c.Value 
             }).ToList();
@@ -148,23 +162,30 @@ public Card[] GetCards()
 
         public Card[] GetCards(string type)
         {
+            List<Card> cards = new List<Card>();
+
             if(Cards != null)
             {
                 int [] multiverseIds = Cards
                     .Select(x => x.MultiverseId)
                     .ToArray();
 
-                return mtgDb.GetCards(multiverseIds)
-                    .Where(x => x.Type.ToLower() == type.ToLower())
+                Card [] all = mtgDb.GetCards(multiverseIds)
                     .ToArray();
+
+                foreach(string t in this.Types[type.ToLower()])
+                {
+                    cards.AddRange(all
+                        .Where(x => x.Type.ToLower() == t.ToLower()));
+                }
             }
 
-            return null;
+            return cards.ToArray();
         }
 
         public Card[] GetSideBarCards()
         {
-            if(Cards != null)
+            if(SideBar != null)
             {
                 int [] multiverseIds = SideBar
                     .Select(x => x.MultiverseId)
@@ -180,6 +201,19 @@ public int CardCount(int multiverseId)
         {
             DeckCard card = 
                 this.Cards.Find(x => x.MultiverseId == multiverseId);
+
+            if(card != null)
+            {
+                return card.Amount;
+            }
+
+            return 0;
+        }
+
+        public int SideBarCardCount(int multiverseId)
+        {
+            DeckCard card = 
+                this.SideBar.Find(x => x.MultiverseId == multiverseId);
 
             if(card != null)
             {

diff --git a/src/www.mtgdb.info/www.mtgdb.info/Views/About.cshtml b/src/www.mtgdb.info/www.mtgdb.info/Views/About.cshtml
@@ -10,7 +10,7 @@
 <input type="hidden" name="cmd" value="_s-xclick">
 <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
 ">
-<input class="donate" type="image" src="http://api.mtgdb.info/content/images/donate.png" name="submit" alt="PayPal - The safer, easier way to pay online!">
+<input class="donate" type="image" src="https://api.mtgdb.info/content/images/donate.png" name="submit" alt="PayPal - The safer, easier way to pay online!">
 <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
 </form>
 
@@ -331,4 +331,7 @@
 	<li>
 		<h3><a href="https://twitter.com/mtgdb"><i class="fa fa-twitter"></i> Twitter</a></h3>
 	</li>
+    <li>
+        <h3><a href="https://jabbr.net/#/rooms/mtgdbinfo"><i class="fa fa-comment"></i> Chat Room</a></h3>
+    </li>
 </ul>
diff --git a/src/www.mtgdb.info/www.mtgdb.info/Views/Deck/Deck.cshtml b/src/www.mtgdb.info/www.mtgdb.info/Views/Deck/Deck.cshtml
@@ -15,18 +15,53 @@
         <button type="submit" class="btn btn-primary btn-lg">Render</button>
     </form>
 </div>
-<div style="float:left;border: 1px solid black;margin-left: 20px;width:800px;" id="deck">
-    <div id="creatures">
-    @if(@Model.Deck != null && @Model.Deck.Cards.Count > 0)
+<div style="float:left;margin-left: 20px;width:800px;" id="deck">
+@foreach(string type in new string[]{"creature", "instant", "sorcery", "enchantment", "artifact", "land", "other"})
+{
+    if(@Model.Deck != null && Model.Deck.GetCards(type).Length > 0)
     {
-        foreach(var card in Model.Deck.GetCards())
+        <div id="@type">
+        <h4>@type</h4>
+        @foreach(var card in Model.Deck.GetCards(type))
         {
             int repeat = (int)System.Math.Ceiling(@Model.Deck.CardCount(card.Id) / 4.0);
             for(int times = 0; times < repeat; times++)
             {
                 int top = 0;
                 string topStyle = string.Format("{0}px;", top);
                 int max = @Model.Deck.CardCount(card.Id) - (times * 4);
+                <div style="float:left;margin-left:10px;">
+                    <div style="position:relative;height:140px;" class="deck-card" data-container="body" data-toggle="popover" data-placement="right" 
+                            data-content="<image src='@card.CardImage' />" data-title="@card.Name">
+
+                        <image src="@card.CardImage" style="position:relative;width:65px;height:87px; z-index: 0;display:block;" />
+                        @for(int i = 1; (i < max && i < 4); i++ )
+                        {
+                            top = i * -70;
+                            topStyle = string.Format("{0}px;", top);
+                            <image src="@card.CardImage"
+                            style="position:relative;width:65px;height:87px; z-index: @i; display: block;top:@topStyle" />
+                        }
+                    </div>
+                </div>
+            }
+        }
+        <br style="clear:both;" />
+        </div>
+    }
+}
+<div id="sidebar">
+    @if(@Model.Deck != null && @Model.Deck.SideBar.Count > 0)
+    {
+        <h1>Side Bar</h1>
+        foreach(var card in Model.Deck.GetSideBarCards())
+        {
+            int repeat = (int)System.Math.Ceiling(@Model.Deck.SideBarCardCount(card.Id) / 4.0);
+            for(int times = 0; times < repeat; times++)
+            {
+                int top = 0;
+                string topStyle = string.Format("{0}px;", top);
+                int max = @Model.Deck.SideBarCardCount(card.Id) - (times * 4);
                 <div style="float:left;margin-left:10px;">
                     <div style="position:relative;height:140px;">
                         <image src="@card.CardImage" style="position:relative;width:65px;height:87px; z-index: 0;display:block;"/>
@@ -42,17 +77,8 @@
             }
         }
     }
-
     <br style="clear:both;" />
-    </div>
-    <div id="spells">
-    </div>
-    <div id="artifacts">
-    </div>
-    <div id="other">
-    </div>
-    <div id="lands">
-    </div>
+</div>
 </div>
 </div>
 <br style="clear:both;" />

diff --git a/src/www.mtgdb.info/www.mtgdb.info/test.dec b/src/www.mtgdb.info/www.mtgdb.info/test.dec
@@ -17,9 +17,6 @@
 2 Koth of the Hammer
 1 Sword of Body and Mind
 
-
-
-
 SB: 1 Basilisk Collar
 SB: 4 Cunning Sparkmage
 SB: 3 Mark of Mutiny