9 Commits

Author SHA1 Message Date
mckunda 9f168828fa Merge branch 'dev' into mckunda
ci/woodpecker/push/default Pipeline was successful
ci/woodpecker/pr/default Pipeline was successful
2023-01-30 18:37:39 +00:00
mckunda 9ad4699d6f Merge pull request 'refactor: prepend time counter date with intro' (#2) from mcpanda into dev
ci/woodpecker/push/default Pipeline was successful
Reviewed-on: #2
2023-01-30 18:37:21 +00:00
mckunda 15865adf1a refactor: remove initial data and preamble from data div
ci/woodpecker/push/default Pipeline was successful
ci/woodpecker/pr/default Pipeline was successful
2023-01-30 21:34:32 +03:00
mckunda 2ef03cd573 chore: update .gitignore 2023-01-30 21:33:18 +03:00
mcpanda 0cf1f856fa refactor: prepend time counter date with intro
ci/woodpecker/push/default Pipeline was successful
ci/woodpecker/pr/default Pipeline was successful
2023-01-30 21:09:30 +03:00
semantic-release-bot 4f761ce5f9 chore(release): 1.0.5 [skip ci]
ci/woodpecker/tag/default Pipeline was successful
## [1.0.5](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.4...v1.0.5) (2023-01-28)

### Bug Fixes

* fix gunicorn.sh ([74841b9](74841b9ebe))
2023-01-28 16:09:43 +00:00
mcpanda 74841b9ebe fix: fix gunicorn.sh
ci/woodpecker/push/default Pipeline was successful
2023-01-28 19:08:53 +03:00
semantic-release-bot c1dc3c554a chore(release): 1.0.4 [skip ci]
ci/woodpecker/tag/default Pipeline was successful
## [1.0.4](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.3...v1.0.4) (2023-01-28)

### Bug Fixes

* **docker:** remove copying requirements.txt inside Dockerfile ([ce62961](ce62961bcf))
2023-01-28 16:04:55 +00:00
mcpanda ce62961bcf fix(docker): remove copying requirements.txt inside Dockerfile
ci/woodpecker/push/default Pipeline was successful
2023-01-28 19:04:11 +03:00
6 changed files with 21 additions and 6 deletions
+2
View File
@@ -1,2 +1,4 @@
__pycache__/
venv/
.vscode/
.idea/
-1
View File
@@ -1,5 +1,4 @@
FROM python:3.11-alpine
COPY requirements.txt /
RUN pip3 install flask gunicorn
+14
View File
@@ -1,3 +1,17 @@
## [1.0.5](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.4...v1.0.5) (2023-01-28)
### Bug Fixes
* fix gunicorn.sh ([74841b9](https://git.mckunda.com/mcpanda/summertime/commit/74841b9ebe6dafb400bde87401c0c6743d0307f7))
## [1.0.4](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.3...v1.0.4) (2023-01-28)
### Bug Fixes
* **docker:** remove copying requirements.txt inside Dockerfile ([ce62961](https://git.mckunda.com/mcpanda/summertime/commit/ce62961bcfdd743b7b4aafa67c2694e6f71db5ba))
## [1.0.3](https://git.mckunda.com/mcpanda/summertime/compare/v1.0.2...v1.0.3) (2023-01-28)
+1 -1
View File
@@ -1,2 +1,2 @@
#!/bin/sh
gunicorn --chdir app wsgi:app -w 2 --threads 2 -b 0.0.0.0:80
gunicorn wsgi:app -w 2 --threads 2 -b 0.0.0.0:80
+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 + ' сек'