Merge branch 'enext' into organizer-creation

Author: mariobehling

.github/workflows/deploy-docs.yml

@@ -0,0 +1,103 @@
+name: Deploy Documentation
+
+on:
+  push:
+    branches:
+      - enext
+      - main
+    paths:
+      - 'doc/**'
+      - '.github/workflows/deploy-docs.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            enchant-2 \
+            libffi-dev \
+            libssl-dev \
+            libxml2-dev \
+            libxslt1-dev \
+            gettext \
+            libfreetype-dev \
+            libjpeg-dev \
+            libpq-dev \
+            build-essential
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          cd doc
+          # Install all dependencies (Sphinx, Django, and all packages)
+          bash install-all-deps.sh
+
+      - name: Build unified documentation
+        run: |
+          cd doc
+          # Set environment variables (conf.py handles Django setup automatically)
+          export DJANGO_SETTINGS_MODULE=eventyay.config.settings
+          export EVENTYAY_CONFIG_FILE=$(pwd)/eventyay-docs.cfg
+          export DATABASE_URL="sqlite:///:memory:"
+          export REDIS_URL="redis://localhost:6379/0"
+          export MPLCONFIGDIR=/tmp/matplotlib
+          mkdir -p $MPLCONFIGDIR
+          # Build documentation
+          make html
+
+      - name: Prepare deployment
+        run: |
+          mkdir -p _site
+          # Copy unified documentation (includes all components: tickets, talk, video)
+          echo "Copying unified documentation..."
+          cp -r doc/_build/html/* _site/
+          # Copy CNAME for custom domain (docs.eventyay.com)
+          cp doc/CNAME _site/
+          # Create .nojekyll to prevent GitHub Pages from ignoring files starting with _
+          touch _site/.nojekyll
+          # List contents for verification
+          echo "Documentation site structure:"
+          ls -la _site/
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: '_site'
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+

.github/workflows/gh-pages-deploy.yml

@@ -19,6 +19,10 @@ __pycache__/
 .mypy_cache/
 .ipython/
 _static/
+# Exception: Track documentation static files
+!doc/_static/
+!doc/talk/_static/
+!doc/video/_static/
 .idea
 .secret
 atlassian-ide-plugin.xml

.gitignore

@@ -127,11 +127,11 @@ After running ``uv sync```, activate a virtual environment
 
    Do **not** edit the database numbers (0, 1, etc.).
 
-8. **Create a superuser account** (for accessing the admin panel):
+8. **Create a admin user account** (for accessing the admin panel):
 
    .. code-block:: bash
 
-      python manage.py createsuperuser
+      python manage.py create_admin_user
 
 9. **Run the development server**:
 

README.rst

@@ -0,0 +1,58 @@
+from django.core.management.base import BaseCommand, CommandError
+from django.core.validators import validate_email
+from django.core.exceptions import ValidationError
+from django.contrib.auth.password_validation import validate_password
+from getpass import getpass
+
+from eventyay.base.models.auth import User
+
+
+class Command(BaseCommand):
+    help = 'Creates an admin user without setting is_superuser to True.'
+
+    def handle(self, *args, **options):
+        email = self.get_email()
+        password = self.get_password()
+
+        # Prevent duplicate users
+        if User.objects.filter(email=email).exists():
+            raise CommandError(f"A user with email {email} already exists.")
+
+        # Create admin user
+        user = User.objects.create_adminuser(email=email, password=password)
+
+        self.stdout.write(self.style.SUCCESS(f"Successfully created admin user: {user.email}"))
+
+    def get_email(self):
+        """Prompt for email and validate format."""
+        while True:
+            email = input("E-mail: ").strip()
+            if not email:
+                self.stderr.write(self.style.ERROR("The email field cannot be empty."))
+                continue
+            try:
+                validate_email(email)
+                return email
+            except ValidationError:
+                self.stderr.write(self.style.ERROR("Please enter a valid email address."))
+
+    def get_password(self):
+        """Prompt for password and apply Django's password validation."""
+        while True:
+            password1 = self._get_password("Password: ")
+            password2 = self._get_password("Confirm password: ")
+
+            if password1 != password2:
+                self.stderr.write(self.style.ERROR("Passwords do not match. Please try again."))
+                continue
+
+            try:
+                validate_password(password1)
+                return password1
+            except ValidationError as e:
+                for error in e.messages:
+                    self.stderr.write(self.style.ERROR(error))
+
+    def _get_password(self, prompt):
+        """Securely read a password input."""
+        return getpass(prompt)

doc/doc_warnings renamed to app/eventyay/base/management/__init__.py

@@ -74,6 +74,7 @@ class Meta:
         }
 
     class urls(EventUrls):
+        """URL patterns for SubmitterAccessCode model views."""
         base = edit = '{self.event.cfp.urls.access_codes}{self.code}/'
         send = '{base}send'
         delete = '{base}delete/'

app/eventyay/base/management/commands/__init__.py

@@ -97,6 +97,21 @@ def create_superuser(self, email: str, password: str = None):  # NOQA
         user.save()
         return user
 
+    def create_adminuser(self, email: str, password: str = None):
+        """
+        Command: python manage.py create_admin_user
+        Create an admin user without setting is_superuser to True.
+        """
+        if password is None:
+            raise ValueError("You must provide a password")
+
+        user = self.model(email=email)
+        user.is_staff = True
+        user.is_administrator = True
+        user.set_password(password)
+        user.save(using=self._db)
+        return user
+
 
 def generate_notifications_token():
     return get_random_string(length=32)
@@ -723,6 +738,7 @@ def reset_password(self, event, user=None, mail_text=None, orga=False):
     reset_password.alters_data = True
 
     class orga_urls(EventUrls):
+        """URL patterns for organizer panel views related to this user."""
         admin = '/orga/admin/users/{self.code}/'
 
     @transaction.atomic

app/eventyay/base/management/commands/create_admin_user.py

@@ -65,8 +65,21 @@ def is_field_required(self, field):
         return self.fields.get(field, default_fields()[field])['visibility'] == 'required'
 
     for field in default_fields().keys():
-        setattr(cls, f'request_{field}', property(partial(is_field_requested, field=field)))
-        setattr(cls, f'require_{field}', property(partial(is_field_required, field=field)))
+        # Create wrapper functions with clean docstrings to avoid RST formatting issues
+        def make_request_getter(field_name):
+            def getter(self):
+                return is_field_requested(self, field_name)
+            getter.__doc__ = f"Check if {field_name} field is requested."
+            return getter
+        
+        def make_require_getter(field_name):
+            def getter(self):
+                return is_field_required(self, field_name)
+            getter.__doc__ = f"Check if {field_name} field is required."
+            return getter
+        
+        setattr(cls, f'request_{field}', property(make_request_getter(field)))
+        setattr(cls, f'require_{field}', property(make_require_getter(field)))
     return cls
 
 
@@ -103,6 +116,7 @@ class CfP(PretalxModel):
     fields = models.JSONField(default=default_fields)
 
     class urls(EventUrls):
+        """URL patterns for public CfP (Call for Proposals) views."""
         base = '{self.event.orga_urls.cfp}'
         editor = '{base}flow/'
         questions = '{base}questions/'