#45 login koblet opp mot LoginState

frontend/android/assets/glassy/skin/glassy-ui.json

@@ -97,6 +97,7 @@ com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
 	}
 	big: {
 		font: font-big
+		fontColor: cyan
 	}
 	black: {
 		font: font

frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java

@@ -21,7 +21,6 @@ public class CreateJoinTournamentState extends State {
     private Table outerTable;
     private Table innerTable;
     private ScrollPane tournamentsPane;
-    private final float labelSize = 10f;
 
     private String backBtnText = "Back";
     private String enterBtnText = "Enter";
@@ -59,7 +58,6 @@ public class CreateJoinTournamentState extends State {
         super(gsm);
         System.out.println("Du er i create join tournament state :0");
         try{
-            //TODO: Er det mulig å lage query som kun henter aktive?
             tournaments = QueryIntermediate.getTournamentsForPlayer(GameWare.getInstance().getPlayer().getId());
             System.out.println(tournaments);
         }catch(Exception e){
@@ -196,6 +194,7 @@ public class CreateJoinTournamentState extends State {
     }
 
     private void handleCreateBtnClick(){
+//        TODO: uncomment
         //gsm.set(new CreateTournamentState(gsm));
     };
 

frontend/core/src/com/gameware/game/states/LoginState.java

 package com.gameware.game.states;
 
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
 import com.badlogic.gdx.scenes.scene2d.ui.Table;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.scenes.scene2d.ui.TextField;
@@ -31,6 +33,8 @@ public class LoginState extends State {
 
         table = new Table();
         table.setFillParent(true);
+//        table.add(new Label("HEI", skin, "font", new Color(1, 0, 0, 1))).spaceBottom(spacingOnBottomInputFIeld);
+//        table.row();
         table.add(makeUserInputField()).size(inputFieldWidth, inputFieldHeight).spaceBottom(spacingOnBottom);
         table.row();
         table.add(makePasswordInputField()).size(inputFieldWidth, inputFieldHeight).spaceBottom(spacingOnBottom);
@@ -124,11 +128,8 @@ public class LoginState extends State {
         String username = usernameInputField.getText();
         String password = passwordInputField.getText();
         Player player;
-        //test-data TODO:slett
-        player = new Player("5e5f61751113b81a1821b0e1", "Tobbelobb2");
         try {
-            //TODO:
-//            player = QueryIntermediate.getPlayerById(username, password);
+            player = QueryIntermediate.loginPlayer(username, password);
             Gdx.input.setOnscreenKeyboardVisible(false);
             stage.unfocusAll();
             gsm.set(new MenuState(gsm));
@@ -136,6 +137,7 @@ public class LoginState extends State {
         }catch(Exception e){
 //            TODO: Endre fra exception til spesifisert Element Not Found Exception eller hva det heter
 //            melding ut om at brukeren ikke eksisterer
+            System.out.println(e);
         }
     }
 
@@ -143,11 +145,8 @@ public class LoginState extends State {
         String username = usernameInputField.getText();
         String password = passwordInputField.getText();
         Player player;
-        //test-data TODO:slett
-        player = new Player("5e5f61751113b81a1821b0e1", "Tobbelobb2");
         try {
-//            TODO:
-//            player = QueryIntermediate.createPlayer(username, password)
+            player = QueryIntermediate.createNewPlayer(username, password);
             Gdx.input.setOnscreenKeyboardVisible(false);
             stage.unfocusAll();
             gsm.set(new MenuState(gsm));