Merge branch 'enext' into fix/dropdown

Author: Aqil-Ahmad

.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

@@ -59,6 +59,7 @@ Getting Started
 4. **Install Python packages**
 
 Use ``uv`` to create virtual environment and install Python packages at the same time.
+**Make sure you are in app directory**
 
   .. code-block:: sh
 
@@ -88,10 +89,9 @@ From now on, you can do everything with the database without specifying password
 
 .. code-block:: sh
 
-   dropdb eventyay-db
    psql eventyay-db
 
-In case you cannot take adavantage of PostgreSQL *peer* mode, you need to create a *.env* file with these values:
+In case you cannot take advantage of PostgreSQL *peer* mode, you need to create a *.env* file with these values:
 
 .. code-block:: sh
 
@@ -102,9 +102,7 @@ In case you cannot take adavantage of PostgreSQL *peer* mode, you need to create
 
 6. **Activate virtual environment**
 
-After running ``uv sync```, ``uv`` will activate the virtual environment. But if you are back
-to work on the project another, we don't run ``uv``, then we activate the virtual environment by:
-
+After running ``uv sync```, activate a virtual environment
 
   .. code-block:: sh
 
@@ -117,11 +115,23 @@ to work on the project another, we don't run ``uv``, then we activate the virtua
 
       python manage.py migrate
 
-8. **Create a superuser account** (for accessing the admin panel):
+   If you see any Redis issues, Install Redis and start it:
+
+   **Update configuration**
+
+
+   Edit ``app/eventyay.cfg`` and change Redis URLs from
+   ``redis://eventyay-next-redis`` **to**
+   ``redis://localhost:6379/``
+
+
+   Do **not** edit the database numbers (0, 1, etc.).
+
+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**:
 
@@ -166,7 +176,7 @@ We assume your current working directory is the checkout of this repo.
 
 5. **Create a superuser account** (for accessing the admin panel):
 
-   This should be necessary only once, since the database is persisted 
+   This should be necessary only once, since the database is persisted
    as docker volume. If you see strange behaviour, see the point 3.
    on how to reset.
 

README.rst

@@ -8,4 +8,4 @@ dist/
 *.bak
 eventyay/static/jsi18n/
 node_modules/
-
+.zed

app/.gitignore

@@ -33,5 +33,8 @@ ENV PATH="/usr/src/app/.venv/bin:$PATH"
 # Run npm stuff
 RUN make npminstall
 
+# Build webapp
+RUN make webappbuild
+
 # run entrypoint.sh
 ENTRYPOINT ["/usr/src/app/entrypoint.sh"]

app/Dockerfile

@@ -30,11 +30,15 @@ COPY Makefile Makefile
 # global-nav-menu
 COPY eventyay/frontend/global-nav-menu eventyay/frontend/global-nav-menu
 RUN npm ci --prefix=eventyay/frontend/global-nav-menu
-RUN npm run build --prefix=eventyay/frontend/global-nav-menu
+RUN OUT_DIR=/home/app/web/eventyay/static npm run build --prefix=eventyay/frontend/global-nav-menu
 # schedule editor
 COPY eventyay/frontend/schedule-editor eventyay/frontend/schedule-editor
 RUN npm ci --prefix=eventyay/frontend/schedule-editor
-RUN npm run build --prefix=eventyay/frontend/schedule-editor
+RUN OUT_DIR=/home/app/web/eventyay/static npm run build --prefix=eventyay/frontend/schedule-editor
+# webapp
+COPY eventyay/webapp eventyay/webapp
+RUN npm install --prefix=eventyay/webapp
+RUN OUT_DIR=/home/app/web/eventyay/static npm run build --prefix=eventyay/webapp
 
 
 #########
@@ -58,7 +62,7 @@ RUN mkdir $APP_HOME/static
 WORKDIR $APP_HOME
 
 # install dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends netcat-traditional nodejs
+RUN apt-get update && apt-get install -y --no-install-recommends netcat-traditional nodejs gettext
 
 # copy entrypoint.prod.sh
 COPY ./entrypoint.prod.sh .
@@ -74,8 +78,9 @@ RUN chown -R app:app $APP_HOME
 # Copy the Python environment from the builder
 # Note: The venv path in the builder must match the one in runner.
 COPY --from=builder --chown=app:app $APP_HOME/.venv $APP_HOME/.venv
-COPY --from=builder --chown=app:app $APP_HOME/eventyay/frontend/global-nav-menu/dist $APP_HOME/eventyay/frontend/global-nav-menu/dist
-COPY --from=builder --chown=app:app $APP_HOME/eventyay/frontend/schedule-editor/dist $APP_HOME/eventyay/frontend/schedule-editor/dist
+COPY --from=builder --chown=app:app $APP_HOME/eventyay/static/global-nav-menu $APP_HOME/eventyay/static/global-nav-menu
+COPY --from=builder --chown=app:app $APP_HOME/eventyay/static/schedule-editor $APP_HOME/eventyay/static/schedule-editor
+COPY --from=builder --chown=app:app $APP_HOME/eventyay/static/webapp $APP_HOME/eventyay/static/webapp
 
 # change to the app user
 USER app

app/Dockerfile.prod

@@ -29,6 +29,12 @@ npminstall:
 	mkdir -p eventyay/static.dist/node_prefix/
 	cp -r eventyay/static/npm_dir/* eventyay/static.dist/node_prefix/
 	npm install --prefix=eventyay/static.dist/node_prefix
+	npm ci --prefix=eventyay/frontend/global-nav-menu
 	npm ci --prefix=eventyay/frontend/schedule-editor
-	npm run build --prefix=eventyay/frontend/schedule-editor
+	OUT_DIR=$(shell pwd)/eventyay/static npm run build --prefix=eventyay/frontend/global-nav-menu
+	OUT_DIR=$(shell pwd)/eventyay/static npm run build --prefix=eventyay/frontend/schedule-editor
+
+webappbuild:
+	npm ci --prefix=eventyay/webapp
+	OUT_DIR=$(shell pwd)/eventyay/static npm run build --prefix=eventyay/webapp
 

app/Makefile

@@ -8,6 +8,10 @@ done
 
 echo "PostgreSQL started"
 
+echo "============== compiling translation messages ================"
+python manage.py compilemessages
+echo "============== compiling JS translation messages ================"
+python manage.py compilejsi18n
 echo "============== running collectstatic ================"
 python manage.py collectstatic --noinput
 echo "============== running compress ====================="

app/entrypoint.prod.sh

@@ -5,13 +5,11 @@ url=https://next.eventyay.com
 currency=USD
 ; DO NOT change the following value, it has to be set to the location of the
 ; directory *inside* the docker container
-datadir=/data
 trust_x_forwarded_for=on
 trust_x_forwarded_proto=on
 registration=on
 talk_hostname=https://next.eventyay.com
 video_server_hostname=https://next.eventyay.com:8443
-base_path=/tickets
 
 [urls]
 static=/static/