Merge pull request 'dev' (#4 ) from dev into master

Reviewed-on: #4
Merge pull request 'refactor: remove initial data and preamble from data div' (#3 ) from mckunda into dev
3 changed files with 6 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,4 @@
 __pycache__/
-venv/
+venv/
+.vscode/
+.idea/
--- a/templates/app.html
+++ b/templates/app.html
@ -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)
    }

--- a/time_counter.py
+++ b/time_counter.py
@ -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 + ' сек'
Author	SHA1	Message	Date
mckunda	d0a641457d	Merge pull request 'dev' (#4 ) from dev into master ci/woodpecker/push/default Pipeline was successful Details ci/woodpecker/tag/default Pipeline was successful Details Reviewed-on: #4	4 years ago
mckunda	112d5b2b3d	Merge pull request 'refactor: remove initial data and preamble from data div' (#3 ) from mckunda into dev ci/woodpecker/push/default Pipeline was successful Details ci/woodpecker/pr/default Pipeline was successful Details Reviewed-on: #3	4 years ago
mckunda	9f168828fa	Merge branch 'dev' into mckunda ci/woodpecker/push/default Pipeline was successful Details ci/woodpecker/pr/default Pipeline was successful Details	4 years ago
mckunda	9ad4699d6f	Merge pull request 'refactor: prepend time counter date with intro' (#2 ) from mcpanda into dev ci/woodpecker/push/default Pipeline was successful Details Reviewed-on: #2	4 years ago
mckunda	15865adf1a	refactor: remove initial data and preamble from data div ci/woodpecker/push/default Pipeline was successful Details ci/woodpecker/pr/default Pipeline was successful Details	4 years ago
mckunda	2ef03cd573	chore: update .gitignore	4 years ago
Marta Enina	0cf1f856fa	refactor: prepend time counter date with intro ci/woodpecker/push/default Pipeline was successful Details ci/woodpecker/pr/default Pipeline was successful Details	4 years ago