Merge develop into master

.gitignore

@@ -148,4 +148,7 @@ node_modules
 .lock-wscript
 
 ### Webpack
-dist/
+dist/
+
+### OS X files
+/**/.DS_Store

package.json

@@ -6,7 +6,8 @@
   "scripts": {
     "build": "webpack --config webpack.config.js --optimize-minimize --devtool source-map",
     "develop": "webpack-dev-server",
-    "test": "karma start"
+    "test": "karma start",
+    "deploy": "node scripts/deploy.js"
   },
   "repository": {
     "type": "git",
@@ -24,7 +25,11 @@
   "homepage": "https://github.com/Cardshifter/HTML-Client#readme",
   "private": true,
   "devDependencies": {
+    "bluebird": "^2.10.0",
     "css-loader": "^0.15.6",
+    "debug": "^2.2.0",
+    "ftp-deploy": "^1.0.0",
+    "temp": "^0.8.3",
     "html-loader": "^0.3.0",
     "jasmine-core": "^2.3.4",
     "karma": "^0.13.8",
@@ -33,14 +38,16 @@
     "karma-webpack": "^1.7.0",
     "ng-annotate-webpack-plugin": "^0.1.2",
     "phantomjs": "^1.9.17",
+    "recursive-copy": "^1.0.10",
+    "request-promise": "^0.4.3",
     "style-loader": "^0.12.3",
     "webpack": "^1.11.0",
     "webpack-dev-server": "^1.10.1"
   },
   "dependencies": {
     "angular": "1.4.3",
-    "angular-route": "1.4.3",
+    "angular-animate": "1.4.3",
     "angular-bootstrap-npm": "0.13.3",
-    "angular-animate": "1.4.3"
+    "angular-route": "1.4.3"
   }
 }

scripts/deploy.js

@@ -0,0 +1,130 @@
+/* Deploy the client to play.cardshifter.com
+ *
+ * How to use:
+ *  1. Build the project and make sure that everything is in order.
+ *  2. Set up environment variables (see below).
+ *  3. Run `npm run deploy`.
+ *  4. Profit!
+ *
+ * Environment variables used:
+ *  - DEPLOY_FTP_USERNAME: Username used to log in through FTP.
+ *  - DEPLOY_FTP_PASSWORD: Password used to log in through FTP.
+ *  - DEPLOY_DUGA_KEY: Duga API key. If not set the chat bot post is skipped.
+ */
+'use strict';
+
+var copy      = require('recursive-copy');
+var FtpDeploy = require('ftp-deploy');
+var path      = require('path');
+var Promise   = require('bluebird');
+var request   = require('request-promise');
+var temp      = require('temp').track();
+
+var deployAddress = "play.cardshifter.com";
+
+function ftpConfig(local, remote) {
+    return {
+        username: process.env.DEPLOY_FTP_USERNAME,
+        password: process.env.DEPLOY_FTP_PASSWORD,
+        host: deployAddress,
+        port: 21, // Standard FTP port
+        localRoot: local,
+        remoteRoot: remote
+    };
+};
+
+var chatBotRequest = {
+    // http://chat.stackexchange.com/rooms/info/16134/cardshifter-tcg
+    roomId: 16134,
+    apiKey: process.env.DEPLOY_DUGA_KEY,
+    text: "New web client version uploaded to [" + deployAddress + "](http://" + deployAddress +"/)."
+};
+
+var chatBotConfig = {
+    url: "http://stats.zomis.net/GithubHookSEChatService/bot/jsonPost",
+    method: "POST",
+    headers: {
+        "Content-Type": "application/json"
+    }
+}
+
+function postToChat(config, botRequest) {
+    return new Promise(function(resolve, reject) {
+        var json = JSON.stringify(botRequest, ["apiKey", "roomId", "text"]);
+        config.headers["Content-Length"] = json.length;
+        config.body = json;
+
+        request(config)
+        .then(function(body) {
+            resolve(body);
+        })
+    });
+}
+
+function setupFiles() {
+    // ftp-deploy doesn't handle uploading from multiple directories well
+    return new Promise(function(resolve, reject) {
+        temp.mkdir("cardshifter-deploy", function (err, tempDir) {
+            if (err) {
+                reject(err);
+            }
+
+            Promise.all([
+                copy(path.join(__dirname, "..", "www"), tempDir),
+                copy(path.join(__dirname, "..", "dist"), path.join(tempDir, "assets"))
+            ])
+            .then(function() {
+                resolve(tempDir);
+            })
+            .catch(function(err) {
+                reject(err);
+            });
+        });
+    });
+}
+
+function deployFtp(config) {
+    return new Promise(function(resolve, reject) {
+        var ftp = new FtpDeploy();
+
+        ftp.on("uploading", function(data) {
+            console.log(
+                data.percentComplete + "% " +
+                "(" + data.transferredFileCount +
+                "/" + data.totalFileCount +
+                ") " + data.filename
+            );
+        });
+
+        ftp.deploy(config, function(err) {
+            if (err) {
+                reject(err);
+            } else {
+                resolve();
+            }
+        });
+    });
+}
+
+setupFiles()
+.then(function(dir) {
+    var config = ftpConfig(dir, "/");
+    console.log("Deploying to ftp://" + config.host + ":" + config.port + "...");
+    return deployFtp(config);
+})
+.then(function() {
+    console.log("FTP deployment successful.");
+    if (chatBotRequest.apiKey) {
+        console.log("Posting message to " + chatBotConfig.url + "...");
+        return postToChat(chatBotConfig, chatBotRequest);
+    }
+})
+.then(function(responseBody) {
+    if (responseBody) {
+        console.log(responseBody);
+    }
+})
+.catch(function(err) {
+    console.error(err.toString());
+    console.error(err.stack);
+});

src/cardshifter.js

@@ -10,6 +10,7 @@ var topNavbar = require('./top_navbar/module');
 var gameBoard = require("./game_board/module");
 var test = require("./test/module");
 var ngAnimate = require('angular-animate');
+var errorCreator = require("./error/module");
 
 angular.module("CardshifterApp", [
     ngRoute,
@@ -20,7 +21,8 @@ angular.module("CardshifterApp", [
     login.name,
     gameBoard.name,
     test.name,
-    uiBootstrap
+    uiBootstrap,
+    errorCreator.name
 ]).config(function($locationProvider) {
     $locationProvider.html5Mode(true);
 }).config(function($routeProvider) {

src/deck_builder/controller.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // @ngInject
-function DeckbuilderController(CardshifterServerAPI, $scope, $rootScope, $location) {
+function DeckbuilderController(CardshifterServerAPI, $scope, $rootScope, $location, ErrorCreator) {
     var DECK_STORAGE = "CARDSHIFTER_DECK_STORAGE";
 
     $scope.cards = [];
@@ -28,25 +28,25 @@ function DeckbuilderController(CardshifterServerAPI, $scope, $rootScope, $locati
         localStorage.setItem(DECK_STORAGE, json);
     }
 
-    CardshifterServerAPI.setMessageListener(function(cardInformation) {
-        deckConfig = cardInformation
-        var deck = cardInformation.configs.Deck;
+    CardshifterServerAPI.setMessageListener({
+        "playerconfig": function(cardInformation) {
+            deckConfig = cardInformation
+            var deck = cardInformation.configs.Deck;
 
-        for(var card in deck.cardData) {
-            if(deck.cardData.hasOwnProperty(card)) {
-                deck.cardData[card].max = deck.max[card] || deck.maxPerCard;
-                $scope.currentDeck[deck.cardData[card].id] = 0;
+            for(var card in deck.cardData) {
+                if(deck.cardData.hasOwnProperty(card)) {
+                    deck.cardData[card].max = deck.max[card] || deck.maxPerCard;
+                    $scope.currentDeck[deck.cardData[card].id] = 0;
+                }
             }
-        }
 
-        $scope.cards = deck.cardData;
-        $scope.maxCards = deck.maxSize;
-        $scope.minCards = deck.minSize;
-        updateSavedDecks();
-        $scope.doneLoading = true;
-
-        $scope.$apply();
-    }, ["playerconfig"]);
+            $scope.cards = deck.cardData;
+            $scope.maxCards = deck.maxSize;
+            $scope.minCards = deck.minSize;
+            updateSavedDecks();
+            $scope.doneLoading = true;
+        }
+    }, $scope);
 
     /**
     * This is called when the minus-sign button for a card
@@ -123,14 +123,17 @@ function DeckbuilderController(CardshifterServerAPI, $scope, $rootScope, $locati
     */
     $scope.saveDeck = function() {
         if($scope.getTotalSelected() !== $scope.minCards) {
+            ErrorCreator.create("Not enough cards");
             console.log("not enough cards");
             return;
         }
         if(!$scope.deckName) {
+            ErrorCreator.create("Please enter a name");
             console.log("enter name");
             return;
         }
         if(getDeckIndex($scope.deckName)) {
+            ErrorCreator.create("A deck with that name already exists");
             console.log("deck already exists");
             return;
         }
@@ -213,6 +216,7 @@ function DeckbuilderController(CardshifterServerAPI, $scope, $rootScope, $locati
 
             $location.path("/game_board");
         } else {
+            ErrorCreator.create("Not enough cards");
             console.log("not enough cards");
         }
     };

src/error/error_creator.js

@@ -0,0 +1,22 @@
+"use strict";
+
+function ErrorCreator($modal) {
+    return {
+        create: function(errorMessage) {
+            var errorModal = $modal.open({
+                animation: true,
+                backdrop: "static",
+                template: require("./error_popup.html"),
+                controller: "ErrorPopupController",
+                size: "sm",
+                resolve: {
+                    message: function() {
+                        return errorMessage;
+                    }
+                }
+            });
+        }
+    }
+}
+
+module.exports = ErrorCreator;

src/error/error_popup.html

@@ -0,0 +1,11 @@
+<div>
+    <div class="modal-header">
+        <h3 class="modal-title">Error!</h3>
+    </div>
+    <div class="modal-body">
+        {{message}}!
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-primary" type="button" ng-click="ok()">OK</button>
+    </div>
+</div>

src/error/module.js

@@ -0,0 +1,12 @@
+"use strict";
+var angular = require("angular");
+var errorCreator = require("./error_creator");
+
+module.exports = angular.module("cardshifter.errorCreator", [])
+    .service("ErrorCreator", errorCreator)
+    .controller("ErrorPopupController", function($scope, $modalInstance, message) {
+        $scope.message = message;
+        $scope.ok = function() {
+            $modalInstance.close();
+        };
+    });