Merge pull request #608 from hackforla/develop

Merge develop into main

.dockerignore

@@ -1,9 +1,41 @@
-./node_modules
+# stage dockerignore
+
 dev
 stage
-.dockerignore
-.git
-.gitignore
+mkdocs
+
+# Environment files
+**/.env
+**/*.env
+*venv/
+**/.DS_store
+
+# Dependency directories
+**/node_modules
+
+# Django
+*.log
+*.pot
+*.pyc
 **/__pycache__/
-mkdocs/
-/.env
+**/db.sqlite3
+**/data
+**/media
+
+# Docker
+**/Dockerfile
+**/*.Dockerfile
+**/.dockerignore
+
+# git
+.git
+**/.gitignore
+
+# Builds
+backend/frontend/static/vite_assets_dist
+backend/staticfiles
+backend/openapi-schema.yml
+
+# vite
+frontend/vite.config.*.timestamp-*
+frontend/dist

.github/workflows/jest-react-test.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
       - name: Install modules
         run: |
           cd frontend

.github/workflows/mkdocs-build.yml

@@ -1,34 +1,42 @@
-# Credit for code: https://github.com/mkdocs/mkdocs/discussions/2369#discussioncomment-625475
-name: Build MkDocs site
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "mkdocs/**/**.md"
-      - "mkdocs/mkdocs.yml"
-  workflow_dispatch:
-
-jobs:
-  docs:
-    runs-on: ubuntu-latest
-    if: github.actor != 'github-actions[bot]'
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Install mkdocs
-        uses: actions/setup-python@v3
-      - name: Publish docs
-        run: |
-          pip install --upgrade pip && pip install setuptools mkdocs
-          pip install markdown==3.2.0
-          python mkdocs/mkdocs-config/setup.py develop
-          git config user.name 'github-actions[bot]' && git config user.email 'github-actions[bot]@users.noreply.github.com'
-          cd mkdocs
-          cd mkdocs-config
-          python setup.py develop
-          cd ..
-          mkdocs gh-deploy
+name: Build MkDocs site
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "mkdocs/**/**.md"
+      - "mkdocs/mkdocs.yml"
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  deploy-docs:
+    runs-on: ubuntu-latest
+    if: github.actor != 'github-actions[bot]'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Configure Git Credentials
+        run: |
+          git config user.name github-actions[bot]
+          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
+      - uses: actions/cache@v4
+        with:
+          key: mkdocs-material-${{ env.cache_id }}
+          path: .cache
+          restore-keys: |
+            mkdocs-material-
+      - name: Install Dependencies
+        run: pip install \
+          mkdocs-material==9.1.17 \
+          mkdocs-autolinks-plugin==0.7.1
+      - name: Publish docs
+        run: |
+          cd mkdocs
+          mkdocs gh-deploy --force

.gitignore

@@ -1,21 +1,29 @@
-node_modules
-db.sqlite3
-secret_key.txt
+# Environment files
+.env
 dev.env
 stage.env
-__pycache__
-.vscode/
+secret_key.txt
 *venv/
-app/frontend/static/frontend/*
-!app/frontend/static/frontend/.gitkeep
-app/frontend/templates/frontend/*
-!app/frontend/templates/frontend/.gitkeep
-data/
 
-**/super-linter.log
-app/staticfiles
+# Django #
+*.log
+*.pot
+*.pyc
+__pycache__
+db.sqlite3
+data
+media
 
-dev/linter.env
+# IDEs
+.vscode/
+.idea
 .DS_store
 
-.idea
+# linters
+dev/linter.env
+**/super-linter.log
+
+# static build files
+backend/frontend/static/vite_assets_dist
+backend/staticfiles
+backend/openapi-schema.yml

backend/.dockerignore

@@ -0,0 +1,28 @@
+# backend dockerignore
+# .dockerignore should be in the build context root
+
+# Environment files
+.env
+*/*.env
+*venv/
+.DS_store
+
+# Django
+*.log
+*.pot
+*.pyc
+**/__pycache__/
+db.sqlite3
+data
+media
+
+# Docker
+.dockerignore
+
+# git
+.git
+.gitignore
+
+# Builds
+frontend/static/vite_assets_dist/*
+staticfiles

backend/.flake8

@@ -0,0 +1,9 @@
+[flake8]
+max-line-length = 88
+extend-ignore = E203, W503
+exclude =
+    .git,
+    __pycache__,
+    migrations,
+    venv,
+    settings.py

backend/.gitignore

@@ -1,3 +1,5 @@
-frontend/static/frontend
-frontend/templates/frontend
-.idea/
+.venv
+.idea
+DCIM
+data
+staticfiles

backend/.python-version

@@ -0,0 +1 @@
+3.12.4

backend/config/asgi.py → backend/backend/asgi.py

@@ -1,16 +1,16 @@
 """
-ASGI config for config project.
+ASGI config for backend project.
 
 It exposes the ASGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/3.2/howto/deployment/asgi/
+https://docs.djangoproject.com/en/5.0/howto/deployment/asgi/
 """
 
 import os
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "backend.settings")
 
 application = get_asgi_application()