From 5c8597a95760df0e72bcfc2e567414ac2dead40d Mon Sep 17 00:00:00 2001
From: deflax <daniel@deflax.net>
Date: Sun, 31 Mar 2024 18:22:08 +0300
Subject: [PATCH] rename forest.py and email.py to fit execution

---
 .gitignore                             | 4 ++++
 docker-compose.yml                     | 5 ++++-
 src/forest/Dockerfile                  | 4 +---
 src/forest/admin/routes.py             | 4 ++--
 src/forest/{forest.py => app.py}       | 5 +++--
 src/forest/auth/routes.py              | 2 +-
 src/forest/{email.py => mailsender.py} | 0
 src/forest/main/routes.py              | 2 +-
 src/forest/panel/routes.py             | 2 +-
 src/forest/settings/routes.py          | 2 +-
 10 files changed, 18 insertions(+), 12 deletions(-)
 rename src/forest/{forest.py => app.py} (97%)
 rename src/forest/{email.py => mailsender.py} (100%)

diff --git a/.gitignore b/.gitignore
index 1876dab..43fe3c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,10 @@ data/db/*
 data/dbadmin/*
 !data/dbadmin/.placeholder
 
+# ignore pgadmin volumes
+data/pgadmin/*
+!data/pgadmin/.placeholder
+
 # ignore osmtile postgresql volume
 data/osmtile/*
 !data/osmtile/.placeholder
diff --git a/docker-compose.yml b/docker-compose.yml
index 24fcbd1..cd3c363 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,9 +14,10 @@ services:
   pgadmin:
     image: dpage/pgadmin4
     volumes:
-      - "./data/pgadmin/lib:/var/lib/pgadmin"
+      - "./data/pgadmin:/var/lib/pgadmin"
     env_file:
       - ./.env
+    user: '$UID:$GID'
     ports:
       - 5050:80
     restart: always
@@ -39,6 +40,8 @@ services:
       - internal
     labels:
       - meta.role=forest
+    #profiles:
+    #  - donotstart
 
 #  osmtile:
 #    image: overv/openstreetmap-tile-server:2.3.0
diff --git a/src/forest/Dockerfile b/src/forest/Dockerfile
index e7befed..5d484cd 100644
--- a/src/forest/Dockerfile
+++ b/src/forest/Dockerfile
@@ -20,6 +20,4 @@ COPY . $APP_HOME
 RUN --mount=type=cache,target=/root/.cache \
     pip3 install -r requirements.txt
 
-EXPOSE 8080
-
-CMD [ "waitress-serve", "--port=5000", "--call", "forest:create_app"]
\ No newline at end of file
+CMD ["python","app.py"]
diff --git a/src/forest/admin/routes.py b/src/forest/admin/routes.py
index 1c02154..8fc8f2b 100644
--- a/src/forest/admin/routes.py
+++ b/src/forest/admin/routes.py
@@ -5,7 +5,7 @@ from flask_sqlalchemy import get_debug_queries
 from . import admin
 
 from .. import db
-from ..email import send_email
+from ..mailsender import send_email
 from ..models import User, Item
 from ..decorators import admin_required, permission_required
 
@@ -40,4 +40,4 @@ def list_users(page):
 @admin_required
 def list_items():
     allservices = Item.query.order_by(Item.date_created.asc()).all()
-    return render_template('admin/list_items.html', items=allitems)
\ No newline at end of file
+    return render_template('admin/list_items.html', items=allitems)
diff --git a/src/forest/forest.py b/src/forest/app.py
similarity index 97%
rename from src/forest/forest.py
rename to src/forest/app.py
index 440f003..1a48075 100644
--- a/src/forest/forest.py
+++ b/src/forest/app.py
@@ -13,6 +13,7 @@ from flask import (
     redirect,
     url_for
 )
+from waitress import serve
 from flask_sqlalchemy import SQLAlchemy
 from flask_bootstrap import Bootstrap
 from flask_mail import Mail
@@ -104,5 +105,5 @@ def service_unavailable(e):
 def handle_csrf_error(e):
     return render_template('errors/csrf_error.html', reason=e.description), 400
 
-def create_app():
-   return app
\ No newline at end of file
+if __name__ == "__main__":
+    serve(app, listen='*:5000')
diff --git a/src/forest/auth/routes.py b/src/forest/auth/routes.py
index 9c6f94b..9c3559b 100644
--- a/src/forest/auth/routes.py
+++ b/src/forest/auth/routes.py
@@ -4,7 +4,7 @@ from flask_login import login_required, login_user, logout_user, current_user
 from . import auth
 from .. import db
 from ..models import User
-from ..email import send_email
+from ..mailsender import send_email
 from .forms import LoginForm, TwoFAForm, RegistrationForm, ChangePasswordForm, PasswordResetRequestForm, PasswordResetForm
 from ..decorators import admin_required, permission_required
 
diff --git a/src/forest/email.py b/src/forest/mailsender.py
similarity index 100%
rename from src/forest/email.py
rename to src/forest/mailsender.py
diff --git a/src/forest/main/routes.py b/src/forest/main/routes.py
index 95cb89f..d6691ca 100644
--- a/src/forest/main/routes.py
+++ b/src/forest/main/routes.py
@@ -5,7 +5,7 @@ from flask_sqlalchemy import get_debug_queries
 from . import main
 from .forms import LoginForm, RegistrationForm
 from .. import db
-from ..email import send_email
+from ..mailsender import send_email
 from ..models import User, Permission, Item
 
 import base64
diff --git a/src/forest/panel/routes.py b/src/forest/panel/routes.py
index 4f2763f..f1d7dc6 100644
--- a/src/forest/panel/routes.py
+++ b/src/forest/panel/routes.py
@@ -4,7 +4,7 @@ from flask_sqlalchemy import get_debug_queries
 
 from . import panel
 from .. import db
-from ..email import send_email
+from ..mailsender import send_email
 from ..models import User, Permission, Item
 
 import base64
diff --git a/src/forest/settings/routes.py b/src/forest/settings/routes.py
index a7224d5..789b525 100644
--- a/src/forest/settings/routes.py
+++ b/src/forest/settings/routes.py
@@ -5,7 +5,7 @@ from sqlalchemy import desc
 from . import settings
 from .forms import EditProfileForm, EditProfileAdminForm
 
-from ..email import send_email
+from ..mailsender import send_email
 from .. import db
 from ..models import User
 import sys