From 216266191c93afc6270baa28f67e942340055498 Mon Sep 17 00:00:00 2001
From: tebarius <tba@gmx.li>
Date: Thu, 2 Nov 2023 15:45:09 +0100
Subject: [PATCH] optimierungen

---
 .idea/inspectionProfiles/Project_Default.xml | 14 --------------
 .idea/misc.xml                               |  2 +-
 .idea/workspace.xml                          | 17 +++++++++++------
 Docker-Flask-QR.iml                          |  4 +++-
 Dockerfile                                   |  4 +---
 Dockerfile-RasPi                             |  7 ++-----
 Flask-QR.py => app/Flask-QR.py               |  0
 requirements.txt => app/requirements.txt     |  1 -
 {templates => app/templates}/index.html      |  0
 {templates => app/templates}/qr.html         |  0
 10 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 rename Flask-QR.py => app/Flask-QR.py (100%)
 rename requirements.txt => app/requirements.txt (66%)
 rename {templates => app/templates}/index.html (100%)
 rename {templates => app/templates}/qr.html (100%)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 930c017..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoredPackages">
-        <value>
-          <list size="1">
-            <item index="0" class="java.lang.String" itemvalue="typing_extensions" />
-          </list>
-        </value>
-      </option>
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0dda005..d21ab2d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.12 (Docker-Flask-QR)" />
   </component>
-  <component name="ProjectRootManager">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="Python 3.12 (Docker-Flask-QR)" project-jdk-type="Python SDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b4a4416..4620587 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,16 +5,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3fdfc273-527d-4717-bd6d-4ba98fba7555" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/dbnavigator.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dbnavigator.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/requirements.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Docker-Flask-QR.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Docker-Flask-QR.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Dockerfile-RasPi" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile-RasPi" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Flask-QR.py" beforeDir="false" afterPath="$PROJECT_DIR$/Flask-QR.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/requirements.txt" beforeDir="false" afterPath="$PROJECT_DIR$/requirements.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/qr.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/qr.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Flask-QR.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/Flask-QR.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/requirements.txt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/app/templates/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/qr.html" beforeDir="false" afterPath="$PROJECT_DIR$/app/templates/qr.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -52,7 +53,10 @@
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
     &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/mager/Documents/IntelliJ/Docker-Flask-QR/Dockerfile-RasPi&quot;
+    &quot;last_opened_file_path&quot;: &quot;D:/mager/Documents/IntelliJ/Docker-Flask-QR/Dockerfile-RasPi&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;SDKs&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;
   }
 }</component>
   <component name="RecentsManager">
@@ -61,6 +65,7 @@
       <recent name="D:\mager\Documents\IntelliJ\Docker-Flask-QR\templates" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/app" />
       <recent name="D:\mager\Documents\IntelliJ\Docker-Flask-QR\templates" />
       <recent name="D:\mager\Documents\IntelliJ\Docker-Flask-QR" />
     </key>
diff --git a/Docker-Flask-QR.iml b/Docker-Flask-QR.iml
index 5b1310a..b25a585 100644
--- a/Docker-Flask-QR.iml
+++ b/Docker-Flask-QR.iml
@@ -2,7 +2,9 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
     <orderEntry type="jdk" jdkName="Python 3.12 (Docker-Flask-QR)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/Dockerfile b/Dockerfile
index 2de38e1..f41cb70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,9 +5,7 @@ LABEL version="1.0"
 LABEL description="Simple QR-Code-Generator-Server"
 
 WORKDIR /app
-RUN mkdir templates
-COPY ./templates /app/templates/
-COPY ./Flask-QR.py ./requirements.txt /app/
+COPY ./app /app/
 
 #RUN pip install --upgrade pip
 RUN pip install --trusted-host pypi.python.org -r requirements.txt
diff --git a/Dockerfile-RasPi b/Dockerfile-RasPi
index 50ecc8a..e3b7d86 100644
--- a/Dockerfile-RasPi
+++ b/Dockerfile-RasPi
@@ -5,12 +5,9 @@ LABEL version="1.0"
 LABEL description="Simple QR-Code-Generator-Server"
 
 WORKDIR /app
+COPY ./app /app/
 
-RUN mkdir templates
-COPY ./templates /app/templates/
-COPY ./Flask-QR.py ./requirements.txt /app/
-
-RUN apt-get update && apt-get install -y zlib1g-dev libjpeg-dev libpng-dev gcc
+RUN apt-get update && apt-get install -y gcc zlib1g-dev libjpeg-dev
 #RUN python -m pip install --upgrade pip
 #RUN python -m pip install --upgrade pillow
 RUN pip install --trusted-host pypi.python.org -r requirements.txt
diff --git a/Flask-QR.py b/app/Flask-QR.py
similarity index 100%
rename from Flask-QR.py
rename to app/Flask-QR.py
diff --git a/requirements.txt b/app/requirements.txt
similarity index 66%
rename from requirements.txt
rename to app/requirements.txt
index 6056ed4..ced55d8 100644
--- a/requirements.txt
+++ b/app/requirements.txt
@@ -1,2 +1 @@
-Flask
 Flask-QRcode
\ No newline at end of file
diff --git a/templates/index.html b/app/templates/index.html
similarity index 100%
rename from templates/index.html
rename to app/templates/index.html
diff --git a/templates/qr.html b/app/templates/qr.html
similarity index 100%
rename from templates/qr.html
rename to app/templates/qr.html