feat: Add version and links to settings page
All checks were successful
Build Docker / Build Image (push) Successful in 54s

This commit is contained in:
Nathan Woodburn 2024-02-13 11:49:42 +11:00
parent 4f74d51514
commit fea42b1177
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
9 changed files with 2265 additions and 2 deletions

Binary file not shown.

13
main.py
View File

@ -12,6 +12,8 @@ import domainLookup
import urllib.parse import urllib.parse
import importlib import importlib
import plugin as plugins_module import plugin as plugins_module
import gitinfo
import datetime
dotenv.load_dotenv() dotenv.load_dotenv()
@ -1041,8 +1043,17 @@ def settings():
if success == None: if success == None:
success = "" success = ""
info = gitinfo.get_git_info()
branch = info['refs']
if branch == "main":
branch = ""
last_commit = info['author_date']
# import to time from format "2024-02-13 11:24:03"
last_commit = datetime.datetime.strptime(last_commit, "%Y-%m-%d %H:%M:%S")
version = f'{last_commit.strftime("%y-%m-%d")} ({branch})'
return render_template("settings.html", account=account,sync=account_module.getNodeSync(), return render_template("settings.html", account=account,sync=account_module.getNodeSync(),
error=error,success=success) error=error,success=success,version=version)
@app.route('/settings/<action>') @app.route('/settings/<action>')
def settings_action(action): def settings_action(action):

View File

@ -8,3 +8,4 @@ cryptography
requests-doh requests-doh
Flask-QRcode Flask-QRcode
PySocks PySocks
python-git-info

Binary file not shown.

11
templates/assets/fonts/ionicons.min.css vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 326 KiB

Binary file not shown.

Binary file not shown.

View File

@ -14,6 +14,7 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i&amp;display=swap"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i&amp;display=swap">
<link rel="stylesheet" href="/assets/fonts/fontawesome-all.min.css"> <link rel="stylesheet" href="/assets/fonts/fontawesome-all.min.css">
<link rel="stylesheet" href="/assets/fonts/font-awesome.min.css"> <link rel="stylesheet" href="/assets/fonts/font-awesome.min.css">
<link rel="stylesheet" href="/assets/fonts/ionicons.min.css">
<link rel="stylesheet" href="/assets/fonts/material-icons.min.css"> <link rel="stylesheet" href="/assets/fonts/material-icons.min.css">
<link rel="stylesheet" href="/assets/fonts/fontawesome5-overrides.min.css"> <link rel="stylesheet" href="/assets/fonts/fontawesome5-overrides.min.css">
<link rel="stylesheet" href="/assets/css/styles.min.css"> <link rel="stylesheet" href="/assets/css/styles.min.css">
@ -105,6 +106,15 @@
</div> </div>
</div> </div>
</div> </div>
<div class="container-fluid" style="margin-top: 50px;">
<div class="card">
<div class="card-body">
<h4 class="card-title">About</h4>
<h6 class="text-muted card-subtitle mb-2">FireWallet version: <code>{{version}}</code></h6>
<div class="text-center"><a href="https://github.com/nathanwoodburn/firewalletbrowser" style="margin: 15px;color: var(--bs-emphasis-color);text-decoration:none;" target="_blank"><i class="icon ion-social-github" style="color: var(--bs-emphasis-color);"></i>&nbsp;Github</a><a href="https://firewallet.au" style="margin: 15px;color: var(--bs-emphasis-color);text-decoration:none;" target="_blank"><i class="icon ion-ios-information" style="color: var(--bs-emphasis-color);"></i>&nbsp;Website</a><a href="https://l.woodburn.au/donate" style="margin: 15px;color: var(--bs-emphasis-color);text-decoration:none;" target="_blank"><i class="icon ion-social-usd" style="color: var(--bs-emphasis-color);"></i>&nbsp;Donate</a></div>
</div>
</div>
</div>
</div> </div>
<footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">
<div class="container my-auto"> <div class="container my-auto">