diff --git a/login/login.css b/login/login.css index 4b0e02e..ae1e07c 100644 --- a/login/login.css +++ b/login/login.css @@ -230,4 +230,5 @@ th { .csh-button { font-size: 1.1em; font-weight: normal; -} \ No newline at end of file +} + diff --git a/login/login.html b/login/login.html index 08dfdd2..ac3aa67 100644 --- a/login/login.html +++ b/login/login.html @@ -35,4 +35,4 @@

Cardshifter login

- \ No newline at end of file + diff --git a/login/login_alt.html b/login/login_alt.html new file mode 100644 index 0000000..df0bef6 --- /dev/null +++ b/login/login_alt.html @@ -0,0 +1,108 @@ +Enter file contents here + + + + Cardshifter Login + + + + + + + + + + + + + + + + + +
+ + + +
+
+ + +
+
+
+ + +
+
+
+ + +
+ +
+ + +
+ +
+ + + +
+
+ +
+ + + diff --git a/login/login_controller.js b/login/login_controller.js index 8df26ee..8c941a2 100644 --- a/login/login_controller.js +++ b/login/login_controller.js @@ -4,6 +4,13 @@ CardshifterApp.controller("LoginController", function($scope) { CardshifterServerAPI.init(finalServer, $scope.is_secure); var login = new CardshifterServerAPI.messageTypes.LoginMessage($scope.username); - //CardshifterServerAPI.sendMessage(login); + + // TODO: Need to find a way to make this work; + // As written it tries to sendMessage the instant that the socket is created, in which case the socket is not ready +/* try { + CardshifterServerAPI.sendMessage(login); + } catch (e) { + console.log(e); + }*/ } }); \ No newline at end of file