Compare commits

..

No commits in common. "809caa1027fe2c2726daa76582acc726825536bc" and "7d6b53cd1dbbe0b15099f65d5fb15e97ac281f25" have entirely different histories.

5 changed files with 8 additions and 5 deletions

2
.gitignore vendored
View File

@ -5,4 +5,4 @@ __pycache__
node_modules
package-lock.json
db.sqlite3
static
src/timetracker/static

View File

@ -9,4 +9,5 @@ poetry run python src/timetracker/manage.py collectstatic --clear --no-input
echo "Starting server"
caddy start
poetry run python -m gunicorn --bind 0.0.0.0:8001 timetracker.asgi:application -k uvicorn.workers.UvicornWorker --access-logfile - --error-logfile -
cd src/timetracker || exit
poetry run python -m gunicorn --bind 0.0.0.0:8001 root.asgi:application -k uvicorn.workers.UvicornWorker --access-logfile - --error-logfile -

View File

@ -13,7 +13,9 @@ def version_date():
"%d-%b-%Y %H:%m",
time.gmtime(
os.path.getmtime(
os.path.abspath(os.path.join(settings.BASE_DIR, "pyproject.toml"))
os.path.abspath(
os.path.join(settings.BASE_DIR, "..", "..", "pyproject.toml")
)
)
),
)

View File

@ -31,4 +31,4 @@ requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"
[tool.poetry.scripts]
timetracker-import = "common.import_data:import_from_file"
timetracker-import = "timetracker.common.import_data:import_from_file"

View File

@ -14,7 +14,7 @@ import os
from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent
BASE_DIR = Path(__file__).resolve()
# Quick-start development settings - unsuitable for production