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

# Conflicts:
#	frontend/src/app/_data/Model.ts
#	frontend/src/app/_pages/add-model/add-model.component.ts

2 files changed, 26 insertions, 0 deletions

diff --git a/backend/microservice/PythonServer/project/api/socket/client.py b/backend/microservice/PythonServer/project/api/socket/client.py
new file mode 100644
index 00000000..d5740e25
--- /dev/null
+++ b/backend/microservice/PythonServer/project/api/socket/client.py
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000..d6ff3f7c
--- /dev/null
+++ b/backend/microservice/PythonServer/project/api/socket/server.py
@@ -0,0 +1,16 @@
+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