From f9c87d9a3132d821fb4aa44d489c0c2eeeecb26c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= <kristof.toth@avatao.com>
Date: Sat, 31 Mar 2018 22:05:48 +0200
Subject: [PATCH] Remove extra folder from demo path

---
 solvable/Dockerfile                                 |   8 ++++----
 solvable/src/{demo => }/app.py                      |   0
 solvable/src/{demo => }/event_handler_main.py       |   0
 .../source_code_server/login_component.py           |   0
 .../src/{demo => }/source_code_server/server.py     |   0
 solvable/src/{demo => }/source_code_server/users.db | Bin
 solvable/src/{demo => }/sql_injection_fsm.py        |   0
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename solvable/src/{demo => }/app.py (100%)
 rename solvable/src/{demo => }/event_handler_main.py (100%)
 rename solvable/src/{demo => }/source_code_server/login_component.py (100%)
 rename solvable/src/{demo => }/source_code_server/server.py (100%)
 rename solvable/src/{demo => }/source_code_server/users.db (100%)
 rename solvable/src/{demo => }/sql_injection_fsm.py (100%)

diff --git a/solvable/Dockerfile b/solvable/Dockerfile
index c409615..bfbb869 100644
--- a/solvable/Dockerfile
+++ b/solvable/Dockerfile
@@ -5,10 +5,10 @@ ENV TFW_APP_DIR="/srv/app"                          \
     TFW_WEBIDE_WD="/home/${AVATAO_USER}/workdir"    \
     TFW_TERMINADO_WD="/home/${AVATAO_USER}/workdir"
 
-COPY solvable/src/demo ${TFW_APP_DIR}/
-COPY solvable/src/demo/source_code_server/server.py ${TFW_LOGIN_APP_DIR}/
-COPY solvable/src/demo/source_code_server/users.db ${TFW_LOGIN_APP_DIR}/
-COPY solvable/src/demo/source_code_server/login_component.py ${TFW_WEBIDE_WD}/
+COPY solvable/src ${TFW_APP_DIR}/
+COPY solvable/src/source_code_server/server.py ${TFW_LOGIN_APP_DIR}/
+COPY solvable/src/source_code_server/users.db ${TFW_LOGIN_APP_DIR}/
+COPY solvable/src/source_code_server/login_component.py ${TFW_WEBIDE_WD}/
 
 RUN chown -R ${AVATAO_USER} ${TFW_WEBIDE_WD} &&\
     chmod -R 755 ${TFW_WEBIDE_WD}
diff --git a/solvable/src/demo/app.py b/solvable/src/app.py
similarity index 100%
rename from solvable/src/demo/app.py
rename to solvable/src/app.py
diff --git a/solvable/src/demo/event_handler_main.py b/solvable/src/event_handler_main.py
similarity index 100%
rename from solvable/src/demo/event_handler_main.py
rename to solvable/src/event_handler_main.py
diff --git a/solvable/src/demo/source_code_server/login_component.py b/solvable/src/source_code_server/login_component.py
similarity index 100%
rename from solvable/src/demo/source_code_server/login_component.py
rename to solvable/src/source_code_server/login_component.py
diff --git a/solvable/src/demo/source_code_server/server.py b/solvable/src/source_code_server/server.py
similarity index 100%
rename from solvable/src/demo/source_code_server/server.py
rename to solvable/src/source_code_server/server.py
diff --git a/solvable/src/demo/source_code_server/users.db b/solvable/src/source_code_server/users.db
similarity index 100%
rename from solvable/src/demo/source_code_server/users.db
rename to solvable/src/source_code_server/users.db
diff --git a/solvable/src/demo/sql_injection_fsm.py b/solvable/src/sql_injection_fsm.py
similarity index 100%
rename from solvable/src/demo/sql_injection_fsm.py
rename to solvable/src/sql_injection_fsm.py