20 files changed, 7 insertions(+), 16 deletions(-)

R auth/__init__.py => blueprints/auth/__init__.py
R auth/forms.py => blueprints/auth/forms.py
R auth/models.py => blueprints/auth/models.py
R auth/templates/account.html => blueprints/auth/templates/account.html
R auth/templates/login.html => blueprints/auth/templates/login.html
R auth/templates/register.html => blueprints/auth/templates/register.html
R auth/views.py => blueprints/auth/views.py
R flatpages/__init__.py => blueprints/flatpages/__init__.py
R flatpages/templates/chat.html => blueprints/flatpages/templates/chat.html
R flatpages/templates/coc.html => blueprints/flatpages/templates/coc.html
R flatpages/templates/contact.html => blueprints/flatpages/templates/contact.html
R flatpages/templates/help.html => blueprints/flatpages/templates/help.html
R flatpages/templates/index.html => blueprints/flatpages/templates/index.html
R flatpages/templates/privacy.html => blueprints/flatpages/templates/privacy.html
R flatpages/templates/talk.html => blueprints/flatpages/templates/talk.html
R flatpages/views.py => blueprints/flatpages/views.py
M setup.py
R app.py => tilde/__init__.py
R static/style.css => tilde/static/style.css
R templates/base.html => tilde/templates/base.html

@@ 2,9 2,9 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-only
 
-import click
 import json
 
+import click
 from flask import (
     Blueprint,
     current_app,

@@ 6,23 6,14 @@ from setuptools import find_packages, setup
 
 setup(
     name="tilde",
-    version="0.2.0",
+    version="0.3.0",
     description="Tilde site and service suite for friends to come together.",
     author="Steven Guikal",
     author_email="void@fluix.one",
     url="https://git.sr.ht/~fluix/tilde",
     license="AGPL-3.0",
     packages=find_packages(),
-    package_data={
-        "tilde": {
-            "app.py",
-            "config.defaults",
-            "auth/",
-            "flatpages/*",
-            "templates/*",
-            "static/*"
-        }
-    },
+    include_package_data=True,
     install_requires=[
         "flask",
         "flask-login",

@@ 11,8 11,8 @@ from flask_sqlalchemy import SQLAlchemy
 logger = logging.getLogger(__name__)
 
 app = Flask(__name__, subdomain_matching=True)
-app.config.from_pyfile("config.defaults")
-for location in ["config", "/etc/tilde/config"]:
+app.config.from_pyfile("../config.defaults")
+for location in ["../config", "/etc/tilde/config"]:
     try:
         app.config.from_pyfile(location)
     except FileNotFoundError:


@@ 27,11 27,11 @@ if not app.config["SECRET_KEY"]:
 app.config["db"] = SQLAlchemy(app)
 
 with app.app_context():
-    from flatpages.views import flatpages
+    from blueprints.flatpages.views import flatpages
 
     app.register_blueprint(flatpages)
 
-    from auth.views import auth
+    from blueprints.auth.views import auth
 
     app.register_blueprint(auth, subdomain="auth")