Merge pull request 'dev' (#4) from dev into master
ci/woodpecker/push/default Pipeline was successful
ci/woodpecker/tag/default Pipeline was successful

Reviewed-on: #4
This commit was merged in pull request #4.
This commit is contained in:
2023-01-30 18:39:54 +00:00
3 changed files with 6 additions and 4 deletions
+3 -1
View File
@@ -1,2 +1,4 @@
__pycache__/
venv/
venv/
.vscode/
.idea/
+2 -2
View File
@@ -31,7 +31,7 @@
<body>
<div class="timer_frame">
<p id="timer_data" class="timer_data">До лета осталось 14д 3ч 24м 30с</p>
<p id="timer_data" class="timer_data"></p>
</div>
</body>
<script>
@@ -45,7 +45,7 @@
let url = "/time";
let info = await fetchAsync(url);
let elem = document.getElementById("timer_data");
elem.textContent = "До лета осталось " + info;
elem.textContent = info;
setTimeout(updateInfoAsync, 1000)
}
+1 -1
View File
@@ -15,4 +15,4 @@ def getTimeBeforeSummer():
m = str((summer_time.seconds % 3600) // 60)
s = str(summer_time.seconds % 60)
return str(summer_time.days) + ' д ' + h + ' ч ' + m + ' мин ' + s + ' сек'
return 'До лета осталось ' + str(summer_time.days) + ' д ' + h + ' ч ' + m + ' мин ' + s + ' сек'