sdasdasdasdsd

.editorconfig

@@ -29,5 +29,5 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
-[*.md]
+[*.{diff,md}]
 trim_trailing_whitespace = false

.gitignore

@@ -15,4 +15,4 @@
 /libpeerconnection.log
 npm-debug.log
 testem.log
-.idea/
+.idea

.jshintrc

@@ -2,11 +2,10 @@
   "predef": [
     "document",
     "window",
-    "-Promise",
-    "Bootstrap"
+    "-Promise"
   ],
-  "browser" : true,
-  "boss" : true,
+  "browser": true,
+  "boss": true,
   "curly": true,
   "debug": false,
   "devel": true,

.travis.yml

@@ -1,4 +1,3 @@
----
 language: node_js
 
 sudo: false
@@ -7,10 +6,25 @@ cache:
   directories:
     - node_modules
 
+before_install:
+  - "npm config set spin false"
+  - "npm install -g npm@^2"
+
 install:
   - npm install -g bower
   - npm install
   - bower install
 
 script:
   - npm test
+
+node_js:
+  - "0.10"
+
+deploy:
+  provider: heroku
+  api_key:
+    secure: Bt7t26dMCqf7yXZPWZd/e6hz6N9Fxg83A34lC7sNTaLvIKnM+g54MHjOlIpnZ9LmN3S7/icg/X+twk2ebWPlc7THUWAaBkU5YjXpyNf9UhG30UG7Ihjgcbhn/Qh/Px8NQX5OFIUHTVoLdJGOj68/Czv+jHwpmFQHDoB1xCY2paE=
+  app: webatrice
+  on:
+    repo: thomasjmwb/bbbbbbbbbbbbbbb

Brocfile.js

@@ -3,14 +3,6 @@
 var EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
 var app = new EmberApp({
-  'ember-cli-bootstrap': {
-    'importBootstrapCSS': false
-  },
-  vendorFiles: {
-    'handlebars.js': {
-      production: 'bower_components/handlebars/handlebars.js'
-    }
-  }
 });
 
 // Use `app.import` to add additional libraries to the generated

README.md

@@ -2,13 +2,17 @@
 
 This README outlines the details of collaborating on this Ember application.
 
-A short introduction of this app could easily go here.
+Webatrice is a web application aspiring to be part of the desktop application called Cockatrice. To read more about Cockatrice, go to https://github.com/Cockatrice/Cockatrice.
 
 ## Prerequisites
 
 You will need the following things properly installed on your computer.
 
 * [Git](http://git-scm.com/)
+* [Node.js](http://nodejs.org/) (with NPM)
+* [Bower](http://bower.io/)
+* [Ember CLI](http://www.ember-cli.com/)
+* [PhantomJS](http://phantomjs.org/)
 * [Node.js](http://nodejs.org/) (with NPM) and [Bower](http://bower.io/)
 
 ## Installation
@@ -21,7 +25,7 @@ You will need the following things properly installed on your computer.
 ## Running / Development
 
 * `ember server`
-* Visit your app at http://localhost:4200.
+* Visit your app at [http://localhost:4200](http://localhost:4200).
 
 ### Code Generators
 
@@ -34,6 +38,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Building
 
+[![Build Status](https://travis-ci.org/thomasjmwb/bbbbbbbbbbbbbbb.svg?branch=master)](https://travis-ci.org/thomasjmwb/bbbbbbbbbbbbbbb)
+
 * `ember build` (development)
 * `ember build --environment production` (production)
 
@@ -43,8 +49,8 @@ Specify what it takes to deploy your app.
 
 ## Further Reading / Useful Links
 
-* ember: http://emberjs.com/
-* ember-cli: http://www.ember-cli.com/
+* [ember.js](http://emberjs.com/)
+* [ember-cli](http://www.ember-cli.com/)
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

app/components/x-card-deck.js

@@ -0,0 +1,98 @@
+import Ember from 'ember';
+
+var basicLands = ['Plains', 'Island', 'Swamp', 'Mountain', 'Forest', 'Snow-Covered Plains',
+  'Snow-Covered Island', 'Snow-Covered Swamp', 'Snow-Covered Mountain', 'Snow-Covered Forest'];
+
+export default Ember.Component.extend({
+  classNames: ['row'],
+
+  /** @property {Boolean} - can this card be added to the main deck being built */
+  canAddToDeck: function () {
+    var cardsInDeck = this.get('deck.cards'),
+      cardsInSideboard = this.get('deck.sideboard'),
+      currentCardName = this.get('card.name');
+
+    if (basicLands.contains(currentCardName)) {
+      return true;
+    }
+
+    return cardsInDeck.filterBy('name', currentCardName).length +
+      cardsInSideboard.filterBy('name', currentCardName).length < 4;
+  }.property('deck.cards.@each', 'deck.sideboard.@each', 'card'),
+
+  /** @property {Boolean} - is this card not allowed to go in the main deck */
+  cannotAddToDeck: Ember.computed.not('canAddToDeck'),
+
+  /** @property {Boolean} - can this card be removed from the main deck */
+  canRemoveFromMainDeck: function () {
+    var currentCardName = this.get('card.name');
+
+    return this.get('deck.cards').filterBy('name', currentCardName).length;
+  }.property('deck.cards.@each', 'deck'),
+
+  /** @property {Boolean} - is this card allowed to be removed from the main deck */
+  cannotRemoveFromMainDeck: Ember.computed.not('canRemoveFromMainDeck'),
+
+  /** @property {Boolean} - can this card be removed from the side deck */
+  canRemoveFromSideDeck: function () {
+    var currentCardName = this.get('card.name');
+
+    return this.get('deck.sideboard').filterBy('name', currentCardName).length;
+  }.property('deck.sideboard.@each'),
+
+  /** @property {Boolean} - can this card be removed from the side deck */
+  cannotRemoveFromSideDeck: Ember.computed.not('canRemoveFromSideDeck'),
+
+  /** @propert {Boolean} - can this card be removed from any deck */
+  cannotRemoveFromAnyDeck: Ember.computed.and('cannotRemoveFromMainDeck', 'cannotRemoveFromSideDeck'),
+
+  actions: {
+    addToMain: function (card) {
+      this.get('deck.cards').pushObject(card);
+    },
+
+    addToSide: function (card) {
+      this.get('deck.sideboard').pushObject(card);
+    },
+
+    removeAllFromMain: function (card) {
+      this.get('deck.cards').removeObject(card);
+    },
+
+    removeOneFromMain: function (card) {
+      var cards = this.get('deck.cards'),
+        cardName = card.get('name'),
+        i = 0,
+        index;
+
+      cards.forEach(function (c) {
+        if (c.get('name') === cardName) {
+          index = i;
+        }
+        i++;
+      });
+
+      cards.removeAt(index);
+    },
+
+    removeAllFromSide: function (card) {
+      this.get('deck.sideboard').removeObject(card);
+    },
+
+    removeOneFromSide: function (card) {
+      var cards = this.get('deck.sideboard'),
+        cardName = card.get('name'),
+        i = 0,
+        index;
+
+      cards.forEach(function (c) {
+        if (c.get('name') === cardName) {
+          index = i;
+        }
+        i++;
+      });
+
+      cards.removeAt(index);
+    }
+  }
+});

app/components/x-modal.js

@@ -0,0 +1,9 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  actions: {
+    close: function () {
+      return this.sendAction();
+    }
+  }
+});

app/controllers/cards.js

@@ -7,9 +7,9 @@ export default Ember.ArrayController.extend(filterableMixin, {
     {
       label: 'Card Types',
       propertyName: 'mainType',
-      values: ['Creature', 'Enchantment', 'Land', 'Instant', 'Sorcery'],
-      possibleValues: ['Creature', 'Enchantment', 'Land', 'Instant', 'Sorcery'],
-      valuesDisplay: ['Creature', 'Enchantment', 'Land', 'Instant', 'Sorcery'],
+      values: ['Creature', 'Enchantment', 'Land', 'Instant', 'Sorcery', 'Artifact'],
+      possibleValues: ['Creature', 'Enchantment', 'Land', 'Instant', 'Sorcery', 'Artifact'],
+      valuesDisplay: ['Creature', 'Enchantment', 'Land', 'Instant', 'Sorcery', 'Artifact'],
       and: false
     },
     {
@@ -19,6 +19,14 @@ export default Ember.ArrayController.extend(filterableMixin, {
       possibleValues: [ 'Black', 'Blue', 'Green', 'Red', 'White'],
       valuesDisplay: [ 'Black', 'Blue', 'Green', 'Red', 'White'],
       and: false
+    },
+    {
+      label: 'Legalities',
+      propertyName: 'legal',
+      values: [ 'isStandard', 'isModern', 'isLegacy', 'isVintage'],
+      possibleValues: [ 'isStandard', 'isModern', 'isLegacy', 'isVintage'],
+      valuesDisplay: [ 'Standard', 'Modern', 'Legacy', 'Vintage'],
+      and: false
     }
 //    {
 //      label: 'Format',
@@ -40,6 +48,22 @@ export default Ember.ArrayController.extend(filterableMixin, {
 //    }
   ],
   displayCards: function () {
-    return this.get('arrangedContent').slice(0, 100);
-  }.property('arrangedContent')
+    return this.get('searchedContent').slice(0, 100);
+  }.property('searchedContent'),
+
+  searchedContent: function () {
+    var searchTerm = this.get('searchTerm'),
+        arrangedContent = this.get('arrangedContent');
+
+    if (!searchTerm) {
+      return arrangedContent;
+    }
+
+    return arrangedContent.filter(function (c) {
+      return c.name.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1;
+    });
+  }.property('arrangedContent', 'searchTerm'),
+
+  /** @property {String} the current search term */
+  searchTerm: ''
 });

app/controllers/deck/build.js

@@ -7,6 +7,10 @@ export default Ember.ObjectController.extend({
 
   doNotShowTypes: [],
 
+  displayCards: Ember.computed.alias('controllers.cards.displayCards'),
+
+  searchTerm: Ember.computed.alias('controllers.cards.searchTerm'),
+
   canShowMainDeck: function () {
     return !this.get('doNotShowTypes').contains('mainDeck');
   }.property('doNotShowTypes.@each'),
@@ -34,4 +38,4 @@ export default Ember.ObjectController.extend({
       }
     }
   }
-});
+});

app/controllers/deck/export-modal.js

@@ -0,0 +1,9 @@
+import Ember from 'ember';
+
+export default Ember.ObjectController.extend({
+  actions: {
+    close: function() {
+      return this.send('closeModal');
+    }
+  }
+});

app/controllers/decks.js

@@ -1,8 +1,5 @@
 import Ember from 'ember';
 
 export default Ember.ArrayController.extend({
-  importModalButtons: [
-    Ember.Object.create({title: 'Import', clicked: 'importDeck'}),
-    Ember.Object.create({title: 'Cancel', dismiss: 'modal'})
-  ]
-});
+
+});

app/controllers/decks/import-deck.js

@@ -0,0 +1,20 @@
+import Ember from 'ember';
+import Deck from 'webatrice/models/deck';
+
+export default Ember.ObjectController.extend({
+  needs: ['cards'],
+
+  actions: {
+    close: function() {
+      return this.send('closeModal');
+    },
+
+    importDeck: function () {
+      var cards = this.get('controllers.cards.model'),
+        deck = Deck.createDeck(this.get('importContents'), cards);
+
+      this.send('closeModal');
+      this.transitionToRoute('deck.build', deck);
+    }
+  }
+});