Merge pull request #14 from fin-tic/dev

update 1.3.1 (bug fixes)
This commit is contained in:
Justin 2023-02-04 17:56:55 +08:00 committed by GitHub
commit f25e8d1991
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 8 deletions

View File

@ -407,6 +407,7 @@ def restart():
def reset(): def reset():
os.system("sudo ./setup_config_files.sh") os.system("sudo ./setup_config_files.sh")
time.sleep(2)
os.system("sudo reboot now") os.system("sudo reboot now")
return index() return index()

File diff suppressed because one or more lines are too long

View File

@ -949,6 +949,7 @@ resetButton.addEventListener("click", () => {
fetch("/reset", { fetch("/reset", {
method: "GET", method: "GET",
}); });
document.getElementById('yooo').style.display = "block";
}); });

View File

@ -67,7 +67,7 @@
<!-- CSS Stylesheet linking --> <!-- CSS Stylesheet linking -->
<!-- <link href="{{ url_for('static', filename='style.css') }}" type="text/css" rel="stylesheet" /> ALWAYS CHANGE VERSIONING WHENEVER CHANGES ARE MADE TO AVOID BAD CACHING --> <!-- <link href="{{ url_for('static', filename='style.css') }}" type="text/css" rel="stylesheet" /> ALWAYS CHANGE VERSIONING WHENEVER CHANGES ARE MADE TO AVOID BAD CACHING -->
<link rel="stylesheet" type="text/css" href="../static/style.css?ver=1.3"/> <link rel="stylesheet" type="text/css" href="../static/style.css?ver=1.3.1"/>
</head> </head>
@ -76,7 +76,7 @@
<body> <body>
<div id="yooo" style="background-color:black; position:fixed; height:100%; width:100%; z-index:10; display:none;"> <div id="yooo" style="background-color:black; position:fixed; height:100%; width:100%; z-index:10; display:none;">
<p style="color:white; font-size:40px; text-align: center; margin-top: 20%;" class="asdasd">Ticker is shutting down / rebooting. Refresh web page when ticker is booted up again.</p> <p style="color:white; font-size:40px; text-align: center; margin-top: 20%;" class="asdasd">Ticker is shutting down / rebooting / resetting. Refresh web page when ticker is booted up again.</p>
</div> </div>
<div class="container"> <div class="container">
@ -122,7 +122,7 @@
</div> </div>
</div> </div>
<p class="text-white" id="version-text">Version 1.3.0</p> <p class="text-white" id="version-text">Version 1.3.1</p>
</nav> </nav>
<!-- End logo bar --> <!-- End logo bar -->
@ -7621,7 +7621,7 @@
<script src="{{ url_for('static', filename='js/jquery-2.1.1.js') }}"></script> <script src="{{ url_for('static', filename='js/jquery-2.1.1.js') }}"></script>
<!-- <script src="{{ url_for('static', filename='app.js') }}"></script>. ALWAYS CHANGE VERSIONING WHENEVER CHANGES ARE MADE TO AVOID BAD CACHING --> <!-- <script src="{{ url_for('static', filename='app.js') }}"></script>. ALWAYS CHANGE VERSIONING WHENEVER CHANGES ARE MADE TO AVOID BAD CACHING -->
<script type='text/javascript' src='../static/app.js?ver=1.3'></script> <script type='text/javascript' src='../static/app.js?ver=1.3.1'></script>
<script> <script>