From 61f13655fd5a4b519ce1702cbf0a52d000267991 Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Thu, 9 Mar 2023 16:24:09 +0100
Subject: [PATCH] updated file names

---
 app-config/caimira-public-docker-image/Dockerfile   |   2 +-
 .../caimira-public-docker-image/run_caimira.sh      |   2 +-
 app-config/caimira-webservice/app.sh                |   2 +-
 caimira/apps/__init__.py                            |   2 +-
 caimira/apps/{simulator.py => expert_co2.py}        |   0
 .../apps/{simulator => expert_co2}/caimira.ipynb    |   0
 .../static/images/header_image.png                  | Bin
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename caimira/apps/{simulator.py => expert_co2.py} (100%)
 rename caimira/apps/{simulator => expert_co2}/caimira.ipynb (100%)
 rename caimira/apps/{simulator => expert_co2}/static/images/header_image.png (100%)

diff --git a/app-config/caimira-public-docker-image/Dockerfile b/app-config/caimira-public-docker-image/Dockerfile
index fe4aa1b8..6e2c6914 100644
--- a/app-config/caimira-public-docker-image/Dockerfile
+++ b/app-config/caimira-public-docker-image/Dockerfile
@@ -15,7 +15,7 @@ COPY ./app-config/caimira-public-docker-image/run_caimira.sh /opt/caimira/start.
 # In the best case this will be a no-op.
 RUN cd /opt/caimira/src/ && /opt/caimira/app/bin/pip install -r /opt/caimira/src/requirements.txt
 RUN /opt/caimira/app/bin/jupyter trust /opt/caimira/src/caimira/apps/expert/*.ipynb
-RUN /opt/caimira/app/bin/jupyter trust /opt/caimira/src/caimira/apps/simulator/*.ipynb
+RUN /opt/caimira/app/bin/jupyter trust /opt/caimira/src/caimira/apps/expert_co2/*.ipynb
 COPY ./app-config/caimira-public-docker-image/nginx.conf /opt/caimira/nginx.conf
 
 EXPOSE 8080
diff --git a/app-config/caimira-public-docker-image/run_caimira.sh b/app-config/caimira-public-docker-image/run_caimira.sh
index 260b2864..5f12ca46 100755
--- a/app-config/caimira-public-docker-image/run_caimira.sh
+++ b/app-config/caimira-public-docker-image/run_caimira.sh
@@ -12,7 +12,7 @@ cd /opt/caimira/src/caimira
   --Voila.tornado_settings 'allow_origin=*' \
   >> /var/log/expert-app.log 2>&1 &
 
-/opt/caimira/app/bin/python -m voila /opt/caimira/src/caimira/apps/simulator/caimira.ipynb \
+/opt/caimira/app/bin/python -m voila /opt/caimira/src/caimira/apps/expert_co2/caimira.ipynb \
   --port=8083 --no-browser --base_url=/co2-voila-server/ \
   --Voila.tornado_settings 'allow_origin=*' \
   >> /var/log/co2-app.log 2>&1 &
diff --git a/app-config/caimira-webservice/app.sh b/app-config/caimira-webservice/app.sh
index a0dc01b2..af223351 100755
--- a/app-config/caimira-webservice/app.sh
+++ b/app-config/caimira-webservice/app.sh
@@ -28,7 +28,7 @@ elif [[ "$APP_NAME" == "caimira-voila" ]]; then
     voila caimira/apps/expert/ --port=8080 --no-browser --base_url=/voila-server/ --tornado_settings 'allow_origin=*'
 elif [[ "$APP_NAME" == "caimira-co2-voila" ]]; then
     echo "Starting the CO2 voila service"
-    voila caimira/apps/simulator/ --port=8080 --no-browser --base_url=/co2-voila-server/ --tornado_settings 'allow_origin=*'
+    voila caimira/apps/expert_co2/ --port=8080 --no-browser --base_url=/co2-voila-server/ --tornado_settings 'allow_origin=*'
 else
     echo "No APP_NAME specified"
     exit 1
diff --git a/caimira/apps/__init__.py b/caimira/apps/__init__.py
index 57441379..26b7f5d3 100644
--- a/caimira/apps/__init__.py
+++ b/caimira/apps/__init__.py
@@ -1,4 +1,4 @@
 from .expert import ExpertApplication
-from .simulator import CO2Application
+from .expert_co2 import CO2Application
 
 __all__ = ['ExpertApplication', 'CO2Application']
diff --git a/caimira/apps/simulator.py b/caimira/apps/expert_co2.py
similarity index 100%
rename from caimira/apps/simulator.py
rename to caimira/apps/expert_co2.py
diff --git a/caimira/apps/simulator/caimira.ipynb b/caimira/apps/expert_co2/caimira.ipynb
similarity index 100%
rename from caimira/apps/simulator/caimira.ipynb
rename to caimira/apps/expert_co2/caimira.ipynb
diff --git a/caimira/apps/simulator/static/images/header_image.png b/caimira/apps/expert_co2/static/images/header_image.png
similarity index 100%
rename from caimira/apps/simulator/static/images/header_image.png
rename to caimira/apps/expert_co2/static/images/header_image.png