Merge branch 'trening' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

# Conflicts:
#	frontend/src/app/_services/models.service.ts

2 files changed, 0 insertions, 26 deletions

diff --git a/backend/microservice/PythonServer/project/api/socket/client.py b/backend/microservice/PythonServer/project/api/socket/client.py
deleted file mode 100644
index d5740e25..00000000
--- a/backend/microservice/PythonServer/project/api/socket/client.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import socket
-
-c = socket.socket()
-
-c.connect(('localhost', 9999))
-
-name = input("Client name:")
-c.send(bytes(name, 'utf-8'))
-
-print(c.recv(1024).decode())
\ No newline at end of file
diff --git a/backend/microservice/PythonServer/project/api/socket/server.py b/backend/microservice/PythonServer/project/api/socket/server.py
deleted file mode 100644
index d6ff3f7c..00000000
--- a/backend/microservice/PythonServer/project/api/socket/server.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import socket
-
-s = socket.socket()
-print('Socket Created')
-
-s.bind(('localhost', 9999))
-
-s.listen(3)
-print('waiting for connections')
-
-while True:
-    c, addr = s.accept()
-    name = c.recv(1024).decode()
-    print('Connected with ', addr, name)
-    c.send(bytes('Welcome', 'utf-8'))
-    c.close()
\ No newline at end of file