diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..357c5ae --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +log diff --git a/.idea/libraries/com_github_cliftonlabs_json_simple_2_1_2.xml b/.idea/libraries/com_github_cliftonlabs_json_simple_2_1_2.xml new file mode 100644 index 0000000..6ea66e5 --- /dev/null +++ b/.idea/libraries/com_github_cliftonlabs_json_simple_2_1_2.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 2de22bf..e16e67e 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,7 @@ + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 375c0ca..f59d6ec 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,8 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -167,29 +263,13 @@ @@ -217,10 +324,10 @@ DEFINITION_ORDER - @@ -238,7 +345,6 @@ - @@ -288,6 +394,142 @@ + - - - + + + + + + + + + - - - - - + + + + + + - + - - + - - - - - - - - - - - + + + - - + + - - + + + + + + + + + + @@ -969,113 +1138,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1088,17 +1154,6 @@ - - - - - - - - - - - @@ -1131,17 +1186,6 @@ - - - - - - - - - - - @@ -1149,19 +1193,6 @@ - - - - - - - - - - - - - @@ -1169,9 +1200,6 @@ - - - @@ -1179,19 +1207,6 @@ - - - - - - - - - - - - - @@ -1199,9 +1214,6 @@ - - - @@ -1209,29 +1221,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -1240,7 +1229,7 @@ - + @@ -1250,10 +1239,10 @@ - - - - + + + + @@ -1262,11 +1251,6 @@ - - - - - @@ -1274,11 +1258,6 @@ - - - - - @@ -1286,9 +1265,6 @@ - - - @@ -1297,74 +1273,97 @@ - + - - + + - - + - - - - - + + - - - - - + + - - + + + + + + + + + + - + - + - - - + + + + + + + + + + + + + + + - + - + - + - - + + + + + + + + + + + + @@ -1374,37 +1373,167 @@ - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1470,6 +1599,7 @@ + com.github.cliftonlabs:json-simple:2.1.2 \ No newline at end of file diff --git a/Client/src/com/texttwist/client/constants/Config.java b/Client/src/com/texttwist/client/constants/Config.java new file mode 100644 index 0000000..ad6db60 --- /dev/null +++ b/Client/src/com/texttwist/client/constants/Config.java @@ -0,0 +1,15 @@ +package com.texttwist.client.constants; + +/** + * Created by loke on 15/06/2017. + */ +public class Config { + + private static String RMIServerURI = "localhost"; + private static Integer RMIServerPort = 9999; + + + public static String getRMIServerAddress(){ + return "rmi://".concat(RMIServerURI).concat(":").concat(RMIServerPort.toString()); + } +} diff --git a/Client/src/com/texttwist/client/pages/Entrypoint.java b/Client/src/com/texttwist/client/pages/Entrypoint.java index 587e2a1..a788b31 100644 --- a/Client/src/com/texttwist/client/pages/Entrypoint.java +++ b/Client/src/com/texttwist/client/pages/Entrypoint.java @@ -1,14 +1,9 @@ package com.texttwist.client.pages; -import com.texttwist.client.constants.Palette; import com.texttwist.client.ui.TTContainer; -import com.texttwist.client.ui.TTImage; -import oracle.jrockit.jfr.JFR; import javax.swing.*; import java.awt.*; -import java.io.File; -import java.io.IOException; /** * Created by loke on 13/06/2017. diff --git a/Client/src/com/texttwist/client/pages/Game.java b/Client/src/com/texttwist/client/pages/Game.java index aba1e6f..3f355a2 100644 --- a/Client/src/com/texttwist/client/pages/Game.java +++ b/Client/src/com/texttwist/client/pages/Game.java @@ -109,7 +109,6 @@ public class Game extends Page { -1, root); - TTGameBox searchUserBar = new TTGameBox( new Point(150, 90), new Dimension(250, 40), @@ -134,8 +133,6 @@ public class Game extends Page { new Font(Palette.inputBox_font.getFontName(), Font.BOLD, 40), null, "00:00"); - } - } diff --git a/Client/src/com/texttwist/client/pages/Home.java b/Client/src/com/texttwist/client/pages/Home.java index 19c5538..3eb77cc 100644 --- a/Client/src/com/texttwist/client/pages/Home.java +++ b/Client/src/com/texttwist/client/pages/Home.java @@ -1,6 +1,8 @@ package com.texttwist.client.pages; import com.texttwist.client.constants.Palette; import com.texttwist.client.ui.*; +import models.TTResponse; + import javax.swing.*; import java.awt.*; import java.util.concurrent.Callable; @@ -8,13 +10,14 @@ import java.util.concurrent.Callable; public class Home extends Page { private TTContainer loginDataContainer; + private HomeManager homeManager; private TTContainer logoContainer; public Home(JFrame window) { super(window); + homeManager = new HomeManager(); createUIComponents(); window.setVisible(true); - } @Override @@ -46,7 +49,14 @@ public class Home extends Page { @Override public Object call() throws Exception { //TODO CHIAMA API PER LOGIN E SE TUTTO OKEY MANDA A PAGINA DEL MENU - return new Menu(Page.window); + TTResponse res = homeManager.login(usernameField.getText(), String.valueOf(passwordField.getPassword())); + if (res.code == 200){ + //OK, go to next page and show popup + return new Menu(window); + } else { + JOptionPane.showMessageDialog(null, "Login Failes"); + return null; + } } }, loginDataContainer); diff --git a/Client/src/com/texttwist/client/pages/HomeManager.java b/Client/src/com/texttwist/client/pages/HomeManager.java new file mode 100644 index 0000000..6bbe756 --- /dev/null +++ b/Client/src/com/texttwist/client/pages/HomeManager.java @@ -0,0 +1,33 @@ +package com.texttwist.client.pages; +import com.texttwist.client.constants.Config; +import interfaces.ITTAuth; +import models.TTResponse; + +import java.net.MalformedURLException; +import java.rmi.Naming; +import java.rmi.NotBoundException; +import java.rmi.RemoteException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +/** + * Created by loke on 15/06/2017. + */ +public class HomeManager { + ExecutorService executor = Executors.newSingleThreadExecutor(); + String baseUrl = Config.getRMIServerAddress().concat("/auth"); + + public HomeManager(){ + } + + public TTResponse login(String userName, String password) throws RemoteException, NotBoundException, MalformedURLException { + System.out.print(password); + ITTAuth auth = (ITTAuth) Naming.lookup(baseUrl); + return auth.login(userName, password); + } + + public TTResponse logout(String userName, String token) throws RemoteException, NotBoundException, MalformedURLException { + ITTAuth auth = (ITTAuth) Naming.lookup(baseUrl); + return auth.logout(userName, token); + } +} diff --git a/Client/src/com/texttwist/client/ui/TTPasswordField.java b/Client/src/com/texttwist/client/ui/TTPasswordField.java index 0340b96..cb10cac 100644 --- a/Client/src/com/texttwist/client/ui/TTPasswordField.java +++ b/Client/src/com/texttwist/client/ui/TTPasswordField.java @@ -12,9 +12,9 @@ import java.util.concurrent.TimeUnit; /** * Created by loke on 13/06/2017. */ -public class TTPasswordField extends TTInputBox{ +public class TTPasswordField extends JPasswordField{ - private String placeholder = "Password"; + private String placeholder = ""; public TTPasswordField(Point position, Dimension dimension, JPanel parent) { super(); @@ -24,22 +24,7 @@ public class TTPasswordField extends TTInputBox{ setBounds(position.x, position.y, dimension.width, dimension.height); setPreferredSize(dimension); setForeground(Palette.fontColor); - setPlaceholder(placeholder); - - addKeyListener(new KeyAdapter() { - //If wish to have multiple inheritance... - @Override - public void keyPressed(KeyEvent e) { - super.keyPressed(e); - String a = getText(); - String l = new String(); - for (int i = 0; i < a.length(); ++i) { - l+="*"; - } - setText(l); - - } - }); + setText(placeholder); parent.add(this); } diff --git a/out/production/TextTwist/TextTwist.iml b/Commons/Commons.iml similarity index 66% rename from out/production/TextTwist/TextTwist.iml rename to Commons/Commons.iml index 49d4430..e14e4f9 100644 --- a/out/production/TextTwist/TextTwist.iml +++ b/Commons/Commons.iml @@ -1,11 +1,12 @@ - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/Commons/src/interfaces/ITTAuth.java b/Commons/src/interfaces/ITTAuth.java new file mode 100644 index 0000000..f0ea5aa --- /dev/null +++ b/Commons/src/interfaces/ITTAuth.java @@ -0,0 +1,13 @@ +package interfaces; +import models.TTResponse; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * Created by loke on 15/06/2017. + */ +public interface ITTAuth extends Remote { + TTResponse login(String userName, String password) throws RemoteException; + TTResponse logout(String userName, String token) throws RemoteException; +} diff --git a/Commons/src/models/TTResponse.java b/Commons/src/models/TTResponse.java new file mode 100644 index 0000000..7b095d1 --- /dev/null +++ b/Commons/src/models/TTResponse.java @@ -0,0 +1,18 @@ +package models; +import org.json.simple.JsonObject; +import java.io.Serializable; + +/** + * Created by loke on 15/06/2017. + */ +public class TTResponse implements Serializable{ + public String message; + public Integer code; + public JsonObject data; + + public TTResponse(String message, Integer code, JsonObject data) { + this.message = message; + this.code = code; + this.data = data; + } +} diff --git a/Commons/src/utilities/TTLogger.java b/Commons/src/utilities/TTLogger.java new file mode 100644 index 0000000..70cdc0e --- /dev/null +++ b/Commons/src/utilities/TTLogger.java @@ -0,0 +1,54 @@ +package utilities; + +import java.io.*; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.Date; + +/** + * Created by loke on 15/06/2017. + */ +public class TTLogger { + + + private static File logFile; + private static PrintWriter out; + private static BufferedWriter bw; + private static FileWriter fw; + + public TTLogger(File logFile) throws IOException { + this.logFile = logFile; + + } + public static void write(String msg){ + try { + fw = new FileWriter(logFile, true); + bw = new BufferedWriter(fw); + out = new PrintWriter(bw); + System.out.println(msg); + Date d = new Date(); + out.append(d.toString()); + out.append(" - "); + out.append(msg); + out.append("\n"); + } catch (IOException e) { + e.printStackTrace(); + } + finally { + out.close(); + try { + bw.close(); + } catch (IOException e) { + e.printStackTrace(); + } + try { + fw.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + } +} diff --git a/Server/Server.iml b/Server/Server.iml index c90834f..5424e31 100644 --- a/Server/Server.iml +++ b/Server/Server.iml @@ -7,5 +7,7 @@ + + \ No newline at end of file diff --git a/Server/src/com/texttwist/server/Main.java b/Server/src/com/texttwist/server/Main.java index 01c5c2c..a7946df 100644 --- a/Server/src/com/texttwist/server/Main.java +++ b/Server/src/com/texttwist/server/Main.java @@ -1,8 +1,18 @@ package com.texttwist.server; +import com.texttwist.server.components.TTServer; +import utilities.TTLogger; + +import java.io.File; +import java.io.IOException; + public class Main { - public static void main(String[] args) { + public static void main(String[] args) throws IOException { System.out.println("Server start"); + TTLogger logger = new TTLogger(new File("./log")); + TTServer ttServer = new TTServer(); + ttServer.start(); + } } diff --git a/Server/src/com/texttwist/server/components/TTServer.java b/Server/src/com/texttwist/server/components/TTServer.java new file mode 100644 index 0000000..46119e0 --- /dev/null +++ b/Server/src/com/texttwist/server/components/TTServer.java @@ -0,0 +1,34 @@ +package com.texttwist.server.components; + +import com.texttwist.server.components.auth.TTAuth; + +import java.rmi.AlreadyBoundException; +import java.rmi.RemoteException; +import java.rmi.registry.LocateRegistry; +import java.rmi.registry.Registry; + +/** + * Created by loke on 15/06/2017. + */ +public class TTServer { + + private static final int PORT = 9999; + + public void start() { + + try { + TTAuth auth = new TTAuth(); + Registry registry = LocateRegistry.createRegistry(PORT); + registry.bind("auth", auth); + System.out.println("Auth Service running at "+PORT+" port..."); + + } catch (RemoteException e) { + System.out.println(e.getMessage()); + e.printStackTrace(); + } catch (AlreadyBoundException e) { + System.out.println(e.getMessage()); + e.printStackTrace(); + } + + } +} diff --git a/Server/src/com/texttwist/server/components/auth/TTAuth.java b/Server/src/com/texttwist/server/components/auth/TTAuth.java new file mode 100644 index 0000000..846beab --- /dev/null +++ b/Server/src/com/texttwist/server/components/auth/TTAuth.java @@ -0,0 +1,52 @@ +package com.texttwist.server.components.auth; +import interfaces.ITTAuth; +import models.TTResponse; +import org.json.simple.JsonObject; +import utilities.TTLogger; + +import java.math.BigInteger; +import java.rmi.RemoteException; +import java.rmi.server.UnicastRemoteObject; +import java.security.SecureRandom; + +/** + * Created by loke on 15/06/2017. + */ +public class TTAuth extends UnicastRemoteObject implements ITTAuth { + + private SecureRandom random = new SecureRandom(); + + public String nextSessionId() { + return new BigInteger(130, random).toString(32); + } + public TTAuth() throws RemoteException{ + } + + @Override + public TTResponse login(String userName, String password) throws RemoteException { + TTLogger.write("LOGGER: Invoked login with username=" + userName + " AND " + " password=" + password); + if ((userName != null && !userName.isEmpty()) + && (password != null && !password.equals(""))) { + + if((userName.equalsIgnoreCase("admin")) + && (password.equals("admin"))) { + JsonObject data = new JsonObject(); + data.put("token", nextSessionId()); + System.out.println("LOGGER: Login successfull"); + return new TTResponse("Login successfull", 200, data); + } + } + System.out.println("LOGGER: Login unsuccessfull"); + return new TTResponse("Login unsuccessfull", 400, null); + } + + @Override + public TTResponse logout(String userName, String token) throws RemoteException { + System.out.println("LOGGER: Invoked logout with username=" + userName + " AND " + " token=" + token); + if ((userName != null && !userName.isEmpty()) + && (token != null && !token.isEmpty())) { + return new TTResponse("Logout successfull", 200, null); + } + return new TTResponse("Logout successfull (but something go wrong)", 200, null); + } +} diff --git a/TextTwist.iml b/TextTwist.iml index 49d4430..bf10195 100644 --- a/TextTwist.iml +++ b/TextTwist.iml @@ -3,9 +3,10 @@ - + + \ No newline at end of file diff --git a/out/production/Client/com/intellij/uiDesigner/core/AbstractLayout.class b/out/production/Client/com/intellij/uiDesigner/core/AbstractLayout.class deleted file mode 100644 index 474957a..0000000 Binary files a/out/production/Client/com/intellij/uiDesigner/core/AbstractLayout.class and /dev/null differ diff --git a/out/production/Client/com/intellij/uiDesigner/core/DimensionInfo.class b/out/production/Client/com/intellij/uiDesigner/core/DimensionInfo.class deleted file mode 100644 index 0db2f7d..0000000 Binary files a/out/production/Client/com/intellij/uiDesigner/core/DimensionInfo.class and /dev/null differ diff --git a/out/production/Client/com/intellij/uiDesigner/core/GridConstraints.class b/out/production/Client/com/intellij/uiDesigner/core/GridConstraints.class deleted file mode 100644 index 2e1afcc..0000000 Binary files a/out/production/Client/com/intellij/uiDesigner/core/GridConstraints.class and /dev/null differ diff --git a/out/production/Client/com/intellij/uiDesigner/core/GridLayoutManager.class b/out/production/Client/com/intellij/uiDesigner/core/GridLayoutManager.class deleted file mode 100644 index 94e3f41..0000000 Binary files a/out/production/Client/com/intellij/uiDesigner/core/GridLayoutManager.class and /dev/null differ diff --git a/out/production/Client/com/intellij/uiDesigner/core/HorizontalInfo.class b/out/production/Client/com/intellij/uiDesigner/core/HorizontalInfo.class deleted file mode 100644 index 8cb1d54..0000000 Binary files a/out/production/Client/com/intellij/uiDesigner/core/HorizontalInfo.class and /dev/null differ diff --git a/out/production/Client/com/intellij/uiDesigner/core/LayoutState.class b/out/production/Client/com/intellij/uiDesigner/core/LayoutState.class deleted file mode 100644 index 183f3ba..0000000 Binary files a/out/production/Client/com/intellij/uiDesigner/core/LayoutState.class and /dev/null differ diff --git a/out/production/Client/com/intellij/uiDesigner/core/Spacer.class b/out/production/Client/com/intellij/uiDesigner/core/Spacer.class deleted file mode 100644 index e534880..0000000 Binary files a/out/production/Client/com/intellij/uiDesigner/core/Spacer.class and /dev/null differ diff --git a/out/production/Client/com/intellij/uiDesigner/core/SupportCode$TextWithMnemonic.class b/out/production/Client/com/intellij/uiDesigner/core/SupportCode$TextWithMnemonic.class deleted file mode 100644 index 67909c5..0000000 Binary files a/out/production/Client/com/intellij/uiDesigner/core/SupportCode$TextWithMnemonic.class and /dev/null differ diff --git a/out/production/Client/com/intellij/uiDesigner/core/SupportCode.class b/out/production/Client/com/intellij/uiDesigner/core/SupportCode.class deleted file mode 100644 index 4950c35..0000000 Binary files a/out/production/Client/com/intellij/uiDesigner/core/SupportCode.class and /dev/null differ diff --git a/out/production/Client/com/intellij/uiDesigner/core/Util.class b/out/production/Client/com/intellij/uiDesigner/core/Util.class deleted file mode 100644 index fa5a7f4..0000000 Binary files a/out/production/Client/com/intellij/uiDesigner/core/Util.class and /dev/null differ diff --git a/out/production/Client/com/intellij/uiDesigner/core/VerticalInfo.class b/out/production/Client/com/intellij/uiDesigner/core/VerticalInfo.class deleted file mode 100644 index f7c59b1..0000000 Binary files a/out/production/Client/com/intellij/uiDesigner/core/VerticalInfo.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/Main.class b/out/production/Client/com/texttwist/client/Main.class deleted file mode 100644 index 3e2d5f2..0000000 Binary files a/out/production/Client/com/texttwist/client/Main.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/constants/Palette.class b/out/production/Client/com/texttwist/client/constants/Palette.class deleted file mode 100644 index 7084f71..0000000 Binary files a/out/production/Client/com/texttwist/client/constants/Palette.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Entrypoint.class b/out/production/Client/com/texttwist/client/pages/Entrypoint.class deleted file mode 100644 index 6b5c1a0..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Entrypoint.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Game$1.class b/out/production/Client/com/texttwist/client/pages/Game$1.class deleted file mode 100644 index e92c7a1..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Game$1.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Game.class b/out/production/Client/com/texttwist/client/pages/Game.class deleted file mode 100644 index 8cbc21d..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Game.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Highscores$1.class b/out/production/Client/com/texttwist/client/pages/Highscores$1.class deleted file mode 100644 index 0558bac..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Highscores$1.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Highscores.class b/out/production/Client/com/texttwist/client/pages/Highscores.class deleted file mode 100644 index 7f3a43b..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Highscores.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Home$1.class b/out/production/Client/com/texttwist/client/pages/Home$1.class deleted file mode 100644 index 6db43c0..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Home$1.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Home$2.class b/out/production/Client/com/texttwist/client/pages/Home$2.class deleted file mode 100644 index 3b42f43..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Home$2.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Home.class b/out/production/Client/com/texttwist/client/pages/Home.class deleted file mode 100644 index 171f54d..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Home.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/MatchRequests$1.class b/out/production/Client/com/texttwist/client/pages/MatchRequests$1.class deleted file mode 100644 index d199b0b..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/MatchRequests$1.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/MatchRequests.class b/out/production/Client/com/texttwist/client/pages/MatchRequests.class deleted file mode 100644 index c4f880e..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/MatchRequests.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/MatchSetup$1.class b/out/production/Client/com/texttwist/client/pages/MatchSetup$1.class deleted file mode 100644 index 782b3c3..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/MatchSetup$1.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/MatchSetup$2.class b/out/production/Client/com/texttwist/client/pages/MatchSetup$2.class deleted file mode 100644 index 1debc0f..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/MatchSetup$2.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/MatchSetup.class b/out/production/Client/com/texttwist/client/pages/MatchSetup.class deleted file mode 100644 index 63b32dc..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/MatchSetup.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Menu$1.class b/out/production/Client/com/texttwist/client/pages/Menu$1.class deleted file mode 100644 index 2cc4282..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Menu$1.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Menu$2.class b/out/production/Client/com/texttwist/client/pages/Menu$2.class deleted file mode 100644 index 4f5d62e..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Menu$2.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Menu$3.class b/out/production/Client/com/texttwist/client/pages/Menu$3.class deleted file mode 100644 index b8c89fe..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Menu$3.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Menu$4.class b/out/production/Client/com/texttwist/client/pages/Menu$4.class deleted file mode 100644 index 0d70a85..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Menu$4.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Menu$5.class b/out/production/Client/com/texttwist/client/pages/Menu$5.class deleted file mode 100644 index 7c7fd0f..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Menu$5.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Menu.class b/out/production/Client/com/texttwist/client/pages/Menu.class deleted file mode 100644 index 887705a..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Menu.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Page.class b/out/production/Client/com/texttwist/client/pages/Page.class deleted file mode 100644 index 21bf1e7..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Page.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Register$1.class b/out/production/Client/com/texttwist/client/pages/Register$1.class deleted file mode 100644 index b9ffb3e..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Register$1.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Register$2.class b/out/production/Client/com/texttwist/client/pages/Register$2.class deleted file mode 100644 index 22c77e7..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Register$2.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/pages/Register.class b/out/production/Client/com/texttwist/client/pages/Register.class deleted file mode 100644 index dbaa06e..0000000 Binary files a/out/production/Client/com/texttwist/client/pages/Register.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTButton$1.class b/out/production/Client/com/texttwist/client/ui/TTButton$1.class deleted file mode 100644 index 86e69ba..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTButton$1.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTButton.class b/out/production/Client/com/texttwist/client/ui/TTButton.class deleted file mode 100644 index 4a57da6..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTButton.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTCircleCounter.class b/out/production/Client/com/texttwist/client/ui/TTCircleCounter.class deleted file mode 100644 index d669387..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTCircleCounter.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTContainer.class b/out/production/Client/com/texttwist/client/ui/TTContainer.class deleted file mode 100644 index 093fb5a..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTContainer.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTGameBox$1.class b/out/production/Client/com/texttwist/client/ui/TTGameBox$1.class deleted file mode 100644 index 62f1b91..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTGameBox$1.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTGameBox.class b/out/production/Client/com/texttwist/client/ui/TTGameBox.class deleted file mode 100644 index 1f68518..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTGameBox.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTImage.class b/out/production/Client/com/texttwist/client/ui/TTImage.class deleted file mode 100644 index 9537221..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTImage.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTImageBtn$1.class b/out/production/Client/com/texttwist/client/ui/TTImageBtn$1.class deleted file mode 100644 index 356e331..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTImageBtn$1.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTImageBtn.class b/out/production/Client/com/texttwist/client/ui/TTImageBtn.class deleted file mode 100644 index 06e1f2a..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTImageBtn.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTInputBox.class b/out/production/Client/com/texttwist/client/ui/TTInputBox.class deleted file mode 100644 index d007182..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTInputBox.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTInputField.class b/out/production/Client/com/texttwist/client/ui/TTInputField.class deleted file mode 100644 index 29d802d..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTInputField.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTLabel.class b/out/production/Client/com/texttwist/client/ui/TTLabel.class deleted file mode 100644 index 40758cc..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTLabel.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTLabelBtn$1.class b/out/production/Client/com/texttwist/client/ui/TTLabelBtn$1.class deleted file mode 100644 index 56c20b2..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTLabelBtn$1.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTLabelBtn.class b/out/production/Client/com/texttwist/client/ui/TTLabelBtn.class deleted file mode 100644 index 05bb2b1..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTLabelBtn.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTLetter.class b/out/production/Client/com/texttwist/client/ui/TTLetter.class deleted file mode 100644 index 919751f..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTLetter.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTPasswordField$1.class b/out/production/Client/com/texttwist/client/ui/TTPasswordField$1.class deleted file mode 100644 index dadfc2d..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTPasswordField$1.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTPasswordField.class b/out/production/Client/com/texttwist/client/ui/TTPasswordField.class deleted file mode 100644 index 04524b6..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTPasswordField.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTScrollList.class b/out/production/Client/com/texttwist/client/ui/TTScrollList.class deleted file mode 100644 index 4ef0d67..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTScrollList.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTSearchBar$1.class b/out/production/Client/com/texttwist/client/ui/TTSearchBar$1.class deleted file mode 100644 index b61ca73..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTSearchBar$1.class and /dev/null differ diff --git a/out/production/Client/com/texttwist/client/ui/TTSearchBar.class b/out/production/Client/com/texttwist/client/ui/TTSearchBar.class deleted file mode 100644 index fb9ebd4..0000000 Binary files a/out/production/Client/com/texttwist/client/ui/TTSearchBar.class and /dev/null differ diff --git a/out/production/Client/fonts/DK Trained Monkey.otf b/out/production/Client/fonts/DK Trained Monkey.otf deleted file mode 100644 index 68463bf..0000000 Binary files a/out/production/Client/fonts/DK Trained Monkey.otf and /dev/null differ diff --git a/out/production/Client/images/back.png b/out/production/Client/images/back.png deleted file mode 100644 index 4452163..0000000 Binary files a/out/production/Client/images/back.png and /dev/null differ diff --git a/out/production/Client/images/logo.png b/out/production/Client/images/logo.png deleted file mode 100644 index 5aabd08..0000000 Binary files a/out/production/Client/images/logo.png and /dev/null differ diff --git a/out/production/Client/images/logout.png b/out/production/Client/images/logout.png deleted file mode 100644 index 6093b84..0000000 Binary files a/out/production/Client/images/logout.png and /dev/null differ diff --git a/out/production/Client/images/scores.png b/out/production/Client/images/scores.png deleted file mode 100644 index d07dfe8..0000000 Binary files a/out/production/Client/images/scores.png and /dev/null differ diff --git a/out/production/Server/com/texttwist/server/Main.class b/out/production/Server/com/texttwist/server/Main.class deleted file mode 100644 index aeeda33..0000000 Binary files a/out/production/Server/com/texttwist/server/Main.class and /dev/null differ diff --git a/out/production/TextTwist/.idea/description.html b/out/production/TextTwist/.idea/description.html deleted file mode 100644 index db5f129..0000000 --- a/out/production/TextTwist/.idea/description.html +++ /dev/null @@ -1 +0,0 @@ -Simple Java application that includes a class with main() method \ No newline at end of file diff --git a/out/production/TextTwist/.idea/misc.xml b/out/production/TextTwist/.idea/misc.xml deleted file mode 100644 index 85bfb6c..0000000 --- a/out/production/TextTwist/.idea/misc.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/out/production/TextTwist/.idea/modules.xml b/out/production/TextTwist/.idea/modules.xml deleted file mode 100644 index 2de22bf..0000000 --- a/out/production/TextTwist/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/out/production/TextTwist/.idea/project-template.xml b/out/production/TextTwist/.idea/project-template.xml deleted file mode 100644 index d57a956..0000000 --- a/out/production/TextTwist/.idea/project-template.xml +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/out/production/TextTwist/.idea/uiDesigner.xml b/out/production/TextTwist/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/out/production/TextTwist/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/out/production/TextTwist/.idea/vcs.xml b/out/production/TextTwist/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/out/production/TextTwist/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/out/production/TextTwist/.idea/workspace.xml b/out/production/TextTwist/.idea/workspace.xml deleted file mode 100644 index 554736c..0000000 --- a/out/production/TextTwist/.idea/workspace.xml +++ /dev/null @@ -1,1468 +0,0 @@ - - - - - - - - - - - - - - - - - - - com.texttwist.client.* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - project - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1497277836157 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No facets are configured - - - - - - - - - - - - - - - 1.8 - - - - - - - - Client - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/out/production/TextTwist/README.md b/out/production/TextTwist/README.md deleted file mode 100644 index af5ffae..0000000 --- a/out/production/TextTwist/README.md +++ /dev/null @@ -1 +0,0 @@ -# texttwist \ No newline at end of file