Compare commits
No commits in common. "fea42b1177ede0058f887386f026ad6b9d826874" and "472e9fb7974c8b934000e8831edb14aeb2fd6a0a" have entirely different histories.
fea42b1177
...
472e9fb797
Binary file not shown.
13
main.py
13
main.py
@ -12,8 +12,6 @@ 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()
|
||||||
|
|
||||||
@ -1043,17 +1041,8 @@ 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,version=version)
|
error=error,success=success)
|
||||||
|
|
||||||
@app.route('/settings/<action>')
|
@app.route('/settings/<action>')
|
||||||
def settings_action(action):
|
def settings_action(action):
|
||||||
|
@ -7,5 +7,4 @@ dnspython
|
|||||||
cryptography
|
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
11
templates/assets/fonts/ionicons.min.css
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
Before Width: | Height: | Size: 326 KiB |
Binary file not shown.
Binary file not shown.
@ -65,7 +65,7 @@
|
|||||||
</nav>
|
</nav>
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="d-sm-flex justify-content-between align-items-center mb-4">
|
<div class="d-sm-flex justify-content-between align-items-center mb-4">
|
||||||
<h3 class="text-dark mb-0">Dashboard</h3><a class="btn btn-primary btn-sm d-none d-sm-inline-block" role="button" href="/report" target="_blank"><i class="fas fa-download fa-sm text-white-50"></i> Generate Report</a>
|
<h3 class="text-dark mb-0">Dashboard</h3><a class="btn btn-primary btn-sm d-none d-sm-inline-block" role="button" href="/report"><i class="fas fa-download fa-sm text-white-50"></i> Generate Report</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-6 col-xl-3 mb-4">
|
<div class="col-md-6 col-xl-3 mb-4">
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
<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&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&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">
|
||||||
@ -106,15 +105,6 @@
|
|||||||
</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> 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> 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> 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">
|
||||||
|
Loading…
Reference in New Issue
Block a user