fix special cards

site/client/app/modules/deck-builder/components/deck-builder.js

@@ -25,12 +25,11 @@ module.exports = {
   filters: {
     getType: function(c, type) {
       var tmp = $.map(c, (item) => {
-        if(item.type == type) return item;
+        //if(item.type == type) return item;
+        if($.inArray(item.type, type) > -1) return item;
       });
 
       return tmp;
-
-      return c;
     }
   },
 
@@ -63,7 +62,6 @@ module.exports = {
       for(var item in _deck) {
         this.deck.push(cards[_deck[item]]);
       }
-
     },
 
     // test

site/client/app/modules/deck-builder/views/deck-builder.html

@@ -35,7 +35,7 @@
     <div class="my-card-container">
       <span>LEADER</span>
 
-      <div class="card-wrap-small" v-repeat="item: deck | getType 3" track-by="$index">
+      <div class="card-wrap-small" v-repeat="item: deck | getType [3]" track-by="$index">
         <div class="count-card no-select">1x</div>
         <div class="bla ani"></div>
         <div class="card-img-small card-small-small" v-style="background-image: 'url(http://80.240.132.120/gwent/assets/cards/' + item.img + '.png)'"></div>
@@ -48,7 +48,7 @@
     <div class="my-card-container">
       <span>CLOSE COMBAT</span>
 
-      <div class="card-wrap-small" v-repeat="item: deck | getType 0" track-by="$index">
+      <div class="card-wrap-small" v-repeat="item: deck | getType [0]" track-by="$index">
         <div class="count-card no-select">{{ c > 1 ? c + 'x' : '' }}</div>
         <div class="bla ani"></div>
         <div class="card-img-small card-small-small" v-style="background-image: 'url(http://80.240.132.120/gwent/assets/cards/' + item.img + '.png)'"></div>
@@ -60,7 +60,7 @@
     <div class="my-card-container">
       <span>RANGE</span>
 
-      <div class="card-wrap-small" v-repeat="item: deck | getType 1" track-by="$index">
+      <div class="card-wrap-small" v-repeat="item: deck | getType [1]" track-by="$index">
         <div class="bla ani"></div>
         <div class="card-img-small card-small-small" v-style="background-image: 'url(http://80.240.132.120/gwent/assets/cards/' + item.img + '.png)'"></div>
         <div class="shadow"></div>
@@ -71,18 +71,7 @@
     <div class="my-card-container">
       <span>SPECIAL</span>
 
-      <div class="card-wrap-small" v-repeat="item: deck | getType 4" track-by="$index">
+      <div class="card-wrap-small" v-repeat="item: deck | getType [4,5]" track-by="$index">
-        <div class="bla ani"></div>
-        <div class="card-img-small card-small-small" v-style="background-image: 'url(http://80.240.132.120/gwent/assets/cards/' + item.img + '.png)'"></div>
-        <div class="shadow"></div>
-        <div class="overlay-card"></div>
-      </div>
-    </div>
-
-    <div class="my-card-container">
-      <span>WEATHER</span>
-
-      <div class="card-wrap-small" v-repeat="item: deck | getType 5" track-by="$index">
         <div class="bla ani"></div>
         <div class="card-img-small card-small-small" v-style="background-image: 'url(http://80.240.132.120/gwent/assets/cards/' + item.img + '.png)'"></div>
         <div class="shadow"></div>

site/client/assets/sass/_shame_cards_copy.scss

@@ -1,155 +0,0 @@
-.card {
-  float: left;
-  border-radius: 12px;
-  position: relative;
-  z-index: 10;
-  top: 5px;
-  left: 5px;
-}
-
-.bla {
-  border-radius: 14px;
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  opacity: 0;
-}
-
-.card-wrap:hover .bla {
-  box-shadow: 0 0 2px 0 orange;
-  opacity: 1;
-}
-
-.shadow {
-  border-radius: 35%;
-  box-shadow: 0 0 15px 14px #ffa500;
-  content: "";
-  height: calc(100% - 50px);
-  left: 15px;
-  position: absolute;
-  width: calc(100% - 22px);
-  z-index: 1;
-  top: 30px;
-  transition: all 0.3s ease-in-out 0s;
-  opacity: 0;
-}
-
-.card-wrap:hover .shadow {
-  -webkit-animation: Shadow 4s ease-in-out infinite;
-  -moz-animation: Shadow 4s ease-in-out infinite;
-  animation: Shadow 4s ease-in-out infinite;
-}
-
-.ani {
-  background: linear-gradient(2deg, #000, #000, #000, #000);;
-  transition: all .05s ease-in-out 0s;
-}
-
-.card-wrap .ani {
-  background: linear-gradient(2deg, #ffa500, #ffd68b, #ffa500, #ffa500);
-  background-size: 800% 800%;
-
-  -webkit-animation: AnimationName 3s ease infinite;
-  -moz-animation: AnimationName 3s ease infinite;
-  animation: AnimationName 3s ease infinite;
-}
-
-@-webkit-keyframes Shadow {
-  0% {
-    opacity: 0;
-  }
-  25% {
-    opacity: .5;
-  }
-  50%{
-    opacity: 1;
-  }
-  75% {
-    opacity: .5;
-  }
-  100%{      opacity: 0;
-  }
-}
-
-@-webkit-keyframes Shadow {
-  0% {
-    opacity: 0;
-  }
-  25% {
-    opacity: .5;
-  }
-  50%{
-    opacity: 1;
-  }
-  75% {
-    opacity: .5;
-  }
-  100%{      opacity: 0;
-  }
-}
-
-@keyframes Shadow {
-  0% {
-    opacity: 0;
-  }
-  25% {
-    opacity: .5;
-  }
-  50%{
-    opacity: 1;
-  }
-  75% {
-    opacity: .5;
-  }
-  100%{      opacity: 0;
-  }
-}
-
-.overlay-card {
-  background: linear-gradient(2deg, rgba(255,255,255,.03), rgba(255,255,255,.2), rgba(255,255,255,.05));
-  background-size: 800% 800%;
-  position: absolute;
-  z-index: 20;
-  top: 10px;
-  left: 10px;
-  width: calc(100% - 10px);
-  height: calc(100% - 5px);
-  border-radius: 12px;
-  opacity: 0;
-  cursor: pointer;
-}
-
-.card-wrap:hover .overlay-card {
-  opacity: 1;
-  -webkit-animation: AnimationName 10s ease infinite;
-  -moz-animation: AnimationName 10s ease infinite;
-  animation: AnimationName 10s ease infinite;
-}
-
-@-webkit-keyframes AnimationName {
-  0%{background-position:51% 0%}
-  50%{background-position:50% 100%}
-  100%{background-position:51% 0%}
-}
-@-moz-keyframes AnimationName {
-  0%{background-position:51% 0%}
-  50%{background-position:50% 100%}
-  100%{background-position:51% 0%}
-}
-@keyframes AnimationName {
-  0%{background-position:51% 0%}
-  50%{background-position:50% 100%}
-  100%{background-position:51% 0%}
-}
-
-.card-wrap {
-  float: left;
-  width: 160px;
-  height: 294px;
-  position: relative;
-  padding: 4px;
-}
-
-.card-wrap:hover {
-  z-index: 100;
-}