From 4107a930b63d9d7193574ad37106bbe88d9be4f3 Mon Sep 17 00:00:00 2001
From: tebarius <tba@gmx.li>
Date: Mon, 13 Nov 2023 15:55:55 +0100
Subject: [PATCH] =?UTF-8?q?anpassung=20f=C3=BCr=20proxy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                   |  50 ++++++++++++++++----------
 app/Flask-QR.py                       |   8 ++++-
 app/{static => qr-static}/favicon.ico | Bin
 app/{static => qr-static}/style.css   |   0
 app/templates/index.html              |  18 +++++-----
 app/templates/qr.html                 |   2 +-
 6 files changed, 48 insertions(+), 30 deletions(-)
 rename app/{static => qr-static}/favicon.ico (100%)
 rename app/{static => qr-static}/style.css (100%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8830aea..fd3347e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3fdfc273-527d-4717-bd6d-4ba98fba7555" name="Changes" comment="geo.html verändert">
+    <list default="true" id="3fdfc273-527d-4717-bd6d-4ba98fba7555" name="Changes" comment="pip-Kommentar in .py gekürzt">
       <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$/app/Flask-QR.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/Flask-QR.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/static/favicon.ico" beforeDir="false" afterPath="$PROJECT_DIR$/app/qr-static/favicon.ico" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/static/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/qr-static/style.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/app/templates/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/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" />
@@ -49,7 +52,7 @@
     <option name="stateVersion" value="1" />
   </component>
   <component name="ProblemsViewState">
-    <option name="selectedTabId" value="DEPENDENCY_CHECKER_PROBLEMS_TAB" />
+    <option name="selectedTabId" value="CurrentFile" />
   </component>
   <component name="ProjectColorInfo">{
   &quot;associatedIndex&quot;: 4
@@ -62,20 +65,20 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "DefaultHtmlFileTemplate": "HTML File",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "ignore.virus.scanning.warn.message": "true",
-    "last_opened_file_path": "/home/tebarius/IdeaProjects/Docker-Flask-QR/app/templates",
-    "project.structure.last.edited": "Modules",
-    "project.structure.proportion": "0.15",
-    "project.structure.side.proportion": "0.2",
-    "settings.editor.selected.configurable": "preferences.keymap"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;DefaultHtmlFileTemplate&quot;: &quot;HTML File&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &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;/home/tebarius/IdeaProjects/Docker-Flask-QR/app/templates&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.keymap&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/app/templates" />
@@ -90,7 +93,7 @@
       <recent name="D:\mager\Documents\IntelliJ\Docker-Flask-QR" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.Flask-QR">
+  <component name="RunManager" selected="Docker.Dockerfile-Raspi">
     <configuration name="Flask-QR" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
       <module name="Docker-Flask-QR" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -198,7 +201,15 @@
       <option name="project" value="LOCAL" />
       <updated>1699515623546</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="pip-Kommentar in .py gekürzt">
+      <option name="closed" value="true" />
+      <created>1699621212644</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1699621212644</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -232,7 +243,8 @@
     <MESSAGE value="MeCard ergänzt" />
     <MESSAGE value="geo ergänzt" />
     <MESSAGE value="geo.html verändert" />
-    <option name="LAST_COMMIT_MESSAGE" value="geo.html verändert" />
+    <MESSAGE value="pip-Kommentar in .py gekürzt" />
+    <option name="LAST_COMMIT_MESSAGE" value="pip-Kommentar in .py gekürzt" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
diff --git a/app/Flask-QR.py b/app/Flask-QR.py
index 7ffa98f..2a6021c 100755
--- a/app/Flask-QR.py
+++ b/app/Flask-QR.py
@@ -4,7 +4,7 @@
 from flask import Flask, render_template, request
 from flask_qrcode import QRcode
 
-app = Flask(__name__)
+app = Flask(__name__, static_folder='qr-static')
 QRcode(app)
 
 
@@ -13,6 +13,11 @@ def index():
     return render_template('index.html')
 
 
+@app.route("/index.html")
+def index_html():
+    return render_template('index.html')
+
+
 @app.route("/text.html")
 def text():
     return render_template('text.html')
@@ -69,6 +74,7 @@ def makeqr():
 
     elif request.args.get('type') == "tel":
         data = f"tel:{request.args.get('tel')}"
+
     elif request.args.get('type') == "geo":
         data = "GEO:"
         if request.args.get('ns') == "S":
diff --git a/app/static/favicon.ico b/app/qr-static/favicon.ico
similarity index 100%
rename from app/static/favicon.ico
rename to app/qr-static/favicon.ico
diff --git a/app/static/style.css b/app/qr-static/style.css
similarity index 100%
rename from app/static/style.css
rename to app/qr-static/style.css
diff --git a/app/templates/index.html b/app/templates/index.html
index 2460085..b3ed0e8 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -3,13 +3,13 @@
 {% block inhalt %}
     <p>
     <b>Welche Art von QR-Code soll generiert werden?</b><br>
-    <div><button><a href="./text.html">einfacher Text </a></button></div>
-    <div><button><a href="./url.html">URL/Website-Link</a></button></div>
-    <div><button><a href="./tel.html">Telefonnummer</a></button></div>
-    <div><button><a href="./mail.html">EMail-Adresse</a></button></div>
-    <div><button><a href="./wifi.html">WIFI</a></button></div>
-    <div><button><a href="./cal.html">Kalender-Termin</a></button></div>
-    <div><button><a href="./vcard.html">Visitenkarte (vCard)</a></button></div>
-    <div><button><a href="./mecard.html">Visitenkarte (MeCard)</a></button></div>
-    <div><button><a href="./geo.html">geographische Koordinaten</a></button></div>
+    <div><button><a href="text.html">einfacher Text </a></button></div>
+    <div><button><a href="url.html">URL/Website-Link</a></button></div>
+    <div><button><a href="tel.html">Telefonnummer</a></button></div>
+    <div><button><a href="mail.html">EMail-Adresse</a></button></div>
+    <div><button><a href="wifi.html">WIFI</a></button></div>
+    <div><button><a href="cal.html">Kalender-Termin</a></button></div>
+    <div><button><a href="vcard.html">Visitenkarte (vCard)</a></button></div>
+    <div><button><a href="mecard.html">Visitenkarte (MeCard)</a></button></div>
+    <div><button><a href="geo.html">geographische Koordinaten</a></button></div>
 {% endblock %}
diff --git a/app/templates/qr.html b/app/templates/qr.html
index 83b6844..511911a 100644
--- a/app/templates/qr.html
+++ b/app/templates/qr.html
@@ -9,7 +9,7 @@
     <img src="{{ data|qrcode(fit=True, box_size=10, border=2, ) }}" alt="QR-Code f&uuml;r {{ data }}">
 </p>
 <p>
-<a href="./">Noch einmal bitte!</a>
+<a href="/index.html">Noch einmal bitte!</a>
 </p>
 {% endblock %}