tebarius/Docker-Flask-QR
1
0
Fork 0
mirror of https://github.com/tebarius/Docker-Flask-QR.git synced 2025-12-20 22:23:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from tebarius/wifi

Browse Source 
wifi geht
This commit is contained in:
tebarius
2023-11-06 19:44:10 +01:00
committed by GitHub
parent 8fd88f1805 99ff706a12
commit c312a874d0
6 changed files with 85 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
.idea/workspace.xml generated
View File

@@ -5,22 +5,12 @@
</component>
<component name="ChangeListManager">
<list default="true" id="3fdfc273-527d-4717-bd6d-4ba98fba7555" name="Changes" comment="css,mail,tel,url,calendar fertig">
<change afterPath="$PROJECT_DIR$/.idea/runConfigurations/Dockerfile_Raspi.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/static/style.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/templates/base.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/templates/cal.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/templates/mail.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/templates/tel.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/templates/text.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/templates/url.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/templates/wifi.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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.zip" beforeDir="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/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/static/style.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/templates/cal.html" beforeDir="false" afterPath="$PROJECT_DIR$/app/templates/cal.html" 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" />
<change beforePath="$PROJECT_DIR$/app/templates/wifi.html" beforeDir="false" afterPath="$PROJECT_DIR$/app/templates/wifi.html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -37,8 +27,27 @@
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="master" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="GitHubPullRequestSearchHistory">{
&quot;lastFilter&quot;: {
&quot;state&quot;: &quot;OPEN&quot;,
&quot;assignee&quot;: &quot;tebarius&quot;
}
}</component>
<component name="GithubPullRequestsUISettings">
<option name="selectedUrlAndAccountId">
<UrlAndAccount>
<option name="accountId" value="7d5c729f-fa2d-4d9c-8a19-05f5f07a37c9" />
<option name="url" value="https://github.com/tebarius/Docker-Flask-QR.git" />
</UrlAndAccount>
</option>
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
@@ -59,7 +68,7 @@
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"ignore.virus.scanning.warn.message": "true",
"last_opened_file_path": "D:/mager/Documents/IntelliJ/Docker-Flask-QR/app/templates",
"project.structure.last.edited": "SDKs",
"project.structure.last.edited": "Global Libraries",
"project.structure.proportion": "0.15",
"project.structure.side.proportion": "0.2",
"settings.editor.selected.configurable": "preferences.lookFeel"
@@ -85,11 +94,6 @@
</deployment>
<method v="2" />
</configuration>
<recent_temporary>
<list>
<item itemvalue="Docker.Dockerfile-Raspi" />
</list>
</recent_temporary>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
@@ -100,6 +104,15 @@
<option name="presentableId" value="Default" />
<updated>1698755716250</updated>
</task>
<task id="LOCAL-00001" summary="css,mail,tel,url,calendar fertig">
<option name="closed" value="true" />
<created>1699219722200</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1699219722200</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@@ -107,7 +120,19 @@
<map>
<entry key="MAIN">
<value>
<State />
<State>
<option name="FILTERS">
<map>
<entry key="branch">
<value>
<list>
<option value="master" />
</list>
</value>
</entry>
</map>
</option>
</State>
</value>
</entry>
</map>

19
app/Flask-QR.py
View File

@@ -55,7 +55,7 @@ def cal():
@app.route("/qr.html")
def makeqr():
data = ""
data = "Sorry kein Inhalt!!!"
if request.args.get('type') == "text":
data = request.args.get('text')
@@ -72,8 +72,18 @@ def makeqr():
pass
elif request.args.get('type') == "wifi":
pass
passw = (request.args.get("passw").replace("\\", "\\\\").replace(";", "\\;")
.replace(",", "\\,").replace(":", "\\:").replace("\"", "\\\""))
ssid = (request.args.get("ssid").replace("\\", "\\\\").replace(";", "\\;")
.replace(",", "\\,").replace(":", "\\:").replace("\"", "\\\""))
if request.args.get("auth") == "WPA":
data = f'WIFI:T:WPA;S:"{ssid}";P:"{passw}"'
else:
data = f'WIFI:T:nopass;S:"{ssid}"'
if request.args.get("hidden"):
data += "H:true;;"
else:
data += ";"
elif request.args.get('type') == "cal":
# Format für Calendar (Zeilenumbrüche beachten!!):
# BEGIN:VEVENT
@@ -124,9 +134,6 @@ def makeqr():
else:
data += "?"
data += f"body={request.args.get('body')}"
else:
data = "Sorry kein Inhalt!!!"
return render_template('qr.html', data=data)

13
app/static/style.css
View File

@@ -26,3 +26,16 @@
border-radius: 50px;
filter: drop-shadow(10px 10px 10px blue);
}
input[type='radio']
{
transform: scale(4);
margin: 10px;
vertical-align:12px;
}
input[type='checkbox']
{
transform: scale(4);
margin: 10px;
vertical-align:12px;
}

2
app/templates/cal.html
View File

@@ -2,7 +2,7 @@
{% block inhalt %}
<form action="qr.html">
<label>Gib bitte Details für deinen Termin ein!</label><br />
<label>Gebe bitte Details für deinen Termin ein!</label><br />
<input type="hidden" name="type" value="cal">
<label for="title">Titel:</label>

2
app/templates/index.html
View File

@@ -9,6 +9,6 @@
<!--<div><button><a href="./vcard.html">Visitenkarte (vCard)</a></button></div>-->
<!--<div><button><a href="./geo.html">geographische Koordinaten</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="./wifi.html">WIFI</a></button></div>
<div><button><a href="./cal.html">Kalender-Termin</a></button></div>
{% endblock %}

16
app/templates/wifi.html
View File

@@ -2,13 +2,21 @@
{% block inhalt %}
<form action="qr.html">
<label>Gib bitte Details zum WIFI ein!</label><br />
<label>Gebe bitte Details zum WIFI ein!</label><br />
<input type="hidden" name="type" value="wifi">
<label for="ssid">SSID:</label>
<label for="ssid">Netzwerkname (SSID):</label>
<input type="text" name="ssid" id="ssid" size="30" maxlength="60" required><br />
<label for="passw">Passcode &#47; Passwort:</label>
<input type="text" name="passw" id="passw" size="30" maxlength="60"><br />
<input type="checkbox" name="hidden" id="hidden" value=True>
<label for="hidden"><i>versteckte &#47; unsichtbare SSID</i></label><br />
<label>
<input name="auth" type="radio" value="WPA" required>
</label> WPA/WPA2/WPA3<br />
<label>
<input name="auth" type="radio" value="nopass" required>
</label> keine Verschl&uuml;sselung