diff --git a/client.py b/client.py old mode 100644 new mode 100755 index 156493b..7852841 --- a/client.py +++ b/client.py @@ -1,5 +1,49 @@ -import requests +import wx +import socket -BASE = "http://192.168.1.99:5000/" -response = requests.post(BASE + "newuser") \ No newline at end of file +class MyFrame(wx.Frame): + def __init__(self): + super().__init__(parent=None, title='VCK Online') + panel = wx.Panel(self) + my_sizer = wx.BoxSizer(wx.VERTICAL) + self.text_ctrl = wx.TextCtrl(panel) + my_sizer.Add(self.text_ctrl, 0, wx.ALL | wx.EXPAND, 5) + my_btn = wx.Button(panel, label='Press Me') + my_btn.Bind(wx.EVT_BUTTON, self.on_press) + my_sizer.Add(my_btn, 0, wx.ALL | wx.CENTER, 5) + panel.SetSizer(my_sizer) + self.host = "lukesau.com" + self.port = 8328 # socket server port number + self.header_size = 1024 + self.format = "utf-8" + self.disconnect_message = "!DISCONNECT" + self.Show() + + def on_press(self, event): + message = self.text_ctrl.GetValue() + if not message: + print("You didn't enter anything!") + else: + client_socket = socket.socket() + client_socket.connect((self.host, self.port)) + self.send(message, client_socket) + self.text_ctrl.SetValue("") + self.send(self.disconnect_message, client_socket) + + def send(self, msg, input_socket): + message = msg.encode(self.format) + msg_length = len(message) + print(msg_length) + send_length = str(msg_length).encode(self.format) + send_length += b' ' * (self.header_size - len(send_length)) + input_socket.send(send_length) + input_socket.send(message) + print("done sending") + print(input_socket.recv(2048).decode(self.format)) + + +if __name__ == '__main__': + app = wx.App() + frame = MyFrame() + app.MainLoop() diff --git a/clientgui.py b/clientgui.py deleted file mode 100755 index 7852841..0000000 --- a/clientgui.py +++ /dev/null @@ -1,49 +0,0 @@ -import wx -import socket - - -class MyFrame(wx.Frame): - def __init__(self): - super().__init__(parent=None, title='VCK Online') - panel = wx.Panel(self) - my_sizer = wx.BoxSizer(wx.VERTICAL) - self.text_ctrl = wx.TextCtrl(panel) - my_sizer.Add(self.text_ctrl, 0, wx.ALL | wx.EXPAND, 5) - my_btn = wx.Button(panel, label='Press Me') - my_btn.Bind(wx.EVT_BUTTON, self.on_press) - my_sizer.Add(my_btn, 0, wx.ALL | wx.CENTER, 5) - panel.SetSizer(my_sizer) - self.host = "lukesau.com" - self.port = 8328 # socket server port number - self.header_size = 1024 - self.format = "utf-8" - self.disconnect_message = "!DISCONNECT" - self.Show() - - def on_press(self, event): - message = self.text_ctrl.GetValue() - if not message: - print("You didn't enter anything!") - else: - client_socket = socket.socket() - client_socket.connect((self.host, self.port)) - self.send(message, client_socket) - self.text_ctrl.SetValue("") - self.send(self.disconnect_message, client_socket) - - def send(self, msg, input_socket): - message = msg.encode(self.format) - msg_length = len(message) - print(msg_length) - send_length = str(msg_length).encode(self.format) - send_length += b' ' * (self.header_size - len(send_length)) - input_socket.send(send_length) - input_socket.send(message) - print("done sending") - print(input_socket.recv(2048).decode(self.format)) - - -if __name__ == '__main__': - app = wx.App() - frame = MyFrame() - app.MainLoop() diff --git a/asseturls.txt b/setup/asseturls.txt similarity index 100% rename from asseturls.txt rename to setup/asseturls.txt diff --git a/citizens_202304121016.sql b/sql/citizens_202304121016.sql similarity index 100% rename from citizens_202304121016.sql rename to sql/citizens_202304121016.sql diff --git a/create_starters_table.sql b/sql/create_starters_table.sql similarity index 100% rename from create_starters_table.sql rename to sql/create_starters_table.sql diff --git a/domains_202304121016.sql b/sql/domains_202304121016.sql similarity index 100% rename from domains_202304121016.sql rename to sql/domains_202304121016.sql diff --git a/dukes_202304121016.sql b/sql/dukes_202304121016.sql similarity index 100% rename from dukes_202304121016.sql rename to sql/dukes_202304121016.sql diff --git a/insert_citizen.sql b/sql/insert_citizen.sql similarity index 100% rename from insert_citizen.sql rename to sql/insert_citizen.sql diff --git a/insert_duke.sql b/sql/insert_duke.sql similarity index 100% rename from insert_duke.sql rename to sql/insert_duke.sql diff --git a/insert_monster.sql b/sql/insert_monster.sql similarity index 100% rename from insert_monster.sql rename to sql/insert_monster.sql diff --git a/insert_starter.sql b/sql/insert_starter.sql similarity index 100% rename from insert_starter.sql rename to sql/insert_starter.sql diff --git a/monsters_202304121016.sql b/sql/monsters_202304121016.sql similarity index 100% rename from monsters_202304121016.sql rename to sql/monsters_202304121016.sql diff --git a/starters_202304121016.sql b/sql/starters_202304121016.sql similarity index 100% rename from starters_202304121016.sql rename to sql/starters_202304121016.sql