Merging develop for new release

.djlintrc

@@ -0,0 +1,3 @@
+{
+  "ignore": "H006"
+}

.github/workflows/depoly.yml

@@ -0,0 +1,60 @@
+name: Deploy
+
+on:
+  workflow_run:
+    workflows: [Test]
+    types: [completed]
+
+permissions:
+  id-token: write # This is required for requesting the JWT
+  contents: read # This is required for actions/checkout
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.workflow_run.head_branch }}
+
+      - name: Checkout Docker configs
+        run: |
+          eval `ssh-agent -s`
+          ssh-add - <<< '${{ secrets.DEPLOY_KEY_FOR_CONFIG_REPO }}'
+          git clone -b "${{ github.event.workflow_run.head_branch }}" "${{ secrets.DEPLOY_CONFIG_REPO}}"
+          mv "${{ secrets.CONFIG_REPO_NAME }}"/* .
+          chmod +x config.sh
+          chmod +x deploy.sh
+
+      - name: Run Config
+        run: ./config.sh
+        env:
+          AWS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_FSX_VOLUME: ${{ secrets.AWS_FSX_VOLUME }}
+          DATABASE_URL: ${{ secrets.DATABASE_URL_DEV }}
+          EMAIL_USER: ${{ secrets.EMAIL_USER }}
+          EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }}
+          BRANCH: ${{ github.event.workflow_run.head_branch }}
+
+      - name: Configure AWS credentials from AWS account
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_DEV }}
+          aws-region: us-east-1
+          role-session-name: GitHub-OIDC-frontend
+
+      - name: Run Deploy
+        env:
+          BRANCH: ${{ github.event.workflow_run.head_branch }}
+          AWS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_FSX_VOLUME: ${{ secrets.AWS_FSX_VOLUME }}
+          DATABASE_URL_DEV: ${{ secrets.DATABASE_URL_DEV}}
+          DATABASE_URL_PROD: ${{ secrets.DATABASE_URL_PROD}}
+          EMAIL_USER: ${{ secrets.EMAIL_USER }}
+          EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }}
+          DEPLOY_KEY: ${{ secrets.DEPLOY_KEY}}
+        run: ./deploy.sh

.github/workflows/test.yml

@@ -0,0 +1,102 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - develop
+      - main
+  workflow_dispatch:
+
+env:
+  DATABASE_URL: postgres://user:password@localhost:5432/readux
+  DJANGO_ENV: test
+
+jobs:
+  pytest:
+    runs-on: ubuntu-22.04
+
+    services:
+      elasticsearch:
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.5
+        env:
+          STACK_VERSION: 7.17.5
+          xpack.security.enabled: false
+          cluster.name: readux-elasticsearch
+          http.port: 9200
+          discovery.type: single-node
+        options: >-
+          --health-cmd "curl http://localhost:9200/_cluster/health"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+        ports:
+          - 9200:9200
+
+      postgres:
+        image: postgres:12
+        env:
+          POSTGRES_PASSWORD: password
+          POSTGRES_USER: user
+          POSTGRES_DB: readux_test
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.7.2"
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+
+      - name: Install system requirements
+        run: |
+          sudo apt update
+          sudo apt install -y libjpeg-dev libopenjp2-7-dev libopenjp2-tools libssl-dev postgresql-client ruby-full openssh-server
+
+      - name: Install Ruby dependencies
+        run: |
+          sudo gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)"
+          bundle install
+          sudo gem install sass
+
+      - name: Install Python dependencies
+        run: |
+          mkdir logs && touch logs/debug.log
+          cp config/settings/local.dst config/settings/local.py
+          pip install --upgrade pip
+          pip install pyld==1.0.5
+          pip install -r requirements/local.txt
+
+      # - name: Test Export
+      #   run: pytest apps/export/
+
+      # - name: Test IIIF
+      #   run: pytest apps/iiif/
+
+      # - name: Test Readux
+      #   run: pytest apps/readux/
+
+      # - name: Test Users
+      #   run: pytest apps/users/
+
+      # - name: Test Webpack build
+      #   run: |
+      #     npm install
+      #     npx webpack

.gitignore

@@ -17,7 +17,6 @@ customizations/**/*.js
 
 ### python gitignores auto-generated by github
 
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -128,7 +127,7 @@ static/plugins/annotator/scss/node_modules
 # Local Junk
 .DS_Store
 local.py
-venv
+*venv
 cert*
 *.bk
 .ruby-version
@@ -146,7 +145,6 @@ assets/upload/*
 !assets/upload/index.html
 
 *_dev
-snippets
 
 # profiler
 *.profile
@@ -157,3 +155,13 @@ dev_*.json
 presentation-validator/
 nohup.out
 webpack-stats.json
+*.key
+*.crt
+*.pem
+
+# compiled scss and JS
+apps/static/css/project.css
+apps/static/js/main.js
+apps/static/js/main.js.map
+
+snippets/*