[DONE -FREEZE] develop 3.1 (#758) (#760)

[DONE] Improve live transcript #780 [DONE] Update main.js -fix user search in video filter aside #779 [DONE] live_event disable buttons when stop is clicked + REMOVE JQuery #778 [DONE] live_event prevent new recording when manually stop #777 [DONE] Update Encoding_video_model.py #776 [DONE] Update playlist.js #775 [DONE] Fix user search from navbar #773 [DONE] fix theme in video edit page #772 [DONE] Correct bad contrast on opencast studio #771 [DONE] 3.1 FIX - Pampletousse/fix fvideo list refresh with filters #770 [DONE] Meeting thumbnail mode #769 [DONE] Fix launch_encode_video_studio fct with name of parameter input_video #766 [DONE] Add missing titles on video cards #765 [DONE] change default port to 9090 #764 [DONE] fix opencast studio last version #755 [DONE] Event video on hold #752 [DONE] improve video obsolescence #750 [DONE] Fix navbar 'My events' button display #749 [DONE] create xapi app to manage and send statements #748 [DONE] Add resolution threshold for encoding #747 [DONE] Ptitloup/improve configuration #746 [DONE] replace block by inline for button navbar #745 [DONE] Fix liveevent qrcode in admin part #743 [DONE] Meeting : get recordings and manage it #741 [DONE][FIX] add return msg when calling fix duration command #740 [DONE] max viewers on each live event #739 [DONE] corrections on code_formatting.yml #738 [DONE] CI: Accessibility testing & Elastic search #737 [DONE] Ptitloup/improve configuration #732 [DONE] Feature/conteneurisation #731 [DONE] Prevent a Reflected XSS on /videos/url (Issue #728) #730 [DONE] Live Transcription #729 [DONE] use reverse to get recorder notify url in command #721 [DONE] Do not include metadata while video is restricted. #720 [DONE] fix url category #718 [DONE] Ajout controle permission pour affichage ajout live live #716 [DONE] add minor correction to channel home page #715 [DONE] Désinscription des utilisateurs aux groupes gérés automatiquement #713 [DONE] add opencast studio config in configuration_markdown #712 [DONE] Update ConfigurationPod.md #711 [DONE] Ptitloup/configuration markdown #710 Co-authored-by: Ptitloup <[email protected]> Co-authored-by: Olivier Bado-Faustin <[email protected]> Co-authored-by: mattbild <[email protected]> Co-authored-by: farid.aitkarra <[email protected]> Co-authored-by: mateo <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: pampletousse <[email protected]> Co-authored-by: Loïc Bonavent <[email protected]> Co-authored-by: MattBild <[email protected]> Co-authored-by: cbissler <> Co-authored-by: fanfounet <> Co-authored-by: RaphaelDebray <>
EsupPortail · Mar 21, 2023 · 35185f5 · 35185f5
1 parent 98c7329
commit 35185f5
Show file tree

Hide file tree

Showing 226 changed files with 23,043 additions and 11,362 deletions.
diff --git a/.env.dev-exemple b/.env.dev-exemple
@@ -0,0 +1,7 @@
+DJANGO_SUPERUSER_USERNAME=<USER>
+DJANGO_SUPERUSER_PASSWORD=<PWD>
+DJANGO_SUPERUSER_EMAIL=<MAIL>
+ELASTICSEARCH_TAG=elasticsearch:7.17.7
+NODE_TAG=node:19
+PYTHON_TAG=python:3.7-buster
+REDIS_TAG=redis:alpine3.16
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,15 @@
+# Définissez le comportement par défaut, au cas où les utilisateurs n'auraient pas défini core.autocrlf.
+* text=auto
+
+# Déclarez explicitement les fichiers texte que vous souhaitez toujours normaliser et convertir
+# *.c text
+# *.h text
+*.sh text eol=lf
+
+# Déclarez les fichiers qui auront toujours des fins de ligne CRLF.
+# *.sln text eol=crlf
+*.bat text eol=crlf
+
+# Désigne tous les fichiers qui sont vraiment binaires et ne doivent pas être modifiés.
+*.png binary
+*.jpg binary
diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
@@ -1,3 +1,4 @@
+---
 name: Code Formatting
 
 on:
@@ -10,20 +11,27 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
+      - name: set git config
+        run: |
+          git config user.name github-actions
+          git config user.email [email protected]
+          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+
+      # Prettify js code with prettier
       - name: Running prettier
         run: npx prettier --write pod/*/static/**/*.js
 
       - name: Check for modified files
         id: prettier-git-check
         run: echo modified=$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi) >> $GITHUB_OUTPUT
 
-      - name: Push changes
+      - name: Push prettify changes
         if: steps.prettier-git-check.outputs.modified == 'true'
         run: |
-          git config user.name github-actions
-          git config user.email [email protected]
-          git commit -am "Fixup: format code with Prettier"
+          git commit -am "Fixup. Format code with Prettier"
+          git push
 
+      # Prettify py code with black
       - name: Install Black
         run: |
           python -m pip install --upgrade pip
@@ -36,11 +44,24 @@ jobs:
         id: black-git-check
         run: echo modified=$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi) >> $GITHUB_OUTPUT
 
-      - name: Commit changes
+      - name: Push black changes
         if: steps.black-git-check.outputs.modified == 'true'
         run: |
-          git config user.name github-actions
-          git config user.email [email protected]
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
-          git commit -am "Fixup: format code with Black"
+          git commit -am "Fixup. Format code with Black"
+          git push
+
+      # Generate configuration doc
+      - name: Generate configuration doc in fr
+        run: |
+          pip install -r requirements.txt
+          python manage.py createconfiguration fr
+
+      - name: Check for modified files
+        id: config-git-check
+        run: echo modified=$(if git diff --quiet; then echo "false"; else echo "true"; fi) >> $GITHUB_OUTPUT
+
+      - name: Push auto-config changes
+        if: steps.config-git-check.outputs.modified == 'true'
+        run: |
+          git commit -am "Auto-update configuration files"
           git push
diff --git a/.github/workflows/pod.yml b/.github/workflows/pod.yml
@@ -1,3 +1,4 @@
+---
 name: Django Pod CI
 
 on:
@@ -12,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.7, 3.8, 3.9] # , 3.10.6
+        python-version: [3.7, 3.8, 3.9]  # , 3.10.6
 
     steps:
       - uses: actions/checkout@v3
@@ -52,21 +53,76 @@ jobs:
           flake8 --max-complexity=7 --ignore=E501,W503,E203 --exclude .git,pod/*/migrations/*.py,*_settings.py
 
       - name: Runs Elasticsearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
+        uses: elastic/elastic-github-actions/elasticsearch@refactor_with_plugins
         with:
-          stack-version: 7.6.0
+          # stack-version: 7.6.0
+          stack-version: 6.8.23
+          plugins: analysis-icu
 
       - name: Setup Pod
         run: |
-          python manage.py create_pod_index
+          python manage.py create_pod_index --settings=pod.main.test_settings
           python manage.py makemigrations --settings=pod.main.test_settings
           python manage.py migrate --settings=pod.main.test_settings
           cd pod
           yarn
 
       - name: Run Tests and coveralls
         env:
+          PYTHONUNBUFFERED: 1
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           coverage run --source='.' manage.py test -v 3 --settings=pod.main.test_settings
           coveralls  --service=github
+
+      ## Start Accessibility tests with pa11y ##
+
+      - name: Install pa11y-ci dependencies.
+        if: matrix.python-version == 3.9
+        run: |
+          npm install -g Badatos/pa11y-ci
+
+      - name: Run Django test server
+        if: matrix.python-version == 3.9
+        env:
+          PYTHONUNBUFFERED: 1
+        run: |
+          python manage.py loaddata pod/video/fixtures/initial_data.json --settings=pod.main.test_settings
+          python manage.py loaddata pod/main/fixtures/initial_data.json --settings=pod.main.test_settings
+          python manage.py loaddata pod/video/fixtures/sample_videos.json --settings=pod.main.test_settings
+          python manage.py collectstatic --clear --settings=pod.main.test_settings
+          python manage.py runserver localhost:9090 --insecure --settings=pod.main.test_settings &
+          sleep 5
+
+      - name: Run pa11y-ci.
+        if: matrix.python-version == 3.9
+        # tee reads `stdin` and writes it to both `stdout` and a file
+        run: |
+          pa11y-ci 2>&1 | tee pa11y_output.txt
+
+      - name: Read pa11y_output file.
+        id: pa11y_output
+        if: matrix.python-version == 3.9
+        uses: juliangruber/read-file-action@v1
+        with:
+          path: ./pa11y_output.txt
+
+      - name: Comment on pull request.
+        if: contains(steps.pa11y_output.outputs.content, 'Errors in http://')
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          message: '<details><summary>Pa11y testing results</summary>
+
+
+```
+
+${{ steps.pa11y_output.outputs.content }}```
+
+
+</details>'
+      - name: Check for pa11y failures.
+        if: contains(steps.pa11y_output.outputs.content, 'Errors in http://')
+        run: |
+          echo "::error::The site is failing accessibility tests. Please review the comment in the pull request or the pa11y-ci step in the workflow for details."
+          exit 1
diff --git a/.gitignore b/.gitignore
@@ -46,6 +46,7 @@ log/
 media/
 pod/*/migrations/
 pod/custom/*
+pod/main/static/custom/img
 !pod/custom/settings_local.py.example
 settings_local.py
 scripts/bbb-pod-live/docker-compose.yml
@@ -54,6 +55,7 @@ transcription/*
 ## Others
 pod/static/
 *.bak
+*.pem
 .coverage
 htmlcov
 compile-model
@@ -68,7 +70,19 @@ compile-model
 *.crt
 *.key
 
-# Bower stuffs #
+# NPM stuffs #
 ################
-bower_components
-node_modules
+node_modules
+
+# Conteneurisation de POD #
+###########################
+.run
+.env.dev
+tmp-local/
+portainer-data
+v8-compile-cache-0
+pod/db_migrations
+pod/log
+pod/media
+pod/node_modules/*
+tmp/
diff --git a/.pa11yci b/.pa11yci
@@ -0,0 +1,24 @@
+{
+    "defaults": {
+        "timeout": 120000,
+        "viewport": {
+            "width": 320,
+            "height": 480,
+            "isMobile": true
+        },
+        "concurrency": 1,
+        "debug": true
+    },
+    "urls": [
+        "http://localhost:9090/",
+        "http://localhost:9090/accounts/login",
+        "http://localhost:9090/videos",
+        "http://localhost:9090/video/0001-video-test/",
+        "http://localhost:9090/live/events/"
+    ],
+    "todo":[
+        "These urls are not A11y compliant yet, and need more work from 3rd party",
+        "http://localhost:9090/video/stats_view/videos/"
+    ]
+}
+
diff --git a/.travis.yml b/.travis.yml
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -13,6 +13,8 @@ A list of much-appreciated contributors who have submitted patches and reported
 * Nicolas Lahoche, University of Lille (design and template) with all the PRI Team 
 * Nathaniel Burlot, University of Lille (member of PRI team for Logo and color of V3)
 * Céline Didier and Matthieu Bildstein, University of Lorraine (Live's Event App)
+* Farid Ait Karra, University of Lille (Docker part)
+* Maxime Taisne and Laurine Sajdak, University of Lille (Documentation and User part)
 * French Ministry of Education (who funded the development of some features)
 
 Partnership