Compare commits
	
		
			2 Commits
		
	
	
		
			7d6b53cd1d
			...
			809caa1027
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						809caa1027
	
				 | 
					
					
						|||
| 
						
						
							
						
						f71ebe7a08
	
				 | 
					
					
						
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@ -5,4 +5,4 @@ __pycache__
 | 
				
			|||||||
node_modules
 | 
					node_modules
 | 
				
			||||||
package-lock.json
 | 
					package-lock.json
 | 
				
			||||||
db.sqlite3
 | 
					db.sqlite3
 | 
				
			||||||
src/timetracker/static
 | 
					static
 | 
				
			||||||
@ -9,5 +9,4 @@ poetry run python src/timetracker/manage.py collectstatic --clear --no-input
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
echo "Starting server"
 | 
					echo "Starting server"
 | 
				
			||||||
caddy start
 | 
					caddy start
 | 
				
			||||||
cd src/timetracker || exit
 | 
					poetry run python -m gunicorn --bind 0.0.0.0:8001 timetracker.asgi:application -k uvicorn.workers.UvicornWorker --access-logfile - --error-logfile -
 | 
				
			||||||
poetry run python -m gunicorn --bind 0.0.0.0:8001 root.asgi:application -k uvicorn.workers.UvicornWorker --access-logfile - --error-logfile -
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -13,9 +13,7 @@ def version_date():
 | 
				
			|||||||
        "%d-%b-%Y %H:%m",
 | 
					        "%d-%b-%Y %H:%m",
 | 
				
			||||||
        time.gmtime(
 | 
					        time.gmtime(
 | 
				
			||||||
            os.path.getmtime(
 | 
					            os.path.getmtime(
 | 
				
			||||||
                os.path.abspath(
 | 
					                os.path.abspath(os.path.join(settings.BASE_DIR, "pyproject.toml"))
 | 
				
			||||||
                    os.path.join(settings.BASE_DIR, "..", "..", "pyproject.toml")
 | 
					 | 
				
			||||||
                )
 | 
					 | 
				
			||||||
            )
 | 
					            )
 | 
				
			||||||
        ),
 | 
					        ),
 | 
				
			||||||
    )
 | 
					    )
 | 
				
			||||||
 | 
				
			|||||||
@ -31,4 +31,4 @@ requires = ["poetry-core"]
 | 
				
			|||||||
build-backend = "poetry.core.masonry.api"
 | 
					build-backend = "poetry.core.masonry.api"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[tool.poetry.scripts]
 | 
					[tool.poetry.scripts]
 | 
				
			||||||
timetracker-import = "timetracker.common.import_data:import_from_file"
 | 
					timetracker-import = "common.import_data:import_from_file"
 | 
				
			||||||
 | 
				
			|||||||
@ -14,7 +14,7 @@ import os
 | 
				
			|||||||
from pathlib import Path
 | 
					from pathlib import Path
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Build paths inside the project like this: BASE_DIR / 'subdir'.
 | 
					# Build paths inside the project like this: BASE_DIR / 'subdir'.
 | 
				
			||||||
BASE_DIR = Path(__file__).resolve()
 | 
					BASE_DIR = Path(__file__).resolve().parent.parent
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Quick-start development settings - unsuitable for production
 | 
					# Quick-start development settings - unsuitable for production
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user