aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar kosayoda <[email protected]>2021-05-14 13:58:56 +0800
committerGravatar kosayoda <[email protected]>2021-05-14 14:23:29 +0800
commit274efc3ec73e2bcfee9cd93b26f737ee68fd4638 (patch)
treec74a0fb5cb80b605d21843b8bd424a192198dd8a
parentMerge pull request #485 from python-discord/ks129/dewikification/redirection (diff)
Merge branch main into dewikification
-rw-r--r--.coveragerc2
-rw-r--r--.dockerignore6
-rw-r--r--.flake82
-rw-r--r--.github/CODEOWNERS22
-rw-r--r--.github/review-policy.yml3
-rw-r--r--.github/workflows/build.yaml58
-rw-r--r--.github/workflows/codeql-analysis.yml32
-rw-r--r--.github/workflows/deploy.yaml46
-rw-r--r--.github/workflows/lint-test.yaml142
-rw-r--r--.github/workflows/sentry-release.yml6
-rw-r--r--.github/workflows/status_embed.yaml78
-rw-r--r--.pre-commit-config.yaml2
-rw-r--r--CODE_OF_CONDUCT.md3
-rw-r--r--CONTRIBUTING.md125
-rw-r--r--Dockerfile (renamed from docker/Dockerfile)22
-rw-r--r--LICENSE2
-rw-r--r--Pipfile9
-rw-r--r--Pipfile.lock285
-rw-r--r--README.md29
-rw-r--r--SECURITY.md3
-rw-r--r--azure-pipelines.yml102
-rw-r--r--docker-compose.yml6
-rw-r--r--docker/uwsgi.ini38
-rw-r--r--docs/deployment.md146
-rwxr-xr-xmanage.py24
-rw-r--r--postgres/init.sql146
-rw-r--r--pydis_site/apps/api/admin.py108
-rw-r--r--pydis_site/apps/api/dblogger.py22
-rw-r--r--pydis_site/apps/api/migrations/0064_delete_logentry.py16
-rw-r--r--pydis_site/apps/api/migrations/0066_merge_20201003_0730.py14
-rw-r--r--pydis_site/apps/api/migrations/0067_add_voice_ban_infraction_type.py18
-rw-r--r--pydis_site/apps/api/migrations/0068_split_nomination_tables.py75
-rw-r--r--pydis_site/apps/api/migrations/0069_documentationlink_validators.py25
-rw-r--r--pydis_site/apps/api/models/__init__.py2
-rw-r--r--pydis_site/apps/api/models/bot/__init__.py2
-rw-r--r--pydis_site/apps/api/models/bot/documentation_link.py17
-rw-r--r--pydis_site/apps/api/models/bot/infraction.py3
-rw-r--r--pydis_site/apps/api/models/bot/metricity.py132
-rw-r--r--pydis_site/apps/api/models/bot/nomination.py52
-rw-r--r--pydis_site/apps/api/models/log_entry.py55
-rw-r--r--pydis_site/apps/api/pagination.py49
-rw-r--r--pydis_site/apps/api/serializers.py139
-rw-r--r--pydis_site/apps/api/tests/test_dblogger.py27
-rw-r--r--pydis_site/apps/api/tests/test_documentation_links.py15
-rw-r--r--pydis_site/apps/api/tests/test_infractions.py30
-rw-r--r--pydis_site/apps/api/tests/test_models.py16
-rw-r--r--pydis_site/apps/api/tests/test_nominations.py118
-rw-r--r--pydis_site/apps/api/tests/test_users.py337
-rw-r--r--pydis_site/apps/api/urls.py2
-rw-r--r--pydis_site/apps/api/views.py5
-rw-r--r--pydis_site/apps/api/viewsets/__init__.py1
-rw-r--r--pydis_site/apps/api/viewsets/bot/infraction.py21
-rw-r--r--pydis_site/apps/api/viewsets/bot/nomination.py142
-rw-r--r--pydis_site/apps/api/viewsets/bot/user.py192
-rw-r--r--pydis_site/apps/api/viewsets/log_entry.py36
-rw-r--r--pydis_site/apps/home/migrations/0002_auto_now_on_repository_metadata.py18
-rw-r--r--pydis_site/apps/home/models/repository_metadata.py15
-rw-r--r--pydis_site/apps/home/tests/mock_github_api_response.json2
-rw-r--r--pydis_site/apps/home/tests/test_repodata_helpers.py42
-rw-r--r--pydis_site/apps/home/urls.py3
-rw-r--r--pydis_site/apps/home/views/__init__.py4
-rw-r--r--pydis_site/apps/home/views/home.py160
-rw-r--r--pydis_site/apps/redirect/tests.py7
-rw-r--r--pydis_site/apps/resources/resources/reading/books/effective_python.yaml5
-rw-r--r--pydis_site/constants.py6
-rw-r--r--pydis_site/hosts.py3
-rw-r--r--pydis_site/settings.py39
-rw-r--r--pydis_site/static/css/base/base.css76
-rw-r--r--pydis_site/static/css/error_pages.css67
-rw-r--r--pydis_site/static/css/home/index.css239
-rw-r--r--pydis_site/static/css/home/timeline.css3823
-rw-r--r--pydis_site/static/images/events/100k.pngbin0 -> 210477 bytes
-rw-r--r--pydis_site/static/images/frontpage/welcome.jpgbin0 -> 51725 bytes
-rw-r--r--pydis_site/static/images/navbar/discord.svg165
-rw-r--r--pydis_site/static/images/navbar/navbar_discordjoin.svg81
-rw-r--r--pydis_site/static/images/sponsors/adafruit.pngbin11705 -> 0 bytes
-rw-r--r--pydis_site/static/images/sponsors/notion.pngbin0 -> 38207 bytes
-rw-r--r--pydis_site/static/images/sponsors/streamyard.pngbin0 -> 86678 bytes
-rwxr-xr-xpydis_site/static/images/timeline/cd-icon-location.svg4
-rwxr-xr-xpydis_site/static/images/timeline/cd-icon-movie.svg4
-rwxr-xr-xpydis_site/static/images/timeline/cd-icon-picture.svg72
-rw-r--r--pydis_site/static/images/waves/wave_dark.svg73
-rw-r--r--pydis_site/static/images/waves/wave_white.svg77
-rw-r--r--pydis_site/static/js/timeline/main.js104
-rw-r--r--pydis_site/templates/404.html34
-rw-r--r--pydis_site/templates/500.html29
-rw-r--r--pydis_site/templates/base/base.html1
-rw-r--r--pydis_site/templates/base/footer.html2
-rw-r--r--pydis_site/templates/base/navbar.html17
-rw-r--r--pydis_site/templates/home/index.html190
-rw-r--r--pydis_site/templates/home/timeline.html693
91 files changed, 7792 insertions, 1273 deletions
diff --git a/.coveragerc b/.coveragerc
index e2511cb9..b4a9bbe4 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -11,9 +11,11 @@ omit =
*/admin.py
*/apps.py
*/urls.py
+ pydis_site/apps/api/models/bot/metricity.py
pydis_site/wsgi.py
pydis_site/settings.py
pydis_site/utils/resources.py
+ pydis_site/apps/home/views/home.py
[report]
fail_under = 100
diff --git a/.dockerignore b/.dockerignore
index 61fa291a..2a1f68e7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,7 @@
.cache
.coverage
.coveragerc
+.git
.github
.gitignore
.gitlab
@@ -15,11 +16,8 @@ pydis_site/apps/home/tests
pydis_site/apps/staff/tests
CHANGELOG.md
CONTRIBUTING.md
-docker
-!docker/uwsgi.ini
-!docker/wheels
docker-compose.yml
-Dockerfile.local
+Dockerfile
docs
htmlcov
LICENSE
diff --git a/.flake8 b/.flake8
index bcd26d9e..6690af3e 100644
--- a/.flake8
+++ b/.flake8
@@ -3,7 +3,7 @@ max-line-length=100
docstring-convention=all
import-order-style=pycharm
application_import_names=pydis_site
-exclude=__pycache__, venv, .venv, **/migrations/**
+exclude=__pycache__, venv, .venv, **/migrations/**, .cache/
ignore=
B311,W503,E226,S311,T000
# Missing Docstrings
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cf5f1590..009b21c4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,21 @@
-* @python-discord/core-developers
+# Infractions API
+pydis_site/apps/api/models/bot/infraction.py @MarkKoz
+pydis_site/apps/api/viewsets/bot/infraction.py @MarkKoz
+
+# Home app
+pydis_site/apps/home/** @ks129
+
+# Django ORM
+**/migrations/** @Akarys42
+**/models/** @Akarys42 @Den4200
+
+# CI & Docker
+.github/workflows/** @MarkKoz @Akarys42 @SebastiaanZ @Den4200 @ks129
+Dockerfile @MarkKoz @Akarys42 @Den4200
+docker-compose.yml @MarkKoz @Akarys42 @Den4200
+
+# Tools
+Pipfile* @Akarys42
+
+# Metricity
+pydis_site/apps/api/models/bot/metricity.py @jb3
diff --git a/.github/review-policy.yml b/.github/review-policy.yml
new file mode 100644
index 00000000..421b30f8
--- /dev/null
+++ b/.github/review-policy.yml
@@ -0,0 +1,3 @@
+remote: python-discord/.github
+path: review-policies/core-developers.yml
+ref: main
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
new file mode 100644
index 00000000..ab7321de
--- /dev/null
+++ b/.github/workflows/build.yaml
@@ -0,0 +1,58 @@
+name: Build
+
+on:
+ workflow_run:
+ workflows: ["Lint & Test"]
+ branches:
+ - main
+ types:
+ - completed
+
+jobs:
+ build:
+ name: Build Docker Image
+ if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push'
+ runs-on: ubuntu-latest
+
+ steps:
+ # Create a commit SHA-based tag for the container repositories
+ - name: Create SHA Container Tag
+ id: sha_tag
+ run: |
+ tag=$(cut -c 1-7 <<< $GITHUB_SHA)
+ echo "::set-output name=tag::$tag"
+
+ - name: Checkout code
+ uses: actions/checkout@v2
+
+ # The current version (v2) of Docker's build-push action uses
+ # buildx, which comes with BuildKit features that help us speed
+ # up our builds using additional cache features. Buildx also
+ # has a lot of other features that are not as relevant to us.
+ #
+ # See https://github.com/docker/build-push-action
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v1
+
+ - name: Login to Github Container Registry
+ uses: docker/login-action@v1
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ # Build the container, including an inline cache manifest to
+ # allow us to use the registry as a cache source.
+ - name: Build and push
+ uses: docker/build-push-action@v2
+ with:
+ context: .
+ file: ./Dockerfile
+ push: true
+ cache-from: type=registry,ref=ghcr.io/python-discord/site:latest
+ cache-to: type=inline
+ tags: |
+ ghcr.io/python-discord/site:latest
+ ghcr.io/python-discord/site:${{ steps.sha_tag.outputs.tag }}
+ build-args: |
+ git_sha=${{ github.sha }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index 8760b35e..00000000
--- a/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: "Code scanning - action"
-
-on:
- push:
- pull_request:
- schedule:
- - cron: '0 12 * * *'
-
-jobs:
- CodeQL-Build:
-
- runs-on: ubuntu-latest
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@v2
- with:
- fetch-depth: 2
-
- - run: git checkout HEAD^2
- if: ${{ github.event_name == 'pull_request' }}
-
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v1
- with:
- languages: python
-
- - name: Autobuild
- uses: github/codeql-action/autobuild@v1
-
- - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
new file mode 100644
index 00000000..efc08040
--- /dev/null
+++ b/.github/workflows/deploy.yaml
@@ -0,0 +1,46 @@
+name: Deploy
+
+on:
+ workflow_run:
+ workflows: ["Build"]
+ branches:
+ - main
+ types:
+ - completed
+
+jobs:
+ deploy:
+ if: github.event.workflow_run.conclusion == 'success'
+ name: Deploy to Kubernetes Cluster
+ runs-on: ubuntu-latest
+ environment: production
+
+ steps:
+ - name: Create SHA Container Tag
+ id: sha_tag
+ run: |
+ tag=$(cut -c 1-7 <<< $GITHUB_SHA)
+ echo "::set-output name=tag::$tag"
+
+ # Check out the private Kubernetes repository for the
+ # deployment.yaml file using a GitHub Personal Access
+ # Token to get access.
+ - name: Checkout code
+ uses: actions/checkout@v2
+ with:
+ repository: python-discord/kubernetes
+ token: ${{ secrets.REPO_TOKEN }}
+
+ - name: Authenticate with Kubernetes
+ uses: azure/k8s-set-context@v1
+ with:
+ method: kubeconfig
+ kubeconfig: ${{ secrets.KUBECONFIG }}
+
+ - name: Deploy to Kubernetes
+ uses: Azure/k8s-deploy@v1
+ with:
+ manifests: |
+ site/deployment.yaml
+ images: 'ghcr.io/python-discord/site:${{ steps.sha_tag.outputs.tag }}'
+ kubectl-version: 'latest'
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
new file mode 100644
index 00000000..9e3d331d
--- /dev/null
+++ b/.github/workflows/lint-test.yaml
@@ -0,0 +1,142 @@
+name: Lint & Test
+
+on:
+ push:
+ branches:
+ - main
+ pull_request:
+
+
+jobs:
+ lint-test:
+ runs-on: ubuntu-latest
+ env:
+ # Configure pip to cache dependencies and do a user install
+ PIP_NO_CACHE_DIR: false
+ PIP_USER: 1
+
+ # Hide the graphical elements from pipenv's output
+ PIPENV_HIDE_EMOJIS: 1
+ PIPENV_NOSPIN: 1
+
+ # Make sure pipenv does not try reuse an environment it's running in
+ PIPENV_IGNORE_VIRTUALENVS: 1
+
+ # Specify explicit paths for python dependencies and the pre-commit
+ # environment so we know which directories to cache
+ PYTHONUSERBASE: ${{ github.workspace }}/.cache/py-user-base
+ PRE_COMMIT_HOME: ${{ github.workspace }}/.cache/pre-commit-cache
+
+ steps:
+ - name: Add custom PYTHONUSERBASE to PATH
+ run: echo '${{ env.PYTHONUSERBASE }}/bin/' >> $GITHUB_PATH
+
+ - name: Checkout repository
+ uses: actions/checkout@v2
+
+ - name: Setup python
+ id: python
+ uses: actions/setup-python@v2
+ with:
+ python-version: '3.8'
+
+ # Start the database early to give it a chance to get ready before
+ # we start running tests.
+ - name: Run database using docker-compose
+ run: docker-compose run -d -p 7777:5432 --name pydis_web postgres
+
+ # This step caches our Python dependencies. To make sure we
+ # only restore a cache when the dependencies, the python version,
+ # the runner operating system, and the dependency location haven't
+ # changed, we create a cache key that is a composite of those states.
+ #
+ # Only when the context is exactly the same, we will restore the cache.
+ - name: Python Dependency Caching
+ uses: actions/cache@v2
+ id: python_cache
+ with:
+ path: ${{ env.PYTHONUSERBASE }}
+ key: "python-0-${{ runner.os }}-${{ env.PYTHONUSERBASE }}-\
+ ${{ steps.python.outputs.python-version }}-\
+ ${{ hashFiles('./Pipfile', './Pipfile.lock') }}"
+
+ # Install our dependencies if we did not restore a dependency cache
+ - name: Install dependencies using pipenv
+ if: steps.python_cache.outputs.cache-hit != 'true'
+ run: |
+ pip install pipenv
+ pipenv install --dev --deploy --system
+
+ # This step caches our pre-commit environment. To make sure we
+ # do create a new environment when our pre-commit setup changes,
+ # we create a cache key based on relevant factors.
+ - name: Pre-commit Environment Caching
+ uses: actions/cache@v2
+ with:
+ path: ${{ env.PRE_COMMIT_HOME }}
+ key: "precommit-0-${{ runner.os }}-${{ env.PRE_COMMIT_HOME }}-\
+ ${{ steps.python.outputs.python-version }}-\
+ ${{ hashFiles('./.pre-commit-config.yaml') }}"
+
+ # We will not run `flake8` here, as we will use a separate flake8
+ # action. As pre-commit does not support user installs, we set
+ # PIP_USER=0 to not do a user install.
+ - name: Run pre-commit hooks
+ run: export PIP_USER=0; SKIP=flake8 pre-commit run --all-files
+
+ # Run flake8 and have it format the linting errors in the format of
+ # the GitHub Workflow command to register error annotations. This
+ # means that our flake8 output is automatically added as an error
+ # annotation to both the run result and in the "Files" tab of a
+ # pull request.
+ #
+ # Format used:
+ # ::error file={filename},line={line},col={col}::{message}
+ - name: Run flake8
+ run: "flake8 \
+ --format='::error file=%(path)s,line=%(row)d,col=%(col)d::\
+ [flake8] %(code)s: %(text)s'"
+
+ - name: Migrations and run tests with coverage.py
+ run: |
+ python manage.py makemigrations --check
+ python manage.py migrate
+ coverage run manage.py test --no-input
+ coverage report -m
+ env:
+ CI: True
+ DATABASE_URL: postgres://pysite:pysite@localhost:7777/pysite
+ METRICITY_DB_URL: postgres://pysite:pysite@localhost:7777/metricity
+
+ # This step will publish the coverage reports coveralls.io and
+ # print a "job" link in the output of the GitHub Action
+ - name: Publish coverage report to coveralls.io
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: coveralls
+
+ - name: Tear down docker-compose containers
+ run: docker-compose stop
+ if: ${{ always() }}
+
+ # Prepare the Pull Request Payload artifact. If this fails, we
+ # we fail silently using the `continue-on-error` option. It's
+ # nice if this succeeds, but if it fails for any reason, it
+ # does not mean that our lint-test checks failed.
+ - name: Prepare Pull Request Payload artifact
+ id: prepare-artifact
+ if: always() && github.event_name == 'pull_request'
+ continue-on-error: true
+ run: cat $GITHUB_EVENT_PATH | jq '.pull_request' > pull_request_payload.json
+
+ # This only makes sense if the previous step succeeded. To
+ # get the original outcome of the previous step before the
+ # `continue-on-error` conclusion is applied, we use the
+ # `.outcome` value. This step also fails silently.
+ - name: Upload a Build Artifact
+ if: always() && steps.prepare-artifact.outcome == 'success'
+ continue-on-error: true
+ uses: actions/upload-artifact@v2
+ with:
+ name: pull-request-payload
+ path: pull_request_payload.json
diff --git a/.github/workflows/sentry-release.yml b/.github/workflows/sentry-release.yml
index 87c85277..a3df5b1a 100644
--- a/.github/workflows/sentry-release.yml
+++ b/.github/workflows/sentry-release.yml
@@ -3,14 +3,14 @@ name: Create Sentry release
on:
push:
branches:
- - master
+ - main
jobs:
createSentryRelease:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@master
+ uses: actions/checkout@main
- name: Create a Sentry.io release
uses: tclindner/[email protected]
env:
@@ -20,4 +20,4 @@ jobs:
with:
tagName: ${{ github.sha }}
environment: production
- releaseNamePrefix: pydis-site@
+ releaseNamePrefix: site@
diff --git a/.github/workflows/status_embed.yaml b/.github/workflows/status_embed.yaml
new file mode 100644
index 00000000..b6a71b88
--- /dev/null
+++ b/.github/workflows/status_embed.yaml
@@ -0,0 +1,78 @@
+name: Status Embed
+
+on:
+ workflow_run:
+ workflows:
+ - Lint & Test
+ - Build
+ - Deploy
+ types:
+ - completed
+
+jobs:
+ status_embed:
+ # We need to send a status embed whenever the workflow
+ # sequence we're running terminates. There are a number
+ # of situations in which that happens:
+ #
+ # 1. We reach the end of the Deploy workflow, without
+ # it being skipped.
+ #
+ # 2. A `pull_request` triggered a Lint & Test workflow,
+ # as the sequence always terminates with one run.
+ #
+ # 3. If any workflow ends in failure or was cancelled.
+ if: >-
+ (github.event.workflow_run.name == 'Deploy' && github.event.workflow_run.conclusion != 'skipped') ||
+ github.event.workflow_run.event == 'pull_request' ||
+ github.event.workflow_run.conclusion == 'failure' ||
+ github.event.workflow_run.conclusion == 'cancelled'
+ name: Send Status Embed to Discord
+ runs-on: ubuntu-latest
+
+ steps:
+ # A workflow_run event does not contain all the information
+ # we need for a PR embed. That's why we upload an artifact
+ # with that information in the Lint workflow.
+ - name: Get Pull Request Information
+ id: pr_info
+ if: github.event.workflow_run.event == 'pull_request'
+ run: |
+ curl -s -H "Authorization: token $GITHUB_TOKEN" ${{ github.event.workflow_run.artifacts_url }} > artifacts.json
+ DOWNLOAD_URL=$(cat artifacts.json | jq -r '.artifacts[] | select(.name == "pull-request-payload") | .archive_download_url')
+ [ -z "$DOWNLOAD_URL" ] && exit 1
+ wget --quiet --header="Authorization: token $GITHUB_TOKEN" -O pull_request_payload.zip $DOWNLOAD_URL || exit 2
+ unzip -p pull_request_payload.zip > pull_request_payload.json
+ [ -s pull_request_payload.json ] || exit 3
+ echo "::set-output name=pr_author_login::$(jq -r '.user.login // empty' pull_request_payload.json)"
+ echo "::set-output name=pr_number::$(jq -r '.number // empty' pull_request_payload.json)"
+ echo "::set-output name=pr_title::$(jq -r '.title // empty' pull_request_payload.json)"
+ echo "::set-output name=pr_source::$(jq -r '.head.label // empty' pull_request_payload.json)"
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ # Send an informational status embed to Discord instead of the
+ # standard embeds that Discord sends. This embed will contain
+ # more information and we can fine tune when we actually want
+ # to send an embed.
+ - name: GitHub Actions Status Embed for Discord
+ uses: SebastiaanZ/[email protected]
+ with:
+ # Our GitHub Actions webhook
+ webhook_id: '784184528997842985'
+ webhook_token: ${{ secrets.GHA_WEBHOOK_TOKEN }}
+
+ # Workflow information
+ workflow_name: ${{ github.event.workflow_run.name }}
+ run_id: ${{ github.event.workflow_run.id }}
+ run_number: ${{ github.event.workflow_run.run_number }}
+ status: ${{ github.event.workflow_run.conclusion }}
+ actor: ${{ github.actor }}
+ repository: ${{ github.repository }}
+ ref: ${{ github.ref }}
+ sha: ${{ github.event.workflow_run.head_sha }}
+
+ pr_author_login: ${{ steps.pr_info.outputs.pr_author_login }}
+ pr_number: ${{ steps.pr_info.outputs.pr_number }}
+ pr_title: ${{ steps.pr_info.outputs.pr_title }}
+ pr_source: ${{ steps.pr_info.outputs.pr_source }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index be57904e..a66bf97c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,6 +20,6 @@ repos:
name: Flake8
description: This hook runs flake8 within our project's pipenv environment.
entry: pipenv run flake8
- language: python
+ language: system
types: [python]
require_serial: true
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..57ccd80e
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,3 @@
+# Code of Conduct
+
+The Python Discord Code of Conduct can be found [on our website](https://pydis.com/coc).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index de682a31..f20b5316 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,124 +1,3 @@
-# Contributing to one of Our Projects
+# Contributing Guidelines
-Our projects are open-source and are automatically deployed whenever commits are pushed to the `master` branch on each repository, so we've created a set of guidelines in order to keep everything clean and in working order.
-
-Note that contributions may be rejected on the basis of a contributor failing to follow these guidelines.
-
-## Rules
-
-1. **No force-pushes** or modifying the Git history in any way.
-2. If you have direct access to the repository, **create a branch for your changes** and create a pull request for that branch. If not, create a branch on a fork of the repository and create a pull request from there.
- * It's common practice for a repository to reject direct pushes to `master`, so make branching a habit!
- * If PRing from your own fork, **ensure that "Allow edits from maintainers" is checked**. This gives permission for maintainers to commit changes directly to your fork, speeding up the review process.
-3. **Adhere to the prevailing code style**, which we enforce using [`flake8`](http://flake8.pycqa.org/en/latest/index.html) and [`pre-commit`](https://pre-commit.com/).
- * Run `flake8` and `pre-commit` against your code [**before** you push it](https://soundcloud.com/lemonsaurusrex/lint-before-you-push). Your commit will be rejected by the build server if it fails to lint.
- * [Git Hooks](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks) are a powerful git feature for executing custom scripts when certain important git actions occur. The pre-commit hook is the first hook executed during the commit process and can be used to check the code being committed & abort the commit if issues, such as linting failures, are detected. While git hooks can seem daunting to configure, the `pre-commit` framework abstracts this process away from you and is provided as a dev dependency for this project. Run `pipenv run precommit` when setting up the project and you'll never have to worry about committing code that fails linting.
-4. **Make great commits**. A well structured git log is key to a project's maintainability; it efficiently provides insight into when and *why* things were done for future maintainers of the project.
- * Commits should be as narrow in scope as possible. Commits that span hundreds of lines across multiple unrelated functions and/or files are very hard for maintainers to follow. After about a week they'll probably be hard for you to follow too.
- * Avoid making minor commits for fixing typos or linting errors. Since you've already set up a `pre-commit` hook to run the linting pipeline before a commit, you shouldn't be committing linting issues anyway.
- * A more in-depth guide to writing great commit messages can be found in Chris Beam's [*How to Write a Git Commit Message*](https://chris.beams.io/posts/git-commit/)
-5. **Avoid frequent pushes to the main repository**. This goes for PRs opened against your fork as well. Our test build pipelines are triggered every time a push to the repository (or PR) is made. Try to batch your commits until you've finished working for that session, or you've reached a point where collaborators need your commits to continue their own work. This also provides you the opportunity to amend commits for minor changes rather than having to commit them on their own because you've already pushed.
- * This includes merging master into your branch. Try to leave merging from master for after your PR passes review; a maintainer will bring your PR up to date before merging. Exceptions to this include: resolving merge conflicts, needing something that was pushed to master for your branch, or something was pushed to master that could potentionally affect the functionality of what you're writing.
-6. **Don't fight the framework**. Every framework has its flaws, but the frameworks we've picked out have been carefully chosen for their particular merits. If you can avoid it, please resist reimplementing swathes of framework logic - the work has already been done for you!
-7. If someone is working on an issue or pull request, **do not open your own pull request for the same task**. Instead, collaborate with the author(s) of the existing pull request. Duplicate PRs opened without communicating with the other author(s) and/or PyDis staff will be closed. Communication is key, and there's no point in two separate implementations of the same thing.
- * One option is to fork the other contributor's repository and submit your changes to their branch with your own pull request. We suggest following these guidelines when interacting with their repository as well.
- * The author(s) of inactive PRs and claimed issues will be be pinged after a week of inactivity for an update. Continued inactivity may result in the issue being released back to the community and/or PR closure.
-8. **Work as a team** and collaborate wherever possible. Keep things friendly and help each other out - these are shared projects and nobody likes to have their feet trodden on.
-9. All API changes **must be validated against the bot** before PRing. Please don't leave this for reviewers to discover. Guides for setting up the developer environment can be [found below](#developer-environment).
-10. All static content, such as images or audio, **must be licensed for open public use**.
- * Static content must be hosted by a service designed to do so. Failing to do so is known as "leeching" and is frowned upon, as it generates extra bandwidth costs to the host without providing benefit. It would be best if appropriately licensed content is added to the repository itself so it can be served by PyDis' infrastructure.
-
-Above all, the needs of our community should come before the wants of an individual. Work together, build solutions to problems and try to do so in a way that people can learn from easily. Abuse of our trust may result in the loss of your Contributor role.
-
-## Changes to this Arrangement
-
-All projects evolve over time, and this contribution guide is no different. This document is open to pull requests or changes by contributors. If you believe you have something valuable to add or change, please don't hesitate to do so in a PR.
-
-## Supplemental Information
-### Developer Environment
-Instructions for setting up environments for both the site and the bot can be found on the PyDis Wiki:
- * [Site](https://pythondiscord.com/pages/contributing/site/)
- * [Bot](https://pythondiscord.com/pages/contributing/bot/)
-
-When pulling down changes from GitHub, remember to sync your environment using `pipenv sync --dev` to ensure you're using the most up-to-date versions the project's dependencies.
-
-### Type Hinting
-[PEP 484](https://www.python.org/dev/peps/pep-0484/) formally specifies type hints for Python functions, added to the Python Standard Library in version 3.5. Type hints are recognized by most modern code editing tools and provide useful insight into both the input and output types of a function, preventing the user from having to go through the codebase to determine these types.
-
-For example:
-
-```py
-import typing as t
-
-
-def foo(input_1: int, input_2: t.Dict[str, str]) -> bool:
- ...
-```
-
-Tells us that `foo` accepts an `int` and a `dict`, with `str` keys and values, and returns a `bool`.
-
-All function declarations should be type hinted in code contributed to the PyDis organization.
-
-For more information, see *[PEP 483](https://www.python.org/dev/peps/pep-0483/) - The Theory of Type Hints* and Python's documentation for the [`typing`](https://docs.python.org/3/library/typing.html) module.
-
-### AutoDoc Formatting Directives
-Many documentation packages provide support for automatic documentation generation from the codebase's docstrings. These tools utilize special formatting directives to enable richer formatting in the generated documentation.
-
-For example:
-
-```py
-import typing as t
-
-
-def foo(bar: int, baz: t.Optional[t.Dict[str, str]] = None) -> bool:
- """
- Does some things with some stuff.
-
- :param bar: Some input
- :param baz: Optional, some dictionary with string keys and values
-
- :return: Some boolean
- """
- ...
-```
-
-Since PyDis does not utilize automatic documentation generation, use of this syntax should not be used in code contributed to the organization. Should the purpose and type of the input variables not be easily discernable from the variable name and type annotation, a prose explanation can be used. Explicit references to variables, functions, classes, etc. should be wrapped with backticks (`` ` ``).
-
-For example, the above docstring would become:
-
-```py
-import typing as t
-
-
-def foo(bar: int, baz: t.Optional[t.Dict[str, str]] = None) -> bool:
- """
- Does some things with some stuff.
-
- This function takes an index, `bar` and checks for its presence in the database `baz`, passed as a dictionary. Returns `False` if `baz` is not passed.
- """
- ...
-```
-
-### Logging Levels
-The project currently defines [`logging`](https://docs.python.org/3/library/logging.html) levels as follows, from lowest to highest severity:
-* **TRACE:** These events should be used to provide a *verbose* trace of every step of a complex process. This is essentially the `logging` equivalent of sprinkling `print` statements throughout the code.
- * **Note:** This is a PyDis-implemented logging level.
-* **DEBUG:** These events should add context to what's happening in a development setup to make it easier to follow what's going while working on a project. This is in the same vein as **TRACE** logging but at a much lower level of verbosity.
-* **INFO:** These events are normal and don't need direct attention but are worth keeping track of in production, like checking which cogs were loaded during a start-up.
-* **WARNING:** These events are out of the ordinary and should be fixed, but have not caused a failure.
- * **NOTE:** Events at this logging level and higher should be reserved for events that require the attention of the DevOps team.
-* **ERROR:** These events have caused a failure in a specific part of the application and require urgent attention.
-* **CRITICAL:** These events have caused the whole application to fail and require immediate intervention.
-
-Ensure that log messages are succinct. Should you want to pass additional useful information that would otherwise make the log message overly verbose the `logging` module accepts an `extra` kwarg, which can be used to pass a dictionary. This is used to populate the `__dict__` of the `LogRecord` created for the logging event with user-defined attributes that can be accessed by a log handler. Additional information and caveats may be found [in Python's `logging` documentation](https://docs.python.org/3/library/logging.html#logging.Logger.debug).
-
-### Work in Progress (WIP) PRs
-Github [provides a PR feature](https://github.blog/2019-02-14-introducing-draft-pull-requests/) that allows the PR author to mark it as a WIP. This provides both a visual and functional indicator that the contents of the PR are in a draft state and not yet ready for formal review.
-
-This feature should be utilized in place of the traditional method of prepending `[WIP]` to the PR title.
-
-As stated earlier, **ensure that "Allow edits from maintainers" is checked**. This gives permission for maintainers to commit changes directly to your fork, speeding up the review process.
-
-## Footnotes
-
-This document was inspired by the [Glowstone contribution guidelines](https://github.com/GlowstoneMC/Glowstone/blob/dev/docs/CONTRIBUTING.md).
+The Contributing Guidelines for Python Discord projects can be found [on our website](https://pydis.com/contributing.md).
diff --git a/docker/Dockerfile b/Dockerfile
index 97cb73d5..5d8ba5da 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7-slim
+FROM python:3.8-slim-buster
# Allow service to handle stops gracefully
STOPSIGNAL SIGQUIT
@@ -8,25 +8,25 @@ ENV PIP_NO_CACHE_DIR=false \
PIPENV_HIDE_EMOJIS=1 \
PIPENV_NOSPIN=1
-# Install git
-RUN apt-get -y update \
- && apt-get install -y \
- git \
- && rm -rf /var/lib/apt/lists/*
-
-# Create non-root user.
-RUN useradd --system --shell /bin/false --uid 1500 pysite
-
# Install pipenv
RUN pip install -U pipenv
# Copy the project files into working directory
WORKDIR /app
-COPY . .
+
+# Copy dependency files
+COPY Pipfile Pipfile.lock ./
# Install project dependencies
RUN pipenv install --system --deploy
+# Copy project code
+COPY . .
+
+# Set Git SHA environment variable
+ARG git_sha="development"
+ENV GIT_SHA=$git_sha
+
# Run web server through custom manager
ENTRYPOINT ["python", "manage.py"]
CMD ["run"]
diff --git a/LICENSE b/LICENSE
index 15f00946..dd39e18d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2018 Python Discord
+Copyright (c) 2018-2020 Python Discord
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/Pipfile b/Pipfile
index 9ec75e84..ca467c9e 100644
--- a/Pipfile
+++ b/Pipfile
@@ -9,14 +9,13 @@ django-environ = "~=0.4.5"
django-filter = "~=2.1.0"
django-hosts = "~=4.0"
djangorestframework = "~=3.11.0"
-djangorestframework-bulk = "~=0.2.1"
psycopg2-binary = "~=2.8"
django-simple-bulma = "~=2.1"
whitenoise = "~=5.0"
requests = "~=2.21"
pyyaml = "~=5.1"
-pyuwsgi = {version = "~=2.0", sys_platform = "!='win32'"}
-sentry-sdk = "~=0.14"
+gunicorn = "~=20.0.4"
+sentry-sdk = "~=0.19"
gitpython = "~=3.1.7"
markdown = "~=3.3.4"
python-frontmatter = "~=1.0"
@@ -35,11 +34,11 @@ flake8-todo = "~=0.7"
mccabe = "~=0.6.1"
pep8-naming = "~=0.9"
pre-commit = "~=2.1"
-unittest-xml-reporting = "~=3.0"
pyfakefs = "~=4.4.0"
+coveralls = "~=2.1"
[requires]
-python_version = "3.7"
+python_version = "3.8"
[scripts]
start = "python manage.py run --debug"
diff --git a/Pipfile.lock b/Pipfile.lock
index 8a81b34d..ab363c10 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,11 +1,11 @@
{
"_meta": {
"hash": {
- "sha256": "a3ca73db3d86d7e8e7cc833ea4fe6aa464332d061c6319bf0c83ee4cb9ed7a27"
+ "sha256": "44f16cc8889bf8e8fc7ab0cbf9a7b95ac14da10341326e6a9961e24a5fa5df4c"
},
"pipfile-spec": 6,
"requires": {
- "python_version": "3.7"
+ "python_version": "3.8"
},
"sources": [
{
@@ -18,11 +18,11 @@
"default": {
"asgiref": {
"hashes": [
- "sha256:5ee950735509d04eb673bd7f7120f8fa1c9e2df495394992c73234d526907e17",
- "sha256:7162a3cb30ab0609f1a4c95938fd73e8604f63bdba516a7f7d64b83ff09478f0"
+ "sha256:92906c611ce6c967347bbfea733f13d6313901d54dcca88195eaeb52b2a8e8ee",
+ "sha256:d1216dfbdfb63826470995d31caed36225dcaf34f182e0fa257a4dd9e86f1b78"
],
- "markers": "python_version >= '3.5'",
- "version": "==3.3.1"
+ "markers": "python_version >= '3.6'",
+ "version": "==3.3.4"
},
"certifi": {
"hashes": [
@@ -41,11 +41,11 @@
},
"django": {
"hashes": [
- "sha256:2afe4900667bcceac792fa34b4fb25448c4fd950d8b32c5508b3442c4b10442a",
- "sha256:6f13c3e8109236129c49d65a42fbf30c928e66b05ca6862246061b9343ecbaf2"
+ "sha256:9bc7aa619ed878fedba62ce139abe663a147dccfd20e907725ec11e02a1ca225",
+ "sha256:d58d8394036db75a81896037d757357e79406e8f68816c3e8a28721c1d9d4c11"
],
"index": "pypi",
- "version": "==3.0.13"
+ "version": "==3.0.14"
},
"django-environ": {
"hashes": [
@@ -73,11 +73,11 @@
},
"django-simple-bulma": {
"hashes": [
- "sha256:048d957a4c2a3c37c461082d07c473e72abef2f706a619bc069a78bef98c84ac",
- "sha256:0894e247b7f6e88432894f10e7c051fba867df5cd645e42de2b94892dacaeeba"
+ "sha256:38530d787b2b6a091b480f7cbb8841a3b3709733ebfa5e543ae339c3d8fece03",
+ "sha256:dfc34839e050d5e4749498806ed7ee8c77794021efa54ab224a2de925c644fea"
],
"index": "pypi",
- "version": "==2.1.0"
+ "version": "==2.2.0"
},
"djangorestframework": {
"hashes": [
@@ -87,13 +87,6 @@
"index": "pypi",
"version": "==3.11.2"
},
- "djangorestframework-bulk": {
- "hashes": [
- "sha256:39230d8379acebd86d313df6c9150cafecb636eae1d097c30a26389ab9fee5b1"
- ],
- "index": "pypi",
- "version": "==0.2.1"
- },
"gitdb": {
"hashes": [
"sha256:6c4cc71933456991da20917998acbe6cf4fb41eeaab7d6d67fbc05ecd4c865b0",
@@ -104,11 +97,19 @@
},
"gitpython": {
"hashes": [
- "sha256:3283ae2fba31c913d857e12e5ba5f9a7772bbc064ae2bb09efafa71b0dd4939b",
- "sha256:be27633e7509e58391f10207cd32b2a6cf5b908f92d9cd30da2e514e1137af61"
+ "sha256:29fe82050709760081f588dd50ce83504feddbebdc4da6956d02351552b1c135",
+ "sha256:ee24bdc93dce357630764db659edaf6b8d664d4ff5447ccfeedd2dc5c253f41e"
+ ],
+ "index": "pypi",
+ "version": "==3.1.17"
+ },
+ "gunicorn": {
+ "hashes": [
+ "sha256:1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626",
+ "sha256:cd4a810dd51bf497552cf3f863b575dabd73d6ad6a91075b65936b151cbf4f9c"
],
"index": "pypi",
- "version": "==3.1.14"
+ "version": "==20.0.4"
},
"idna": {
"hashes": [
@@ -118,14 +119,6 @@
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==2.10"
},
- "importlib-metadata": {
- "hashes": [
- "sha256:c9db46394197244adf2f0b08ec5bc3cf16757e9590b02af1fca085c16c0d600a",
- "sha256:d2d46ef77ffc85cbf7dac7e81dd663fde71c45326131bea8033b9bad42268ebe"
- ],
- "markers": "python_version < '3.8'",
- "version": "==3.10.0"
- },
"libsass": {
"hashes": [
"sha256:1521d2a8d4b397c6ec90640a1f6b5529077035efc48ef1c2e53095544e713d1b",
@@ -208,27 +201,6 @@
],
"version": "==2021.1"
},
- "pyuwsgi": {
- "hashes": [
- "sha256:0bd14517398f494d828d77a9bf72b5a6cbef0112e1cc05e9a0080fa8828ccfa0",
- "sha256:149675b2e020b0e833e8b871a545751ca346cbfed85c8fd2b320a01d40dc3d8f",
- "sha256:285e263a9094389f13cfdefd033a4e99fbed3ad120dba9ac5093846cc03ac5ab",
- "sha256:297d1d0b8c472374b12eda7f17a9f5de67cf516612e42b71a7636afb9d1e3974",
- "sha256:5439f0f3ef5d6bf1622f341662d04c1d92b88889db40b295419e5fe75a7c7d45",
- "sha256:56ecda11e873b2eb937b33d2999766322eebfa82ee5b26a2196a335c4e786186",
- "sha256:66a9751f28abf348e0ddccadc4ded47623f2d35cf9609c87b57909d55a4cdc15",
- "sha256:890e7e863cb61c8369b6bcfa5d6f323753aaeec2cfaba16741f119c79b964aa7",
- "sha256:90e4235020048456ad867aefc383cdf5528b7f6e327555ceec579c428a828759",
- "sha256:94d4287b155aa789ce4b6f671c981f7d6c58fc3113330e2f29ac7926cb854645",
- "sha256:a425f562f382a097ca49df26b70d47d12f0cf0abf233610f3f58b1f7f780355e",
- "sha256:ac79dead0685beab5ecfe0926426849a44c5572528f89bb17f6ecf5eb561024e",
- "sha256:bddeb8df77010d0f842068765a0b3155fdcfd847f14bc1ba89fc7e37914a13d2",
- "sha256:dac4a04dc0f69d641dba984e83214d2c2cc098496c5d5585e7d3f4e7a9190f84"
- ],
- "index": "pypi",
- "markers": "sys_platform != 'win32'",
- "version": "==2.0.19.1.post0"
- },
"pyyaml": {
"hashes": [
"sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf",
@@ -282,11 +254,11 @@
},
"six": {
"hashes": [
- "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
- "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
+ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
+ "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
- "version": "==1.15.0"
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
+ "version": "==1.16.0"
},
"smmap": {
"hashes": [
@@ -304,15 +276,6 @@
"markers": "python_version >= '3.5'",
"version": "==0.4.1"
},
- "typing-extensions": {
- "hashes": [
- "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
- "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
- "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
- ],
- "markers": "python_version < '3.8'",
- "version": "==3.7.4.3"
- },
"urllib3": {
"hashes": [
"sha256:2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df",
@@ -328,14 +291,6 @@
],
"index": "pypi",
"version": "==5.2.0"
- },
- "zipp": {
- "hashes": [
- "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76",
- "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"
- ],
- "markers": "python_version >= '3.6'",
- "version": "==3.4.1"
}
},
"develop": {
@@ -348,11 +303,11 @@
},
"attrs": {
"hashes": [
- "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
- "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"
+ "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1",
+ "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
- "version": "==20.3.0"
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+ "version": "==21.2.0"
},
"bandit": {
"hashes": [
@@ -361,6 +316,13 @@
],
"version": "==1.7.0"
},
+ "certifi": {
+ "hashes": [
+ "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c",
+ "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"
+ ],
+ "version": "==2020.12.5"
+ },
"cfgv": {
"hashes": [
"sha256:32e43d604bbe7896fe7c248a9c2276447dbef840feb28fe20494f62af110211d",
@@ -369,6 +331,14 @@
"markers": "python_full_version >= '3.6.1'",
"version": "==3.2.0"
},
+ "chardet": {
+ "hashes": [
+ "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa",
+ "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"
+ ],
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+ "version": "==4.0.0"
+ },
"coverage": {
"hashes": [
"sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c",
@@ -427,6 +397,14 @@
"index": "pypi",
"version": "==5.5"
},
+ "coveralls": {
+ "hashes": [
+ "sha256:2301a19500b06649d2ec4f2858f9c69638d7699a4c63027c5d53daba666147cc",
+ "sha256:b990ba1f7bc4288e63340be0433698c1efe8217f78c689d254c2540af3d38617"
+ ],
+ "index": "pypi",
+ "version": "==2.2.0"
+ },
"distlib": {
"hashes": [
"sha256:8c09de2c67b3e7deef7184574fc060ab8a793e7adbb183d942c389c8b13c52fb",
@@ -434,6 +412,12 @@
],
"version": "==0.3.1"
},
+ "docopt": {
+ "hashes": [
+ "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"
+ ],
+ "version": "==0.6.2"
+ },
"filelock": {
"hashes": [
"sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59",
@@ -443,19 +427,19 @@
},
"flake8": {
"hashes": [
- "sha256:12d05ab02614b6aee8df7c36b97d1a3b2372761222b19b58621355e82acddcff",
- "sha256:78873e372b12b093da7b5e5ed302e8ad9e988b38b063b61ad937f26ca58fc5f0"
+ "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b",
+ "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"
],
"index": "pypi",
- "version": "==3.9.0"
+ "version": "==3.9.2"
},
"flake8-annotations": {
"hashes": [
- "sha256:40a4d504cdf64126ea0bdca39edab1608bc6d515e96569b7e7c3c59c84f66c36",
- "sha256:eabbfb2dd59ae0e9835f509f930e79cd99fa4ff1026fe6ca073503a57407037c"
+ "sha256:0d6cd2e770b5095f09689c9d84cc054c51b929c41a68969ea1beb4b825cac515",
+ "sha256:d10c4638231f8a50c0a597c4efce42bd7b7d85df4f620a0ddaca526138936a4f"
],
"index": "pypi",
- "version": "==2.6.1"
+ "version": "==2.6.2"
},
"flake8-bandit": {
"hashes": [
@@ -505,11 +489,11 @@
},
"flake8-tidy-imports": {
"hashes": [
- "sha256:52e5f2f987d3d5597538d5941153409ebcab571635835b78f522c7bf03ca23bc",
- "sha256:76e36fbbfdc8e3c5017f9a216c2855a298be85bc0631e66777f4e6a07a859dc4"
+ "sha256:d6e64cb565ca9474d13d5cb3f838b8deafb5fed15906998d4a674daf55bd6d89",
+ "sha256:e66d46f58ed108f36da920e7781a728dc2d8e4f9269e7e764274105700c0a90c"
],
"index": "pypi",
- "version": "==4.2.1"
+ "version": "==4.3.0"
},
"flake8-todo": {
"hashes": [
@@ -528,27 +512,27 @@
},
"gitpython": {
"hashes": [
- "sha256:3283ae2fba31c913d857e12e5ba5f9a7772bbc064ae2bb09efafa71b0dd4939b",
- "sha256:be27633e7509e58391f10207cd32b2a6cf5b908f92d9cd30da2e514e1137af61"
+ "sha256:29fe82050709760081f588dd50ce83504feddbebdc4da6956d02351552b1c135",
+ "sha256:ee24bdc93dce357630764db659edaf6b8d664d4ff5447ccfeedd2dc5c253f41e"
],
"index": "pypi",
- "version": "==3.1.14"
+ "version": "==3.1.17"
},
"identify": {
"hashes": [
- "sha256:43cb1965e84cdd247e875dec6d13332ef5be355ddc16776396d98089b9053d87",
- "sha256:c7c0f590526008911ccc5ceee6ed7b085cbc92f7b6591d0ee5913a130ad64034"
+ "sha256:9bcc312d4e2fa96c7abebcdfb1119563b511b5e3985ac52f60d9116277865b2e",
+ "sha256:ad9f3fa0c2316618dc4d840f627d474ab6de106392a4f00221820200f490f5a8"
],
"markers": "python_full_version >= '3.6.1'",
- "version": "==2.2.2"
+ "version": "==2.2.4"
},
- "importlib-metadata": {
+ "idna": {
"hashes": [
- "sha256:c9db46394197244adf2f0b08ec5bc3cf16757e9590b02af1fca085c16c0d600a",
- "sha256:d2d46ef77ffc85cbf7dac7e81dd663fde71c45326131bea8033b9bad42268ebe"
+ "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
+ "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
],
- "markers": "python_version < '3.8'",
- "version": "==3.10.0"
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+ "version": "==2.10"
},
"mccabe": {
"hashes": [
@@ -560,18 +544,18 @@
},
"nodeenv": {
"hashes": [
- "sha256:5304d424c529c997bc888453aeaa6362d242b6b4631e90f3d4bf1b290f1c84a9",
- "sha256:ab45090ae383b716c4ef89e690c41ff8c2b257b85b309f01f3654df3d084bd7c"
+ "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b",
+ "sha256:621e6b7076565ddcacd2db0294c0381e01fd28945ab36bcf00f41c5daf63bef7"
],
- "version": "==1.5.0"
+ "version": "==1.6.0"
},
"pbr": {
"hashes": [
- "sha256:5fad80b613c402d5b7df7bd84812548b2a61e9977387a80a5fc5c396492b13c9",
- "sha256:b236cde0ac9a6aedd5e3c34517b423cd4fd97ef723849da6b0d2231142d89c00"
+ "sha256:42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd",
+ "sha256:c68c661ac5cc81058ac94247278eeda6d2e6aecb3e227b0387c30d277e7ef8d4"
],
"markers": "python_version >= '2.6'",
- "version": "==5.5.1"
+ "version": "==5.6.0"
},
"pep8-naming": {
"hashes": [
@@ -583,11 +567,11 @@
},
"pre-commit": {
"hashes": [
- "sha256:94c82f1bf5899d56edb1d926732f4e75a7df29a0c8c092559c77420c9d62428b",
- "sha256:de55c5c72ce80d79106e48beb1b54104d16495ce7f95b0c7b13d4784193a00af"
+ "sha256:70c5ec1f30406250b706eda35e868b87e3e4ba099af8787e3e8b4b01e84f4712",
+ "sha256:900d3c7e1bf4cf0374bb2893c24c23304952181405b4d88c9c40b72bda1bb8a9"
],
"index": "pypi",
- "version": "==2.11.1"
+ "version": "==2.12.1"
},
"pycodestyle": {
"hashes": [
@@ -656,13 +640,21 @@
"index": "pypi",
"version": "==5.4.1"
},
+ "requests": {
+ "hashes": [
+ "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804",
+ "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"
+ ],
+ "index": "pypi",
+ "version": "==2.25.1"
+ },
"six": {
"hashes": [
- "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
- "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
+ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
+ "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
- "version": "==1.15.0"
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
+ "version": "==1.16.0"
},
"smmap": {
"hashes": [
@@ -692,77 +684,24 @@
"sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
"sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
],
- "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+ "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'",
"version": "==0.10.2"
},
- "typed-ast": {
- "hashes": [
- "sha256:07d49388d5bf7e863f7fa2f124b1b1d89d8aa0e2f7812faff0a5658c01c59aa1",
- "sha256:14bf1522cdee369e8f5581238edac09150c765ec1cb33615855889cf33dcb92d",
- "sha256:240296b27397e4e37874abb1df2a608a92df85cf3e2a04d0d4d61055c8305ba6",
- "sha256:36d829b31ab67d6fcb30e185ec996e1f72b892255a745d3a82138c97d21ed1cd",
- "sha256:37f48d46d733d57cc70fd5f30572d11ab8ed92da6e6b28e024e4a3edfb456e37",
- "sha256:4c790331247081ea7c632a76d5b2a265e6d325ecd3179d06e9cf8d46d90dd151",
- "sha256:5dcfc2e264bd8a1db8b11a892bd1647154ce03eeba94b461effe68790d8b8e07",
- "sha256:7147e2a76c75f0f64c4319886e7639e490fee87c9d25cb1d4faef1d8cf83a440",
- "sha256:7703620125e4fb79b64aa52427ec192822e9f45d37d4b6625ab37ef403e1df70",
- "sha256:8368f83e93c7156ccd40e49a783a6a6850ca25b556c0fa0240ed0f659d2fe496",
- "sha256:84aa6223d71012c68d577c83f4e7db50d11d6b1399a9c779046d75e24bed74ea",
- "sha256:85f95aa97a35bdb2f2f7d10ec5bbdac0aeb9dafdaf88e17492da0504de2e6400",
- "sha256:8db0e856712f79c45956da0c9a40ca4246abc3485ae0d7ecc86a20f5e4c09abc",
- "sha256:9044ef2df88d7f33692ae3f18d3be63dec69c4fb1b5a4a9ac950f9b4ba571606",
- "sha256:963c80b583b0661918718b095e02303d8078950b26cc00b5e5ea9ababe0de1fc",
- "sha256:987f15737aba2ab5f3928c617ccf1ce412e2e321c77ab16ca5a293e7bbffd581",
- "sha256:9ec45db0c766f196ae629e509f059ff05fc3148f9ffd28f3cfe75d4afb485412",
- "sha256:9fc0b3cb5d1720e7141d103cf4819aea239f7d136acf9ee4a69b047b7986175a",
- "sha256:a2c927c49f2029291fbabd673d51a2180038f8cd5a5b2f290f78c4516be48be2",
- "sha256:a38878a223bdd37c9709d07cd357bb79f4c760b29210e14ad0fb395294583787",
- "sha256:b4fcdcfa302538f70929eb7b392f536a237cbe2ed9cba88e3bf5027b39f5f77f",
- "sha256:c0c74e5579af4b977c8b932f40a5464764b2f86681327410aa028a22d2f54937",
- "sha256:c1c876fd795b36126f773db9cbb393f19808edd2637e00fd6caba0e25f2c7b64",
- "sha256:c9aadc4924d4b5799112837b226160428524a9a45f830e0d0f184b19e4090487",
- "sha256:cc7b98bf58167b7f2db91a4327da24fb93368838eb84a44c472283778fc2446b",
- "sha256:cf54cfa843f297991b7388c281cb3855d911137223c6b6d2dd82a47ae5125a41",
- "sha256:d003156bb6a59cda9050e983441b7fa2487f7800d76bdc065566b7d728b4581a",
- "sha256:d175297e9533d8d37437abc14e8a83cbc68af93cc9c1c59c2c292ec59a0697a3",
- "sha256:d746a437cdbca200622385305aedd9aef68e8a645e385cc483bdc5e488f07166",
- "sha256:e683e409e5c45d5c9082dc1daf13f6374300806240719f95dc783d1fc942af10"
- ],
- "markers": "python_version < '3.8'",
- "version": "==1.4.2"
- },
- "typing-extensions": {
- "hashes": [
- "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
- "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
- "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
- ],
- "markers": "python_version < '3.8'",
- "version": "==3.7.4.3"
- },
- "unittest-xml-reporting": {
- "hashes": [
- "sha256:7bf515ea8cb244255a25100cd29db611a73f8d3d0aaf672ed3266307e14cc1ca",
- "sha256:984cebba69e889401bfe3adb9088ca376b3a1f923f0590d005126c1bffd1a695"
- ],
- "index": "pypi",
- "version": "==3.0.4"
- },
- "virtualenv": {
+ "urllib3": {
"hashes": [
- "sha256:49ec4eb4c224c6f7dd81bb6d0a28a09ecae5894f4e593c89b0db0885f565a107",
- "sha256:83f95875d382c7abafe06bd2a4cdd1b363e1bb77e02f155ebe8ac082a916b37c"
+ "sha256:2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df",
+ "sha256:e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
- "version": "==20.4.3"
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
+ "version": "==1.26.4"
},
- "zipp": {
+ "virtualenv": {
"hashes": [
- "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76",
- "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"
+ "sha256:307a555cf21e1550885c82120eccaf5acedf42978fd362d32ba8410f9593f543",
+ "sha256:72cf267afc04bf9c86ec932329b7e94db6a0331ae9847576daaa7ca3c86b29a4"
],
- "markers": "python_version >= '3.6'",
- "version": "==3.4.1"
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+ "version": "==20.4.6"
}
}
}
diff --git a/README.md b/README.md
index 616f2edc..f88c2cf7 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,25 @@
# Python Discord: Site
-[![Discord](https://img.shields.io/static/v1?label=Python%20Discord&logo=discord&message=%3E95k%20members&color=%237289DA&logoColor=white)](https://discord.gg/2B963hn)
-[![Build Status](https://dev.azure.com/python-discord/Python%20Discord/_apis/build/status/Site?branchName=master)](https://dev.azure.com/python-discord/Python%20Discord/_build/latest?definitionId=2&branchName=master)
-[![Tests](https://img.shields.io/azure-devops/tests/python-discord/Python%20Discord/2?compact_message)](https://dev.azure.com/python-discord/Python%20Discord/_apis/build/status/Site?branchName=master)
-[![Coverage](https://img.shields.io/azure-devops/coverage/python-discord/Python%20Discord/2/master)](https://dev.azure.com/python-discord/Python%20Discord/_apis/build/status/Site?branchName=master)
-[![License](https://img.shields.io/github/license/python-discord/site)](LICENSE)
-[![Status](https://img.shields.io/website?url=https%3A%2F%2Fpythondiscord.com)][1]
+[![Discord][10]][11]
+[![Lint & Test][1]][2]
+[![Build & Deploy][3]][4]
+[![Coverage Status][5]][6]
+[![License](https://img.shields.io/badge/license-MIT-green)](LICENSE)
-This is all of the code that is responsible for maintaining [our website][1] and all of its subdomains.
+This is all of the code that is responsible for maintaining [our website][7] and all of its subdomains.
The website is built on Django and should be simple to set up and get started with.
If you happen to run into issues with setup, please don't hesitate to open an issue!
-If you're looking to contribute or play around with the code, take a look at [the wiki][2] or the [`docs` directory](docs). If you're looking for things to do, check out [our issues][3].
+If you're looking to contribute or play around with the code, take a look at [the wiki][8] or the [`docs` directory](docs). If you're looking for things to do, check out [our issues][9].
-[1]: https://pythondiscord.com
-[2]: https://pythondiscord.com/pages/contributing/site/
-[3]: https://github.com/python-discord/site/issues
+[1]: https://github.com/python-discord/site/workflows/Lint%20&%20Test/badge.svg?branch=main
+[2]: https://github.com/python-discord/site/actions?query=workflow%3A%22Lint+%26+Test%22+branch%3Amain
+[3]: https://github.com/python-discord/site/workflows/Build%20&%20Deploy/badge.svg?branch=main
+[4]: https://github.com/python-discord/site/actions?query=workflow%3A%22Build+%26+Deploy%22+branch%3Amain
+[5]: https://coveralls.io/repos/github/python-discord/site/badge.svg?branch=main
+[6]: https://coveralls.io/github/python-discord/site?branch=main
+[7]: https://pythondiscord.com
+[8]: https://pythondiscord.com/pages/contributing/site/
+[9]: https://github.com/python-discord/site/issues
+[10]: https://raw.githubusercontent.com/python-discord/branding/main/logos/badge/badge_github.svg
+[11]: https://discord.gg/python
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000..fa5a88a3
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,3 @@
+# Security Notice
+
+The Security Notice for Python Discord projects can be found [on our website](https://pydis.com/security.md).
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index f273dad3..00000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,102 +0,0 @@
-# https://aka.ms/yaml
-
-jobs:
- - job: test
- displayName: 'Test & Lint'
- pool:
- vmImage: ubuntu-16.04
-
- variables:
- PIP_CACHE_DIR: .cache/pip
- PRE_COMMIT_HOME: $(Pipeline.Workspace)/pre-commit-cache
-
- steps:
- - task: UsePythonVersion@0
- displayName: 'Set Python Version'
- name: PythonVersion
- inputs:
- versionSpec: '3.7.x'
- addToPath: true
-
- - task: DockerCompose@0
- displayName: 'Setup Database'
- inputs:
- action: Run a specific service
- dockerComposeFile: docker-compose.yml
- projectName: pydis_web
- serviceName: postgres
- ports: '7777:5432'
-
- - script: |
- pip install pipenv
- pipenv install --dev --system
- pip install flake8-formatter-junit-xml
- displayName: 'Install Project Environment'
-
- # Create an executable shell script which replaces the original pipenv binary.
- # The shell script ignores the first argument and executes the rest of the args as a command.
- # It makes the `pipenv run flake8` command in the pre-commit hook work by circumventing
- # pipenv entirely, which is too dumb to know it should use the system interpreter rather than
- # creating a new venv.
- - script: |
- printf '%s\n%s' '#!/bin/bash' '"${@:2}"' > $(PythonVersion.pythonLocation)/bin/pipenv \
- && chmod +x $(PythonVersion.pythonLocation)/bin/pipenv
- displayName: 'Mock pipenv binary'
-
- - task: Cache@2
- displayName: 'Restore pre-commit environment'
- inputs:
- key: pre-commit | "$(PythonVersion.pythonLocation)" | .pre-commit-config.yaml
- restoreKeys: |
- pre-commit | "$(PythonVersion.pythonLocation)"
- path: $(PRE_COMMIT_HOME)
-
- # flake8 runs so it can generate the XML output. pre-commit will run it again to show stdout.
- # flake8 standalone runs first to avoid any fixes pre-commit hooks may make.
- - script: flake8 --format junit-xml --output-file TEST-lint.xml; pre-commit run --all-files
- displayName: 'Run pre-commit hooks'
-
- - script: |
- python3 manage.py makemigrations --check
- python3 manage.py migrate
- coverage run \
- manage.py test \
- --testrunner xmlrunner.extra.djangotestrunner.XMLTestRunner \
- --no-input
- env:
- CI: azure
- DATABASE_URL: postgres://pysite:pysite@localhost:7777/pysite
- displayName: 'Run Tests'
-
- - script: coverage report -m && coverage xml
- displayName: 'Generate Coverage Reports'
-
- - task: PublishTestResults@2
- condition: succeededOrFailed()
- displayName: 'Publish Test & Linting Results'
- inputs:
- testResultsFiles: '**/TEST-*.xml'
- testRunTitle: 'Site Test Results'
-
- - task: PublishCodeCoverageResults@1
- displayName: 'Publish Coverage Results'
- condition: succeededOrFailed()
- inputs:
- codeCoverageTool: Cobertura
- summaryFileLocation: '**/coverage.xml'
-
- - job: build
- displayName: 'Build & Push Container'
- dependsOn: test
- condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
-
- steps:
- - task: Docker@2
- displayName: 'Build & Push Container'
- inputs:
- containerRegistry: 'DockerHub'
- repository: 'pythondiscord/site'
- command: 'buildAndPush'
- Dockerfile: 'docker/Dockerfile'
- buildContext: '.'
- tags: 'latest'
diff --git a/docker-compose.yml b/docker-compose.yml
index 73d2ff85..1f49f1f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,11 +18,13 @@ services:
POSTGRES_DB: pysite
POSTGRES_PASSWORD: pysite
POSTGRES_USER: pysite
+ volumes:
+ - ./postgres/init.sql:/docker-entrypoint-initdb.d/init.sql
web:
build:
context: .
- dockerfile: docker/Dockerfile
+ dockerfile: Dockerfile
command: ["run", "--debug"]
networks:
default:
@@ -40,8 +42,10 @@ services:
- staticfiles:/var/www/static
environment:
DATABASE_URL: postgres://pysite:pysite@postgres:5432/pysite
+ METRICITY_DB_URL: postgres://pysite:pysite@postgres:5432/metricity
SECRET_KEY: suitable-for-development-only
STATIC_ROOT: /var/www/static
+ DEBUG: 1
volumes:
staticfiles:
diff --git a/docker/uwsgi.ini b/docker/uwsgi.ini
deleted file mode 100644
index 3f35258c..00000000
--- a/docker/uwsgi.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[uwsgi]
-### Exposed ports
-# uWSGI protocol socket
-socket = :4000
-
-### File settings
-# WSGI application
-wsgi = pydis_site.wsgi:application
-# Directory to move into at startup
-chdir = /app
-
-### Concurrency options
-# Run a master to supervise the workers
-master = true
-# Keep a minimum of 1 worker
-cheaper = 1
-# Allow a maximum of 4 workers
-workers = 4
-# Automatically set up meanginful process names
-auto-procname = true
-# Prefix process names with `pydis_site : `
-procname-prefix-spaced = pydis_site :
-
-### Worker options
-# Kill workers if they take more than 30 seconds to respond.
-harakiri = 30
-
-### Startup settings
-# Exit if we can't load the app
-need-app = true
-# `setuid` to an unprivileged user
-uid = 1500
-# Do not use multiple interpreters
-single-interpreter = true
-
-### Hook setup
-# Gracefully kill workers on `SIGQUIT`
-hook-master-start = unix_signal:3 gracefully_kill_them_all
diff --git a/docs/deployment.md b/docs/deployment.md
deleted file mode 100644
index e561b5d0..00000000
--- a/docs/deployment.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# Deployment
-The default Dockerfile should do a good job at running a solid web server that
-automatically adjusts its worker count based on traffic. This is managed by
-uWSGI. You need to configure the `DATABASE_URL` and `SECRET_KEY` variables. If
-you want to deploy to a different host than the default, configure the
-`ALLOWED_HOSTS` variable.
-
-## Static file hosting
-You can either collect the static files in the container and use uWSGI to host
-them, or put them on your host and manage them through a web server running on
-the host like nginx.
-
-## Database migrations
-To bring the schema up-to-date, first stop an existing database container, then
-start a container that just runs the migrations and exits, and then starts the
-main container off the new container again.
-
-## Ansible task
-An example Ansible task to deploy the site is shown below, it should read fairly
-humanly and give you a rough idea of steps needed to deploy the site.
-
-```yml
-- name: ensure the `{{ pysite_pg_username }}` postgres user exists
- become: yes
- become_user: postgres
- postgresql_user:
- name: "{{ pysite_pg_username }}"
- password: "{{ pysite_pg_password }}"
- when: pysite_pg_host == 'localhost'
-
-- name: ensure the `{{ pysite_pg_database }}` postgres database exists
- become: yes
- become_user: postgres
- postgresql_db:
- name: "{{ pysite_pg_database }}"
- owner: "{{ pysite_pg_username }}"
- when: pysite_pg_host == 'localhost'
-
-- name: ensure the `{{ pysite_hub_repository }}` image is up-to-date
- become: yes
- docker_image:
- name: "{{ pysite_hub_repository }}"
- force: yes
-
-- name: ensure the nginx HTTP vhosts are up-to-date
- become: yes
- template:
- src: "nginx/{{ item.key }}.http.conf.j2"
- dest: "/etc/nginx/sites-available/{{ item.value }}.http.conf"
- with_dict: "{{ pysite_domains }}"
- notify: reload nginx
-
-- name: ensure the nginx HTTPS vhosts are up-to-date
- become: yes
- template:
- src: "nginx/{{ item.key }}.https.conf.j2"
- dest: "/etc/nginx/sites-available/{{ item.value }}.https.conf"
- with_dict: "{{ pysite_domains }}"
- notify: reload nginx
-
-- name: ensure the nginx HTTP vhosts are symlinked to `/etc/nginx/sites-enabled`
- become: yes
- file:
- src: /etc/nginx/sites-available/{{ item.value }}.http.conf
- dest: /etc/nginx/sites-enabled/{{ item.value }}.http.conf
- state: link
- with_dict: "{{ pysite_domains }}"
- notify: reload nginx
-
-- name: ensure we have HTTPS certificates
- include_role:
- name: thefinn93.letsencrypt
- vars:
- letsencrypt_cert_domains: "{{ pysite_domains | dict2items | map(attribute='value') | list }}"
- letsencrypt_email: "[email protected]"
- letsencrypt_renewal_command_args: '--renew-hook "systemctl restart nginx"'
- letsencrypt_webroot_path: /var/www/_letsencrypt
-
-- name: ensure the nginx HTTPS vhosts are symlinked to `/etc/nginx/sites-enabled`
- become: yes
- file:
- src: /etc/nginx/sites-available/{{ item.value }}.https.conf
- dest: /etc/nginx/sites-enabled/{{ item.value }}.https.conf
- state: link
- with_dict: "{{ pysite_domains }}"
- notify: reload nginx
-
-- name: ensure the web container is absent
- become: yes
- docker_container:
- name: pysite
- state: absent
-
-- name: ensure the `{{ pysite_static_file_dir }}` directory exists
- become: yes
- file:
- path: "{{ pysite_static_file_dir }}"
- state: directory
- owner: root
- group: root
-
-- name: collect static files
- become: yes
- docker_container:
- image: "{{ pysite_hub_repository }}"
- name: pysite-static-file-writer
- command: python manage.py collectstatic --noinput
- detach: no
- cleanup: yes
- network_mode: host
- env:
- DATABASE_URL: "{{ pysite_pg_database_url }}"
- SECRET_KEY: "me-dont-need-no-secret-key"
- STATIC_ROOT: "/html"
- volumes:
- - "/var/www/pythondiscord.com:/html"
-
-- name: ensure the database schema is up-to-date
- become: yes
- docker_container:
- image: "{{ pysite_hub_repository }}"
- name: pysite-migrator
- detach: no
- cleanup: yes
- command: python manage.py migrate
- network_mode: host
- env:
- DATABASE_URL: "postgres://{{ pysite_pg_username }}:{{ pysite_pg_password }}@{{ pysite_pg_host }}/{{ pysite_pg_database }}"
- SECRET_KEY: "me-dont-need-no-secret-key"
-
-- name: ensure the website container is started
- become: yes
- docker_container:
- image: "{{ pysite_hub_repository }}"
- name: pysite
- network_mode: host
- restart: yes
- restart_policy: unless-stopped
- ports:
- - "127.0.0.1:4000:4000"
- env:
- ALLOWED_HOSTS: "{{ pysite_domains | dict2items | map(attribute='value') | join(',') }}"
- DATABASE_URL: "postgres://{{ pysite_pg_username }}:{{ pysite_pg_password }}@{{ pysite_pg_host }}/{{ pysite_pg_database }}"
- PARENT_HOST: pysite.example.com
- SECRET_KEY: "{{ pysite_secret_key }}"
-```
diff --git a/manage.py b/manage.py
index d4748a3a..71af23c4 100755
--- a/manage.py
+++ b/manage.py
@@ -10,7 +10,6 @@ import django
from django.contrib.auth import get_user_model
from django.core.management import call_command, execute_from_command_line
-
DEFAULT_ENVS = {
"DJANGO_SETTINGS_MODULE": "pydis_site.settings",
"SUPER_USERNAME": "admin",
@@ -156,10 +155,25 @@ class SiteManager:
call_command("runserver", "0.0.0.0:8000")
return
- import pyuwsgi
-
- # Run uwsgi for production server
- pyuwsgi.run(["--ini", "docker/uwsgi.ini"])
+ # Import gunicorn only if we aren't in debug mode.
+ import gunicorn.app.wsgiapp
+
+ # Patch the arguments for gunicorn
+ sys.argv = [
+ "gunicorn",
+ "--preload",
+ "-b", "0.0.0.0:8000",
+ "pydis_site.wsgi:application",
+ "--threads", "8",
+ "-w", "2",
+ "--max-requests", "1000",
+ "--max-requests-jitter", "50",
+ "--statsd-host", "graphite.default.svc.cluster.local:8125",
+ "--statsd-prefix", "site",
+ ]
+
+ # Run gunicorn for the production server.
+ gunicorn.app.wsgiapp.run()
def main() -> None:
diff --git a/postgres/init.sql b/postgres/init.sql
new file mode 100644
index 00000000..190a705c
--- /dev/null
+++ b/postgres/init.sql
@@ -0,0 +1,146 @@
+CREATE DATABASE metricity;
+
+\c metricity;
+
+CREATE TABLE users (
+ id varchar,
+ joined_at timestamp,
+ primary key(id)
+);
+
+INSERT INTO users VALUES (
+ 0,
+ current_timestamp
+);
+
+INSERT INTO users VALUES (
+ 1,
+ current_timestamp
+);
+
+CREATE TABLE channels (
+ id varchar,
+ name varchar,
+ primary key(id)
+);
+
+INSERT INTO channels VALUES(
+ '267659945086812160',
+ 'python-general'
+);
+
+INSERT INTO channels VALUES(
+ '11',
+ 'help-apple'
+);
+
+INSERT INTO channels VALUES(
+ '12',
+ 'help-cherry'
+);
+
+INSERT INTO channels VALUES(
+ '21',
+ 'ot0-hello'
+);
+
+INSERT INTO channels VALUES(
+ '22',
+ 'ot1-world'
+);
+
+INSERT INTO channels VALUES(
+ '31',
+ 'voice-chat-0'
+);
+
+INSERT INTO channels VALUES(
+ '32',
+ 'code-help-voice-0'
+);
+
+INSERT INTO channels VALUES(
+ '1234',
+ 'zebra'
+);
+
+CREATE TABLE messages (
+ id varchar,
+ author_id varchar references users(id),
+ is_deleted boolean,
+ created_at timestamp,
+ channel_id varchar references channels(id),
+ primary key(id)
+);
+
+INSERT INTO messages VALUES(
+ 0,
+ 0,
+ false,
+ now(),
+ '267659945086812160'
+);
+
+INSERT INTO messages VALUES(
+ 1,
+ 0,
+ false,
+ now() + INTERVAL '10 minutes,',
+ '1234'
+);
+
+INSERT INTO messages VALUES(
+ 2,
+ 0,
+ false,
+ now(),
+ '11'
+);
+
+INSERT INTO messages VALUES(
+ 3,
+ 0,
+ false,
+ now(),
+ '12'
+);
+
+INSERT INTO messages VALUES(
+ 4,
+ 1,
+ false,
+ now(),
+ '21'
+);
+
+INSERT INTO messages VALUES(
+ 5,
+ 1,
+ false,
+ now(),
+ '22'
+);
+
+INSERT INTO messages VALUES(
+ 6,
+ 1,
+ false,
+ now(),
+ '31'
+);
+
+INSERT INTO messages VALUES(
+ 7,
+ 1,
+ false,
+ now(),
+ '32'
+);
+
+INSERT INTO messages VALUES(
+ 8,
+ 1,
+ true,
+ now(),
+ '32'
+);
diff --git a/pydis_site/apps/api/admin.py b/pydis_site/apps/api/admin.py
index 5093e605..449e660e 100644
--- a/pydis_site/apps/api/admin.py
+++ b/pydis_site/apps/api/admin.py
@@ -14,7 +14,6 @@ from .models import (
DeletedMessage,
DocumentationLink,
Infraction,
- LogEntry,
MessageDeletionContext,
Nomination,
OffTopicChannelName,
@@ -22,6 +21,7 @@ from .models import (
Role,
User
)
+from .models.bot.nomination import NominationEntry
admin.site.site_header = "Python Discord | Administration"
admin.site.site_title = "Python Discord"
@@ -120,33 +120,6 @@ class InfractionAdmin(admin.ModelAdmin):
return False
-class LogEntryAdmin(admin.ModelAdmin):
- """Allows viewing logs in the Django Admin without allowing edits."""
-
- actions = None
- list_display = ('timestamp', 'level', 'message')
- fieldsets = (
- ('Overview', {'fields': ('timestamp', 'application', 'logger_name')}),
- ('Metadata', {'fields': ('level', 'module', 'line')}),
- ('Contents', {'fields': ('message',)})
- )
- list_filter = ('level', 'timestamp')
- search_fields = ('message',)
-
- def has_add_permission(self, request: HttpRequest) -> bool:
- """Deny manual LogEntry creation."""
- return False
-
- def has_change_permission(self, *args) -> bool:
- """Prevent editing from django admin."""
- return False
-
- def has_delete_permission(self, request: HttpRequest, obj: Optional[LogEntry] = None) -> bool:
- """Deny LogEntry deletion."""
- return False
-
-
@admin.register(DeletedMessage)
class DeletedMessageAdmin(admin.ModelAdmin):
"""Admin formatting for the DeletedMessage model."""
@@ -246,7 +219,7 @@ class NominationActorFilter(admin.SimpleListFilter):
def lookups(self, request: HttpRequest, model: NominationAdmin) -> Iterable[Tuple[int, str]]:
"""Selectable values for viewer to filter by."""
- actor_ids = Nomination.objects.order_by().values_list("actor").distinct()
+ actor_ids = NominationEntry.objects.order_by().values_list("actor").distinct()
actors = User.objects.filter(id__in=actor_ids)
return ((a.id, a.username) for a in actors)
@@ -254,7 +227,10 @@ class NominationActorFilter(admin.SimpleListFilter):
"""Query to filter the list of Users against."""
if not self.value():
return
- return queryset.filter(actor__id=self.value())
+ nomination_ids = NominationEntry.objects.filter(
+ actor__id=self.value()
+ ).values_list("nomination_id").distinct()
+ return queryset.filter(id__in=nomination_ids)
@admin.register(Nomination)
@@ -264,9 +240,6 @@ class NominationAdmin(admin.ModelAdmin):
search_fields = (
"user__name",
"user__id",
- "actor__name",
- "actor__id",
- "reason",
"end_reason"
)
@@ -275,27 +248,25 @@ class NominationAdmin(admin.ModelAdmin):
list_display = (
"user",
"active",
- "reason",
- "actor",
+ "reviewed"
)
fields = (
"user",
"active",
- "actor",
- "reason",
"inserted_at",
"ended_at",
- "end_reason"
+ "end_reason",
+ "reviewed"
)
- # only allow reason fields to be edited.
+ # only allow end reason field to be edited.
readonly_fields = (
"user",
"active",
- "actor",
"inserted_at",
- "ended_at"
+ "ended_at",
+ "reviewed"
)
def has_add_permission(self, *args) -> bool:
@@ -303,6 +274,61 @@ class NominationAdmin(admin.ModelAdmin):
return False
+class NominationEntryActorFilter(admin.SimpleListFilter):
+ """Actor Filter for NominationEntry Admin list page."""
+
+ title = "Actor"
+ parameter_name = "actor"
+
+ def lookups(self, request: HttpRequest, model: NominationAdmin) -> Iterable[Tuple[int, str]]:
+ """Selectable values for viewer to filter by."""
+ actor_ids = NominationEntry.objects.order_by().values_list("actor").distinct()
+ actors = User.objects.filter(id__in=actor_ids)
+ return ((a.id, a.username) for a in actors)
+
+ def queryset(self, request: HttpRequest, queryset: QuerySet) -> Optional[QuerySet]:
+ """Query to filter the list of Users against."""
+ if not self.value():
+ return
+ return queryset.filter(actor__id=self.value())
+
+
[email protected](NominationEntry)
+class NominationEntryAdmin(admin.ModelAdmin):
+ """Admin formatting for the NominationEntry model."""
+
+ search_fields = (
+ "actor__name",
+ "actor__id",
+ "reason",
+ )
+
+ list_filter = (NominationEntryActorFilter,)
+
+ list_display = (
+ "nomination",
+ "actor",
+ )
+
+ fields = (
+ "nomination",
+ "actor",
+ "reason",
+ "inserted_at",
+ )
+
+ # only allow reason field to be edited
+ readonly_fields = (
+ "nomination",
+ "actor",
+ "inserted_at",
+ )
+
+ def has_add_permission(self, request: HttpRequest) -> bool:
+ """Disable adding new nomination entry from admin."""
+ return False
+
+
@admin.register(OffTopicChannelName)
class OffTopicChannelNameAdmin(admin.ModelAdmin):
"""Admin formatting for the OffTopicChannelName model."""
diff --git a/pydis_site/apps/api/dblogger.py b/pydis_site/apps/api/dblogger.py
deleted file mode 100644
index 4b4e3a9d..00000000
--- a/pydis_site/apps/api/dblogger.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from logging import LogRecord, StreamHandler
-
-
-class DatabaseLogHandler(StreamHandler):
- """Logs entries into the database."""
-
- def emit(self, record: LogRecord) -> None:
- """Write the given `record` into the database."""
- # This import needs to be deferred due to Django's application
- # registry instantiation logic loading this handler before the
- # application is ready.
- from pydis_site.apps.api.models.log_entry import LogEntry
-
- entry = LogEntry(
- application='site',
- logger_name=record.name,
- level=record.levelname.lower(),
- module=record.module,
- line=record.lineno,
- message=self.format(record)
- )
- entry.save()
diff --git a/pydis_site/apps/api/migrations/0064_delete_logentry.py b/pydis_site/apps/api/migrations/0064_delete_logentry.py
new file mode 100644
index 00000000..a5f344d1
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0064_delete_logentry.py
@@ -0,0 +1,16 @@
+# Generated by Django 3.0.9 on 2020-10-03 06:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('api', '0063_Allow_blank_or_null_for_nomination_reason'),
+ ]
+
+ operations = [
+ migrations.DeleteModel(
+ name='LogEntry',
+ ),
+ ]
diff --git a/pydis_site/apps/api/migrations/0066_merge_20201003_0730.py b/pydis_site/apps/api/migrations/0066_merge_20201003_0730.py
new file mode 100644
index 00000000..298416db
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0066_merge_20201003_0730.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.9 on 2020-10-03 07:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('api', '0064_delete_logentry'),
+ ('api', '0065_auto_20200919_2033'),
+ ]
+
+ operations = [
+ ]
diff --git a/pydis_site/apps/api/migrations/0067_add_voice_ban_infraction_type.py b/pydis_site/apps/api/migrations/0067_add_voice_ban_infraction_type.py
new file mode 100644
index 00000000..9a940ff4
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0067_add_voice_ban_infraction_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.10 on 2020-10-10 16:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('api', '0066_merge_20201003_0730'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='infraction',
+ name='type',
+ field=models.CharField(choices=[('note', 'Note'), ('warning', 'Warning'), ('watch', 'Watch'), ('mute', 'Mute'), ('kick', 'Kick'), ('ban', 'Ban'), ('superstar', 'Superstar'), ('voice_ban', 'Voice Ban')], help_text='The type of the infraction.', max_length=9),
+ ),
+ ]
diff --git a/pydis_site/apps/api/migrations/0068_split_nomination_tables.py b/pydis_site/apps/api/migrations/0068_split_nomination_tables.py
new file mode 100644
index 00000000..79825ed7
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0068_split_nomination_tables.py
@@ -0,0 +1,75 @@
+# Generated by Django 3.0.11 on 2021-02-21 15:32
+
+from django.apps.registry import Apps
+from django.db import backends, migrations, models
+from django.db.backends.base.schema import BaseDatabaseSchemaEditor
+import django.db.models.deletion
+import pydis_site.apps.api.models.mixins
+
+
+def migrate_nominations(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None:
+ Nomination = apps.get_model("api", "Nomination")
+ NominationEntry = apps.get_model("api", "NominationEntry")
+
+ for nomination in Nomination.objects.all():
+ nomination_entry = NominationEntry(
+ nomination=nomination,
+ actor=nomination.actor,
+ reason=nomination.reason,
+ inserted_at=nomination.inserted_at
+ )
+ nomination_entry.save()
+
+
+def unmigrate_nominations(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None:
+ Nomination = apps.get_model("api", "Nomination")
+ NominationEntry = apps.get_model("api", "NominationEntry")
+
+ for entry in NominationEntry.objects.all():
+ nomination = Nomination.objects.get(pk=entry.nomination.id)
+ nomination.actor = entry.actor
+ nomination.reason = entry.reason
+ nomination.inserted_at = entry.inserted_at
+
+ nomination.save()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('api', '0067_add_voice_ban_infraction_type'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='NominationEntry',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('reason', models.TextField(blank=True, help_text='Why the actor nominated this user.', default="")),
+ ('inserted_at',
+ models.DateTimeField(auto_now_add=True, help_text='The creation date of this nomination entry.')),
+ ('actor', models.ForeignKey(help_text='The staff member that nominated this user.',
+ on_delete=django.db.models.deletion.CASCADE, related_name='nomination_set',
+ to='api.User')),
+ ('nomination', models.ForeignKey(help_text='The nomination this entry belongs to.',
+ on_delete=django.db.models.deletion.CASCADE, to='api.Nomination',
+ related_name='entries')),
+ ],
+ bases=(pydis_site.apps.api.models.mixins.ModelReprMixin, models.Model),
+ options={'ordering': ('-inserted_at',), 'verbose_name_plural': 'nomination entries'}
+ ),
+ migrations.RunPython(migrate_nominations, unmigrate_nominations),
+ migrations.RemoveField(
+ model_name='nomination',
+ name='actor',
+ ),
+ migrations.RemoveField(
+ model_name='nomination',
+ name='reason',
+ ),
+ migrations.AddField(
+ model_name='nomination',
+ name='reviewed',
+ field=models.BooleanField(default=False, help_text='Whether a review was made.'),
+ ),
+ ]
diff --git a/pydis_site/apps/api/migrations/0069_documentationlink_validators.py b/pydis_site/apps/api/migrations/0069_documentationlink_validators.py
new file mode 100644
index 00000000..347c0e1a
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0069_documentationlink_validators.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.0.11 on 2021-03-26 18:21
+
+import django.core.validators
+from django.db import migrations, models
+import pydis_site.apps.api.models.bot.documentation_link
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('api', '0068_split_nomination_tables'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='documentationlink',
+ name='base_url',
+ field=models.URLField(help_text='The base URL from which documentation will be available for this project. Used to generate links to various symbols within this package.', validators=[pydis_site.apps.api.models.bot.documentation_link.ends_with_slash_validator]),
+ ),
+ migrations.AlterField(
+ model_name='documentationlink',
+ name='package',
+ field=models.CharField(help_text='The Python package name that this documentation link belongs to.', max_length=50, primary_key=True, serialize=False, validators=[django.core.validators.RegexValidator(message='Package names can only consist of lowercase a-z letters, digits, and underscores.', regex='^[a-z0-9_]+$')]),
+ ),
+ ]
diff --git a/pydis_site/apps/api/models/__init__.py b/pydis_site/apps/api/models/__init__.py
index e3f928e1..fd5bf220 100644
--- a/pydis_site/apps/api/models/__init__.py
+++ b/pydis_site/apps/api/models/__init__.py
@@ -8,10 +8,10 @@ from .bot import (
Message,
MessageDeletionContext,
Nomination,
+ NominationEntry,
OffensiveMessage,
OffTopicChannelName,
Reminder,
Role,
User
)
-from .log_entry import LogEntry
diff --git a/pydis_site/apps/api/models/bot/__init__.py b/pydis_site/apps/api/models/bot/__init__.py
index 1673b434..ac864de3 100644
--- a/pydis_site/apps/api/models/bot/__init__.py
+++ b/pydis_site/apps/api/models/bot/__init__.py
@@ -6,7 +6,7 @@ from .documentation_link import DocumentationLink
from .infraction import Infraction
from .message import Message
from .message_deletion_context import MessageDeletionContext
-from .nomination import Nomination
+from .nomination import Nomination, NominationEntry
from .off_topic_channel_name import OffTopicChannelName
from .offensive_message import OffensiveMessage
from .reminder import Reminder
diff --git a/pydis_site/apps/api/models/bot/documentation_link.py b/pydis_site/apps/api/models/bot/documentation_link.py
index 2a0ce751..3dcc71fc 100644
--- a/pydis_site/apps/api/models/bot/documentation_link.py
+++ b/pydis_site/apps/api/models/bot/documentation_link.py
@@ -1,7 +1,20 @@
+from django.core.exceptions import ValidationError
+from django.core.validators import RegexValidator
from django.db import models
from pydis_site.apps.api.models.mixins import ModelReprMixin
+package_name_validator = RegexValidator(
+ regex=r"^[a-z0-9_]+$",
+ message="Package names can only consist of lowercase a-z letters, digits, and underscores."
+)
+
+
+def ends_with_slash_validator(string: str) -> None:
+ """Raise a ValidationError if `string` does not end with a slash."""
+ if not string.endswith("/"):
+ raise ValidationError("The entered URL must end with a slash.")
+
class DocumentationLink(ModelReprMixin, models.Model):
"""A documentation link used by the `!docs` command of the bot."""
@@ -9,13 +22,15 @@ class DocumentationLink(ModelReprMixin, models.Model):
package = models.CharField(
primary_key=True,
max_length=50,
+ validators=(package_name_validator,),
help_text="The Python package name that this documentation link belongs to."
)
base_url = models.URLField(
help_text=(
"The base URL from which documentation will be available for this project. "
"Used to generate links to various symbols within this package."
- )
+ ),
+ validators=(ends_with_slash_validator,)
)
inventory_url = models.URLField(
help_text="The URL at which the Sphinx inventory is available for this package."
diff --git a/pydis_site/apps/api/models/bot/infraction.py b/pydis_site/apps/api/models/bot/infraction.py
index 7660cbba..60c1e8dd 100644
--- a/pydis_site/apps/api/models/bot/infraction.py
+++ b/pydis_site/apps/api/models/bot/infraction.py
@@ -15,7 +15,8 @@ class Infraction(ModelReprMixin, models.Model):
("mute", "Mute"),
("kick", "Kick"),
("ban", "Ban"),
- ("superstar", "Superstar")
+ ("superstar", "Superstar"),
+ ("voice_ban", "Voice Ban"),
)
inserted_at = models.DateTimeField(
default=timezone.now,
diff --git a/pydis_site/apps/api/models/bot/metricity.py b/pydis_site/apps/api/models/bot/metricity.py
new file mode 100644
index 00000000..5daa5c66
--- /dev/null
+++ b/pydis_site/apps/api/models/bot/metricity.py
@@ -0,0 +1,132 @@
+from typing import List, Tuple
+
+from django.db import connections
+
+BLOCK_INTERVAL = 10 * 60 # 10 minute blocks
+
+EXCLUDE_CHANNELS = [
+ "267659945086812160", # Bot commands
+ "607247579608121354" # SeasonalBot commands
+]
+
+
+class NotFound(Exception):
+ """Raised when an entity cannot be found."""
+
+ pass
+
+
+class Metricity:
+ """Abstraction for a connection to the metricity database."""
+
+ def __init__(self):
+ self.cursor = connections['metricity'].cursor()
+
+ def __enter__(self):
+ return self
+
+ def __exit__(self, *_):
+ self.cursor.close()
+
+ def user(self, user_id: str) -> dict:
+ """Query a user's data."""
+ # TODO: Swap this back to some sort of verified at date
+ columns = ["joined_at"]
+ query = f"SELECT {','.join(columns)} FROM users WHERE id = '%s'"
+ self.cursor.execute(query, [user_id])
+ values = self.cursor.fetchone()
+
+ if not values:
+ raise NotFound()
+
+ return dict(zip(columns, values))
+
+ def total_messages(self, user_id: str) -> int:
+ """Query total number of messages for a user."""
+ self.cursor.execute(
+ """
+ SELECT
+ COUNT(*)
+ FROM messages
+ WHERE
+ author_id = '%s'
+ AND NOT is_deleted
+ AND NOT %s::varchar[] @> ARRAY[channel_id]
+ """,
+ [user_id, EXCLUDE_CHANNELS]
+ )
+ values = self.cursor.fetchone()
+
+ if not values:
+ raise NotFound()
+
+ return values[0]
+
+ def total_message_blocks(self, user_id: str) -> int:
+ """
+ Query number of 10 minute blocks during which the user has been active.
+
+ This metric prevents users from spamming to achieve the message total threshold.
+ """
+ self.cursor.execute(
+ """
+ SELECT
+ COUNT(*)
+ FROM (
+ SELECT
+ (floor((extract('epoch' from created_at) / %s )) * %s) AS interval
+ FROM messages
+ WHERE
+ author_id='%s'
+ AND NOT is_deleted
+ AND NOT %s::varchar[] @> ARRAY[channel_id]
+ GROUP BY interval
+ ) block_query;
+ """,
+ [BLOCK_INTERVAL, BLOCK_INTERVAL, user_id, EXCLUDE_CHANNELS]
+ )
+ values = self.cursor.fetchone()
+
+ if not values:
+ raise NotFound()
+
+ return values[0]
+
+ def top_channel_activity(self, user_id: str) -> List[Tuple[str, int]]:
+ """
+ Query the top three channels in which the user is most active.
+
+ Help channels are grouped under "the help channels",
+ and off-topic channels are grouped under "off-topic".
+ """
+ self.cursor.execute(
+ """
+ SELECT
+ CASE
+ WHEN channels.name ILIKE 'help-%%' THEN 'the help channels'
+ WHEN channels.name ILIKE 'ot%%' THEN 'off-topic'
+ WHEN channels.name ILIKE '%%voice%%' THEN 'voice chats'
+ ELSE channels.name
+ END,
+ COUNT(1)
+ FROM
+ messages
+ LEFT JOIN channels ON channels.id = messages.channel_id
+ WHERE
+ author_id = '%s' AND NOT messages.is_deleted
+ GROUP BY
+ 1
+ ORDER BY
+ 2 DESC
+ LIMIT
+ 3;
+ """,
+ [user_id]
+ )
+
+ values = self.cursor.fetchall()
+
+ if not values:
+ raise NotFound()
+
+ return values
diff --git a/pydis_site/apps/api/models/bot/nomination.py b/pydis_site/apps/api/models/bot/nomination.py
index 11b9e36e..221d8534 100644
--- a/pydis_site/apps/api/models/bot/nomination.py
+++ b/pydis_site/apps/api/models/bot/nomination.py
@@ -5,23 +5,12 @@ from pydis_site.apps.api.models.mixins import ModelReprMixin
class Nomination(ModelReprMixin, models.Model):
- """A helper nomination created by staff."""
+ """A general helper nomination information created by staff."""
active = models.BooleanField(
default=True,
help_text="Whether this nomination is still relevant."
)
- actor = models.ForeignKey(
- User,
- on_delete=models.CASCADE,
- help_text="The staff member that nominated this user.",
- related_name='nomination_set'
- )
- reason = models.TextField(
- help_text="Why this user was nominated.",
- null=True,
- blank=True
- )
user = models.ForeignKey(
User,
on_delete=models.CASCADE,
@@ -42,6 +31,10 @@ class Nomination(ModelReprMixin, models.Model):
help_text="When the nomination was ended.",
null=True
)
+ reviewed = models.BooleanField(
+ default=False,
+ help_text="Whether a review was made."
+ )
def __str__(self):
"""Representation that makes the target and state of the nomination immediately evident."""
@@ -52,3 +45,38 @@ class Nomination(ModelReprMixin, models.Model):
"""Set the ordering of nominations to most recent first."""
ordering = ("-inserted_at",)
+
+
+class NominationEntry(ModelReprMixin, models.Model):
+ """A nomination entry created by a single staff member."""
+
+ nomination = models.ForeignKey(
+ Nomination,
+ on_delete=models.CASCADE,
+ help_text="The nomination this entry belongs to.",
+ related_name="entries"
+ )
+ actor = models.ForeignKey(
+ User,
+ on_delete=models.CASCADE,
+ help_text="The staff member that nominated this user.",
+ related_name='nomination_set'
+ )
+ reason = models.TextField(
+ help_text="Why the actor nominated this user.",
+ default="",
+ blank=True
+ )
+ inserted_at = models.DateTimeField(
+ auto_now_add=True,
+ help_text="The creation date of this nomination entry."
+ )
+
+ class Meta:
+ """Meta options for NominationEntry model."""
+
+ verbose_name_plural = "nomination entries"
+
+ # Set default ordering here to latest first
+ # so we don't need to define it everywhere
+ ordering = ("-inserted_at",)
diff --git a/pydis_site/apps/api/models/log_entry.py b/pydis_site/apps/api/models/log_entry.py
deleted file mode 100644
index 752cd2ca..00000000
--- a/pydis_site/apps/api/models/log_entry.py
+++ /dev/null
@@ -1,55 +0,0 @@
-from django.db import models
-from django.utils import timezone
-
-from pydis_site.apps.api.models.mixins import ModelReprMixin
-
-
-class LogEntry(ModelReprMixin, models.Model):
- """A log entry generated by one of the PyDis applications."""
-
- application = models.CharField(
- max_length=20,
- help_text="The application that generated this log entry.",
- choices=(
- ('bot', 'Bot'),
- ('seasonalbot', 'Seasonalbot'),
- ('site', 'Website')
- )
- )
- logger_name = models.CharField(
- max_length=100,
- help_text="The name of the logger that generated this log entry."
- )
- timestamp = models.DateTimeField(
- default=timezone.now,
- help_text="The date and time when this entry was created."
- )
- level = models.CharField(
- max_length=8, # 'critical'
- choices=(
- ('debug', 'Debug'),
- ('info', 'Info'),
- ('warning', 'Warning'),
- ('error', 'Error'),
- ('critical', 'Critical')
- ),
- help_text=(
- "The logger level at which this entry was emitted. The levels "
- "correspond to the Python `logging` levels."
- )
- )
- module = models.CharField(
- max_length=100,
- help_text="The fully qualified path of the module generating this log line."
- )
- line = models.PositiveSmallIntegerField(
- help_text="The line at which the log line was emitted."
- )
- message = models.TextField(
- help_text="The textual content of the log line."
- )
-
- class Meta:
- """Customizes the default generated plural name to valid English."""
-
- verbose_name_plural = 'Log entries'
diff --git a/pydis_site/apps/api/pagination.py b/pydis_site/apps/api/pagination.py
new file mode 100644
index 00000000..2a325460
--- /dev/null
+++ b/pydis_site/apps/api/pagination.py
@@ -0,0 +1,49 @@
+import typing
+
+from rest_framework.pagination import LimitOffsetPagination
+from rest_framework.response import Response
+
+
+class LimitOffsetPaginationExtended(LimitOffsetPagination):
+ """
+ Extend LimitOffsetPagination to customise the default response.
+
+ For example:
+
+ ## Default response
+ >>> {
+ ... "count": 1,
+ ... "next": None,
+ ... "previous": None,
+ ... "results": [{
+ ... "id": 6,
+ ... "inserted_at": "2021-01-26T21:13:35.477879Z",
+ ... "expires_at": None,
+ ... "active": False,
+ ... "user": 1,
+ ... "actor": 2,
+ ... "type": "warning",
+ ... "reason": null,
+ ... "hidden": false
+ ... }]
+ ... }
+
+ ## Required response
+ >>> [{
+ ... "id": 6,
+ ... "inserted_at": "2021-01-26T21:13:35.477879Z",
+ ... "expires_at": None,
+ ... "active": False,
+ ... "user": 1,
+ ... "actor": 2,
+ ... "type": "warning",
+ ... "reason": None,
+ ... "hidden": False
+ ... }]
+ """
+
+ default_limit = 100
+
+ def get_paginated_response(self, data: typing.Any) -> Response:
+ """Override to skip metadata i.e. `count`, `next`, and `previous`."""
+ return Response(data)
diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index 90bd6f91..f47bedca 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -1,7 +1,16 @@
"""Converters from Django models to data interchange formats and back."""
-from rest_framework.serializers import ModelSerializer, PrimaryKeyRelatedField, ValidationError
+from django.db.models.query import QuerySet
+from django.db.utils import IntegrityError
+from rest_framework.exceptions import NotFound
+from rest_framework.serializers import (
+ IntegerField,
+ ListSerializer,
+ ModelSerializer,
+ PrimaryKeyRelatedField,
+ ValidationError
+)
+from rest_framework.settings import api_settings
from rest_framework.validators import UniqueTogetherValidator
-from rest_framework_bulk import BulkSerializerMixin
from .models import (
BotSetting,
@@ -9,9 +18,9 @@ from .models import (
DocumentationLink,
FilterList,
Infraction,
- LogEntry,
MessageDeletionContext,
Nomination,
+ NominationEntry,
OffTopicChannelName,
OffensiveMessage,
Reminder,
@@ -159,7 +168,7 @@ class InfractionSerializer(ModelSerializer):
raise ValidationError({'expires_at': [f'{infr_type} infractions cannot expire.']})
hidden = attrs.get('hidden')
- if hidden and infr_type in ('superstar', 'warning'):
+ if hidden and infr_type in ('superstar', 'warning', 'voice_ban'):
raise ValidationError({'hidden': [f'{infr_type} infractions cannot be hidden.']})
if not hidden and infr_type in ('note', ):
@@ -191,19 +200,6 @@ class ExpandedInfractionSerializer(InfractionSerializer):
return ret
-class LogEntrySerializer(ModelSerializer):
- """A class providing (de-)serialization of `LogEntry` instances."""
-
- class Meta:
- """Metadata defined for the Django REST Framework."""
-
- model = LogEntry
- fields = (
- 'application', 'logger_name', 'timestamp',
- 'level', 'module', 'line', 'message'
- )
-
-
class OffTopicChannelNameSerializer(ModelSerializer):
"""A class providing (de-)serialization of `OffTopicChannelName` instances."""
@@ -249,27 +245,130 @@ class RoleSerializer(ModelSerializer):
fields = ('id', 'name', 'colour', 'permissions', 'position')
-class UserSerializer(BulkSerializerMixin, ModelSerializer):
+class UserListSerializer(ListSerializer):
+ """List serializer for User model to handle bulk updates."""
+
+ def create(self, validated_data: list) -> list:
+ """Override create method to optimize django queries."""
+ new_users = []
+ seen = set()
+
+ for user_dict in validated_data:
+ if user_dict["id"] in seen:
+ raise ValidationError(
+ {"id": [f"User with ID {user_dict['id']} given multiple times."]}
+ )
+ seen.add(user_dict["id"])
+ new_users.append(User(**user_dict))
+
+ User.objects.bulk_create(new_users, ignore_conflicts=True)
+ return []
+
+ def update(self, queryset: QuerySet, validated_data: list) -> list:
+ """
+ Override update method to support bulk updates.
+
+ ref:https://www.django-rest-framework.org/api-guide/serializers/#customizing-multiple-update
+ """
+ object_ids = set()
+
+ for data in validated_data:
+ try:
+ if data["id"] in object_ids:
+ # If request data contains users with same ID.
+ raise ValidationError(
+ {"id": [f"User with ID {data['id']} given multiple times."]}
+ )
+ except KeyError:
+ # If user ID not provided in request body.
+ raise ValidationError(
+ {"id": ["This field is required."]}
+ )
+ object_ids.add(data["id"])
+
+ # filter queryset
+ filtered_instances = queryset.filter(id__in=object_ids)
+
+ instance_mapping = {user.id: user for user in filtered_instances}
+
+ updated = []
+ fields_to_update = set()
+ for user_data in validated_data:
+ for key in user_data:
+ fields_to_update.add(key)
+
+ try:
+ user = instance_mapping[user_data["id"]]
+ except KeyError:
+ raise NotFound({"detail": f"User with id {user_data['id']} not found."})
+
+ user.__dict__.update(user_data)
+ updated.append(user)
+
+ fields_to_update.remove("id")
+
+ if not fields_to_update:
+ # Raise ValidationError when only id field is given.
+ raise ValidationError(
+ {api_settings.NON_FIELD_ERRORS_KEY: ["Insufficient data provided."]}
+ )
+
+ User.objects.bulk_update(updated, fields_to_update)
+ return updated
+
+
+class UserSerializer(ModelSerializer):
"""A class providing (de-)serialization of `User` instances."""
+ # ID field must be explicitly set as the default id field is read-only.
+ id = IntegerField(min_value=0)
+
class Meta:
"""Metadata defined for the Django REST Framework."""
model = User
fields = ('id', 'name', 'discriminator', 'roles', 'in_guild')
depth = 1
+ list_serializer_class = UserListSerializer
+
+ def create(self, validated_data: dict) -> User:
+ """Override create method to catch IntegrityError."""
+ try:
+ return super().create(validated_data)
+ except IntegrityError:
+ raise ValidationError({"id": ["User with ID already present."]})
+
+
+class NominationEntrySerializer(ModelSerializer):
+ """A class providing (de-)serialization of `NominationEntry` instances."""
+
+ # We need to define it here, because we don't want that nomination ID
+ # return inside nomination response entry, because ID is already available
+ # as top-level field. Queryset is required if field is not read only.
+ nomination = PrimaryKeyRelatedField(
+ queryset=Nomination.objects.all(),
+ write_only=True
+ )
+
+ class Meta:
+ """Metadata defined for the Django REST framework."""
+
+ model = NominationEntry
+ fields = ('nomination', 'actor', 'reason', 'inserted_at')
class NominationSerializer(ModelSerializer):
"""A class providing (de-)serialization of `Nomination` instances."""
+ entries = NominationEntrySerializer(many=True, read_only=True)
+
class Meta:
"""Metadata defined for the Django REST Framework."""
model = Nomination
fields = (
- 'id', 'active', 'actor', 'reason', 'user',
- 'inserted_at', 'end_reason', 'ended_at')
+ 'id', 'active', 'user', 'inserted_at', 'end_reason', 'ended_at', 'reviewed', 'entries'
+ )
class OffensiveMessageSerializer(ModelSerializer):
diff --git a/pydis_site/apps/api/tests/test_dblogger.py b/pydis_site/apps/api/tests/test_dblogger.py
deleted file mode 100644
index bb19f297..00000000
--- a/pydis_site/apps/api/tests/test_dblogger.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import logging
-from datetime import datetime
-
-from django.test import TestCase
-
-from ..dblogger import DatabaseLogHandler
-from ..models import LogEntry
-
-
-class DatabaseLogHandlerTests(TestCase):
- def test_logs_to_database(self):
- module_basename = __name__.split('.')[-1]
- logger = logging.getLogger(__name__)
- logger.handlers = [DatabaseLogHandler()]
- logger.warning("I am a test case!")
-
- # Ensure we only have a single record in the database
- # after the logging call above.
- [entry] = LogEntry.objects.all()
-
- self.assertEqual(entry.application, 'site')
- self.assertEqual(entry.logger_name, __name__)
- self.assertIsInstance(entry.timestamp, datetime)
- self.assertEqual(entry.level, 'warning')
- self.assertEqual(entry.module, module_basename)
- self.assertIsInstance(entry.line, int)
- self.assertEqual(entry.message, "I am a test case!")
diff --git a/pydis_site/apps/api/tests/test_documentation_links.py b/pydis_site/apps/api/tests/test_documentation_links.py
index e560a2fd..39fb08f3 100644
--- a/pydis_site/apps/api/tests/test_documentation_links.py
+++ b/pydis_site/apps/api/tests/test_documentation_links.py
@@ -60,7 +60,7 @@ class DetailLookupDocumentationLinkAPITests(APISubdomainTestCase):
def setUpTestData(cls):
cls.doc_link = DocumentationLink.objects.create(
package='testpackage',
- base_url='https://example.com',
+ base_url='https://example.com/',
inventory_url='https://example.com'
)
@@ -108,6 +108,17 @@ class DetailLookupDocumentationLinkAPITests(APISubdomainTestCase):
self.assertEqual(response.status_code, 400)
+ def test_create_invalid_package_name_returns_400(self):
+ test_cases = ("InvalidPackage", "invalid package", "i\u0150valid")
+ for case in test_cases:
+ with self.subTest(package_name=case):
+ body = self.doc_json.copy()
+ body['package'] = case
+ url = reverse('bot:documentationlink-list', host='api')
+ response = self.client.post(url, data=body)
+
+ self.assertEqual(response.status_code, 400)
+
class DocumentationLinkCreationTests(APISubdomainTestCase):
def setUp(self):
@@ -115,7 +126,7 @@ class DocumentationLinkCreationTests(APISubdomainTestCase):
self.body = {
'package': 'example',
- 'base_url': 'https://example.com',
+ 'base_url': 'https://example.com/',
'inventory_url': 'https://docs.example.com'
}
diff --git a/pydis_site/apps/api/tests/test_infractions.py b/pydis_site/apps/api/tests/test_infractions.py
index 93ef8171..82b497aa 100644
--- a/pydis_site/apps/api/tests/test_infractions.py
+++ b/pydis_site/apps/api/tests/test_infractions.py
@@ -512,6 +512,36 @@ class CreationTests(APISubdomainTestCase):
)
+class InfractionDeletionTests(APISubdomainTestCase):
+ @classmethod
+ def setUpTestData(cls):
+ cls.user = User.objects.create(
+ id=9876,
+ name='Unknown user',
+ discriminator=9876,
+ )
+
+ cls.warning = Infraction.objects.create(
+ user_id=cls.user.id,
+ actor_id=cls.user.id,
+ type='warning',
+ active=False
+ )
+
+ def test_delete_unknown_infraction_returns_404(self):
+ url = reverse('bot:infraction-detail', args=('something',), host='api')
+ response = self.client.delete(url)
+
+ self.assertEqual(response.status_code, 404)
+
+ def test_delete_known_infraction_returns_204(self):
+ url = reverse('bot:infraction-detail', args=(self.warning.id,), host='api')
+ response = self.client.delete(url)
+
+ self.assertEqual(response.status_code, 204)
+ self.assertRaises(Infraction.DoesNotExist, Infraction.objects.get, id=self.warning.id)
+
+
class ExpandedTests(APISubdomainTestCase):
@classmethod
def setUpTestData(cls):
diff --git a/pydis_site/apps/api/tests/test_models.py b/pydis_site/apps/api/tests/test_models.py
index 853e6621..66052e01 100644
--- a/pydis_site/apps/api/tests/test_models.py
+++ b/pydis_site/apps/api/tests/test_models.py
@@ -10,6 +10,7 @@ from pydis_site.apps.api.models import (
Message,
MessageDeletionContext,
Nomination,
+ NominationEntry,
OffTopicChannelName,
OffensiveMessage,
Reminder,
@@ -37,17 +38,11 @@ class StringDunderMethodTests(SimpleTestCase):
def setUp(self):
self.nomination = Nomination(
id=123,
- actor=User(
- id=9876,
- name='Mr. Hemlock',
- discriminator=6666,
- ),
user=User(
id=9876,
name="Hemlock's Cat",
discriminator=7777,
),
- reason="He purrrrs like the best!",
)
self.objects = (
@@ -135,6 +130,15 @@ class StringDunderMethodTests(SimpleTestCase):
),
content="oh no",
expiration=dt(5018, 11, 20, 15, 52, tzinfo=timezone.utc)
+ ),
+ NominationEntry(
+ nomination_id=self.nomination.id,
+ actor=User(
+ id=9876,
+ name='Mr. Hemlock',
+ discriminator=6666,
+ ),
+ reason="He purrrrs like the best!",
)
)
diff --git a/pydis_site/apps/api/tests/test_nominations.py b/pydis_site/apps/api/tests/test_nominations.py
index b37135f8..9cefbd8f 100644
--- a/pydis_site/apps/api/tests/test_nominations.py
+++ b/pydis_site/apps/api/tests/test_nominations.py
@@ -3,7 +3,7 @@ from datetime import datetime as dt, timedelta, timezone
from django_hosts.resolvers import reverse
from .base import APISubdomainTestCase
-from ..models import Nomination, User
+from ..models import Nomination, NominationEntry, User
class CreationTests(APISubdomainTestCase):
@@ -14,6 +14,11 @@ class CreationTests(APISubdomainTestCase):
name='joe dart',
discriminator=1111,
)
+ cls.user2 = User.objects.create(
+ id=9876,
+ name='Who?',
+ discriminator=1234
+ )
def test_accepts_valid_data(self):
url = reverse('bot:nomination-list', host='api')
@@ -27,17 +32,39 @@ class CreationTests(APISubdomainTestCase):
self.assertEqual(response.status_code, 201)
nomination = Nomination.objects.get(id=response.json()['id'])
+ nomination_entry = NominationEntry.objects.get(
+ nomination_id=nomination.id,
+ actor_id=self.user.id
+ )
self.assertAlmostEqual(
nomination.inserted_at,
dt.now(timezone.utc),
delta=timedelta(seconds=2)
)
self.assertEqual(nomination.user.id, data['user'])
- self.assertEqual(nomination.actor.id, data['actor'])
- self.assertEqual(nomination.reason, data['reason'])
+ self.assertEqual(nomination_entry.reason, data['reason'])
self.assertEqual(nomination.active, True)
- def test_returns_400_on_second_active_nomination(self):
+ def test_returns_200_on_second_active_nomination_by_different_user(self):
+ url = reverse('bot:nomination-list', host='api')
+ first_data = {
+ 'actor': self.user.id,
+ 'reason': 'Joe Dart on Fender Bass',
+ 'user': self.user.id,
+ }
+ second_data = {
+ 'actor': self.user2.id,
+ 'reason': 'Great user',
+ 'user': self.user.id
+ }
+
+ response1 = self.client.post(url, data=first_data)
+ self.assertEqual(response1.status_code, 201)
+
+ response2 = self.client.post(url, data=second_data)
+ self.assertEqual(response2.status_code, 201)
+
+ def test_returns_400_on_second_active_nomination_by_existing_nominator(self):
url = reverse('bot:nomination-list', host='api')
data = {
'actor': self.user.id,
@@ -51,7 +78,7 @@ class CreationTests(APISubdomainTestCase):
response2 = self.client.post(url, data=data)
self.assertEqual(response2.status_code, 400)
self.assertEqual(response2.json(), {
- 'active': ['There can only be one active nomination.']
+ 'actor': ['This actor has already endorsed this nomination.']
})
def test_returns_400_for_missing_user(self):
@@ -189,30 +216,40 @@ class NominationTests(APISubdomainTestCase):
)
cls.active_nomination = Nomination.objects.create(
- user=cls.user,
+ user=cls.user
+ )
+ cls.active_nomination_entry = NominationEntry.objects.create(
+ nomination=cls.active_nomination,
actor=cls.user,
reason="He's pretty funky"
)
cls.inactive_nomination = Nomination.objects.create(
user=cls.user,
- actor=cls.user,
- reason="He's pretty funky",
active=False,
end_reason="His neck couldn't hold the funk",
ended_at="5018-11-20T15:52:00+00:00"
)
+ cls.inactive_nomination_entry = NominationEntry.objects.create(
+ nomination=cls.inactive_nomination,
+ actor=cls.user,
+ reason="He's pretty funky"
+ )
- def test_returns_200_update_reason_on_active(self):
+ def test_returns_200_update_reason_on_active_with_actor(self):
url = reverse('bot:nomination-detail', args=(self.active_nomination.id,), host='api')
data = {
- 'reason': "He's one funky duck"
+ 'reason': "He's one funky duck",
+ 'actor': self.user.id
}
response = self.client.patch(url, data=data)
self.assertEqual(response.status_code, 200)
- nomination = Nomination.objects.get(id=response.json()['id'])
- self.assertEqual(nomination.reason, data['reason'])
+ nomination_entry = NominationEntry.objects.get(
+ nomination_id=response.json()['id'],
+ actor_id=self.user.id
+ )
+ self.assertEqual(nomination_entry.reason, data['reason'])
def test_returns_400_on_frozen_field_update(self):
url = reverse('bot:nomination-detail', args=(self.active_nomination.id,), host='api')
@@ -241,14 +278,18 @@ class NominationTests(APISubdomainTestCase):
def test_returns_200_update_reason_on_inactive(self):
url = reverse('bot:nomination-detail', args=(self.inactive_nomination.id,), host='api')
data = {
- 'reason': "He's one funky duck"
+ 'reason': "He's one funky duck",
+ 'actor': self.user.id
}
response = self.client.patch(url, data=data)
self.assertEqual(response.status_code, 200)
- nomination = Nomination.objects.get(id=response.json()['id'])
- self.assertEqual(nomination.reason, data['reason'])
+ nomination_entry = NominationEntry.objects.get(
+ nomination_id=response.json()['id'],
+ actor_id=self.user.id
+ )
+ self.assertEqual(nomination_entry.reason, data['reason'])
def test_returns_200_update_end_reason_on_inactive(self):
url = reverse('bot:nomination-detail', args=(self.inactive_nomination.id,), host='api')
@@ -442,3 +483,50 @@ class NominationTests(APISubdomainTestCase):
infractions = response.json()
self.assertEqual(len(infractions), 2)
+
+ def test_patch_nomination_set_reviewed_of_active_nomination(self):
+ url = reverse('api:nomination-detail', args=(self.active_nomination.id,), host='api')
+ data = {'reviewed': True}
+
+ response = self.client.patch(url, data=data)
+ self.assertEqual(response.status_code, 200)
+
+ def test_patch_nomination_set_reviewed_of_inactive_nomination(self):
+ url = reverse('api:nomination-detail', args=(self.inactive_nomination.id,), host='api')
+ data = {'reviewed': True}
+
+ response = self.client.patch(url, data=data)
+ self.assertEqual(response.status_code, 400)
+ self.assertEqual(response.json(), {
+ 'reviewed': ['This field cannot be set if the nomination is inactive.']
+ })
+
+ def test_patch_nomination_set_reviewed_and_end(self):
+ url = reverse('api:nomination-detail', args=(self.active_nomination.id,), host='api')
+ data = {'reviewed': True, 'active': False, 'end_reason': "What?"}
+
+ response = self.client.patch(url, data=data)
+ self.assertEqual(response.status_code, 400)
+ self.assertEqual(response.json(), {
+ 'reviewed': ['This field cannot be set while you are ending a nomination.']
+ })
+
+ def test_modifying_reason_without_actor(self):
+ url = reverse('api:nomination-detail', args=(self.active_nomination.id,), host='api')
+ data = {'reason': 'That is my reason!'}
+
+ response = self.client.patch(url, data=data)
+ self.assertEqual(response.status_code, 400)
+ self.assertEqual(response.json(), {
+ 'actor': ['This field is required when editing the reason.']
+ })
+
+ def test_modifying_reason_with_unknown_actor(self):
+ url = reverse('api:nomination-detail', args=(self.active_nomination.id,), host='api')
+ data = {'reason': 'That is my reason!', 'actor': 90909090909090}
+
+ response = self.client.patch(url, data=data)
+ self.assertEqual(response.status_code, 400)
+ self.assertEqual(response.json(), {
+ 'actor': ["The actor doesn't exist or has not nominated the user."]
+ })
diff --git a/pydis_site/apps/api/tests/test_users.py b/pydis_site/apps/api/tests/test_users.py
index a02fce8a..c43b916a 100644
--- a/pydis_site/apps/api/tests/test_users.py
+++ b/pydis_site/apps/api/tests/test_users.py
@@ -1,7 +1,11 @@
+from unittest.mock import patch
+
+from django.core.exceptions import ObjectDoesNotExist
from django_hosts.resolvers import reverse
from .base import APISubdomainTestCase
from ..models import Role, User
+from ..models.bot.metricity import NotFound
class UnauthedUserAPITests(APISubdomainTestCase):
@@ -45,6 +49,13 @@ class CreationTests(APISubdomainTestCase):
position=1
)
+ cls.user = User.objects.create(
+ id=11,
+ name="Name doesn't matter.",
+ discriminator=1122,
+ in_guild=True
+ )
+
def test_accepts_valid_data(self):
url = reverse('bot:user-list', host='api')
data = {
@@ -89,7 +100,7 @@ class CreationTests(APISubdomainTestCase):
response = self.client.post(url, data=data)
self.assertEqual(response.status_code, 201)
- self.assertEqual(response.json(), data)
+ self.assertEqual(response.json(), [])
def test_returns_400_for_unknown_role_id(self):
url = reverse('bot:user-list', host='api')
@@ -115,6 +126,176 @@ class CreationTests(APISubdomainTestCase):
response = self.client.post(url, data=data)
self.assertEqual(response.status_code, 400)
+ def test_returns_400_for_user_recreation(self):
+ """Return 201 if User is already present in database as it skips User creation."""
+ url = reverse('bot:user-list', host='api')
+ data = [{
+ 'id': 11,
+ 'name': 'You saw nothing.',
+ 'discriminator': 112,
+ 'in_guild': True
+ }]
+ response = self.client.post(url, data=data)
+ self.assertEqual(response.status_code, 201)
+
+ def test_returns_400_for_duplicate_request_users(self):
+ """Return 400 if 2 Users with same ID is passed in the request data."""
+ url = reverse('bot:user-list', host='api')
+ data = [
+ {
+ 'id': 11,
+ 'name': 'You saw nothing.',
+ 'discriminator': 112,
+ 'in_guild': True
+ },
+ {
+ 'id': 11,
+ 'name': 'You saw nothing part 2.',
+ 'discriminator': 1122,
+ 'in_guild': False
+ }
+ ]
+ response = self.client.post(url, data=data)
+ self.assertEqual(response.status_code, 400)
+
+ def test_returns_400_for_existing_user(self):
+ """Returns 400 if user is already present in DB."""
+ url = reverse('bot:user-list', host='api')
+ data = {
+ 'id': 11,
+ 'name': 'You saw nothing part 3.',
+ 'discriminator': 1122,
+ 'in_guild': True
+ }
+ response = self.client.post(url, data=data)
+ self.assertEqual(response.status_code, 400)
+
+
+class MultiPatchTests(APISubdomainTestCase):
+ @classmethod
+ def setUpTestData(cls):
+ cls.role_developer = Role.objects.create(
+ id=159,
+ name="Developer",
+ colour=2,
+ permissions=0b01010010101,
+ position=10,
+ )
+ cls.user_1 = User.objects.create(
+ id=1,
+ name="Patch test user 1.",
+ discriminator=1111,
+ in_guild=True
+ )
+ cls.user_2 = User.objects.create(
+ id=2,
+ name="Patch test user 2.",
+ discriminator=2222,
+ in_guild=True
+ )
+
+ def test_multiple_users_patch(self):
+ url = reverse("bot:user-bulk-patch", host="api")
+ data = [
+ {
+ "id": 1,
+ "name": "User 1 patched!",
+ "discriminator": 1010,
+ "roles": [self.role_developer.id],
+ "in_guild": False
+ },
+ {
+ "id": 2,
+ "name": "User 2 patched!"
+ }
+ ]
+
+ response = self.client.patch(url, data=data)
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.json()[0], data[0])
+
+ user_2 = User.objects.get(id=2)
+ self.assertEqual(user_2.name, data[1]["name"])
+
+ def test_returns_400_for_missing_user_id(self):
+ url = reverse("bot:user-bulk-patch", host="api")
+ data = [
+ {
+ "name": "I am ghost user!",
+ "discriminator": 1010,
+ "roles": [self.role_developer.id],
+ "in_guild": False
+ },
+ {
+ "name": "patch me? whats my id?"
+ }
+ ]
+ response = self.client.patch(url, data=data)
+ self.assertEqual(response.status_code, 400)
+
+ def test_returns_404_for_not_found_user(self):
+ url = reverse("bot:user-bulk-patch", host="api")
+ data = [
+ {
+ "id": 1,
+ "name": "User 1 patched again!!!",
+ "discriminator": 1010,
+ "roles": [self.role_developer.id],
+ "in_guild": False
+ },
+ {
+ "id": 22503405,
+ "name": "User unknown not patched!"
+ }
+ ]
+ response = self.client.patch(url, data=data)
+ self.assertEqual(response.status_code, 404)
+
+ def test_returns_400_for_bad_data(self):
+ url = reverse("bot:user-bulk-patch", host="api")
+ data = [
+ {
+ "id": 1,
+ "in_guild": "Catch me!"
+ },
+ {
+ "id": 2,
+ "discriminator": "find me!"
+ }
+ ]
+
+ response = self.client.patch(url, data=data)
+ self.assertEqual(response.status_code, 400)
+
+ def test_returns_400_for_insufficient_data(self):
+ url = reverse("bot:user-bulk-patch", host="api")
+ data = [
+ {
+ "id": 1,
+ },
+ {
+ "id": 2,
+ }
+ ]
+ response = self.client.patch(url, data=data)
+ self.assertEqual(response.status_code, 400)
+
+ def test_returns_400_for_duplicate_request_users(self):
+ """Return 400 if 2 Users with same ID is passed in the request data."""
+ url = reverse("bot:user-bulk-patch", host="api")
+ data = [
+ {
+ 'id': 1,
+ 'name': 'You saw nothing.',
+ },
+ {
+ 'id': 1,
+ 'name': 'You saw nothing part 2.',
+ }
+ ]
+ response = self.client.patch(url, data=data)
+ self.assertEqual(response.status_code, 400)
+
class UserModelTests(APISubdomainTestCase):
@classmethod
@@ -170,3 +351,157 @@ class UserModelTests(APISubdomainTestCase):
def test_correct_username_formatting(self):
"""Tests the username property with both name and discriminator formatted together."""
self.assertEqual(self.user_with_roles.username, "Test User with two roles#0001")
+
+
+class UserPaginatorTests(APISubdomainTestCase):
+ @classmethod
+ def setUpTestData(cls):
+ users = []
+ for i in range(1, 10_001):
+ users.append(User(
+ id=i,
+ name=f"user{i}",
+ discriminator=1111,
+ in_guild=True
+ ))
+ cls.users = User.objects.bulk_create(users)
+
+ def test_returns_single_page_response(self):
+ url = reverse("bot:user-list", host="api")
+ response = self.client.get(url).json()
+ self.assertIsNone(response["next_page_no"])
+ self.assertIsNone(response["previous_page_no"])
+
+ def test_returns_next_page_number(self):
+ User.objects.create(
+ id=10_001,
+ name="user10001",
+ discriminator=1111,
+ in_guild=True
+ )
+ url = reverse("bot:user-list", host="api")
+ response = self.client.get(url).json()
+ self.assertEqual(2, response["next_page_no"])
+
+ def test_returns_previous_page_number(self):
+ User.objects.create(
+ id=10_001,
+ name="user10001",
+ discriminator=1111,
+ in_guild=True
+ )
+ url = reverse("bot:user-list", host="api")
+ response = self.client.get(url, {"page": 2}).json()
+ self.assertEqual(1, response["previous_page_no"])
+
+
+class UserMetricityTests(APISubdomainTestCase):
+ @classmethod
+ def setUpTestData(cls):
+ User.objects.create(
+ id=0,
+ name="Test user",
+ discriminator=1,
+ in_guild=True,
+ )
+
+ def test_get_metricity_data(self):
+ # Given
+ joined_at = "foo"
+ total_messages = 1
+ total_blocks = 1
+ self.mock_metricity_user(joined_at, total_messages, total_blocks, [])
+
+ # When
+ url = reverse('bot:user-metricity-data', args=[0], host='api')
+ response = self.client.get(url)
+
+ # Then
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.json(), {
+ "joined_at": joined_at,
+ "total_messages": total_messages,
+ "voice_banned": False,
+ "activity_blocks": total_blocks
+ })
+
+ def test_no_metricity_user(self):
+ # Given
+ self.mock_no_metricity_user()
+
+ # When
+ url = reverse('bot:user-metricity-data', args=[0], host='api')
+ response = self.client.get(url)
+
+ # Then
+ self.assertEqual(response.status_code, 404)
+
+ def test_no_metricity_user_for_review(self):
+ # Given
+ self.mock_no_metricity_user()
+
+ # When
+ url = reverse('bot:user-metricity-review-data', args=[0], host='api')
+ response = self.client.get(url)
+
+ # Then
+ self.assertEqual(response.status_code, 404)
+
+ def test_metricity_voice_banned(self):
+ cases = [
+ {'exception': None, 'voice_banned': True},
+ {'exception': ObjectDoesNotExist, 'voice_banned': False},
+ ]
+
+ self.mock_metricity_user("foo", 1, 1, [["bar", 1]])
+
+ for case in cases:
+ with self.subTest(exception=case['exception'], voice_banned=case['voice_banned']):
+ with patch("pydis_site.apps.api.viewsets.bot.user.Infraction.objects.get") as p:
+ p.side_effect = case['exception']
+
+ url = reverse('bot:user-metricity-data', args=[0], host='api')
+ response = self.client.get(url)
+
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.json()["voice_banned"], case["voice_banned"])
+
+ def test_metricity_review_data(self):
+ # Given
+ joined_at = "foo"
+ total_messages = 10
+ total_blocks = 1
+ channel_activity = [["bar", 4], ["buzz", 6]]
+ self.mock_metricity_user(joined_at, total_messages, total_blocks, channel_activity)
+
+ # When
+ url = reverse('bot:user-metricity-review-data', args=[0], host='api')
+ response = self.client.get(url)
+
+ # Then
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.json(), {
+ "joined_at": joined_at,
+ "top_channel_activity": channel_activity,
+ "total_messages": total_messages
+ })
+
+ def mock_metricity_user(self, joined_at, total_messages, total_blocks, top_channel_activity):
+ patcher = patch("pydis_site.apps.api.viewsets.bot.user.Metricity")
+ self.metricity = patcher.start()
+ self.addCleanup(patcher.stop)
+ self.metricity = self.metricity.return_value.__enter__.return_value
+ self.metricity.user.return_value = dict(joined_at=joined_at)
+ self.metricity.total_messages.return_value = total_messages
+ self.metricity.total_message_blocks.return_value = total_blocks
+ self.metricity.top_channel_activity.return_value = top_channel_activity
+
+ def mock_no_metricity_user(self):
+ patcher = patch("pydis_site.apps.api.viewsets.bot.user.Metricity")
+ self.metricity = patcher.start()
+ self.addCleanup(patcher.stop)
+ self.metricity = self.metricity.return_value.__enter__.return_value
+ self.metricity.user.side_effect = NotFound()
+ self.metricity.total_messages.side_effect = NotFound()
+ self.metricity.total_message_blocks.side_effect = NotFound()
+ self.metricity.top_channel_activity.side_effect = NotFound()
diff --git a/pydis_site/apps/api/urls.py b/pydis_site/apps/api/urls.py
index 4dbf93db..2e1ef0b4 100644
--- a/pydis_site/apps/api/urls.py
+++ b/pydis_site/apps/api/urls.py
@@ -8,7 +8,6 @@ from .viewsets import (
DocumentationLinkViewSet,
FilterListViewSet,
InfractionViewSet,
- LogEntryViewSet,
NominationViewSet,
OffTopicChannelNameViewSet,
OffensiveMessageViewSet,
@@ -71,7 +70,6 @@ urlpatterns = (
#
# from django_hosts.resolvers import reverse
path('bot/', include((bot_router.urls, 'api'), namespace='bot')),
- path('logs', LogEntryViewSet.as_view({'post': 'create'}), name='logs'),
path('healthcheck', HealthcheckView.as_view(), name='healthcheck'),
path('rules', RulesView.as_view(), name='rules')
)
diff --git a/pydis_site/apps/api/views.py b/pydis_site/apps/api/views.py
index 7ac56641..0d126051 100644
--- a/pydis_site/apps/api/views.py
+++ b/pydis_site/apps/api/views.py
@@ -135,8 +135,9 @@ class RulesView(APIView):
),
(
"Do not provide or request help on projects that may break laws, "
- "breach terms of services, be considered malicious/inappropriate "
- "or be for graded coursework/exams."
+ "breach terms of services, be considered malicious or inappropriate. "
+ "Do not help with ongoing exams. Do not provide or request solutions "
+ "for graded assignments, although general guidance is okay."
),
(
"No spamming or unapproved advertising, including requests for paid work. "
diff --git a/pydis_site/apps/api/viewsets/__init__.py b/pydis_site/apps/api/viewsets/__init__.py
index dfbb880d..f133e77f 100644
--- a/pydis_site/apps/api/viewsets/__init__.py
+++ b/pydis_site/apps/api/viewsets/__init__.py
@@ -12,4 +12,3 @@ from .bot import (
RoleViewSet,
UserViewSet
)
-from .log_entry import LogEntryViewSet
diff --git a/pydis_site/apps/api/viewsets/bot/infraction.py b/pydis_site/apps/api/viewsets/bot/infraction.py
index edec0a1e..bd512ddd 100644
--- a/pydis_site/apps/api/viewsets/bot/infraction.py
+++ b/pydis_site/apps/api/viewsets/bot/infraction.py
@@ -5,6 +5,7 @@ from rest_framework.exceptions import ValidationError
from rest_framework.filters import OrderingFilter, SearchFilter
from rest_framework.mixins import (
CreateModelMixin,
+ DestroyModelMixin,
ListModelMixin,
RetrieveModelMixin
)
@@ -12,13 +13,20 @@ from rest_framework.response import Response
from rest_framework.viewsets import GenericViewSet
from pydis_site.apps.api.models.bot.infraction import Infraction
+from pydis_site.apps.api.pagination import LimitOffsetPaginationExtended
from pydis_site.apps.api.serializers import (
ExpandedInfractionSerializer,
InfractionSerializer
)
-class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, GenericViewSet):
+class InfractionViewSet(
+ CreateModelMixin,
+ RetrieveModelMixin,
+ ListModelMixin,
+ GenericViewSet,
+ DestroyModelMixin
+):
"""
View providing CRUD operations on infractions for Discord users.
@@ -31,6 +39,8 @@ class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
- **active** `bool`: whether the infraction is still active
- **actor__id** `int`: snowflake of the user which applied the infraction
- **hidden** `bool`: whether the infraction is a shadow infraction
+ - **limit** `int`: number of results return per page (default 100)
+ - **offset** `int`: the initial index from which to return the results (default 0)
- **search** `str`: regular expression applied to the infraction's reason
- **type** `str`: the type of the infraction
- **user__id** `int`: snowflake of the user to which the infraction was applied
@@ -39,6 +49,7 @@ class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
Invalid query parameters are ignored.
#### Response format
+ Response is paginated but the result is returned without any pagination metadata.
>>> [
... {
... 'id': 5,
@@ -108,6 +119,13 @@ class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
- 400: if a field in the request body is invalid or disallowed
- 404: if an infraction with the given `id` could not be found
+ ### DELETE /bot/infractions/<id:int>
+ Delete the infraction with the given `id`.
+
+ #### Status codes
+ - 204: returned on success
+ - 404: if a infraction with the given `id` does not exist
+
### Expanded routes
All routes support expansion of `user` and `actor` in responses. To use an expanded route,
append `/expanded` to the end of the route e.g. `GET /bot/infractions/expanded`.
@@ -119,6 +137,7 @@ class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
serializer_class = InfractionSerializer
queryset = Infraction.objects.all()
+ pagination_class = LimitOffsetPaginationExtended
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
filter_fields = ('user__id', 'actor__id', 'active', 'hidden', 'type')
search_fields = ('$reason',)
diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index cf6e262f..144daab0 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -14,8 +14,8 @@ from rest_framework.mixins import (
from rest_framework.response import Response
from rest_framework.viewsets import GenericViewSet
-from pydis_site.apps.api.models.bot import Nomination
-from pydis_site.apps.api.serializers import NominationSerializer
+from pydis_site.apps.api.models.bot import Nomination, NominationEntry
+from pydis_site.apps.api.serializers import NominationEntrySerializer, NominationSerializer
class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, GenericViewSet):
@@ -29,7 +29,6 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
#### Query parameters
- **active** `bool`: whether the nomination is still active
- - **actor__id** `int`: snowflake of the user who nominated the user
- **user__id** `int`: snowflake of the user who received the nomination
- **ordering** `str`: comma-separated sequence of fields to order the returned results
@@ -40,12 +39,18 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
... {
... 'id': 1,
... 'active': false,
- ... 'actor': 336843820513755157,
- ... 'reason': 'They know how to explain difficult concepts',
... 'user': 336843820513755157,
... 'inserted_at': '2019-04-25T14:02:37.775587Z',
... 'end_reason': 'They were helpered after a staff-vote',
- ... 'ended_at': '2019-04-26T15:12:22.123587Z'
+ ... 'ended_at': '2019-04-26T15:12:22.123587Z',
+ ... 'entries': [
+ ... {
+ ... 'actor': 336843820513755157,
+ ... 'reason': 'They know how to explain difficult concepts',
+ ... 'inserted_at': '2019-04-25T14:02:37.775587Z'
+ ... }
+ ... ],
+ ... 'reviewed': true
... }
... ]
@@ -59,12 +64,18 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
>>> {
... 'id': 1,
... 'active': true,
- ... 'actor': 336843820513755157,
- ... 'reason': 'They know how to explain difficult concepts',
... 'user': 336843820513755157,
... 'inserted_at': '2019-04-25T14:02:37.775587Z',
... 'end_reason': 'They were helpered after a staff-vote',
- ... 'ended_at': '2019-04-26T15:12:22.123587Z'
+ ... 'ended_at': '2019-04-26T15:12:22.123587Z',
+ ... 'entries': [
+ ... {
+ ... 'actor': 336843820513755157,
+ ... 'reason': 'They know how to explain difficult concepts',
+ ... 'inserted_at': '2019-04-25T14:02:37.775587Z'
+ ... }
+ ... ],
+ ... 'reviewed': false
... }
### Status codes
@@ -75,8 +86,9 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
Create a new, active nomination returns the created nominations.
The `user`, `reason` and `actor` fields are required and the `user`
and `actor` need to know by the site. Providing other valid fields
- is not allowed and invalid fields are ignored. A `user` is only
- allowed one active nomination at a time.
+ is not allowed and invalid fields are ignored. If `user` already has an
+ active nomination, a new nomination entry will be created and assigned to the
+ active nomination.
#### Request body
>>> {
@@ -91,7 +103,6 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
#### Status codes
- 201: returned on success
- 400: returned on failure for one of the following reasons:
- - A user already has an active nomination;
- The `user` or `actor` are unknown to the site;
- The request contained a field that cannot be set at creation.
@@ -102,16 +113,18 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
1. Updating the `reason` of `active` nomination;
2. Ending an `active` nomination;
3. Updating the `end_reason` or `reason` field of an `inactive` nomination.
+ 4. Updating `reviewed` field of `active` nomination.
While the response format and status codes are the same for all three operations (see
below), the request bodies vary depending on the operation. For all operations it holds
that providing other valid fields is not allowed and invalid fields are ignored.
- ### 1. Updating the `reason` of `active` nomination
+ ### 1. Updating the `reason` of `active` nomination. The `actor` field is required.
#### Request body
>>> {
... 'reason': 'He would make a great helper',
+ ... 'actor': 409107086526644234
... }
#### Response format
@@ -133,24 +146,35 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
See operation 1 for the response format and status codes.
### 3. Updating the `end_reason` or `reason` field of an `inactive` nomination.
+ Actor field is required when updating reason.
#### Request body
>>> {
... 'reason': 'Updated reason for this nomination',
+ ... 'actor': 409107086526644234,
... 'end_reason': 'Updated end_reason for this nomination',
... }
Note: The request body may contain either or both fields.
See operation 1 for the response format and status codes.
+
+ ### 4. Setting nomination `reviewed`
+
+ #### Request body
+ >>> {
+ ... 'reviewed': True
+ ... }
+
+ See operation 1 for the response format and status codes.
"""
serializer_class = NominationSerializer
queryset = Nomination.objects.all()
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
- filter_fields = ('user__id', 'actor__id', 'active')
- frozen_fields = ('id', 'actor', 'inserted_at', 'user', 'ended_at')
- frozen_on_create = ('ended_at', 'end_reason', 'active', 'inserted_at')
+ filter_fields = ('user__id', 'active')
+ frozen_fields = ('id', 'inserted_at', 'user', 'ended_at')
+ frozen_on_create = ('ended_at', 'end_reason', 'active', 'inserted_at', 'reviewed')
def create(self, request: HttpRequest, *args, **kwargs) -> Response:
"""
@@ -163,19 +187,50 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
raise ValidationError({field: ['This field cannot be set at creation.']})
user_id = request.data.get("user")
- if Nomination.objects.filter(active=True, user__id=user_id).exists():
- raise ValidationError({'active': ['There can only be one active nomination.']})
+ nomination_filter = Nomination.objects.filter(active=True, user__id=user_id)
+
+ if not nomination_filter.exists():
+ serializer = NominationSerializer(
+ data=ChainMap(
+ request.data,
+ {"active": True}
+ )
+ )
+ serializer.is_valid(raise_exception=True)
+ nomination = Nomination.objects.create(**serializer.validated_data)
- serializer = self.get_serializer(
- data=ChainMap(
- request.data,
- {"active": True}
+ # The serializer will truncate and get rid of excessive data
+ entry_serializer = NominationEntrySerializer(
+ data=ChainMap(request.data, {"nomination": nomination.id})
)
+ entry_serializer.is_valid(raise_exception=True)
+ NominationEntry.objects.create(**entry_serializer.validated_data)
+
+ data = NominationSerializer(nomination).data
+
+ headers = self.get_success_headers(data)
+ return Response(data, status=status.HTTP_201_CREATED, headers=headers)
+
+ entry_serializer = NominationEntrySerializer(
+ data=ChainMap(request.data, {"nomination": nomination_filter[0].id})
)
- serializer.is_valid(raise_exception=True)
- self.perform_create(serializer)
- headers = self.get_success_headers(serializer.data)
- return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
+ entry_serializer.is_valid(raise_exception=True)
+
+ # Don't allow a user to create many nomination entries in a single nomination
+ if NominationEntry.objects.filter(
+ nomination_id=nomination_filter[0].id,
+ actor__id=entry_serializer.validated_data["actor"].id
+ ).exists():
+ raise ValidationError(
+ {'actor': ['This actor has already endorsed this nomination.']}
+ )
+
+ NominationEntry.objects.create(**entry_serializer.validated_data)
+
+ data = NominationSerializer(nomination_filter[0]).data
+
+ headers = self.get_success_headers(data)
+ return Response(data, status=status.HTTP_201_CREATED, headers=headers)
def partial_update(self, request: HttpRequest, *args, **kwargs) -> Response:
"""
@@ -203,7 +258,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
elif instance.active and not data['active']:
# 2. We're ending an active nomination.
- if 'reason' in data:
+ if 'reason' in request.data:
raise ValidationError(
{'reason': ['This field cannot be set when ending a nomination.']}
)
@@ -213,6 +268,11 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
{'end_reason': ['This field is required when ending a nomination.']}
)
+ if 'reviewed' in request.data:
+ raise ValidationError(
+ {'reviewed': ['This field cannot be set while you are ending a nomination.']}
+ )
+
instance.ended_at = timezone.now()
elif 'active' in data:
@@ -221,6 +281,34 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
{'active': ['This field can only be used to end a nomination']}
)
+ # This is actually covered, but for some reason coverage don't think so.
+ elif 'reviewed' in request.data: # pragma: no cover
+ # 4. We are altering the reviewed state of the nomination.
+ if not instance.active:
+ raise ValidationError(
+ {'reviewed': ['This field cannot be set if the nomination is inactive.']}
+ )
+
+ if 'reason' in request.data:
+ if 'actor' not in request.data:
+ raise ValidationError(
+ {'actor': ['This field is required when editing the reason.']}
+ )
+
+ entry_filter = NominationEntry.objects.filter(
+ nomination_id=instance.id,
+ actor__id=request.data['actor']
+ )
+
+ if not entry_filter.exists():
+ raise ValidationError(
+ {'actor': ["The actor doesn't exist or has not nominated the user."]}
+ )
+
+ entry = entry_filter[0]
+ entry.reason = request.data['reason']
+ entry.save()
+
serializer.save()
return Response(serializer.data)
diff --git a/pydis_site/apps/api/viewsets/bot/user.py b/pydis_site/apps/api/viewsets/bot/user.py
index 9571b3d7..25722f5a 100644
--- a/pydis_site/apps/api/viewsets/bot/user.py
+++ b/pydis_site/apps/api/viewsets/bot/user.py
@@ -1,21 +1,67 @@
+import typing
+from collections import OrderedDict
+
+from django.core.exceptions import ObjectDoesNotExist
+from rest_framework import status
+from rest_framework.decorators import action
+from rest_framework.pagination import PageNumberPagination
+from rest_framework.request import Request
+from rest_framework.response import Response
+from rest_framework.serializers import ModelSerializer
from rest_framework.viewsets import ModelViewSet
-from rest_framework_bulk import BulkCreateModelMixin
+from pydis_site.apps.api.models.bot.infraction import Infraction
+from pydis_site.apps.api.models.bot.metricity import Metricity, NotFound
from pydis_site.apps.api.models.bot.user import User
from pydis_site.apps.api.serializers import UserSerializer
-class UserViewSet(BulkCreateModelMixin, ModelViewSet):
+class UserListPagination(PageNumberPagination):
+ """Custom pagination class for the User Model."""
+
+ page_size = 10000
+ page_size_query_param = "page_size"
+
+ def get_next_page_number(self) -> typing.Optional[int]:
+ """Get the next page number."""
+ if not self.page.has_next():
+ return None
+ page_number = self.page.next_page_number()
+ return page_number
+
+ def get_previous_page_number(self) -> typing.Optional[int]:
+ """Get the previous page number."""
+ if not self.page.has_previous():
+ return None
+
+ page_number = self.page.previous_page_number()
+ return page_number
+
+ def get_paginated_response(self, data: list) -> Response:
+ """Override method to send modified response."""
+ return Response(OrderedDict([
+ ('count', self.page.paginator.count),
+ ('next_page_no', self.get_next_page_number()),
+ ('previous_page_no', self.get_previous_page_number()),
+ ('results', data)
+ ]))
+
+
+class UserViewSet(ModelViewSet):
"""
View providing CRUD operations on Discord users through the bot.
## Routes
### GET /bot/users
- Returns all users currently known.
+ Returns all users currently known with pagination.
#### Response format
- >>> [
- ... {
+ >>> {
+ ... 'count': 95000,
+ ... 'next_page_no': "2",
+ ... 'previous_page_no': None,
+ ... 'results': [
+ ... {
... 'id': 409107086526644234,
... 'name': "Python",
... 'discriminator': 4329,
@@ -26,8 +72,13 @@ class UserViewSet(BulkCreateModelMixin, ModelViewSet):
... 458226699344019457
... ],
... 'in_guild': True
- ... }
- ... ]
+ ... },
+ ... ]
+ ... }
+
+ #### Optional Query Parameters
+ - page_size: number of Users in one page, defaults to 10,000
+ - page: page number
#### Status codes
- 200: returned on success
@@ -53,9 +104,41 @@ class UserViewSet(BulkCreateModelMixin, ModelViewSet):
- 200: returned on success
- 404: if a user with the given `snowflake` could not be found
+ ### GET /bot/users/<snowflake:int>/metricity_data
+ Gets metricity data for a single user by ID.
+
+ #### Response format
+ >>> {
+ ... "joined_at": "2020-10-06T21:54:23.540766",
+ ... "total_messages": 2,
+ ... "voice_banned": False,
+ ... "activity_blocks": 1
+ ...}
+
+ #### Status codes
+ - 200: returned on success
+ - 404: if a user with the given `snowflake` could not be found
+
+ ### GET /bot/users/<snowflake:int>/metricity_review_data
+ Gets metricity data for a single user's review by ID.
+
+ #### Response format
+ >>> {
+ ... 'joined_at': '2020-08-26T08:09:43.507000',
+ ... 'top_channel_activity': [['off-topic', 15],
+ ... ['talent-pool', 4],
+ ... ['defcon', 2]],
+ ... 'total_messages': 22
+ ... }
+
+ #### Status codes
+ - 200: returned on success
+ - 404: if a user with the given `snowflake` could not be found
+
### POST /bot/users
Adds a single or multiple new users.
The roles attached to the user(s) must be roles known by the site.
+ Users that already exist in the database will be skipped.
#### Request body
>>> {
@@ -67,11 +150,13 @@ class UserViewSet(BulkCreateModelMixin, ModelViewSet):
... }
Alternatively, request users can be POSTed as a list of above objects,
- in which case multiple users will be created at once.
+ in which case multiple users will be created at once. In this case,
+ the response is an empty list.
#### Status codes
- 201: returned on success
- 400: if one of the given roles does not exist, or one of the given fields is invalid
+ - 400: if multiple user objects with the same id are given
### PUT /bot/users/<snowflake:int>
Update the user with the given `snowflake`.
@@ -109,6 +194,34 @@ class UserViewSet(BulkCreateModelMixin, ModelViewSet):
- 400: if the request body was invalid, see response body for details
- 404: if the user with the given `snowflake` could not be found
+ ### BULK PATCH /bot/users/bulk_patch
+ Update users with the given `ids` and `details`.
+ `id` field and at least one other field is mandatory.
+
+ #### Request body
+ >>> [
+ ... {
+ ... 'id': int,
+ ... 'name': str,
+ ... 'discriminator': int,
+ ... 'roles': List[int],
+ ... 'in_guild': bool
+ ... },
+ ... {
+ ... 'id': int,
+ ... 'name': str,
+ ... 'discriminator': int,
+ ... 'roles': List[int],
+ ... 'in_guild': bool
+ ... },
+ ... ]
+
+ #### Status codes
+ - 200: returned on success
+ - 400: if the request body was invalid, see response body for details
+ - 400: if multiple user objects with the same id are given
+ - 404: if the user with the given id does not exist
+
### DELETE /bot/users/<snowflake:int>
Deletes the user with the given `snowflake`.
@@ -118,4 +231,65 @@ class UserViewSet(BulkCreateModelMixin, ModelViewSet):
"""
serializer_class = UserSerializer
- queryset = User.objects
+ queryset = User.objects.all().order_by("id")
+ pagination_class = UserListPagination
+
+ def get_serializer(self, *args, **kwargs) -> ModelSerializer:
+ """Set Serializer many attribute to True if request body contains a list."""
+ if isinstance(kwargs.get('data', {}), list):
+ kwargs['many'] = True
+
+ return super().get_serializer(*args, **kwargs)
+
+ @action(detail=False, methods=["PATCH"], name='user-bulk-patch')
+ def bulk_patch(self, request: Request) -> Response:
+ """Update multiple User objects in a single request."""
+ serializer = self.get_serializer(
+ instance=self.get_queryset(),
+ data=request.data,
+ many=True,
+ partial=True
+ )
+
+ serializer.is_valid(raise_exception=True)
+ serializer.save()
+
+ return Response(serializer.data, status=status.HTTP_200_OK)
+
+ @action(detail=True)
+ def metricity_data(self, request: Request, pk: str = None) -> Response:
+ """Request handler for metricity_data endpoint."""
+ user = self.get_object()
+
+ try:
+ Infraction.objects.get(user__id=user.id, active=True, type="voice_ban")
+ except ObjectDoesNotExist:
+ voice_banned = False
+ else:
+ voice_banned = True
+
+ with Metricity() as metricity:
+ try:
+ data = metricity.user(user.id)
+ data["total_messages"] = metricity.total_messages(user.id)
+ data["voice_banned"] = voice_banned
+ data["activity_blocks"] = metricity.total_message_blocks(user.id)
+ return Response(data, status=status.HTTP_200_OK)
+ except NotFound:
+ return Response(dict(detail="User not found in metricity"),
+ status=status.HTTP_404_NOT_FOUND)
+
+ @action(detail=True)
+ def metricity_review_data(self, request: Request, pk: str = None) -> Response:
+ """Request handler for metricity_review_data endpoint."""
+ user = self.get_object()
+
+ with Metricity() as metricity:
+ try:
+ data = metricity.user(user.id)
+ data["total_messages"] = metricity.total_messages(user.id)
+ data["top_channel_activity"] = metricity.top_channel_activity(user.id)
+ return Response(data, status=status.HTTP_200_OK)
+ except NotFound:
+ return Response(dict(detail="User not found in metricity"),
+ status=status.HTTP_404_NOT_FOUND)
diff --git a/pydis_site/apps/api/viewsets/log_entry.py b/pydis_site/apps/api/viewsets/log_entry.py
deleted file mode 100644
index 9108a4fa..00000000
--- a/pydis_site/apps/api/viewsets/log_entry.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from rest_framework.mixins import CreateModelMixin
-from rest_framework.viewsets import GenericViewSet
-
-from pydis_site.apps.api.models.log_entry import LogEntry
-from pydis_site.apps.api.serializers import LogEntrySerializer
-
-
-class LogEntryViewSet(CreateModelMixin, GenericViewSet):
- """
- View supporting the creation of log entries in the database for viewing via the log browser.
-
- ## Routes
- ### POST /logs
- Create a new log entry.
-
- #### Request body
- >>> {
- ... 'application': str, # 'bot' | 'seasonalbot' | 'site'
- ... 'logger_name': str, # such as 'bot.cogs.moderation'
- ... 'timestamp': Optional[str], # from `datetime.utcnow().isoformat()`
- ... 'level': str, # 'debug' | 'info' | 'warning' | 'error' | 'critical'
- ... 'module': str, # such as 'pydis_site.apps.api.serializers'
- ... 'line': int, # > 0
- ... 'message': str, # textual formatted content of the logline
- ... }
-
- #### Status codes
- - 201: returned on success
- - 400: if the request body has invalid fields, see the response for details
-
- ## Authentication
- Requires a API token.
- """
-
- queryset = LogEntry.objects.all()
- serializer_class = LogEntrySerializer
diff --git a/pydis_site/apps/home/migrations/0002_auto_now_on_repository_metadata.py b/pydis_site/apps/home/migrations/0002_auto_now_on_repository_metadata.py
new file mode 100644
index 00000000..7e78045b
--- /dev/null
+++ b/pydis_site/apps/home/migrations/0002_auto_now_on_repository_metadata.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.11 on 2020-12-21 22:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('home', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='repositorymetadata',
+ name='last_updated',
+ field=models.DateTimeField(auto_now=True, help_text='The date and time this data was last fetched.'),
+ ),
+ ]
diff --git a/pydis_site/apps/home/models/repository_metadata.py b/pydis_site/apps/home/models/repository_metadata.py
index 92d2404d..00a83cd7 100644
--- a/pydis_site/apps/home/models/repository_metadata.py
+++ b/pydis_site/apps/home/models/repository_metadata.py
@@ -1,32 +1,31 @@
from django.db import models
-from django.utils import timezone
class RepositoryMetadata(models.Model):
"""Information about one of our repos fetched from the GitHub API."""
last_updated = models.DateTimeField(
- default=timezone.now,
- help_text="The date and time this data was last fetched."
+ help_text="The date and time this data was last fetched.",
+ auto_now=True,
)
repo_name = models.CharField(
primary_key=True,
max_length=40,
- help_text="The full name of the repo, e.g. python-discord/site"
+ help_text="The full name of the repo, e.g. python-discord/site",
)
description = models.CharField(
max_length=400,
- help_text="The description of the repo."
+ help_text="The description of the repo.",
)
forks = models.IntegerField(
- help_text="The number of forks of this repo"
+ help_text="The number of forks of this repo",
)
stargazers = models.IntegerField(
- help_text="The number of stargazers for this repo"
+ help_text="The number of stargazers for this repo",
)
language = models.CharField(
max_length=20,
- help_text="The primary programming language used for this repo."
+ help_text="The primary programming language used for this repo.",
)
def __str__(self):
diff --git a/pydis_site/apps/home/tests/mock_github_api_response.json b/pydis_site/apps/home/tests/mock_github_api_response.json
index 10be4f99..ddbffed8 100644
--- a/pydis_site/apps/home/tests/mock_github_api_response.json
+++ b/pydis_site/apps/home/tests/mock_github_api_response.json
@@ -35,7 +35,7 @@
"forks_count": 31
},
{
- "full_name": "python-discord/seasonalbot",
+ "full_name": "python-discord/sir-lancebot",
"description": "test",
"stargazers_count": 97,
"language": "Python",
diff --git a/pydis_site/apps/home/tests/test_repodata_helpers.py b/pydis_site/apps/home/tests/test_repodata_helpers.py
index 77b1a68d..5634bc9b 100644
--- a/pydis_site/apps/home/tests/test_repodata_helpers.py
+++ b/pydis_site/apps/home/tests/test_repodata_helpers.py
@@ -123,10 +123,38 @@ class TestRepositoryMetadataHelpers(TestCase):
mock_get.return_value.json.return_value = ['garbage']
metadata = self.home_view._get_repo_data()
- self.assertEquals(len(metadata), len(self.home_view.repos))
- for item in metadata:
- with self.subTest(item=item):
- self.assertEqual(item.description, "Not available.")
- self.assertEqual(item.forks, 999)
- self.assertEqual(item.stargazers, 999)
- self.assertEqual(item.language, "Python")
+ self.assertEquals(len(metadata), 0)
+
+ def test_cleans_up_stale_metadata(self):
+ """Tests that we clean up stale metadata when we start the HomeView."""
+ repo_data = RepositoryMetadata(
+ repo_name="python-discord/INVALID",
+ description="testrepo",
+ forks=42,
+ stargazers=42,
+ language="English",
+ last_updated=timezone.now() - timedelta(seconds=HomeView.repository_cache_ttl + 1),
+ )
+ repo_data.save()
+ self.home_view.__init__()
+ cached_repos = RepositoryMetadata.objects.all()
+ cached_names = [repo.repo_name for repo in cached_repos]
+
+ self.assertNotIn("python-discord/INVALID", cached_names)
+
+ def test_dont_clean_up_unstale_metadata(self):
+ """Tests that we don't clean up good metadata when we start the HomeView."""
+ repo_data = RepositoryMetadata(
+ repo_name="python-discord/site",
+ description="testrepo",
+ forks=42,
+ stargazers=42,
+ language="English",
+ last_updated=timezone.now() - timedelta(seconds=HomeView.repository_cache_ttl + 1),
+ )
+ repo_data.save()
+ self.home_view.__init__()
+ cached_repos = RepositoryMetadata.objects.all()
+ cached_names = [repo.repo_name for repo in cached_repos]
+
+ self.assertIn("python-discord/site", cached_names)
diff --git a/pydis_site/apps/home/urls.py b/pydis_site/apps/home/urls.py
index e475c491..1e2af8f3 100644
--- a/pydis_site/apps/home/urls.py
+++ b/pydis_site/apps/home/urls.py
@@ -1,7 +1,7 @@
from django.contrib import admin
from django.urls import include, path
-from .views import HomeView
+from .views import HomeView, timeline
app_name = 'home'
urlpatterns = [
@@ -11,4 +11,5 @@ urlpatterns = [
path('resources/', include('pydis_site.apps.resources.urls')),
path('pages/', include('pydis_site.apps.content.urls')),
path('events/', include('pydis_site.apps.events.urls', namespace='events')),
+ path('timeline/', timeline, name="timeline"),
]
diff --git a/pydis_site/apps/home/views/__init__.py b/pydis_site/apps/home/views/__init__.py
index 971d73a3..28cc4d65 100644
--- a/pydis_site/apps/home/views/__init__.py
+++ b/pydis_site/apps/home/views/__init__.py
@@ -1,3 +1,3 @@
-from .home import HomeView
+from .home import HomeView, timeline
-__all__ = ["HomeView"]
+__all__ = ["HomeView", "timeline"]
diff --git a/pydis_site/apps/home/views/home.py b/pydis_site/apps/home/views/home.py
index 3b5cd5ac..e77772fb 100644
--- a/pydis_site/apps/home/views/home.py
+++ b/pydis_site/apps/home/views/home.py
@@ -1,4 +1,4 @@
-import datetime
+import logging
from typing import Dict, List
import requests
@@ -10,11 +10,13 @@ from django.views import View
from pydis_site.apps.home.models import RepositoryMetadata
+log = logging.getLogger(__name__)
+
class HomeView(View):
"""The main landing page for the website."""
- github_api = "https://api.github.com/users/python-discord/repos"
+ github_api = "https://api.github.com/users/python-discord/repos?per_page=100"
repository_cache_ttl = 3600
# Which of our GitHub repos should be displayed on the front page, and in which order?
@@ -22,82 +24,98 @@ class HomeView(View):
"python-discord/site",
"python-discord/bot",
"python-discord/snekbox",
- "python-discord/seasonalbot",
+ "python-discord/sir-lancebot",
"python-discord/metricity",
"python-discord/django-simple-bulma",
]
+ def __init__(self):
+ """Clean up stale RepositoryMetadata."""
+ RepositoryMetadata.objects.exclude(repo_name__in=self.repos).delete()
+
def _get_api_data(self) -> Dict[str, Dict[str, str]]:
- """Call the GitHub API and get information about our repos."""
- repo_dict: Dict[str, dict] = {repo_name: {} for repo_name in self.repos}
+ """
+ Call the GitHub API and get information about our repos.
+
+ If we're unable to get that info for any reason, return an empty dict.
+ """
+ repo_dict = {}
# Fetch the data from the GitHub API
api_data: List[dict] = requests.get(self.github_api).json()
# Process the API data into our dict
for repo in api_data:
- full_name = repo["full_name"]
-
- if full_name in self.repos:
- repo_dict[full_name] = {
- "full_name": repo["full_name"],
- "description": repo["description"],
- "language": repo["language"],
- "forks_count": repo["forks_count"],
- "stargazers_count": repo["stargazers_count"],
- }
+ try:
+ full_name = repo["full_name"]
+
+ if full_name in self.repos:
+ repo_dict[full_name] = {
+ "full_name": repo["full_name"],
+ "description": repo["description"],
+ "language": repo["language"],
+ "forks_count": repo["forks_count"],
+ "stargazers_count": repo["stargazers_count"],
+ }
+ # Something is not right about the API data we got back from GitHub.
+ except (TypeError, ConnectionError, KeyError) as e:
+ log.error(
+ "Unable to parse the GitHub repository metadata from response!",
+ extra={
+ 'api_data': api_data,
+ 'error': e
+ }
+ )
+ continue
return repo_dict
def _get_repo_data(self) -> List[RepositoryMetadata]:
"""Build a list of RepositoryMetadata objects that we can use to populate the front page."""
- # Try to get site data from the cache
- try:
- repo_data = RepositoryMetadata.objects.get(repo_name="python-discord/site")
+ database_repositories = []
- # If the data is stale, we should refresh it.
- if (timezone.now() - repo_data.last_updated).seconds > self.repository_cache_ttl:
+ # First, let's see if we have any metadata cached.
+ cached_data = RepositoryMetadata.objects.all()
- # Try to get new data from the API. If it fails, return the cached data.
- try:
- api_repositories = self._get_api_data()
- except (TypeError, ConnectionError):
- return RepositoryMetadata.objects.all()
- database_repositories = []
-
- # Update or create all RepoData objects in self.repos
- for repo_name, api_data in api_repositories.items():
- try:
- repo_data = RepositoryMetadata.objects.get(repo_name=repo_name)
- repo_data.description = api_data["description"]
- repo_data.language = api_data["language"]
- repo_data.forks = api_data["forks_count"]
- repo_data.stargazers = api_data["stargazers_count"]
- except RepositoryMetadata.DoesNotExist:
- repo_data = RepositoryMetadata(
- repo_name=api_data["full_name"],
- description=api_data["description"],
- forks=api_data["forks_count"],
- stargazers=api_data["stargazers_count"],
- language=api_data["language"],
- )
- repo_data.save()
- database_repositories.append(repo_data)
- return database_repositories
-
- # Otherwise, if the data is fresher than 2 minutes old, we should just return it.
- else:
- return RepositoryMetadata.objects.all()
+ # If we don't, we have to create some!
+ if not cached_data:
- # If this is raised, the database has no repodata at all, we will create them all.
- except RepositoryMetadata.DoesNotExist:
- database_repositories = []
- try:
- # Get new data from API
- api_repositories = self._get_api_data()
+ # Try to get new data from the API. If it fails, we'll return an empty list.
+ # In this case, we simply don't display our projects on the site.
+ api_repositories = self._get_api_data()
+
+ # Create all the repodata records in the database.
+ for api_data in api_repositories.values():
+ repo_data = RepositoryMetadata(
+ repo_name=api_data["full_name"],
+ description=api_data["description"],
+ forks=api_data["forks_count"],
+ stargazers=api_data["stargazers_count"],
+ language=api_data["language"],
+ )
+
+ repo_data.save()
+ database_repositories.append(repo_data)
+
+ return database_repositories
+
+ # If the data is stale, we should refresh it.
+ if (timezone.now() - cached_data[0].last_updated).seconds > self.repository_cache_ttl:
+ # Try to get new data from the API. If it fails, return the cached data.
+ api_repositories = self._get_api_data()
+
+ if not api_repositories:
+ return RepositoryMetadata.objects.all()
- # Create all the repodata records in the database.
- for api_data in api_repositories.values():
+ # Update or create all RepoData objects in self.repos
+ for repo_name, api_data in api_repositories.items():
+ try:
+ repo_data = RepositoryMetadata.objects.get(repo_name=repo_name)
+ repo_data.description = api_data["description"]
+ repo_data.language = api_data["language"]
+ repo_data.forks = api_data["forks_count"]
+ repo_data.stargazers = api_data["stargazers_count"]
+ except RepositoryMetadata.DoesNotExist:
repo_data = RepositoryMetadata(
repo_name=api_data["full_name"],
description=api_data["description"],
@@ -105,24 +123,20 @@ class HomeView(View):
stargazers=api_data["stargazers_count"],
language=api_data["language"],
)
- repo_data.save()
- database_repositories.append(repo_data)
- except TypeError:
- for repo_name in self.repos:
- repo_data = RepositoryMetadata(
- last_updated=timezone.now() - datetime.timedelta(minutes=50),
- repo_name=repo_name,
- description="Not available.",
- forks=999,
- stargazers=999,
- language="Python",
- )
- repo_data.save()
- database_repositories.append(repo_data)
-
+ repo_data.save()
+ database_repositories.append(repo_data)
return database_repositories
+ # Otherwise, if the data is fresher than 2 minutes old, we should just return it.
+ else:
+ return RepositoryMetadata.objects.all()
+
def get(self, request: WSGIRequest) -> HttpResponse:
"""Collect repo data and render the homepage view."""
repo_data = self._get_repo_data()
return render(request, "home/index.html", {"repo_data": repo_data})
+
+
+def timeline(request: WSGIRequest) -> HttpResponse:
+ """Render timeline view."""
+ return render(request, 'home/timeline.html')
diff --git a/pydis_site/apps/redirect/tests.py b/pydis_site/apps/redirect/tests.py
index c145ecda..fce2642f 100644
--- a/pydis_site/apps/redirect/tests.py
+++ b/pydis_site/apps/redirect/tests.py
@@ -40,11 +40,14 @@ class RedirectTests(TestCase):
if data.get("prefix_redirect", False):
expected_args = (
"".join(
- tuple(data.get("redirect_arguments", ())) + TESTING_ARGUMENTS.get(name, ())
+ tuple(data.get("redirect_arguments", ()))
+ + TESTING_ARGUMENTS.get(name, ())
),
)
else:
- expected_args = TESTING_ARGUMENTS.get(name, ()) + tuple(data.get("redirect_arguments", ()))
+ expected_args = (
+ TESTING_ARGUMENTS.get(name, ()) + tuple(data.get("redirect_arguments", ()))
+ )
self.assertEqual(1, len(resp.redirect_chain))
self.assertRedirects(
diff --git a/pydis_site/apps/resources/resources/reading/books/effective_python.yaml b/pydis_site/apps/resources/resources/reading/books/effective_python.yaml
index 1d4124cc..becd0578 100644
--- a/pydis_site/apps/resources/resources/reading/books/effective_python.yaml
+++ b/pydis_site/apps/resources/resources/reading/books/effective_python.yaml
@@ -1,4 +1,4 @@
-description: A book that gives 59 best practices for writing excellent Python. Great
+description: A book that gives 90 best practices for writing excellent Python. Great
for intermediates.
name: Effective Python
position: 3
@@ -7,8 +7,9 @@ urls:
url: https://effectivepython.com/
color: teal
- icon: branding/amazon
- url: https://www.amazon.com/Effective-Python-Specific-Software-Development/dp/0134034287
+ url: https://www.amazon.com/Effective-Python-Specific-Software-Development/dp/0134853989
color: amazon-orange
+ title: Amazon
- icon: branding/github
url: https://github.com/bslatkin/effectivepython
color: black
diff --git a/pydis_site/constants.py b/pydis_site/constants.py
index 0b76694a..c7ab5db0 100644
--- a/pydis_site/constants.py
+++ b/pydis_site/constants.py
@@ -1,5 +1,3 @@
-import git
+import os
-# Git SHA
-repo = git.Repo(search_parent_directories=True)
-GIT_SHA = repo.head.object.hexsha
+GIT_SHA = os.environ.get("GIT_SHA", "development")
diff --git a/pydis_site/hosts.py b/pydis_site/hosts.py
index 898e8cdc..5a837a8b 100644
--- a/pydis_site/hosts.py
+++ b/pydis_site/hosts.py
@@ -4,7 +4,10 @@ from django_hosts import host, patterns
host_patterns = patterns(
'',
host(r'admin', 'pydis_site.apps.admin.urls', name="admin"),
+ # External API ingress (over the net)
host(r'api', 'pydis_site.apps.api.urls', name='api'),
+ # Internal API ingress (cluster local)
+ host(r'pydis-api', 'pydis_site.apps.api.urls', name='internal_api'),
host(r'staff', 'pydis_site.apps.staff.urls', name='staff'),
host(r'.*', 'pydis_site.apps.home.urls', name=settings.DEFAULT_HOST)
)
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 65bd8e7a..2fd16241 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -23,14 +23,14 @@ from pydis_site.constants import GIT_SHA
env = environ.Env(
DEBUG=(bool, False),
- SITE_SENTRY_DSN=(str, "")
+ SITE_DSN=(str, "")
)
sentry_sdk.init(
- dsn=env('SITE_SENTRY_DSN'),
+ dsn=env('SITE_DSN'),
integrations=[DjangoIntegration()],
send_default_pii=True,
- release=f"pydis-site@{GIT_SHA}"
+ release=f"site@{GIT_SHA}"
)
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -42,21 +42,7 @@ DEBUG = env('DEBUG')
# SECURITY WARNING: keep the secret key used in production secret!
if DEBUG:
- ALLOWED_HOSTS = env.list(
- 'ALLOWED_HOSTS',
- default=[
- 'pythondiscord.local',
- 'api.pythondiscord.local',
- 'admin.pythondiscord.local',
- 'staff.pythondiscord.local',
- '0.0.0.0', # noqa: S104
- 'localhost',
- 'web',
- 'api.web',
- 'admin.web',
- 'staff.web'
- ]
- )
+ ALLOWED_HOSTS = env.list('ALLOWED_HOSTS', default=['*'])
SECRET_KEY = "yellow polkadot bikini" # noqa: S105
elif 'CI' in os.environ:
@@ -71,10 +57,7 @@ else:
'admin.pythondiscord.com',
'api.pythondiscord.com',
'staff.pythondiscord.com',
- 'pydis.com',
- 'api.pydis.com',
- 'admin.pydis.com',
- 'staff.pydis.com',
+ 'pydis-api.default.svc.cluster.local',
]
)
SECRET_KEY = env('SECRET_KEY')
@@ -147,7 +130,8 @@ WSGI_APPLICATION = 'pydis_site.wsgi.application'
# https://docs.djangoproject.com/en/2.1/ref/settings/#databases
DATABASES = {
- 'default': env.db()
+ 'default': env.db(),
+ 'metricity': env.db('METRICITY_DB_URL'),
}
# Password validation
@@ -232,14 +216,11 @@ LOGGING = {
'handlers': {
'console': {
'class': 'logging.StreamHandler'
- },
- 'database': {
- 'class': 'pydis_site.apps.api.dblogger.DatabaseLogHandler'
}
},
'loggers': {
'django': {
- 'handlers': ['console', 'database'],
+ 'handlers': ['console'],
'propagate': True,
'level': env(
'LOG_LEVEL',
@@ -279,6 +260,9 @@ BULMA_SETTINGS = {
"footer-padding": "1rem 1.5rem 1rem",
"tooltip-max-width": "30rem",
},
+ "extensions": [
+ "bulma-navbar-burger",
+ ],
}
# Information about site repository
@@ -292,4 +276,5 @@ EVENTS_PAGES_PATH = Path(BASE_DIR, "pydis_site", "templates", "events", "pages")
# Path for content pages
CONTENT_PAGES_PATH = Path(BASE_DIR, "pydis_site", "apps", "content", "resources")
+# Path for redirection links
REDIRECTIONS_PATH = Path(BASE_DIR, "pydis_site", "apps", "redirect", "redirects.yaml")
diff --git a/pydis_site/static/css/base/base.css b/pydis_site/static/css/base/base.css
index dc7c504d..830dad59 100644
--- a/pydis_site/static/css/base/base.css
+++ b/pydis_site/static/css/base/base.css
@@ -12,42 +12,69 @@ main.site-content {
flex: 1;
}
-div.card.has-equal-height {
+.card.has-equal-height {
height: 100%;
display: flex;
flex-direction: column;
}
-.navbar-item.is-fullsize {
- padding: 0;
+.navbar {
+ padding-right: 0.8em;
}
-.navbar-item.is-fullsize img {
- max-height: 4.75rem;
+.navbar-item .navbar-link {
+ padding-left: 1.5em;
+ padding-right: 2.5em;
+}
+
+.navbar-link:not(.is-arrowless)::after {
+ right: 1.125em;
+ margin-top: -0.455em;
}
.navbar-item.has-no-highlight:hover {
background-color: transparent;
}
-.navbar-item.has-left-margin-1 {
- margin-left: 1rem;
+#navbar-banner {
+ background-color: transparent;
}
-.navbar-item.has-left-margin-2 {
- margin-left: 2rem;
+#navbar-banner img {
+ max-height: 3rem;
}
-.navbar-item.has-left-margin-3 {
- margin-left: 3rem;
+#discord-btn a {
+ color: transparent;
+ background-image: url(../../images/navbar/discord.svg);
+ background-size: 200%;
+ background-position: 100% 50%;
+ background-repeat: no-repeat;
+ padding-left: 2.5rem;
+ padding-right: 2.5rem;
+ background-color: #697ec4ff;
+ margin-left: 0.5rem;
+ transition: all 0.2s cubic-bezier(.25,.8,.25,1);
+ overflow: hidden;
}
-#navbar-banner {
+#discord-btn:hover a {
+ box-shadow: 0 1px 4px rgba(0,0,0,0.16), 0 1px 6px rgba(0,0,0,0.23);
+ /*transform: scale(1.03) translate3d(0,0,0);*/
+ background-size: 200%;
+ background-position: 1% 50%;
+}
+
+#discord-btn:hover {
background-color: transparent;
}
-#navbar-banner img {
- max-height: 3rem;
+#linode-logo {
+ padding-left: 15px;
+ background: url(https://www.linode.com/wp-content/uploads/2021/01/Linode-Logo-Black.svg) no-repeat center;
+ filter: invert(1) grayscale(1);
+ background-size: 60px;
+ color: #00000000;
}
#django-logo {
@@ -97,17 +124,16 @@ button.is-size-navbar-menu, a.is-size-navbar-menu {
}
}
-/* Fix for modals being behind the navbar */
-
-.modal * {
- z-index: 1020;
-}
-
-.modal-background {
- z-index: 1010;
+/* 16:9 aspect ratio fixing */
+.force-aspect-container {
+ position: relative;
+ padding-bottom: 56.25%;
}
-/* Wiki style tweaks */
-.codehilite-wrap {
- margin-bottom: 1em;
+.force-aspect-content {
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ position: absolute;
}
diff --git a/pydis_site/static/css/error_pages.css b/pydis_site/static/css/error_pages.css
new file mode 100644
index 00000000..e59e2a54
--- /dev/null
+++ b/pydis_site/static/css/error_pages.css
@@ -0,0 +1,67 @@
+html {
+ height: 100%;
+}
+
+body {
+ background-color: #7289DA;
+ background-image: url("https://raw.githubusercontent.com/python-discord/branding/main/logos/banner_pattern/banner_pattern.svg");
+ background-size: 128px;
+ font-family: "Hind", "Helvetica", "Arial", sans-serif;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+ margin: 0;
+}
+
+h1,
+p {
+ color: black;
+ padding: 0;
+ margin: 0;
+ margin-bottom: 10px;
+}
+
+h1 {
+ margin-bottom: 15px;
+ font-size: 26px;
+}
+
+p,
+li {
+ line-height: 125%;
+}
+
+a {
+ color: #7289DA;
+}
+
+ul {
+ margin-bottom: 0;
+}
+
+li {
+ margin-top: 10px;
+}
+
+.error-box {
+ display: flex;
+ flex-direction: column;
+ max-width: 512px;
+ background-color: white;
+ border-radius: 20px;
+ overflow: hidden;
+ box-shadow: 5px 7px 40px rgba(0, 0, 0, 0.432);
+}
+
+.logo-box {
+ display: flex;
+ justify-content: center;
+ height: 80px;
+ padding: 15px;
+ background-color: #758ad4;
+}
+
+.content-box {
+ padding: 25px;
+}
diff --git a/pydis_site/static/css/home/index.css b/pydis_site/static/css/home/index.css
index ba856a8e..ee6f6e4c 100644
--- a/pydis_site/static/css/home/index.css
+++ b/pydis_site/static/css/home/index.css
@@ -1,87 +1,226 @@
-.discord-banner {
- border-radius: 0.5rem;
+h1 {
+ padding-bottom: 0.5em;
}
-.hero-image {
- width: 20rem;
- margin: auto;
+/* Mobile-only notice banner */
+
+#mobile-notice {
+ margin: 5px;
+ margin-bottom: -10px!important;
}
-.hero-body {
- padding-top: 1rem;
- padding-bottom: 1rem;
+/* Wave hero */
+
+#wave-hero {
+ position: relative;
+ background-color: #7289DA;
+ color: #fff;
+ height: 32vw;
+ min-height: 270px;
+ max-height: 500px;
+ overflow-x: hidden;
+ width: 100%;
+ padding: 0;
}
-.section-sp img {
- height: 5rem;
- margin-right: 2rem;
+#wave-hero .container {
+ z-index: 4; /* keep hero contents above wave animations */
}
-.video-container iframe,
-.video-container object,
-.video-container embed {
- width: 100%;
- height: calc(92vw * 0.5625);
- margin: 8px auto auto auto;
+@media screen and (min-width: 769px) and (max-width: 1023px) {
+ #wave-hero .columns {
+ margin: 0 1em 0 1em; /* Stop cards touching canvas edges in table-view */
+ }
+}
+
+#wave-hero iframe {
+ box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
+ transition: all 0.3s cubic-bezier(.25,.8,.25,1);
+ border-radius: 10px;
+ margin-top: 1em;
+ border: none;
+}
+
+#wave-hero iframe:hover {
+ box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22);
+}
+
+#wave-hero-centered {
+ margin: auto auto;
+}
+
+#wave-hero-right img{
+ border-radius: 10px;
+ box-shadow: 0 1px 6px rgba(0,0,0,0.16), 0 1px 6px rgba(0,0,0,0.23);
+ margin-top: 1em;
+ text-align: right;
+}
+
+#wave-hero .wave {
+ background: url(../../images/waves/wave_dark.svg) repeat-x;
+ position: absolute;
+ bottom: 0;
+ width: 6400px;
+ animation-name: wave;
+ animation-timing-function: cubic-bezier(.36,.45,.63,.53);
+ animation-iteration-count: infinite;
+ transform: translate3d(0,0,0); /* Trigger 3D acceleration for smoother animation */
+}
+
+#front-wave {
+ animation-duration: 60s;
+ animation-delay: -50s;
+ opacity: 0.5;
+ height: 178px;
+}
+
+#back-wave {
+ animation-duration: 65s;
+ height: 198px;
+}
+
+#bottom-wave {
+ animation-duration: 50s;
+ animation-delay: -10s;
+ background: url(../../images/waves/wave_white.svg) repeat-x !important;
+ height: 26px;
+ z-index: 3;
+}
+
+@keyframes wave {
+ 0% {
+ margin-left: 0;
+ }
+ 100% {
+ margin-left: -1600px;
+ }
+}
+
+/* Showcase */
+
+#showcase {
+ margin: 0 1em;
+}
+
+#showcase .mini-timeline {
+ height: 3px;
+ position: relative;
+ margin: 50px 0 50px 0;
+ background: linear-gradient(to right, #ffffff00, #666666ff, #ffffff00);
+ text-align: center;
+}
+
+#showcase .mini-timeline i {
+ display: inline-block;
+ vertical-align: middle;
+ width: 30px;
+ height: 30px;
+ border-radius: 50%;
+ position: relative;
+ top: -14px;
+ margin: 0 4% 0 4%;
+ background-color: #3EB2EF;
+ color: white;
+ font-size: 15px;
+ line-height: 33px;
+ border:none;
+ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+ transition: all 0.3s cubic-bezier(.25,.8,.25,1);
+}
+
+#showcase .mini-timeline i:hover {
+ box-shadow: 0 2px 5px rgba(0,0,0,0.16), 0 2px 5px rgba(0,0,0,0.23);
+ transform: scale(1.5);
+}
+
+/* Projects */
+
+#projects {
+ padding-top: 0;
}
-div.card.github-card {
+#projects .card {
box-shadow: none;
border: #d1d5da 1px solid;
border-radius: 3px;
+ transition: all 0.2s cubic-bezier(.25,.8,.25,1);
+ height: 100%;
+ display: flex;
+ flex-direction: column;
}
-div.repo-headline {
+#projects .card:hover {
+ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+}
+
+#projects .card-header {
+ box-shadow: none;
font-size: 1.25rem;
- margin-bottom: 8px;
+ padding: 1.5rem 1.5rem 0 1.5rem;
}
-span.repo-language-dot {
- border-radius: 50%;
- height: 12px;
- width: 12px;
- top: 1px;
- display: inline-block;
- position: relative;
+#projects .card-header-icon {
+ font-size: 1.5rem;
+ padding: 0 1rem 0 0;
}
-span.repo-language-dot.python {
- background-color: #3572A5;
+#projects .card-header-title {
+ padding: 0;
+ color: #7289DA;
}
-span.repo-language-dot.html {
- background-color: #e34c26;
+#projects .card:hover .card-header-title {
+ color: #363636;
}
-span.repo-language-dot.css {
- background-color: #563d7c;
+#projects .card-content {
+ padding-top: 8px;
+ padding-bottom: 1rem;
+}
+
+#projects .card-footer {
+ margin-top: auto;
+ border: none;
}
-span.repo-language-dot.javascript {
- background-color: #f1e05a;
+#projects .card-footer-item {
+ border: none;
}
-#repo-footer-item {
- margin-left: 1.2rem;
+#projects .card-footer-item i {
+ margin-right: 0.5rem;
}
-#sponsors-hero {
+#projects .repo-language-dot {
+ border-radius: 50%;
+ height: 12px;
+ width: 12px;
+ top: -1px;
+ display: inline-block;
+ position: relative;
+}
+
+#projects .repo-language-dot.python { background-color: #3572A5; }
+#projects .repo-language-dot.html { background-color: #e34c26; }
+#projects .repo-language-dot.css { background-color: #563d7c; }
+#projects .repo-language-dot.javascript { background-color: #f1e05a; }
+
+/* Sponsors */
+
+#sponsors .hero-body {
padding-top: 2rem;
padding-bottom: 3rem;
+
+ text-align: center;
}
-@media screen and (min-width: 1088px) {
- .video-container iframe {
- height: calc(42vw * 0.5625);
- max-height: 371px;
- max-width: 660px;
- }
+#sponsors .columns {
+ justify-content: center;
+ margin: auto;
+ max-width: 80%;
}
-@media screen and (max-width: 1087px) {
- .video-container iframe {
- height: calc(92vw * 0.5625);
- max-height: none;
- max-width: none;
- }
+#sponsors img {
+ height: 5rem;
+ margin: auto 1rem;
}
diff --git a/pydis_site/static/css/home/timeline.css b/pydis_site/static/css/home/timeline.css
new file mode 100644
index 00000000..0a4dfbb6
--- /dev/null
+++ b/pydis_site/static/css/home/timeline.css
@@ -0,0 +1,3823 @@
+body {
+ background-color: hsl(0, 0%, 100%);
+ background-color: var(--color-bg, white)
+}
+
+h2 {
+ font-size: 2em;
+}
+
+@media (max-width: 500px) {
+ h2 {
+ font-size: 1em;
+ }
+}
+
+article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, main, form legend {
+ display: block
+}
+
+ol, ul {
+ list-style: none
+}
+
+blockquote, q {
+ quotes: none
+}
+
+button, input, textarea, select {
+ margin: 0
+}
+
+.pastel-red {
+ background-color: #FF7878 !important;
+}
+
+.pastel-orange {
+ background-color: #FFBF76 !important;
+}
+
+.pastel-green {
+ background-color: #8bd6a7 !important;
+}
+
+.pastel-blue {
+ background-color: #8edbec !important;
+}
+
+.pastel-purple {
+ background-color: #CBB1FF !important;
+}
+
+.pastel-pink {
+ background-color: #F6ACFF !important;
+}
+
+.pastel-lime {
+ background-color: #b6df3a !important;
+}
+
+.pastel-dark-blue {
+ background-color: #576297 !important;
+}
+
+.pydis-logo-banner {
+ background-color: #7289DA !important;
+ border-radius: 10px;
+}
+
+.pydis-logo-banner img {
+ padding-right: 20px;
+}
+
+.btn, .form-control, .link, .reset {
+ background-color: transparent;
+ padding: 0;
+ border: 0;
+ border-radius: 0;
+ color: inherit;
+ line-height: inherit;
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none
+}
+
+select.form-control::-ms-expand {
+ display: none
+}
+
+textarea {
+ resize: vertical;
+ overflow: auto;
+ vertical-align: top
+}
+
+input::-ms-clear {
+ display: none
+}
+
+table {
+ border-collapse: collapse;
+ border-spacing: 0
+}
+
+img, video, svg {
+ max-width: 100%
+}
+
+[data-theme] {
+ background-color: hsl(0, 0%, 100%);
+ background-color: var(--color-bg, #fff);
+ color: hsl(240, 4%, 20%);
+ color: var(--color-contrast-high, #313135)
+}
+
+:root {
+ --space-unit: 1em;
+ --space-xxxxs: calc(0.125*var(--space-unit));
+ --space-xxxs: calc(0.25*var(--space-unit));
+ --space-xxs: calc(0.375*var(--space-unit));
+ --space-xs: calc(0.5*var(--space-unit));
+ --space-sm: calc(0.75*var(--space-unit));
+ --space-md: calc(1.25*var(--space-unit));
+ --space-lg: calc(2*var(--space-unit));
+ --space-xl: calc(3.25*var(--space-unit));
+ --space-xxl: calc(5.25*var(--space-unit));
+ --space-xxxl: calc(8.5*var(--space-unit));
+ --space-xxxxl: calc(13.75*var(--space-unit));
+ --component-padding: var(--space-md)
+}
+
+:root {
+ --max-width-xxs: 32rem;
+ --max-width-xs: 38rem;
+ --max-width-sm: 48rem;
+ --max-width-md: 64rem;
+ --max-width-lg: 80rem;
+ --max-width-xl: 90rem;
+ --max-width-xxl: 120rem
+}
+
+.container {
+ width: calc(100% - 1.25em);
+ width: calc(100% - 2*var(--component-padding));
+ margin-left: auto;
+ margin-right: auto
+}
+
+.max-width-xxs {
+ max-width: 32rem;
+ max-width: var(--max-width-xxs)
+}
+
+.max-width-xs {
+ max-width: 38rem;
+ max-width: var(--max-width-xs)
+}
+
+.max-width-sm {
+ max-width: 48rem;
+ max-width: var(--max-width-sm)
+}
+
+.max-width-md {
+ max-width: 64rem;
+ max-width: var(--max-width-md)
+}
+
+.max-width-lg {
+ max-width: 80rem;
+ max-width: var(--max-width-lg)
+}
+
+.max-width-xl {
+ max-width: 90rem;
+ max-width: var(--max-width-xl)
+}
+
+.max-width-xxl {
+ max-width: 120rem;
+ max-width: var(--max-width-xxl)
+}
+
+.max-width-adaptive-sm {
+ max-width: 38rem;
+ max-width: var(--max-width-xs)
+}
+
+@media (min-width: 64rem) {
+ .max-width-adaptive-sm {
+ max-width: 48rem;
+ max-width: var(--max-width-sm)
+ }
+}
+
+.max-width-adaptive-md {
+ max-width: 38rem;
+ max-width: var(--max-width-xs)
+}
+
+@media (min-width: 64rem) {
+ .max-width-adaptive-md {
+ max-width: 64rem;
+ max-width: var(--max-width-md)
+ }
+}
+
+.max-width-adaptive, .max-width-adaptive-lg {
+ max-width: 38rem;
+ max-width: var(--max-width-xs)
+}
+
+@media (min-width: 64rem) {
+ .max-width-adaptive, .max-width-adaptive-lg {
+ max-width: 64rem;
+ max-width: var(--max-width-md)
+ }
+}
+
+@media (min-width: 90rem) {
+ .max-width-adaptive, .max-width-adaptive-lg {
+ max-width: 80rem;
+ max-width: var(--max-width-lg)
+ }
+}
+
+.max-width-adaptive-xl {
+ max-width: 38rem;
+ max-width: var(--max-width-xs)
+}
+
+@media (min-width: 64rem) {
+ .max-width-adaptive-xl {
+ max-width: 64rem;
+ max-width: var(--max-width-md)
+ }
+}
+
+@media (min-width: 90rem) {
+ .max-width-adaptive-xl {
+ max-width: 90rem;
+ max-width: var(--max-width-xl)
+ }
+}
+
+.grid {
+ --grid-gap: 0px;
+ display: -ms-flexbox;
+ display: flex;
+ -ms-flex-wrap: wrap;
+ flex-wrap: wrap
+}
+
+.grid>* {
+ -ms-flex-preferred-size: 100%;
+ flex-basis: 100%
+}
+
+[class*="grid-gap"] {
+ margin-bottom: 1em * -1;
+ margin-bottom: calc(var(--grid-gap, 1em)*-1);
+ margin-right: 1em * -1;
+ margin-right: calc(var(--grid-gap, 1em)*-1)
+}
+
+[class*="grid-gap"]>* {
+ margin-bottom: 1em;
+ margin-bottom: var(--grid-gap, 1em);
+ margin-right: 1em;
+ margin-right: var(--grid-gap, 1em)
+}
+
+.grid-gap-xxxxs {
+ --grid-gap: var(--space-xxxxs)
+}
+
+.grid-gap-xxxs {
+ --grid-gap: var(--space-xxxs)
+}
+
+.grid-gap-xxs {
+ --grid-gap: var(--space-xxs)
+}
+
+.grid-gap-xs {
+ --grid-gap: var(--space-xs)
+}
+
+.grid-gap-sm {
+ --grid-gap: var(--space-sm)
+}
+
+.grid-gap-md {
+ --grid-gap: var(--space-md)
+}
+
+.grid-gap-lg {
+ --grid-gap: var(--space-lg)
+}
+
+.grid-gap-xl {
+ --grid-gap: var(--space-xl)
+}
+
+.grid-gap-xxl {
+ --grid-gap: var(--space-xxl)
+}
+
+.grid-gap-xxxl {
+ --grid-gap: var(--space-xxxl)
+}
+
+.grid-gap-xxxxl {
+ --grid-gap: var(--space-xxxxl)
+}
+
+.col {
+ -ms-flex-positive: 1;
+ flex-grow: 1;
+ -ms-flex-preferred-size: 0;
+ flex-basis: 0;
+ max-width: 100%
+}
+
+.col-1 {
+ -ms-flex-preferred-size: calc(8.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(8.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(8.33% - 0.01px - 1em);
+ flex-basis: calc(8.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(8.33% - 0.01px - 1em);
+ max-width: calc(8.33% - 0.01px - var(--grid-gap, 1em))
+}
+
+.col-2 {
+ -ms-flex-preferred-size: calc(16.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(16.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(16.66% - 0.01px - 1em);
+ flex-basis: calc(16.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(16.66% - 0.01px - 1em);
+ max-width: calc(16.66% - 0.01px - var(--grid-gap, 1em))
+}
+
+.col-3 {
+ -ms-flex-preferred-size: calc(25% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(25% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(25% - 0.01px - 1em);
+ flex-basis: calc(25% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(25% - 0.01px - 1em);
+ max-width: calc(25% - 0.01px - var(--grid-gap, 1em))
+}
+
+.col-4 {
+ -ms-flex-preferred-size: calc(33.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(33.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(33.33% - 0.01px - 1em);
+ flex-basis: calc(33.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(33.33% - 0.01px - 1em);
+ max-width: calc(33.33% - 0.01px - var(--grid-gap, 1em))
+}
+
+.col-5 {
+ -ms-flex-preferred-size: calc(41.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(41.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(41.66% - 0.01px - 1em);
+ flex-basis: calc(41.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(41.66% - 0.01px - 1em);
+ max-width: calc(41.66% - 0.01px - var(--grid-gap, 1em))
+}
+
+.col-6 {
+ -ms-flex-preferred-size: calc(50% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(50% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(50% - 0.01px - 1em);
+ flex-basis: calc(50% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(50% - 0.01px - 1em);
+ max-width: calc(50% - 0.01px - var(--grid-gap, 1em))
+}
+
+.col-7 {
+ -ms-flex-preferred-size: calc(58.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(58.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(58.33% - 0.01px - 1em);
+ flex-basis: calc(58.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(58.33% - 0.01px - 1em);
+ max-width: calc(58.33% - 0.01px - var(--grid-gap, 1em))
+}
+
+.col-8 {
+ -ms-flex-preferred-size: calc(66.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(66.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(66.66% - 0.01px - 1em);
+ flex-basis: calc(66.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(66.66% - 0.01px - 1em);
+ max-width: calc(66.66% - 0.01px - var(--grid-gap, 1em))
+}
+
+.col-9 {
+ -ms-flex-preferred-size: calc(75% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(75% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(75% - 0.01px - 1em);
+ flex-basis: calc(75% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(75% - 0.01px - 1em);
+ max-width: calc(75% - 0.01px - var(--grid-gap, 1em))
+}
+
+.col-10 {
+ -ms-flex-preferred-size: calc(83.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(83.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(83.33% - 0.01px - 1em);
+ flex-basis: calc(83.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(83.33% - 0.01px - 1em);
+ max-width: calc(83.33% - 0.01px - var(--grid-gap, 1em))
+}
+
+.col-11 {
+ -ms-flex-preferred-size: calc(91.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(91.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(91.66% - 0.01px - 1em);
+ flex-basis: calc(91.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(91.66% - 0.01px - 1em);
+ max-width: calc(91.66% - 0.01px - var(--grid-gap, 1em))
+}
+
+.col-12 {
+ -ms-flex-preferred-size: calc(100% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(100% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(100% - 0.01px - 1em);
+ flex-basis: calc(100% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(100% - 0.01px - 1em);
+ max-width: calc(100% - 0.01px - var(--grid-gap, 1em))
+}
+
+@media (min-width: 32rem) {
+ .col\@xs {
+ -ms-flex-positive: 1;
+ flex-grow: 1;
+ -ms-flex-preferred-size: 0;
+ flex-basis: 0;
+ max-width: 100%
+ }
+ .col-1\@xs {
+ -ms-flex-preferred-size: calc(8.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(8.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(8.33% - 0.01px - 1em);
+ flex-basis: calc(8.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(8.33% - 0.01px - 1em);
+ max-width: calc(8.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-2\@xs {
+ -ms-flex-preferred-size: calc(16.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(16.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(16.66% - 0.01px - 1em);
+ flex-basis: calc(16.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(16.66% - 0.01px - 1em);
+ max-width: calc(16.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-3\@xs {
+ -ms-flex-preferred-size: calc(25% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(25% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(25% - 0.01px - 1em);
+ flex-basis: calc(25% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(25% - 0.01px - 1em);
+ max-width: calc(25% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-4\@xs {
+ -ms-flex-preferred-size: calc(33.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(33.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(33.33% - 0.01px - 1em);
+ flex-basis: calc(33.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(33.33% - 0.01px - 1em);
+ max-width: calc(33.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-5\@xs {
+ -ms-flex-preferred-size: calc(41.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(41.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(41.66% - 0.01px - 1em);
+ flex-basis: calc(41.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(41.66% - 0.01px - 1em);
+ max-width: calc(41.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-6\@xs {
+ -ms-flex-preferred-size: calc(50% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(50% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(50% - 0.01px - 1em);
+ flex-basis: calc(50% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(50% - 0.01px - 1em);
+ max-width: calc(50% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-7\@xs {
+ -ms-flex-preferred-size: calc(58.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(58.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(58.33% - 0.01px - 1em);
+ flex-basis: calc(58.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(58.33% - 0.01px - 1em);
+ max-width: calc(58.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-8\@xs {
+ -ms-flex-preferred-size: calc(66.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(66.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(66.66% - 0.01px - 1em);
+ flex-basis: calc(66.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(66.66% - 0.01px - 1em);
+ max-width: calc(66.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-9\@xs {
+ -ms-flex-preferred-size: calc(75% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(75% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(75% - 0.01px - 1em);
+ flex-basis: calc(75% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(75% - 0.01px - 1em);
+ max-width: calc(75% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-10\@xs {
+ -ms-flex-preferred-size: calc(83.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(83.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(83.33% - 0.01px - 1em);
+ flex-basis: calc(83.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(83.33% - 0.01px - 1em);
+ max-width: calc(83.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-11\@xs {
+ -ms-flex-preferred-size: calc(91.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(91.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(91.66% - 0.01px - 1em);
+ flex-basis: calc(91.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(91.66% - 0.01px - 1em);
+ max-width: calc(91.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-12\@xs {
+ -ms-flex-preferred-size: calc(100% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(100% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(100% - 0.01px - 1em);
+ flex-basis: calc(100% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(100% - 0.01px - 1em);
+ max-width: calc(100% - 0.01px - var(--grid-gap, 1em))
+ }
+}
+
+@media (min-width: 48rem) {
+ .col\@sm {
+ -ms-flex-positive: 1;
+ flex-grow: 1;
+ -ms-flex-preferred-size: 0;
+ flex-basis: 0;
+ max-width: 100%
+ }
+ .col-1\@sm {
+ -ms-flex-preferred-size: calc(8.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(8.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(8.33% - 0.01px - 1em);
+ flex-basis: calc(8.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(8.33% - 0.01px - 1em);
+ max-width: calc(8.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-2\@sm {
+ -ms-flex-preferred-size: calc(16.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(16.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(16.66% - 0.01px - 1em);
+ flex-basis: calc(16.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(16.66% - 0.01px - 1em);
+ max-width: calc(16.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-3\@sm {
+ -ms-flex-preferred-size: calc(25% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(25% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(25% - 0.01px - 1em);
+ flex-basis: calc(25% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(25% - 0.01px - 1em);
+ max-width: calc(25% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-4\@sm {
+ -ms-flex-preferred-size: calc(33.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(33.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(33.33% - 0.01px - 1em);
+ flex-basis: calc(33.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(33.33% - 0.01px - 1em);
+ max-width: calc(33.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-5\@sm {
+ -ms-flex-preferred-size: calc(41.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(41.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(41.66% - 0.01px - 1em);
+ flex-basis: calc(41.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(41.66% - 0.01px - 1em);
+ max-width: calc(41.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-6\@sm {
+ -ms-flex-preferred-size: calc(50% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(50% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(50% - 0.01px - 1em);
+ flex-basis: calc(50% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(50% - 0.01px - 1em);
+ max-width: calc(50% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-7\@sm {
+ -ms-flex-preferred-size: calc(58.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(58.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(58.33% - 0.01px - 1em);
+ flex-basis: calc(58.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(58.33% - 0.01px - 1em);
+ max-width: calc(58.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-8\@sm {
+ -ms-flex-preferred-size: calc(66.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(66.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(66.66% - 0.01px - 1em);
+ flex-basis: calc(66.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(66.66% - 0.01px - 1em);
+ max-width: calc(66.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-9\@sm {
+ -ms-flex-preferred-size: calc(75% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(75% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(75% - 0.01px - 1em);
+ flex-basis: calc(75% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(75% - 0.01px - 1em);
+ max-width: calc(75% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-10\@sm {
+ -ms-flex-preferred-size: calc(83.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(83.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(83.33% - 0.01px - 1em);
+ flex-basis: calc(83.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(83.33% - 0.01px - 1em);
+ max-width: calc(83.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-11\@sm {
+ -ms-flex-preferred-size: calc(91.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(91.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(91.66% - 0.01px - 1em);
+ flex-basis: calc(91.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(91.66% - 0.01px - 1em);
+ max-width: calc(91.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-12\@sm {
+ -ms-flex-preferred-size: calc(100% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(100% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(100% - 0.01px - 1em);
+ flex-basis: calc(100% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(100% - 0.01px - 1em);
+ max-width: calc(100% - 0.01px - var(--grid-gap, 1em))
+ }
+}
+
+@media (min-width: 64rem) {
+ .col\@md {
+ -ms-flex-positive: 1;
+ flex-grow: 1;
+ -ms-flex-preferred-size: 0;
+ flex-basis: 0;
+ max-width: 100%
+ }
+ .col-1\@md {
+ -ms-flex-preferred-size: calc(8.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(8.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(8.33% - 0.01px - 1em);
+ flex-basis: calc(8.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(8.33% - 0.01px - 1em);
+ max-width: calc(8.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-2\@md {
+ -ms-flex-preferred-size: calc(16.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(16.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(16.66% - 0.01px - 1em);
+ flex-basis: calc(16.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(16.66% - 0.01px - 1em);
+ max-width: calc(16.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-3\@md {
+ -ms-flex-preferred-size: calc(25% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(25% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(25% - 0.01px - 1em);
+ flex-basis: calc(25% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(25% - 0.01px - 1em);
+ max-width: calc(25% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-4\@md {
+ -ms-flex-preferred-size: calc(33.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(33.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(33.33% - 0.01px - 1em);
+ flex-basis: calc(33.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(33.33% - 0.01px - 1em);
+ max-width: calc(33.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-5\@md {
+ -ms-flex-preferred-size: calc(41.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(41.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(41.66% - 0.01px - 1em);
+ flex-basis: calc(41.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(41.66% - 0.01px - 1em);
+ max-width: calc(41.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-6\@md {
+ -ms-flex-preferred-size: calc(50% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(50% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(50% - 0.01px - 1em);
+ flex-basis: calc(50% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(50% - 0.01px - 1em);
+ max-width: calc(50% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-7\@md {
+ -ms-flex-preferred-size: calc(58.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(58.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(58.33% - 0.01px - 1em);
+ flex-basis: calc(58.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(58.33% - 0.01px - 1em);
+ max-width: calc(58.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-8\@md {
+ -ms-flex-preferred-size: calc(66.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(66.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(66.66% - 0.01px - 1em);
+ flex-basis: calc(66.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(66.66% - 0.01px - 1em);
+ max-width: calc(66.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-9\@md {
+ -ms-flex-preferred-size: calc(75% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(75% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(75% - 0.01px - 1em);
+ flex-basis: calc(75% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(75% - 0.01px - 1em);
+ max-width: calc(75% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-10\@md {
+ -ms-flex-preferred-size: calc(83.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(83.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(83.33% - 0.01px - 1em);
+ flex-basis: calc(83.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(83.33% - 0.01px - 1em);
+ max-width: calc(83.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-11\@md {
+ -ms-flex-preferred-size: calc(91.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(91.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(91.66% - 0.01px - 1em);
+ flex-basis: calc(91.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(91.66% - 0.01px - 1em);
+ max-width: calc(91.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-12\@md {
+ -ms-flex-preferred-size: calc(100% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(100% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(100% - 0.01px - 1em);
+ flex-basis: calc(100% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(100% - 0.01px - 1em);
+ max-width: calc(100% - 0.01px - var(--grid-gap, 1em))
+ }
+}
+
+@media (min-width: 80rem) {
+ .col\@lg {
+ -ms-flex-positive: 1;
+ flex-grow: 1;
+ -ms-flex-preferred-size: 0;
+ flex-basis: 0;
+ max-width: 100%
+ }
+ .col-1\@lg {
+ -ms-flex-preferred-size: calc(8.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(8.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(8.33% - 0.01px - 1em);
+ flex-basis: calc(8.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(8.33% - 0.01px - 1em);
+ max-width: calc(8.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-2\@lg {
+ -ms-flex-preferred-size: calc(16.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(16.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(16.66% - 0.01px - 1em);
+ flex-basis: calc(16.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(16.66% - 0.01px - 1em);
+ max-width: calc(16.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-3\@lg {
+ -ms-flex-preferred-size: calc(25% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(25% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(25% - 0.01px - 1em);
+ flex-basis: calc(25% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(25% - 0.01px - 1em);
+ max-width: calc(25% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-4\@lg {
+ -ms-flex-preferred-size: calc(33.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(33.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(33.33% - 0.01px - 1em);
+ flex-basis: calc(33.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(33.33% - 0.01px - 1em);
+ max-width: calc(33.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-5\@lg {
+ -ms-flex-preferred-size: calc(41.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(41.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(41.66% - 0.01px - 1em);
+ flex-basis: calc(41.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(41.66% - 0.01px - 1em);
+ max-width: calc(41.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-6\@lg {
+ -ms-flex-preferred-size: calc(50% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(50% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(50% - 0.01px - 1em);
+ flex-basis: calc(50% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(50% - 0.01px - 1em);
+ max-width: calc(50% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-7\@lg {
+ -ms-flex-preferred-size: calc(58.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(58.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(58.33% - 0.01px - 1em);
+ flex-basis: calc(58.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(58.33% - 0.01px - 1em);
+ max-width: calc(58.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-8\@lg {
+ -ms-flex-preferred-size: calc(66.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(66.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(66.66% - 0.01px - 1em);
+ flex-basis: calc(66.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(66.66% - 0.01px - 1em);
+ max-width: calc(66.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-9\@lg {
+ -ms-flex-preferred-size: calc(75% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(75% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(75% - 0.01px - 1em);
+ flex-basis: calc(75% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(75% - 0.01px - 1em);
+ max-width: calc(75% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-10\@lg {
+ -ms-flex-preferred-size: calc(83.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(83.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(83.33% - 0.01px - 1em);
+ flex-basis: calc(83.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(83.33% - 0.01px - 1em);
+ max-width: calc(83.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-11\@lg {
+ -ms-flex-preferred-size: calc(91.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(91.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(91.66% - 0.01px - 1em);
+ flex-basis: calc(91.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(91.66% - 0.01px - 1em);
+ max-width: calc(91.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-12\@lg {
+ -ms-flex-preferred-size: calc(100% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(100% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(100% - 0.01px - 1em);
+ flex-basis: calc(100% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(100% - 0.01px - 1em);
+ max-width: calc(100% - 0.01px - var(--grid-gap, 1em))
+ }
+}
+
+@media (min-width: 90rem) {
+ .col\@xl {
+ -ms-flex-positive: 1;
+ flex-grow: 1;
+ -ms-flex-preferred-size: 0;
+ flex-basis: 0;
+ max-width: 100%
+ }
+ .col-1\@xl {
+ -ms-flex-preferred-size: calc(8.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(8.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(8.33% - 0.01px - 1em);
+ flex-basis: calc(8.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(8.33% - 0.01px - 1em);
+ max-width: calc(8.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-2\@xl {
+ -ms-flex-preferred-size: calc(16.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(16.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(16.66% - 0.01px - 1em);
+ flex-basis: calc(16.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(16.66% - 0.01px - 1em);
+ max-width: calc(16.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-3\@xl {
+ -ms-flex-preferred-size: calc(25% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(25% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(25% - 0.01px - 1em);
+ flex-basis: calc(25% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(25% - 0.01px - 1em);
+ max-width: calc(25% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-4\@xl {
+ -ms-flex-preferred-size: calc(33.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(33.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(33.33% - 0.01px - 1em);
+ flex-basis: calc(33.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(33.33% - 0.01px - 1em);
+ max-width: calc(33.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-5\@xl {
+ -ms-flex-preferred-size: calc(41.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(41.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(41.66% - 0.01px - 1em);
+ flex-basis: calc(41.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(41.66% - 0.01px - 1em);
+ max-width: calc(41.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-6\@xl {
+ -ms-flex-preferred-size: calc(50% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(50% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(50% - 0.01px - 1em);
+ flex-basis: calc(50% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(50% - 0.01px - 1em);
+ max-width: calc(50% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-7\@xl {
+ -ms-flex-preferred-size: calc(58.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(58.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(58.33% - 0.01px - 1em);
+ flex-basis: calc(58.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(58.33% - 0.01px - 1em);
+ max-width: calc(58.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-8\@xl {
+ -ms-flex-preferred-size: calc(66.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(66.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(66.66% - 0.01px - 1em);
+ flex-basis: calc(66.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(66.66% - 0.01px - 1em);
+ max-width: calc(66.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-9\@xl {
+ -ms-flex-preferred-size: calc(75% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(75% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(75% - 0.01px - 1em);
+ flex-basis: calc(75% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(75% - 0.01px - 1em);
+ max-width: calc(75% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-10\@xl {
+ -ms-flex-preferred-size: calc(83.33% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(83.33% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(83.33% - 0.01px - 1em);
+ flex-basis: calc(83.33% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(83.33% - 0.01px - 1em);
+ max-width: calc(83.33% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-11\@xl {
+ -ms-flex-preferred-size: calc(91.66% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(91.66% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(91.66% - 0.01px - 1em);
+ flex-basis: calc(91.66% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(91.66% - 0.01px - 1em);
+ max-width: calc(91.66% - 0.01px - var(--grid-gap, 1em))
+ }
+ .col-12\@xl {
+ -ms-flex-preferred-size: calc(100% - 0.01px - 1em);
+ -ms-flex-preferred-size: calc(100% - 0.01px - var(--grid-gap, 1em));
+ flex-basis: calc(100% - 0.01px - 1em);
+ flex-basis: calc(100% - 0.01px - var(--grid-gap, 1em));
+ max-width: calc(100% - 0.01px - 1em);
+ max-width: calc(100% - 0.01px - var(--grid-gap, 1em))
+ }
+}
+
+:root {
+ --radius-sm: calc(var(--radius, 0.25em)/2);
+ --radius-md: var(--radius, 0.25em);
+ --radius-lg: calc(var(--radius, 0.25em)*2);
+ --shadow-sm: 0 1px 2px rgba(0, 0, 0, .085), 0 1px 8px rgba(0, 0, 0, .1);
+ --shadow-md: 0 1px 8px rgba(0, 0, 0, .1), 0 8px 24px rgba(0, 0, 0, .15);
+ --shadow-lg: 0 1px 8px rgba(0, 0, 0, .1), 0 16px 48px rgba(0, 0, 0, .1), 0 24px 60px rgba(0, 0, 0, .1);
+ --bounce: cubic-bezier(0.175, 0.885, 0.32, 1.275);
+ --ease-in-out: cubic-bezier(0.645, 0.045, 0.355, 1);
+ --ease-in: cubic-bezier(0.55, 0.055, 0.675, 0.19);
+ --ease-out: cubic-bezier(0.215, 0.61, 0.355, 1)
+}
+
+:root {
+ --body-line-height: 1.4;
+ --heading-line-height: 1.2
+}
+
+body {
+ color: hsl(240, 4%, 20%);
+ color: var(--color-contrast-high, #313135)
+}
+
+h1, h2, h3, h4 {
+ color: hsl(240, 8%, 12%);
+ color: var(--color-contrast-higher, #1c1c21);
+ line-height: 1.2;
+ line-height: var(--heading-line-height, 1.2)
+}
+
+.text-xxxl {
+ font-size: 2.48832em;
+ font-size: var(--text-xxxl, 2.488em)
+}
+
+small, .text-sm {
+ font-size: 0.83333em;
+ font-size: var(--text-sm, 0.833em)
+}
+
+.text-xs {
+ font-size: 0.69444em;
+ font-size: var(--text-xs, 0.694em)
+}
+
+strong, .text-bold {
+ font-weight: bold
+}
+
+s {
+ text-decoration: line-through
+}
+
+u, .text-underline {
+ text-decoration: underline
+}
+
+
+.text-component h1, .text-component h2, .text-component h3, .text-component h4 {
+ line-height: 1.2;
+ line-height: var(--component-heading-line-height, 1.2);
+ margin-bottom: 0.25em;
+ margin-bottom: calc(var(--space-xxxs)*var(--text-vspace-multiplier, 1))
+}
+
+.text-component h2, .text-component h3, .text-component h4 {
+ margin-top: 0.75em;
+ margin-top: calc(var(--space-sm)*var(--text-vspace-multiplier, 1))
+}
+
+.text-component p, .text-component blockquote, .text-component ul li, .text-component ol li {
+ line-height: 1.4;
+ line-height: var(--component-body-line-height)
+}
+
+.text-component ul, .text-component ol, .text-component p, .text-component blockquote, .text-component .text-component__block {
+ margin-bottom: 0.75em;
+ margin-bottom: calc(var(--space-sm)*var(--text-vspace-multiplier, 1))
+}
+
+.text-component ul, .text-component ol {
+ padding-left: 1em
+}
+
+.text-component ul {
+ list-style-type: disc
+}
+
+.text-component ol {
+ list-style-type: decimal
+}
+
+.text-component img {
+ display: block;
+ margin: 0 auto
+}
+
+.text-component figcaption {
+ text-align: center;
+ margin-top: 0.5em;
+ margin-top: var(--space-xs)
+}
+
+.text-component em {
+ font-style: italic
+}
+
+.text-component hr {
+ margin-top: 2em;
+ margin-top: calc(var(--space-lg)*var(--text-vspace-multiplier, 1));
+ margin-bottom: 2em;
+ margin-bottom: calc(var(--space-lg)*var(--text-vspace-multiplier, 1));
+ margin-left: auto;
+ margin-right: auto
+}
+
+.text-component>*:first-child {
+ margin-top: 0
+}
+
+.text-component>*:last-child {
+ margin-bottom: 0
+}
+
+.text-component__block--full-width {
+ width: 100vw;
+ margin-left: calc(50% - 50vw)
+}
+
+@media (min-width: 48rem) {
+ .text-component__block--left, .text-component__block--right {
+ width: 45%
+ }
+ .text-component__block--left img, .text-component__block--right img {
+ width: 100%
+ }
+ .text-component__block--left {
+ float: left;
+ margin-right: 0.75em;
+ margin-right: calc(var(--space-sm)*var(--text-vspace-multiplier, 1))
+ }
+ .text-component__block--right {
+ float: right;
+ margin-left: 0.75em;
+ margin-left: calc(var(--space-sm)*var(--text-vspace-multiplier, 1))
+ }
+}
+
+@media (min-width: 90rem) {
+ .text-component__block--outset {
+ width: calc(100% + 10.5em);
+ width: calc(100% + 2*var(--space-xxl))
+ }
+ .text-component__block--outset img {
+ width: 100%
+ }
+ .text-component__block--outset:not(.text-component__block--right) {
+ margin-left: -5.25em;
+ margin-left: calc(-1*var(--space-xxl))
+ }
+ .text-component__block--left, .text-component__block--right {
+ width: 50%
+ }
+ .text-component__block--right.text-component__block--outset {
+ margin-right: -5.25em;
+ margin-right: calc(-1*var(--space-xxl))
+ }
+}
+
+:root {
+ --icon-xxs: 12px;
+ --icon-xs: 16px;
+ --icon-sm: 24px;
+ --icon-md: 32px;
+ --icon-lg: 48px;
+ --icon-xl: 64px;
+ --icon-xxl: 128px
+}
+
+.icon--xxs {
+ font-size: 12px;
+ font-size: var(--icon-xxs)
+}
+
+.icon--xs {
+ font-size: 16px;
+ font-size: var(--icon-xs)
+}
+
+.icon--sm {
+ font-size: 24px;
+ font-size: var(--icon-sm)
+}
+
+.icon--md {
+ font-size: 32px;
+ font-size: var(--icon-md)
+}
+
+.icon--lg {
+ font-size: 48px;
+ font-size: var(--icon-lg)
+}
+
+.icon--xl {
+ font-size: 64px;
+ font-size: var(--icon-xl)
+}
+
+.icon--xxl {
+ font-size: 128px;
+ font-size: var(--icon-xxl)
+}
+
+.icon--is-spinning {
+ -webkit-animation: icon-spin 1s infinite linear;
+ animation: icon-spin 1s infinite linear
+}
+
+@-webkit-keyframes icon-spin {
+ 0% {
+ -webkit-transform: rotate(0deg);
+ transform: rotate(0deg)
+ }
+ 100% {
+ -webkit-transform: rotate(360deg);
+ transform: rotate(360deg)
+ }
+}
+
+@keyframes icon-spin {
+ 0% {
+ -webkit-transform: rotate(0deg);
+ transform: rotate(0deg)
+ }
+ 100% {
+ -webkit-transform: rotate(360deg);
+ transform: rotate(360deg)
+ }
+}
+
+.icon use {
+ color: inherit;
+ fill: currentColor
+}
+
+.btn {
+ position: relative;
+ display: -ms-inline-flexbox;
+ display: inline-flex;
+ -ms-flex-pack: center;
+ justify-content: center;
+ -ms-flex-align: center;
+ align-items: center;
+ white-space: nowrap;
+ text-decoration: none;
+ line-height: 1;
+ font-size: 1em;
+ font-size: var(--btn-font-size, 1em);
+ padding-top: 0.5em;
+ padding-top: var(--btn-padding-y, 0.5em);
+ padding-bottom: 0.5em;
+ padding-bottom: var(--btn-padding-y, 0.5em);
+ padding-left: 0.75em;
+ padding-left: var(--btn-padding-x, 0.75em);
+ padding-right: 0.75em;
+ padding-right: var(--btn-padding-x, 0.75em);
+ border-radius: 0.25em;
+ border-radius: var(--btn-radius, 0.25em)
+}
+
+.btn--primary {
+ background-color: hsl(220, 90%, 56%);
+ background-color: var(--color-primary, #2a6df4);
+ color: hsl(0, 0%, 100%);
+ color: var(--color-white, #fff)
+}
+
+.btn--subtle {
+ background-color: hsl(240, 1%, 83%);
+ background-color: var(--color-contrast-low, #d3d3d4);
+ color: hsl(240, 8%, 12%);
+ color: var(--color-contrast-higher, #1c1c21)
+}
+
+.btn--accent {
+ background-color: hsl(355, 90%, 61%);
+ background-color: var(--color-accent, #f54251);
+ color: hsl(0, 0%, 100%);
+ color: var(--color-white, #fff)
+}
+
+.btn--disabled {
+ cursor: not-allowed
+}
+
+.btn--sm {
+ font-size: 0.8em;
+ font-size: var(--btn-font-size-sm, 0.8em)
+}
+
+.btn--md {
+ font-size: 1.2em;
+ font-size: var(--btn-font-size-md, 1.2em)
+}
+
+.btn--lg {
+ font-size: 1.4em;
+ font-size: var(--btn-font-size-lg, 1.4em)
+}
+
+.btn--icon {
+ padding: 0.5em;
+ padding: var(--btn-padding-y, 0.5em)
+}
+
+.form-control {
+ background-color: hsl(0, 0%, 100%);
+ background-color: var(--color-bg, #f2f2f2);
+ padding-top: 0.5em;
+ padding-top: var(--form-control-padding-y, 0.5em);
+ padding-bottom: 0.5em;
+ padding-bottom: var(--form-control-padding-y, 0.5em);
+ padding-left: 0.75em;
+ padding-left: var(--form-control-padding-x, 0.75em);
+ padding-right: 0.75em;
+ padding-right: var(--form-control-padding-x, 0.75em);
+ border-radius: 0.25em;
+ border-radius: var(--form-control-radius, 0.25em)
+}
+
+.form-control::-webkit-input-placeholder {
+ color: hsl(240, 1%, 48%);
+ color: var(--color-contrast-medium, #79797c)
+}
+
+.form-control::-moz-placeholder {
+ opacity: 1;
+ color: hsl(240, 1%, 48%);
+ color: var(--color-contrast-medium, #79797c)
+}
+
+.form-control:-ms-input-placeholder {
+ color: hsl(240, 1%, 48%);
+ color: var(--color-contrast-medium, #79797c)
+}
+
+.form-control:-moz-placeholder {
+ color: hsl(240, 1%, 48%);
+ color: var(--color-contrast-medium, #79797c)
+}
+
+.form-control[disabled], .form-control[readonly] {
+ cursor: not-allowed
+}
+
+.form-legend {
+ color: hsl(240, 8%, 12%);
+ color: var(--color-contrast-higher, #1c1c21);
+ line-height: 1.2;
+ font-size: 1.2em;
+ font-size: var(--text-md, 1.2em);
+ margin-bottom: 0.375em;
+ margin-bottom: var(--space-xxs)
+}
+
+.form-label {
+ display: inline-block
+}
+
+.form__msg-error {
+ background-color: hsl(355, 90%, 61%);
+ background-color: var(--color-error, #f54251);
+ color: hsl(0, 0%, 100%);
+ color: var(--color-white, #fff);
+ font-size: 0.83333em;
+ font-size: var(--text-sm, 0.833em);
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ padding: 0.5em;
+ padding: var(--space-xs);
+ margin-top: 0.75em;
+ margin-top: var(--space-sm);
+ border-radius: 0.25em;
+ border-radius: var(--radius-md, 0.25em);
+ position: absolute;
+ clip: rect(1px, 1px, 1px, 1px)
+}
+
+.form__msg-error::before {
+ content: '';
+ position: absolute;
+ left: 0.75em;
+ left: var(--space-sm);
+ top: 0;
+ -webkit-transform: translateY(-100%);
+ -ms-transform: translateY(-100%);
+ transform: translateY(-100%);
+ width: 0;
+ height: 0;
+ border: 8px solid transparent;
+ border-bottom-color: hsl(355, 90%, 61%);
+ border-bottom-color: var(--color-error)
+}
+
+.form__msg-error--is-visible {
+ position: relative;
+ clip: auto
+}
+
+.radio-list>*, .checkbox-list>* {
+ position: relative;
+ display: -ms-flexbox;
+ display: flex;
+ -ms-flex-align: baseline;
+ align-items: baseline;
+ margin-bottom: 0.375em;
+ margin-bottom: var(--space-xxs)
+}
+
+.radio-list>*:last-of-type, .checkbox-list>*:last-of-type {
+ margin-bottom: 0
+}
+
+.radio-list label, .checkbox-list label {
+ line-height: 1.4;
+ line-height: var(--body-line-height);
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none
+}
+
+.radio-list input, .checkbox-list input {
+ vertical-align: top;
+ margin-right: 0.25em;
+ margin-right: var(--space-xxxs);
+ -ms-flex-negative: 0;
+ flex-shrink: 0
+}
+
+:root {
+ --zindex-header: 2;
+ --zindex-popover: 5;
+ --zindex-fixed-element: 10;
+ --zindex-overlay: 15
+}
+
+@media not all and (min-width: 32rem) {
+ .display\@xs {
+ display: none !important
+ }
+}
+
+@media (min-width: 32rem) {
+ .hide\@xs {
+ display: none !important
+ }
+}
+
+@media not all and (min-width: 48rem) {
+ .display\@sm {
+ display: none !important
+ }
+}
+
+@media (min-width: 48rem) {
+ .hide\@sm {
+ display: none !important
+ }
+}
+
+@media not all and (min-width: 64rem) {
+ .display\@md {
+ display: none !important
+ }
+}
+
+@media (min-width: 64rem) {
+ .hide\@md {
+ display: none !important
+ }
+}
+
+@media not all and (min-width: 80rem) {
+ .display\@lg {
+ display: none !important
+ }
+}
+
+@media (min-width: 80rem) {
+ .hide\@lg {
+ display: none !important
+ }
+}
+
+@media not all and (min-width: 90rem) {
+ .display\@xl {
+ display: none !important
+ }
+}
+
+@media (min-width: 90rem) {
+ .hide\@xl {
+ display: none !important
+ }
+}
+
+:root {
+ --display: block
+}
+
+.is-visible {
+ display: block !important;
+ display: var(--display) !important
+}
+
+.is-hidden {
+ display: none !important
+}
+
+.sr-only {
+ position: absolute;
+ clip: rect(1px, 1px, 1px, 1px);
+ -webkit-clip-path: inset(50%);
+ clip-path: inset(50%);
+ width: 1px;
+ height: 1px;
+ overflow: hidden;
+ padding: 0;
+ border: 0;
+ white-space: nowrap
+}
+
+.flex {
+ display: -ms-flexbox;
+ display: flex
+}
+
+.inline-flex {
+ display: -ms-inline-flexbox;
+ display: inline-flex
+}
+
+.flex-wrap {
+ -ms-flex-wrap: wrap;
+ flex-wrap: wrap
+}
+
+.flex-column {
+ -ms-flex-direction: column;
+ flex-direction: column
+}
+
+.flex-row {
+ -ms-flex-direction: row;
+ flex-direction: row
+}
+
+.flex-center {
+ -ms-flex-pack: center;
+ justify-content: center;
+ -ms-flex-align: center;
+ align-items: center
+}
+
+.justify-start {
+ -ms-flex-pack: start;
+ justify-content: flex-start
+}
+
+.justify-end {
+ -ms-flex-pack: end;
+ justify-content: flex-end
+}
+
+.justify-center {
+ -ms-flex-pack: center;
+ justify-content: center
+}
+
+.justify-between {
+ -ms-flex-pack: justify;
+ justify-content: space-between
+}
+
+.items-center {
+ -ms-flex-align: center;
+ align-items: center
+}
+
+.items-start {
+ -ms-flex-align: start;
+ align-items: flex-start
+}
+
+.items-end {
+ -ms-flex-align: end;
+ align-items: flex-end
+}
+
+@media (min-width: 32rem) {
+ .flex-wrap\@xs {
+ -ms-flex-wrap: wrap;
+ flex-wrap: wrap
+ }
+ .flex-column\@xs {
+ -ms-flex-direction: column;
+ flex-direction: column
+ }
+ .flex-row\@xs {
+ -ms-flex-direction: row;
+ flex-direction: row
+ }
+ .flex-center\@xs {
+ -ms-flex-pack: center;
+ justify-content: center;
+ -ms-flex-align: center;
+ align-items: center
+ }
+ .justify-start\@xs {
+ -ms-flex-pack: start;
+ justify-content: flex-start
+ }
+ .justify-end\@xs {
+ -ms-flex-pack: end;
+ justify-content: flex-end
+ }
+ .justify-center\@xs {
+ -ms-flex-pack: center;
+ justify-content: center
+ }
+ .justify-between\@xs {
+ -ms-flex-pack: justify;
+ justify-content: space-between
+ }
+ .items-center\@xs {
+ -ms-flex-align: center;
+ align-items: center
+ }
+ .items-start\@xs {
+ -ms-flex-align: start;
+ align-items: flex-start
+ }
+ .items-end\@xs {
+ -ms-flex-align: end;
+ align-items: flex-end
+ }
+}
+
+@media (min-width: 48rem) {
+ .flex-wrap\@sm {
+ -ms-flex-wrap: wrap;
+ flex-wrap: wrap
+ }
+ .flex-column\@sm {
+ -ms-flex-direction: column;
+ flex-direction: column
+ }
+ .flex-row\@sm {
+ -ms-flex-direction: row;
+ flex-direction: row
+ }
+ .flex-center\@sm {
+ -ms-flex-pack: center;
+ justify-content: center;
+ -ms-flex-align: center;
+ align-items: center
+ }
+ .justify-start\@sm {
+ -ms-flex-pack: start;
+ justify-content: flex-start
+ }
+ .justify-end\@sm {
+ -ms-flex-pack: end;
+ justify-content: flex-end
+ }
+ .justify-center\@sm {
+ -ms-flex-pack: center;
+ justify-content: center
+ }
+ .justify-between\@sm {
+ -ms-flex-pack: justify;
+ justify-content: space-between
+ }
+ .items-center\@sm {
+ -ms-flex-align: center;
+ align-items: center
+ }
+ .items-start\@sm {
+ -ms-flex-align: start;
+ align-items: flex-start
+ }
+ .items-end\@sm {
+ -ms-flex-align: end;
+ align-items: flex-end
+ }
+}
+
+@media (min-width: 64rem) {
+ .flex-wrap\@md {
+ -ms-flex-wrap: wrap;
+ flex-wrap: wrap
+ }
+ .flex-column\@md {
+ -ms-flex-direction: column;
+ flex-direction: column
+ }
+ .flex-row\@md {
+ -ms-flex-direction: row;
+ flex-direction: row
+ }
+ .flex-center\@md {
+ -ms-flex-pack: center;
+ justify-content: center;
+ -ms-flex-align: center;
+ align-items: center
+ }
+ .justify-start\@md {
+ -ms-flex-pack: start;
+ justify-content: flex-start
+ }
+ .justify-end\@md {
+ -ms-flex-pack: end;
+ justify-content: flex-end
+ }
+ .justify-center\@md {
+ -ms-flex-pack: center;
+ justify-content: center
+ }
+ .justify-between\@md {
+ -ms-flex-pack: justify;
+ justify-content: space-between
+ }
+ .items-center\@md {
+ -ms-flex-align: center;
+ align-items: center
+ }
+ .items-start\@md {
+ -ms-flex-align: start;
+ align-items: flex-start
+ }
+ .items-end\@md {
+ -ms-flex-align: end;
+ align-items: flex-end
+ }
+}
+
+@media (min-width: 80rem) {
+ .flex-wrap\@lg {
+ -ms-flex-wrap: wrap;
+ flex-wrap: wrap
+ }
+ .flex-column\@lg {
+ -ms-flex-direction: column;
+ flex-direction: column
+ }
+ .flex-row\@lg {
+ -ms-flex-direction: row;
+ flex-direction: row
+ }
+ .flex-center\@lg {
+ -ms-flex-pack: center;
+ justify-content: center;
+ -ms-flex-align: center;
+ align-items: center
+ }
+ .justify-start\@lg {
+ -ms-flex-pack: start;
+ justify-content: flex-start
+ }
+ .justify-end\@lg {
+ -ms-flex-pack: end;
+ justify-content: flex-end
+ }
+ .justify-center\@lg {
+ -ms-flex-pack: center;
+ justify-content: center
+ }
+ .justify-between\@lg {
+ -ms-flex-pack: justify;
+ justify-content: space-between
+ }
+ .items-center\@lg {
+ -ms-flex-align: center;
+ align-items: center
+ }
+ .items-start\@lg {
+ -ms-flex-align: start;
+ align-items: flex-start
+ }
+ .items-end\@lg {
+ -ms-flex-align: end;
+ align-items: flex-end
+ }
+}
+
+@media (min-width: 90rem) {
+ .flex-wrap\@xl {
+ -ms-flex-wrap: wrap;
+ flex-wrap: wrap
+ }
+ .flex-column\@xl {
+ -ms-flex-direction: column;
+ flex-direction: column
+ }
+ .flex-row\@xl {
+ -ms-flex-direction: row;
+ flex-direction: row
+ }
+ .flex-center\@xl {
+ -ms-flex-pack: center;
+ justify-content: center;
+ -ms-flex-align: center;
+ align-items: center
+ }
+ .justify-start\@xl {
+ -ms-flex-pack: start;
+ justify-content: flex-start
+ }
+ .justify-end\@xl {
+ -ms-flex-pack: end;
+ justify-content: flex-end
+ }
+ .justify-center\@xl {
+ -ms-flex-pack: center;
+ justify-content: center
+ }
+ .justify-between\@xl {
+ -ms-flex-pack: justify;
+ justify-content: space-between
+ }
+ .items-center\@xl {
+ -ms-flex-align: center;
+ align-items: center
+ }
+ .items-start\@xl {
+ -ms-flex-align: start;
+ align-items: flex-start
+ }
+ .items-end\@xl {
+ -ms-flex-align: end;
+ align-items: flex-end
+ }
+}
+
+.flex-grow {
+ -ms-flex-positive: 1;
+ flex-grow: 1
+}
+
+.flex-shrink-0 {
+ -ms-flex-negative: 0;
+ flex-shrink: 0
+}
+
+.flex-gap-xxxs {
+ margin-bottom: -0.25em;
+ margin-bottom: calc(-1*var(--space-xxxs));
+ margin-right: -0.25em;
+ margin-right: calc(-1*var(--space-xxxs))
+}
+
+.flex-gap-xxxs>* {
+ margin-bottom: 0.25em;
+ margin-bottom: var(--space-xxxs);
+ margin-right: 0.25em;
+ margin-right: var(--space-xxxs)
+}
+
+.flex-gap-xxs {
+ margin-bottom: -0.375em;
+ margin-bottom: calc(-1*var(--space-xxs));
+ margin-right: -0.375em;
+ margin-right: calc(-1*var(--space-xxs))
+}
+
+.flex-gap-xxs>* {
+ margin-bottom: 0.375em;
+ margin-bottom: var(--space-xxs);
+ margin-right: 0.375em;
+ margin-right: var(--space-xxs)
+}
+
+.flex-gap-xs {
+ margin-bottom: -0.5em;
+ margin-bottom: calc(-1*var(--space-xs));
+ margin-right: -0.5em;
+ margin-right: calc(-1*var(--space-xs))
+}
+
+.flex-gap-xs>* {
+ margin-bottom: 0.5em;
+ margin-bottom: var(--space-xs);
+ margin-right: 0.5em;
+ margin-right: var(--space-xs)
+}
+
+.flex-gap-sm {
+ margin-bottom: -0.75em;
+ margin-bottom: calc(-1*var(--space-sm));
+ margin-right: -0.75em;
+ margin-right: calc(-1*var(--space-sm))
+}
+
+.flex-gap-sm>* {
+ margin-bottom: 0.75em;
+ margin-bottom: var(--space-sm);
+ margin-right: 0.75em;
+ margin-right: var(--space-sm)
+}
+
+.flex-gap-md {
+ margin-bottom: -1.25em;
+ margin-bottom: calc(-1*var(--space-md));
+ margin-right: -1.25em;
+ margin-right: calc(-1*var(--space-md))
+}
+
+.flex-gap-md>* {
+ margin-bottom: 1.25em;
+ margin-bottom: var(--space-md);
+ margin-right: 1.25em;
+ margin-right: var(--space-md)
+}
+
+.flex-gap-lg {
+ margin-bottom: -2em;
+ margin-bottom: calc(-1*var(--space-lg));
+ margin-right: -2em;
+ margin-right: calc(-1*var(--space-lg))
+}
+
+.flex-gap-lg>* {
+ margin-bottom: 2em;
+ margin-bottom: var(--space-lg);
+ margin-right: 2em;
+ margin-right: var(--space-lg)
+}
+
+.flex-gap-xl {
+ margin-bottom: -3.25em;
+ margin-bottom: calc(-1*var(--space-xl));
+ margin-right: -3.25em;
+ margin-right: calc(-1*var(--space-xl))
+}
+
+.flex-gap-xl>* {
+ margin-bottom: 3.25em;
+ margin-bottom: var(--space-xl);
+ margin-right: 3.25em;
+ margin-right: var(--space-xl)
+}
+
+.flex-gap-xxl {
+ margin-bottom: -5.25em;
+ margin-bottom: calc(-1*var(--space-xxl));
+ margin-right: -5.25em;
+ margin-right: calc(-1*var(--space-xxl))
+}
+
+.flex-gap-xxl>* {
+ margin-bottom: 5.25em;
+ margin-bottom: var(--space-xxl);
+ margin-right: 5.25em;
+ margin-right: var(--space-xxl)
+}
+
+.margin-xxxxs {
+ margin: 0.125em;
+ margin: var(--space-xxxxs)
+}
+
+.margin-xxxs {
+ margin: 0.25em;
+ margin: var(--space-xxxs)
+}
+
+.margin-xxs {
+ margin: 0.375em;
+ margin: var(--space-xxs)
+}
+
+.margin-xs {
+ margin: 0.5em;
+ margin: var(--space-xs)
+}
+
+.margin-sm {
+ margin: 0.75em;
+ margin: var(--space-sm)
+}
+
+.margin-md {
+ margin: 1.25em;
+ margin: var(--space-md)
+}
+
+.margin-lg {
+ margin: 2em;
+ margin: var(--space-lg)
+}
+
+.margin-xl {
+ margin: 3.25em;
+ margin: var(--space-xl)
+}
+
+.margin-xxl {
+ margin: 5.25em;
+ margin: var(--space-xxl)
+}
+
+.margin-xxxl {
+ margin: 8.5em;
+ margin: var(--space-xxxl)
+}
+
+.margin-xxxxl {
+ margin: 13.75em;
+ margin: var(--space-xxxxl)
+}
+
+.margin-auto {
+ margin: auto
+}
+
+.margin-top-xxxxs {
+ margin-top: 0.125em;
+ margin-top: var(--space-xxxxs)
+}
+
+.margin-top-xxxs {
+ margin-top: 0.25em;
+ margin-top: var(--space-xxxs)
+}
+
+.margin-top-xxs {
+ margin-top: 0.375em;
+ margin-top: var(--space-xxs)
+}
+
+.margin-top-xs {
+ margin-top: 0.5em;
+ margin-top: var(--space-xs)
+}
+
+.margin-top-sm {
+ margin-top: 0.75em;
+ margin-top: var(--space-sm)
+}
+
+.margin-top-md {
+ margin-top: 1.25em;
+ margin-top: var(--space-md)
+}
+
+.margin-top-lg {
+ margin-top: 2em;
+ margin-top: var(--space-lg)
+}
+
+.margin-top-xl {
+ margin-top: 3.25em;
+ margin-top: var(--space-xl)
+}
+
+.margin-top-xxl {
+ margin-top: 5.25em;
+ margin-top: var(--space-xxl)
+}
+
+.margin-top-xxxl {
+ margin-top: 8.5em;
+ margin-top: var(--space-xxxl)
+}
+
+.margin-top-xxxxl {
+ margin-top: 13.75em;
+ margin-top: var(--space-xxxxl)
+}
+
+.margin-top-auto {
+ margin-top: auto
+}
+
+.margin-bottom-xxxxs {
+ margin-bottom: 0.125em;
+ margin-bottom: var(--space-xxxxs)
+}
+
+.margin-bottom-xxxs {
+ margin-bottom: 0.25em;
+ margin-bottom: var(--space-xxxs)
+}
+
+.margin-bottom-xxs {
+ margin-bottom: 0.375em;
+ margin-bottom: var(--space-xxs)
+}
+
+.margin-bottom-xs {
+ margin-bottom: 0.5em;
+ margin-bottom: var(--space-xs)
+}
+
+.margin-bottom-sm {
+ margin-bottom: 0.75em;
+ margin-bottom: var(--space-sm)
+}
+
+.margin-bottom-md {
+ margin-bottom: 1.25em;
+ margin-bottom: var(--space-md)
+}
+
+.margin-bottom-lg {
+ margin-bottom: 2em;
+ margin-bottom: var(--space-lg)
+}
+
+.margin-bottom-xl {
+ margin-bottom: 3.25em;
+ margin-bottom: var(--space-xl)
+}
+
+.margin-bottom-xxl {
+ margin-bottom: 5.25em;
+ margin-bottom: var(--space-xxl)
+}
+
+.margin-bottom-xxxl {
+ margin-bottom: 8.5em;
+ margin-bottom: var(--space-xxxl)
+}
+
+.margin-bottom-xxxxl {
+ margin-bottom: 13.75em;
+ margin-bottom: var(--space-xxxxl)
+}
+
+.margin-bottom-auto {
+ margin-bottom: auto
+}
+
+.margin-right-xxxxs {
+ margin-right: 0.125em;
+ margin-right: var(--space-xxxxs)
+}
+
+.margin-right-xxxs {
+ margin-right: 0.25em;
+ margin-right: var(--space-xxxs)
+}
+
+.margin-right-xxs {
+ margin-right: 0.375em;
+ margin-right: var(--space-xxs)
+}
+
+.margin-right-xs {
+ margin-right: 0.5em;
+ margin-right: var(--space-xs)
+}
+
+.margin-right-sm {
+ margin-right: 0.75em;
+ margin-right: var(--space-sm)
+}
+
+.margin-right-md {
+ margin-right: 1.25em;
+ margin-right: var(--space-md)
+}
+
+.margin-right-lg {
+ margin-right: 2em;
+ margin-right: var(--space-lg)
+}
+
+.margin-right-xl {
+ margin-right: 3.25em;
+ margin-right: var(--space-xl)
+}
+
+.margin-right-xxl {
+ margin-right: 5.25em;
+ margin-right: var(--space-xxl)
+}
+
+.margin-right-xxxl {
+ margin-right: 8.5em;
+ margin-right: var(--space-xxxl)
+}
+
+.margin-right-xxxxl {
+ margin-right: 13.75em;
+ margin-right: var(--space-xxxxl)
+}
+
+.margin-right-auto {
+ margin-right: auto
+}
+
+.margin-left-xxxxs {
+ margin-left: 0.125em;
+ margin-left: var(--space-xxxxs)
+}
+
+.margin-left-xxxs {
+ margin-left: 0.25em;
+ margin-left: var(--space-xxxs)
+}
+
+.margin-left-xxs {
+ margin-left: 0.375em;
+ margin-left: var(--space-xxs)
+}
+
+.margin-left-xs {
+ margin-left: 0.5em;
+ margin-left: var(--space-xs)
+}
+
+.margin-left-sm {
+ margin-left: 0.75em;
+ margin-left: var(--space-sm)
+}
+
+.margin-left-md {
+ margin-left: 1.25em;
+ margin-left: var(--space-md)
+}
+
+.margin-left-lg {
+ margin-left: 2em;
+ margin-left: var(--space-lg)
+}
+
+.margin-left-xl {
+ margin-left: 3.25em;
+ margin-left: var(--space-xl)
+}
+
+.margin-left-xxl {
+ margin-left: 5.25em;
+ margin-left: var(--space-xxl)
+}
+
+.margin-left-xxxl {
+ margin-left: 8.5em;
+ margin-left: var(--space-xxxl)
+}
+
+.margin-left-xxxxl {
+ margin-left: 13.75em;
+ margin-left: var(--space-xxxxl)
+}
+
+.margin-left-auto {
+ margin-left: auto
+}
+
+.margin-x-xxxxs {
+ margin-left: 0.125em;
+ margin-left: var(--space-xxxxs);
+ margin-right: 0.125em;
+ margin-right: var(--space-xxxxs)
+}
+
+.margin-x-xxxs {
+ margin-left: 0.25em;
+ margin-left: var(--space-xxxs);
+ margin-right: 0.25em;
+ margin-right: var(--space-xxxs)
+}
+
+.margin-x-xxs {
+ margin-left: 0.375em;
+ margin-left: var(--space-xxs);
+ margin-right: 0.375em;
+ margin-right: var(--space-xxs)
+}
+
+.margin-x-xs {
+ margin-left: 0.5em;
+ margin-left: var(--space-xs);
+ margin-right: 0.5em;
+ margin-right: var(--space-xs)
+}
+
+.margin-x-sm {
+ margin-left: 0.75em;
+ margin-left: var(--space-sm);
+ margin-right: 0.75em;
+ margin-right: var(--space-sm)
+}
+
+.margin-x-md {
+ margin-left: 1.25em;
+ margin-left: var(--space-md);
+ margin-right: 1.25em;
+ margin-right: var(--space-md)
+}
+
+.margin-x-lg {
+ margin-left: 2em;
+ margin-left: var(--space-lg);
+ margin-right: 2em;
+ margin-right: var(--space-lg)
+}
+
+.margin-x-xl {
+ margin-left: 3.25em;
+ margin-left: var(--space-xl);
+ margin-right: 3.25em;
+ margin-right: var(--space-xl)
+}
+
+.margin-x-xxl {
+ margin-left: 5.25em;
+ margin-left: var(--space-xxl);
+ margin-right: 5.25em;
+ margin-right: var(--space-xxl)
+}
+
+.margin-x-xxxl {
+ margin-left: 8.5em;
+ margin-left: var(--space-xxxl);
+ margin-right: 8.5em;
+ margin-right: var(--space-xxxl)
+}
+
+.margin-x-xxxxl {
+ margin-left: 13.75em;
+ margin-left: var(--space-xxxxl);
+ margin-right: 13.75em;
+ margin-right: var(--space-xxxxl)
+}
+
+.margin-x-auto {
+ margin-left: auto;
+ margin-right: auto
+}
+
+.margin-y-xxxxs {
+ margin-top: 0.125em;
+ margin-top: var(--space-xxxxs);
+ margin-bottom: 0.125em;
+ margin-bottom: var(--space-xxxxs)
+}
+
+.margin-y-xxxs {
+ margin-top: 0.25em;
+ margin-top: var(--space-xxxs);
+ margin-bottom: 0.25em;
+ margin-bottom: var(--space-xxxs)
+}
+
+.margin-y-xxs {
+ margin-top: 0.375em;
+ margin-top: var(--space-xxs);
+ margin-bottom: 0.375em;
+ margin-bottom: var(--space-xxs)
+}
+
+.margin-y-xs {
+ margin-top: 0.5em;
+ margin-top: var(--space-xs);
+ margin-bottom: 0.5em;
+ margin-bottom: var(--space-xs)
+}
+
+.margin-y-sm {
+ margin-top: 0.75em;
+ margin-top: var(--space-sm);
+ margin-bottom: 0.75em;
+ margin-bottom: var(--space-sm)
+}
+
+.margin-y-md {
+ margin-top: 1.25em;
+ margin-top: var(--space-md);
+ margin-bottom: 1.25em;
+ margin-bottom: var(--space-md)
+}
+
+.margin-y-lg {
+ margin-top: 2em;
+ margin-top: var(--space-lg);
+ margin-bottom: 2em;
+ margin-bottom: var(--space-lg)
+}
+
+.margin-y-xl {
+ margin-top: 3.25em;
+ margin-top: var(--space-xl);
+ margin-bottom: 3.25em;
+ margin-bottom: var(--space-xl)
+}
+
+.margin-y-xxl {
+ margin-top: 5.25em;
+ margin-top: var(--space-xxl);
+ margin-bottom: 5.25em;
+ margin-bottom: var(--space-xxl)
+}
+
+.margin-y-xxxl {
+ margin-top: 8.5em;
+ margin-top: var(--space-xxxl);
+ margin-bottom: 8.5em;
+ margin-bottom: var(--space-xxxl)
+}
+
+.margin-y-xxxxl {
+ margin-top: 13.75em;
+ margin-top: var(--space-xxxxl);
+ margin-bottom: 13.75em;
+ margin-bottom: var(--space-xxxxl)
+}
+
+.margin-y-auto {
+ margin-top: auto;
+ margin-bottom: auto
+}
+
+@media not all and (min-width: 32rem) {
+ .has-margin\@xs {
+ margin: 0 !important
+ }
+}
+
+@media not all and (min-width: 48rem) {
+ .has-margin\@sm {
+ margin: 0 !important
+ }
+}
+
+@media not all and (min-width: 64rem) {
+ .has-margin\@md {
+ margin: 0 !important
+ }
+}
+
+@media not all and (min-width: 80rem) {
+ .has-margin\@lg {
+ margin: 0 !important
+ }
+}
+
+@media not all and (min-width: 90rem) {
+ .has-margin\@xl {
+ margin: 0 !important
+ }
+}
+
+.padding-md {
+ padding: 1.25em;
+ padding: var(--space-md)
+}
+
+.padding-xxxxs {
+ padding: 0.125em;
+ padding: var(--space-xxxxs)
+}
+
+.padding-xxxs {
+ padding: 0.25em;
+ padding: var(--space-xxxs)
+}
+
+.padding-xxs {
+ padding: 0.375em;
+ padding: var(--space-xxs)
+}
+
+.padding-xs {
+ padding: 0.5em;
+ padding: var(--space-xs)
+}
+
+.padding-sm {
+ padding: 0.75em;
+ padding: var(--space-sm)
+}
+
+.padding-lg {
+ padding: 2em;
+ padding: var(--space-lg)
+}
+
+.padding-xl {
+ padding: 3.25em;
+ padding: var(--space-xl)
+}
+
+.padding-xxl {
+ padding: 5.25em;
+ padding: var(--space-xxl)
+}
+
+.padding-xxxl {
+ padding: 8.5em;
+ padding: var(--space-xxxl)
+}
+
+.padding-xxxxl {
+ padding: 13.75em;
+ padding: var(--space-xxxxl)
+}
+
+.padding-component {
+ padding: 1.25em;
+ padding: var(--component-padding)
+}
+
+.padding-top-md {
+ padding-top: 1.25em;
+ padding-top: var(--space-md)
+}
+
+.padding-top-xxxxs {
+ padding-top: 0.125em;
+ padding-top: var(--space-xxxxs)
+}
+
+.padding-top-xxxs {
+ padding-top: 0.25em;
+ padding-top: var(--space-xxxs)
+}
+
+.padding-top-xxs {
+ padding-top: 0.375em;
+ padding-top: var(--space-xxs)
+}
+
+.padding-top-xs {
+ padding-top: 0.5em;
+ padding-top: var(--space-xs)
+}
+
+.padding-top-sm {
+ padding-top: 0.75em;
+ padding-top: var(--space-sm)
+}
+
+.padding-top-lg {
+ padding-top: 2em;
+ padding-top: var(--space-lg)
+}
+
+.padding-top-xl {
+ padding-top: 3.25em;
+ padding-top: var(--space-xl)
+}
+
+.padding-top-xxl {
+ padding-top: 5.25em;
+ padding-top: var(--space-xxl)
+}
+
+.padding-top-xxxl {
+ padding-top: 8.5em;
+ padding-top: var(--space-xxxl)
+}
+
+.padding-top-xxxxl {
+ padding-top: 13.75em;
+ padding-top: var(--space-xxxxl)
+}
+
+.padding-top-component {
+ padding-top: 1.25em;
+ padding-top: var(--component-padding)
+}
+
+.padding-bottom-md {
+ padding-bottom: 1.25em;
+ padding-bottom: var(--space-md)
+}
+
+.padding-bottom-xxxxs {
+ padding-bottom: 0.125em;
+ padding-bottom: var(--space-xxxxs)
+}
+
+.padding-bottom-xxxs {
+ padding-bottom: 0.25em;
+ padding-bottom: var(--space-xxxs)
+}
+
+.padding-bottom-xxs {
+ padding-bottom: 0.375em;
+ padding-bottom: var(--space-xxs)
+}
+
+.padding-bottom-xs {
+ padding-bottom: 0.5em;
+ padding-bottom: var(--space-xs)
+}
+
+.padding-bottom-sm {
+ padding-bottom: 0.75em;
+ padding-bottom: var(--space-sm)
+}
+
+.padding-bottom-lg {
+ padding-bottom: 2em;
+ padding-bottom: var(--space-lg)
+}
+
+.padding-bottom-xl {
+ padding-bottom: 3.25em;
+ padding-bottom: var(--space-xl)
+}
+
+.padding-bottom-xxl {
+ padding-bottom: 5.25em;
+ padding-bottom: var(--space-xxl)
+}
+
+.padding-bottom-xxxl {
+ padding-bottom: 8.5em;
+ padding-bottom: var(--space-xxxl)
+}
+
+.padding-bottom-xxxxl {
+ padding-bottom: 13.75em;
+ padding-bottom: var(--space-xxxxl)
+}
+
+.padding-bottom-component {
+ padding-bottom: 1.25em;
+ padding-bottom: var(--component-padding)
+}
+
+.padding-right-md {
+ padding-right: 1.25em;
+ padding-right: var(--space-md)
+}
+
+.padding-right-xxxxs {
+ padding-right: 0.125em;
+ padding-right: var(--space-xxxxs)
+}
+
+.padding-right-xxxs {
+ padding-right: 0.25em;
+ padding-right: var(--space-xxxs)
+}
+
+.padding-right-xxs {
+ padding-right: 0.375em;
+ padding-right: var(--space-xxs)
+}
+
+.padding-right-xs {
+ padding-right: 0.5em;
+ padding-right: var(--space-xs)
+}
+
+.padding-right-sm {
+ padding-right: 0.75em;
+ padding-right: var(--space-sm)
+}
+
+.padding-right-lg {
+ padding-right: 2em;
+ padding-right: var(--space-lg)
+}
+
+.padding-right-xl {
+ padding-right: 3.25em;
+ padding-right: var(--space-xl)
+}
+
+.padding-right-xxl {
+ padding-right: 5.25em;
+ padding-right: var(--space-xxl)
+}
+
+.padding-right-xxxl {
+ padding-right: 8.5em;
+ padding-right: var(--space-xxxl)
+}
+
+.padding-right-xxxxl {
+ padding-right: 13.75em;
+ padding-right: var(--space-xxxxl)
+}
+
+.padding-right-component {
+ padding-right: 1.25em;
+ padding-right: var(--component-padding)
+}
+
+.padding-left-md {
+ padding-left: 1.25em;
+ padding-left: var(--space-md)
+}
+
+.padding-left-xxxxs {
+ padding-left: 0.125em;
+ padding-left: var(--space-xxxxs)
+}
+
+.padding-left-xxxs {
+ padding-left: 0.25em;
+ padding-left: var(--space-xxxs)
+}
+
+.padding-left-xxs {
+ padding-left: 0.375em;
+ padding-left: var(--space-xxs)
+}
+
+.padding-left-xs {
+ padding-left: 0.5em;
+ padding-left: var(--space-xs)
+}
+
+.padding-left-sm {
+ padding-left: 0.75em;
+ padding-left: var(--space-sm)
+}
+
+.padding-left-lg {
+ padding-left: 2em;
+ padding-left: var(--space-lg)
+}
+
+.padding-left-xl {
+ padding-left: 3.25em;
+ padding-left: var(--space-xl)
+}
+
+.padding-left-xxl {
+ padding-left: 5.25em;
+ padding-left: var(--space-xxl)
+}
+
+.padding-left-xxxl {
+ padding-left: 8.5em;
+ padding-left: var(--space-xxxl)
+}
+
+.padding-left-xxxxl {
+ padding-left: 13.75em;
+ padding-left: var(--space-xxxxl)
+}
+
+.padding-left-component {
+ padding-left: 1.25em;
+ padding-left: var(--component-padding)
+}
+
+.padding-x-md {
+ padding-left: 1.25em;
+ padding-left: var(--space-md);
+ padding-right: 1.25em;
+ padding-right: var(--space-md)
+}
+
+.padding-x-xxxxs {
+ padding-left: 0.125em;
+ padding-left: var(--space-xxxxs);
+ padding-right: 0.125em;
+ padding-right: var(--space-xxxxs)
+}
+
+.padding-x-xxxs {
+ padding-left: 0.25em;
+ padding-left: var(--space-xxxs);
+ padding-right: 0.25em;
+ padding-right: var(--space-xxxs)
+}
+
+.padding-x-xxs {
+ padding-left: 0.375em;
+ padding-left: var(--space-xxs);
+ padding-right: 0.375em;
+ padding-right: var(--space-xxs)
+}
+
+.padding-x-xs {
+ padding-left: 0.5em;
+ padding-left: var(--space-xs);
+ padding-right: 0.5em;
+ padding-right: var(--space-xs)
+}
+
+.padding-x-sm {
+ padding-left: 0.75em;
+ padding-left: var(--space-sm);
+ padding-right: 0.75em;
+ padding-right: var(--space-sm)
+}
+
+.padding-x-lg {
+ padding-left: 2em;
+ padding-left: var(--space-lg);
+ padding-right: 2em;
+ padding-right: var(--space-lg)
+}
+
+.padding-x-xl {
+ padding-left: 3.25em;
+ padding-left: var(--space-xl);
+ padding-right: 3.25em;
+ padding-right: var(--space-xl)
+}
+
+.padding-x-xxl {
+ padding-left: 5.25em;
+ padding-left: var(--space-xxl);
+ padding-right: 5.25em;
+ padding-right: var(--space-xxl)
+}
+
+.padding-x-xxxl {
+ padding-left: 8.5em;
+ padding-left: var(--space-xxxl);
+ padding-right: 8.5em;
+ padding-right: var(--space-xxxl)
+}
+
+.padding-x-xxxxl {
+ padding-left: 13.75em;
+ padding-left: var(--space-xxxxl);
+ padding-right: 13.75em;
+ padding-right: var(--space-xxxxl)
+}
+
+.padding-x-component {
+ padding-left: 1.25em;
+ padding-left: var(--component-padding);
+ padding-right: 1.25em;
+ padding-right: var(--component-padding)
+}
+
+.padding-y-md {
+ padding-top: 1.25em;
+ padding-top: var(--space-md);
+ padding-bottom: 1.25em;
+ padding-bottom: var(--space-md)
+}
+
+.padding-y-xxxxs {
+ padding-top: 0.125em;
+ padding-top: var(--space-xxxxs);
+ padding-bottom: 0.125em;
+ padding-bottom: var(--space-xxxxs)
+}
+
+.padding-y-xxxs {
+ padding-top: 0.25em;
+ padding-top: var(--space-xxxs);
+ padding-bottom: 0.25em;
+ padding-bottom: var(--space-xxxs)
+}
+
+.padding-y-xxs {
+ padding-top: 0.375em;
+ padding-top: var(--space-xxs);
+ padding-bottom: 0.375em;
+ padding-bottom: var(--space-xxs)
+}
+
+.padding-y-xs {
+ padding-top: 0.5em;
+ padding-top: var(--space-xs);
+ padding-bottom: 0.5em;
+ padding-bottom: var(--space-xs)
+}
+
+.padding-y-sm {
+ padding-top: 0.75em;
+ padding-top: var(--space-sm);
+ padding-bottom: 0.75em;
+ padding-bottom: var(--space-sm)
+}
+
+.padding-y-lg {
+ padding-top: 2em;
+ padding-top: var(--space-lg);
+ padding-bottom: 2em;
+ padding-bottom: var(--space-lg)
+}
+
+.padding-y-xl {
+ padding-top: 3.25em;
+ padding-top: var(--space-xl);
+ padding-bottom: 3.25em;
+ padding-bottom: var(--space-xl)
+}
+
+.padding-y-xxl {
+ padding-top: 5.25em;
+ padding-top: var(--space-xxl);
+ padding-bottom: 5.25em;
+ padding-bottom: var(--space-xxl)
+}
+
+.padding-y-xxxl {
+ padding-top: 8.5em;
+ padding-top: var(--space-xxxl);
+ padding-bottom: 8.5em;
+ padding-bottom: var(--space-xxxl)
+}
+
+.padding-y-xxxxl {
+ padding-top: 13.75em;
+ padding-top: var(--space-xxxxl);
+ padding-bottom: 13.75em;
+ padding-bottom: var(--space-xxxxl)
+}
+
+.padding-y-component {
+ padding-top: 1.25em;
+ padding-top: var(--component-padding);
+ padding-bottom: 1.25em;
+ padding-bottom: var(--component-padding)
+}
+
+@media not all and (min-width: 32rem) {
+ .has-padding\@xs {
+ padding: 0 !important
+ }
+}
+
+@media not all and (min-width: 48rem) {
+ .has-padding\@sm {
+ padding: 0 !important
+ }
+}
+
+@media not all and (min-width: 64rem) {
+ .has-padding\@md {
+ padding: 0 !important
+ }
+}
+
+@media not all and (min-width: 80rem) {
+ .has-padding\@lg {
+ padding: 0 !important
+ }
+}
+
+@media not all and (min-width: 90rem) {
+ .has-padding\@xl {
+ padding: 0 !important
+ }
+}
+
+.truncate {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap
+}
+
+.text-replace {
+ overflow: hidden;
+ color: transparent;
+ text-indent: 100%;
+ white-space: nowrap
+}
+
+.text-center {
+ text-align: center
+}
+
+.text-left {
+ text-align: left
+}
+
+.text-right {
+ text-align: right
+}
+
+@media (min-width: 32rem) {
+ .text-center\@xs {
+ text-align: center
+ }
+ .text-left\@xs {
+ text-align: left
+ }
+ .text-right\@xs {
+ text-align: right
+ }
+}
+
+@media (min-width: 48rem) {
+ .text-center\@sm {
+ text-align: center
+ }
+ .text-left\@sm {
+ text-align: left
+ }
+ .text-right\@sm {
+ text-align: right
+ }
+}
+
+@media (min-width: 64rem) {
+ .text-center\@md {
+ text-align: center
+ }
+ .text-left\@md {
+ text-align: left
+ }
+ .text-right\@md {
+ text-align: right
+ }
+}
+
+@media (min-width: 80rem) {
+ .text-center\@lg {
+ text-align: center
+ }
+ .text-left\@lg {
+ text-align: left
+ }
+ .text-right\@lg {
+ text-align: right
+ }
+}
+
+@media (min-width: 90rem) {
+ .text-center\@xl {
+ text-align: center
+ }
+ .text-left\@xl {
+ text-align: left
+ }
+ .text-right\@xl {
+ text-align: right
+ }
+}
+
+.color-inherit {
+ color: inherit
+}
+
+.color-contrast-medium {
+ color: hsl(240, 1%, 48%);
+ color: var(--color-contrast-medium, #79797c)
+}
+
+.color-contrast-high {
+ color: hsl(240, 4%, 20%);
+ color: var(--color-contrast-high, #313135)
+}
+
+.color-contrast-higher {
+ color: hsl(240, 8%, 12%);
+ color: var(--color-contrast-higher, #1c1c21)
+}
+
+.color-primary {
+ color: hsl(220, 90%, 56%);
+ color: var(--color-primary, #2a6df4)
+}
+
+.color-accent {
+ color: hsl(355, 90%, 61%);
+ color: var(--color-accent, #f54251)
+}
+
+.color-success {
+ color: hsl(94, 48%, 56%);
+ color: var(--color-success, #88c559)
+}
+
+.color-warning {
+ color: hsl(46, 100%, 61%);
+ color: var(--color-warning, #ffd138)
+}
+
+.color-error {
+ color: hsl(355, 90%, 61%);
+ color: var(--color-error, #f54251)
+}
+
+.width-100\% {
+ width: 100%
+}
+
+.height-100\% {
+ height: 100%
+}
+
+.media-wrapper {
+ position: relative;
+ height: 0;
+ padding-bottom: 56.25%
+}
+
+.media-wrapper iframe, .media-wrapper video, .media-wrapper img {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%
+}
+
+.media-wrapper video, .media-wrapper img {
+ -o-object-fit: cover;
+ object-fit: cover
+}
+
+.media-wrapper--4\:3 {
+ padding-bottom: 75%
+}
+
+:root, [data-theme="default"] {
+ --color-primary-darker: hsl(220, 90%, 36%);
+ --color-primary-darker-h: 220;
+ --color-primary-darker-s: 90%;
+ --color-primary-darker-l: 36%;
+ --color-primary-dark: hsl(220, 90%, 46%);
+ --color-primary-dark-h: 220;
+ --color-primary-dark-s: 90%;
+ --color-primary-dark-l: 46%;
+ --color-primary: hsl(220, 90%, 56%);
+ --color-primary-h: 220;
+ --color-primary-s: 90%;
+ --color-primary-l: 56%;
+ --color-primary-light: hsl(220, 90%, 66%);
+ --color-primary-light-h: 220;
+ --color-primary-light-s: 90%;
+ --color-primary-light-l: 66%;
+ --color-primary-lighter: hsl(220, 90%, 76%);
+ --color-primary-lighter-h: 220;
+ --color-primary-lighter-s: 90%;
+ --color-primary-lighter-l: 76%;
+ --color-accent-darker: hsl(355, 90%, 41%);
+ --color-accent-darker-h: 355;
+ --color-accent-darker-s: 90%;
+ --color-accent-darker-l: 41%;
+ --color-accent-dark: hsl(355, 90%, 51%);
+ --color-accent-dark-h: 355;
+ --color-accent-dark-s: 90%;
+ --color-accent-dark-l: 51%;
+ --color-accent: hsl(355, 90%, 61%);
+ --color-accent-h: 355;
+ --color-accent-s: 90%;
+ --color-accent-l: 61%;
+ --color-accent-light: hsl(355, 90%, 71%);
+ --color-accent-light-h: 355;
+ --color-accent-light-s: 90%;
+ --color-accent-light-l: 71%;
+ --color-accent-lighter: hsl(355, 90%, 81%);
+ --color-accent-lighter-h: 355;
+ --color-accent-lighter-s: 90%;
+ --color-accent-lighter-l: 81%;
+ --color-black: hsl(240, 8%, 12%);
+ --color-black-h: 240;
+ --color-black-s: 8%;
+ --color-black-l: 12%;
+ --color-white: hsl(0, 0%, 100%);
+ --color-white-h: 0;
+ --color-white-s: 0%;
+ --color-white-l: 100%;
+ --color-success-darker: hsl(94, 48%, 36%);
+ --color-success-darker-h: 94;
+ --color-success-darker-s: 48%;
+ --color-success-darker-l: 36%;
+ --color-success-dark: hsl(94, 48%, 46%);
+ --color-success-dark-h: 94;
+ --color-success-dark-s: 48%;
+ --color-success-dark-l: 46%;
+ --color-success: hsl(94, 48%, 56%);
+ --color-success-h: 94;
+ --color-success-s: 48%;
+ --color-success-l: 56%;
+ --color-success-light: hsl(94, 48%, 66%);
+ --color-success-light-h: 94;
+ --color-success-light-s: 48%;
+ --color-success-light-l: 66%;
+ --color-success-lighter: hsl(94, 48%, 76%);
+ --color-success-lighter-h: 94;
+ --color-success-lighter-s: 48%;
+ --color-success-lighter-l: 76%;
+ --color-error-darker: hsl(355, 90%, 41%);
+ --color-error-darker-h: 355;
+ --color-error-darker-s: 90%;
+ --color-error-darker-l: 41%;
+ --color-error-dark: hsl(355, 90%, 51%);
+ --color-error-dark-h: 355;
+ --color-error-dark-s: 90%;
+ --color-error-dark-l: 51%;
+ --color-error: hsl(355, 90%, 61%);
+ --color-error-h: 355;
+ --color-error-s: 90%;
+ --color-error-l: 61%;
+ --color-error-light: hsl(355, 90%, 71%);
+ --color-error-light-h: 355;
+ --color-error-light-s: 90%;
+ --color-error-light-l: 71%;
+ --color-error-lighter: hsl(355, 90%, 81%);
+ --color-error-lighter-h: 355;
+ --color-error-lighter-s: 90%;
+ --color-error-lighter-l: 81%;
+ --color-warning-darker: hsl(46, 100%, 41%);
+ --color-warning-darker-h: 46;
+ --color-warning-darker-s: 100%;
+ --color-warning-darker-l: 41%;
+ --color-warning-dark: hsl(46, 100%, 51%);
+ --color-warning-dark-h: 46;
+ --color-warning-dark-s: 100%;
+ --color-warning-dark-l: 51%;
+ --color-warning: hsl(46, 100%, 61%);
+ --color-warning-h: 46;
+ --color-warning-s: 100%;
+ --color-warning-l: 61%;
+ --color-warning-light: hsl(46, 100%, 71%);
+ --color-warning-light-h: 46;
+ --color-warning-light-s: 100%;
+ --color-warning-light-l: 71%;
+ --color-warning-lighter: hsl(46, 100%, 81%);
+ --color-warning-lighter-h: 46;
+ --color-warning-lighter-s: 100%;
+ --color-warning-lighter-l: 81%;
+ --color-bg: hsl(0, 0%, 100%);
+ --color-bg-h: 0;
+ --color-bg-s: 0%;
+ --color-bg-l: 100%;
+ --color-contrast-lower: hsl(0, 0%, 95%);
+ --color-contrast-lower-h: 0;
+ --color-contrast-lower-s: 0%;
+ --color-contrast-lower-l: 95%;
+ --color-contrast-low: hsl(240, 1%, 83%);
+ --color-contrast-low-h: 240;
+ --color-contrast-low-s: 1%;
+ --color-contrast-low-l: 83%;
+ --color-contrast-medium: hsl(240, 1%, 48%);
+ --color-contrast-medium-h: 240;
+ --color-contrast-medium-s: 1%;
+ --color-contrast-medium-l: 48%;
+ --color-contrast-high: hsl(240, 4%, 20%);
+ --color-contrast-high-h: 240;
+ --color-contrast-high-s: 4%;
+ --color-contrast-high-l: 20%;
+ --color-contrast-higher: hsl(240, 8%, 12%);
+ --color-contrast-higher-h: 240;
+ --color-contrast-higher-s: 8%;
+ --color-contrast-higher-l: 12%
+}
+
+@supports (--css: variables) {
+ @media (min-width: 64rem) {
+ :root {
+ --space-unit: 1.25em
+ }
+ }
+}
+
+:root {
+ --radius: 0.25em
+}
+
+:root {
+ --font-primary: sans-serif;
+ --text-base-size: 1em;
+ --text-scale-ratio: 1.2;
+ --text-xs: calc(1em/var(--text-scale-ratio)/var(--text-scale-ratio));
+ --text-sm: calc(var(--text-xs)*var(--text-scale-ratio));
+ --text-md: calc(var(--text-sm)*var(--text-scale-ratio)*var(--text-scale-ratio));
+ --text-lg: calc(var(--text-md)*var(--text-scale-ratio));
+ --text-xl: calc(var(--text-lg)*var(--text-scale-ratio));
+ --text-xxl: calc(var(--text-xl)*var(--text-scale-ratio));
+ --text-xxxl: calc(var(--text-xxl)*var(--text-scale-ratio));
+ --body-line-height: 1.4;
+ --heading-line-height: 1.2;
+ --font-primary-capital-letter: 1
+}
+
+@supports (--css: variables) {
+ @media (min-width: 64rem) {
+ :root {
+ --text-base-size: 1.25em;
+ --text-scale-ratio: 1.25
+ }
+ }
+}
+
+mark {
+ background-color: hsla(355, 90%, 61%, 0.2);
+ background-color: hsla(var(--color-accent-h), var(--color-accent-s), var(--color-accent-l), 0.2);
+ color: inherit
+}
+
+.text-component {
+ --line-height-multiplier: 1;
+ --text-vspace-multiplier: 1
+}
+
+.text-component blockquote {
+ padding-left: 1em;
+ border-left: 4px solid hsl(240, 1%, 83%);
+ border-left: 4px solid var(--color-contrast-low)
+}
+
+.text-component hr {
+ background: hsl(240, 1%, 83%);
+ background: var(--color-contrast-low);
+ height: 1px
+}
+
+.text-component figcaption {
+ font-size: 0.83333em;
+ font-size: var(--text-sm);
+ color: hsl(240, 1%, 48%);
+ color: var(--color-contrast-medium)
+}
+
+.article.text-component {
+ --line-height-multiplier: 1.13;
+ --text-vspace-multiplier: 1.2
+}
+
+:root {
+ --btn-font-size: 1em;
+ --btn-font-size-sm: calc(var(--btn-font-size) - 0.2em);
+ --btn-font-size-md: calc(var(--btn-font-size) + 0.2em);
+ --btn-font-size-lg: calc(var(--btn-font-size) + 0.4em);
+ --btn-radius: 0.25em;
+ --btn-padding-x: var(--space-sm);
+ --btn-padding-y: var(--space-xs)
+}
+
+.btn {
+ --color-shadow: hsla(240, 8%, 12%, 0.15);
+ --color-shadow: hsla(var(--color-black-h), var(--color-black-s), var(--color-black-l), 0.15);
+ box-shadow: 0 4px 16px hsla(240, 8%, 12%, 0.15);
+ box-shadow: 0 4px 16px hsla(var(--color-black-h), var(--color-black-s), var(--color-black-l), 0.15);
+ cursor: pointer
+}
+
+.btn--primary {
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale
+}
+
+.btn--accent {
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale
+}
+
+.btn--disabled {
+ opacity: 0.6
+}
+
+:root {
+ --form-control-padding-x: var(--space-sm);
+ --form-control-padding-y: var(--space-xs);
+ --form-control-radius: 0.25em
+}
+
+.form-control {
+ border: 2px solid hsl(240, 1%, 83%);
+ border: 2px solid var(--color-contrast-low)
+}
+
+.form-control:focus {
+ outline: none;
+ border-color: hsl(220, 90%, 56%);
+ border-color: var(--color-primary);
+ --color-shadow: hsla(220, 90%, 56%, 0.2);
+ --color-shadow: hsla(var(--color-primary-h), var(--color-primary-s), var(--color-primary-l), 0.2);
+ box-shadow: undefined;
+ box-shadow: 0 0 0 3px var(--color-shadow)
+}
+
+.form-control:focus:focus {
+ box-shadow: 0 0 0 3px hsla(220, 90%, 56%, 0.2);
+ box-shadow: 0 0 0 3px var(--color-shadow)
+}
+
+.form-control[aria-invalid="true"] {
+ border-color: hsl(355, 90%, 61%);
+ border-color: var(--color-error)
+}
+
+.form-control[aria-invalid="true"]:focus {
+ --color-shadow: hsla(355, 90%, 61%, 0.2);
+ --color-shadow: hsla(var(--color-error-h), var(--color-error-s), var(--color-error-l), 0.2);
+ box-shadow: undefined;
+ box-shadow: 0 0 0 3px var(--color-shadow)
+}
+
+.form-control[aria-invalid="true"]:focus:focus {
+ box-shadow: 0 0 0 3px hsla(355, 90%, 61%, 0.2);
+ box-shadow: 0 0 0 3px var(--color-shadow)
+}
+
+.form-label {
+ font-size: 0.83333em;
+ font-size: var(--text-sm)
+}
+
+:root {
+ --cd-color-1: hsl(206, 21%, 24%);
+ --cd-color-1-h: 206;
+ --cd-color-1-s: 21%;
+ --cd-color-1-l: 24%;
+ --cd-color-2: hsl(205, 38%, 89%);
+ --cd-color-2-h: 205;
+ --cd-color-2-s: 38%;
+ --cd-color-2-l: 89%;
+ --cd-color-3: hsl(207, 10%, 55%);
+ --cd-color-3-h: 207;
+ --cd-color-3-s: 10%;
+ --cd-color-3-l: 55%;
+ --cd-color-4: hsl(111, 51%, 60%);
+ --cd-color-4-h: 111;
+ --cd-color-4-s: 51%;
+ --cd-color-4-l: 60%;
+ --cd-color-5: hsl(356, 53%, 49%);
+ --cd-color-5-h: 356;
+ --cd-color-5-s: 53%;
+ --cd-color-5-l: 49%;
+ --cd-color-6: hsl(47, 85%, 61%);
+ --cd-color-6-h: 47;
+ --cd-color-6-s: 85%;
+ --cd-color-6-l: 61%;
+ --cd-header-height: 200px;
+ --font-primary: 'Droid Serif', serif;
+ --font-secondary: 'Open Sans', sans-serif
+}
+
+@supports (--css: variables) {
+ @media (min-width: 64rem) {
+ :root {
+ --cd-header-height: 300px
+ }
+ }
+}
+
+.cd-main-header {
+ height: 200px;
+ height: var(--cd-header-height);
+ background: hsl(206, 21%, 24%);
+ background: var(--cd-color-1);
+ color: hsl(0, 0%, 100%);
+ color: var(--color-white);
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale
+}
+
+.cd-main-header h1 {
+ color: inherit
+}
+
+.cd-timeline {
+ overflow: hidden;
+ padding: 2em 0;
+ padding: var(--space-lg) 0;
+ color: hsl(207, 10%, 55%);
+ color: var(--cd-color-3);
+ background-color: hsl(205, 38%, 93.45%);
+ background-color: hsl(var(--cd-color-2-h), var(--cd-color-2-s), calc(var(--cd-color-2-l)*1.05));
+}
+
+.cd-timeline h2 {
+ font-weight: 700
+}
+
+.cd-timeline__container {
+ position: relative;
+ padding: 1.25em 0;
+ padding: var(--space-md) 0
+}
+
+.cd-timeline__container::before {
+ content: '';
+ position: absolute;
+ top: 0;
+ left: 18px;
+ height: 100%;
+ width: 4px;
+ background: hsl(205, 38%, 89%);
+ background: var(--cd-color-2)
+}
+
+@media (min-width: 64rem) {
+ .cd-timeline__container::before {
+ left: 50%;
+ -webkit-transform: translateX(-50%);
+ -ms-transform: translateX(-50%);
+ transform: translateX(-50%)
+ }
+}
+
+.cd-timeline__block {
+ display: -ms-flexbox;
+ display: flex;
+ position: relative;
+ z-index: 1;
+ margin-bottom: 2em;
+ margin-bottom: var(--space-lg)
+}
+
+.cd-timeline__block:last-child {
+ margin-bottom: 0
+}
+
+@media (min-width: 64rem) {
+ .cd-timeline__block:nth-child(even) {
+ -ms-flex-direction: row-reverse;
+ flex-direction: row-reverse
+ }
+}
+
+.cd-timeline__img {
+ display: -ms-flexbox;
+ display: flex;
+ -ms-flex-pack: center;
+ justify-content: center;
+ -ms-flex-align: center;
+ align-items: center;
+ -ms-flex-negative: 0;
+ flex-shrink: 0;
+ width: 30px;
+ height: 30px;
+ border-radius: 50%;
+ box-shadow: 0 0 0 4px hsl(0, 0%, 100%), inset 0 2px 0 rgba(0, 0, 0, 0.08), 0 3px 0 4px rgba(0, 0, 0, 0.05);
+ box-shadow: 0 0 0 4px var(--color-white), inset 0 2px 0 rgba(0, 0, 0, 0.08), 0 3px 0 4px rgba(0, 0, 0, 0.05)
+}
+
+.cd-timeline__img i {
+ font-size: 1.5em;
+ color: white;
+}
+
+@media (max-width: 64rem) {
+ .cd-timeline__img i {
+ font-size: 0.9em;
+ }
+}
+
+.cd-timeline__img img {
+ width: 40px;
+ height: 40px;
+ margin-left: 2px;
+ margin-top: 2px;
+}
+
+@media (max-width: 64rem) {
+ .cd-timeline__img img {
+ width: 20px;
+ height: 20px;
+ margin-left: 2px;
+ margin-top: 2px;
+ }
+}
+
+@media (min-width: 64rem) {
+ .cd-timeline__img {
+ width: 60px;
+ height: 60px;
+ -ms-flex-order: 1;
+ order: 1;
+ margin-left: calc(5% - 30px);
+ will-change: transform;
+ }
+
+ .cd-timeline__block:nth-child(even) .cd-timeline__img {
+ margin-right: calc(5% - 30px)
+ }
+}
+
+.cd-timeline__img--picture {
+ background-color: #7289DA;
+}
+
+.cd-timeline__img--movie {
+ background-color: hsl(356, 53%, 49%);
+ background-color: var(--cd-color-5)
+}
+
+.cd-timeline__img--location {
+ background-color: hsl(47, 85%, 61%);
+ background-color: var(--cd-color-6)
+}
+
+.cd-timeline__content {
+ -ms-flex-positive: 1;
+ flex-grow: 1;
+ position: relative;
+ margin-left: 1.25em;
+ margin-left: var(--space-md);
+ background: hsl(0, 0%, 100%);
+ background: var(--color-white);
+ border-radius: 0.25em;
+ border-radius: var(--radius-md);
+ padding: 1.25em;
+ padding: var(--space-md);
+ box-shadow: 0 3px 0 hsl(205, 38%, 89%);
+ box-shadow: 0 3px 0 var(--cd-color-2)
+}
+
+.cd-timeline__content::before {
+ content: '';
+ position: absolute;
+ top: 16px;
+ right: 100%;
+ width: 0;
+ height: 0;
+ border: 7px solid transparent;
+ border-right-color: hsl(0, 0%, 100%);
+ border-right-color: var(--color-white)
+}
+
+.cd-timeline__content h2 {
+ color: hsl(206, 21%, 24%);
+ color: var(--cd-color-1)
+}
+
+@media (min-width: 64rem) {
+ .cd-timeline__content {
+ width: 45%;
+ -ms-flex-positive: 0;
+ flex-grow: 0;
+ will-change: transform;
+ margin: 0;
+ font-size: 0.9em;
+ --line-height-multiplier: 1.2
+ }
+ .cd-timeline__content::before {
+ top: 24px
+ }
+ .cd-timeline__block:nth-child(odd) .cd-timeline__content::before {
+ right: auto;
+ left: 100%;
+ width: 0;
+ height: 0;
+ border: 7px solid transparent;
+ border-left-color: hsl(0, 0%, 100%);
+ border-left-color: var(--color-white)
+ }
+}
+
+.cd-timeline__date {
+ color: hsla(207, 10%, 55%, 0.7);
+ color: hsla(var(--cd-color-3-h), var(--cd-color-3-s), var(--cd-color-3-l), 0.7)
+}
+
+@media (min-width: 64rem) {
+ .cd-timeline__date {
+ position: absolute;
+ width: 100%;
+ left: 120%;
+ top: 20px
+ }
+ .cd-timeline__block:nth-child(even) .cd-timeline__date {
+ left: auto;
+ right: 120%;
+ text-align: right
+ }
+}
+
+@media (min-width: 64rem) {
+ .cd-timeline__img--hidden, .cd-timeline__content--hidden {
+ visibility: hidden
+ }
+ .cd-timeline__img--bounce-in {
+ -webkit-animation: cd-bounce-1 0.6s;
+ animation: cd-bounce-1 0.6s
+ }
+ .cd-timeline__content--bounce-in {
+ -webkit-animation: cd-bounce-2 0.6s;
+ animation: cd-bounce-2 0.6s
+ }
+ .cd-timeline__block:nth-child(even) .cd-timeline__content--bounce-in {
+ -webkit-animation-name: cd-bounce-2-inverse;
+ animation-name: cd-bounce-2-inverse
+ }
+ .cd-timeline__img--bounce-out {
+ -webkit-animation: cd-bounce-out-1 0.6s;
+ animation: cd-bounce-out-1 0.6s;
+ }
+ .cd-timeline__content--bounce-out {
+ -webkit-animation: cd-bounce-out-2 0.6s;
+ animation: cd-bounce-out-2 0.6s;
+ }
+}
+
+@-webkit-keyframes cd-bounce-1 {
+ 0% {
+ opacity: 0;
+ -webkit-transform: scale(0.5);
+ transform: scale(0.5)
+ }
+ 60% {
+ opacity: 1;
+ -webkit-transform: scale(1.2);
+ transform: scale(1.2)
+ }
+ 100% {
+ -webkit-transform: scale(1);
+ transform: scale(1)
+ }
+}
+
+@keyframes cd-bounce-1 {
+ 0% {
+ opacity: 0;
+ -webkit-transform: scale(0.5);
+ transform: scale(0.5)
+ }
+ 60% {
+ opacity: 1;
+ -webkit-transform: scale(1.2);
+ transform: scale(1.2)
+ }
+ 100% {
+ -webkit-transform: scale(1);
+ transform: scale(1)
+ }
+}
+
+@-webkit-keyframes cd-bounce-2 {
+ 0% {
+ opacity: 0;
+ -webkit-transform: translateX(-100px);
+ transform: translateX(-100px)
+ }
+ 60% {
+ opacity: 1;
+ -webkit-transform: translateX(20px);
+ transform: translateX(20px)
+ }
+ 100% {
+ -webkit-transform: translateX(0);
+ transform: translateX(0)
+ }
+}
+
+@keyframes cd-bounce-2 {
+ 0% {
+ opacity: 0;
+ -webkit-transform: translateX(-100px);
+ transform: translateX(-100px)
+ }
+ 60% {
+ opacity: 1;
+ -webkit-transform: translateX(20px);
+ transform: translateX(20px)
+ }
+ 100% {
+ -webkit-transform: translateX(0);
+ transform: translateX(0)
+ }
+}
+
+@-webkit-keyframes cd-bounce-2-inverse {
+ 0% {
+ opacity: 0;
+ -webkit-transform: translateX(100px);
+ transform: translateX(100px)
+ }
+ 60% {
+ opacity: 1;
+ -webkit-transform: translateX(-20px);
+ transform: translateX(-20px)
+ }
+ 100% {
+ -webkit-transform: translateX(0);
+ transform: translateX(0)
+ }
+}
+
+@keyframes cd-bounce-2-inverse {
+ 0% {
+ opacity: 0;
+ -webkit-transform: translateX(100px);
+ transform: translateX(100px)
+ }
+ 60% {
+ opacity: 1;
+ -webkit-transform: translateX(-20px);
+ transform: translateX(-20px)
+ }
+ 100% {
+ -webkit-transform: translateX(0);
+ transform: translateX(0)
+ }
+}
+
+@-webkit-keyframes cd-bounce-out-1 {
+ 0% {
+ opacity: 1;
+ -webkit-transform: scale(1);
+ transform: scale(1)
+ }
+
+ 60% {
+ -webkit-transform: scale(1.2);
+ transform: scale(1.2)
+ }
+
+ 100% {
+ opacity: 0;
+ -webkit-transform: scale(0.5);
+ transform: scale(0.5)
+ }
+}
+
+@keyframes cd-bounce-out-1 {
+ 0% {
+ opacity: 1;
+ -webkit-transform: scale(1);
+ transform: scale(1);
+ }
+
+ 60% {
+ -webkit-transform: scale(1.2);
+ transform: scale(1.2);
+ }
+
+ 100% {
+ opacity: 0;
+ -webkit-transform: scale(0.5);
+ transform: scale(0.5);
+ }
+}
+
+@-webkit-keyframes cd-bounce-out-2 {
+ 0% {
+ opacity: 1;
+ -webkit-transform: translateX(0);
+ transform: translateX(0)
+ }
+ 60% {
+ -webkit-transform: translateX(20px);
+ transform: translateX(20px)
+ }
+ 100% {
+ opacity: 0;
+ -webkit-transform: translateX(-100px);
+ transform: translateX(-100px)
+ }
+}
+
+@keyframes cd-bounce-out-2 {
+ 0% {
+ opacity: 1;
+ -webkit-transform: translateX(0);
+ transform: translateX(0)
+ }
+ 60% {
+ -webkit-transform: translateX(20px);
+ transform: translateX(20px)
+ }
+ 100% {
+ opacity: 0;
+ -webkit-transform: translateX(-100px);
+ transform: translateX(-100px)
+ }
+}
diff --git a/pydis_site/static/images/events/100k.png b/pydis_site/static/images/events/100k.png
new file mode 100644
index 00000000..ae024d77
--- /dev/null
+++ b/pydis_site/static/images/events/100k.png
Binary files differ
diff --git a/pydis_site/static/images/frontpage/welcome.jpg b/pydis_site/static/images/frontpage/welcome.jpg
new file mode 100644
index 00000000..0eb8f672
--- /dev/null
+++ b/pydis_site/static/images/frontpage/welcome.jpg
Binary files differ
diff --git a/pydis_site/static/images/navbar/discord.svg b/pydis_site/static/images/navbar/discord.svg
new file mode 100644
index 00000000..406e3836
--- /dev/null
+++ b/pydis_site/static/images/navbar/discord.svg
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="120mm"
+ height="30mm"
+ viewBox="0 0 120 30"
+ version="1.1"
+ id="svg8"
+ inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+ sodipodi:docname="discord.svg">
+ <defs
+ id="defs2">
+ <rect
+ x="75.819944"
+ y="98.265513"
+ width="25.123336"
+ height="7.8844509"
+ id="rect953" />
+ <rect
+ x="75.819946"
+ y="98.265511"
+ width="25.123337"
+ height="7.8844509"
+ id="rect953-0" />
+ <rect
+ x="75.819946"
+ y="98.265511"
+ width="25.123337"
+ height="7.8844509"
+ id="rect968" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2.8"
+ inkscape:cx="194.44623"
+ inkscape:cy="53.152927"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="2560"
+ inkscape:window-height="1413"
+ inkscape:window-x="4880"
+ inkscape:window-y="677"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:document-rotation="0" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-52.233408,-75.88169)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke-width:0.137677;paint-order:stroke fill markers;stop-color:#000000"
+ id="rect832"
+ width="61.511906"
+ height="30"
+ x="52.23341"
+ y="75.881691" />
+ <g
+ id="g910"
+ transform="matrix(0.90000009,0,0,0.90000009,17.445516,9.7980333)">
+ <g
+ id="g850"
+ transform="matrix(0.06491223,0,0,0.06491223,109.76284,82.07218)">
+ <path
+ class="st0"
+ d="m 142.8,120.1 c -5.7,0 -10.2,4.9 -10.2,11 0,6.1 4.6,11 10.2,11 5.7,0 10.2,-4.9 10.2,-11 0,-6.1 -4.6,-11 -10.2,-11 z m -36.5,0 c -5.7,0 -10.2,4.9 -10.2,11 0,6.1 4.6,11 10.2,11 5.7,0 10.2,-4.9 10.2,-11 0.1,-6.1 -4.5,-11 -10.2,-11 z"
+ id="path836" />
+ <path
+ class="st0"
+ d="m 191.4,36.9 h -134 c -11.3,0 -20.5,9.2 -20.5,20.5 v 134 c 0,11.3 9.2,20.5 20.5,20.5 h 113.4 l -5.3,-18.3 12.8,11.8 12.1,11.1 21.6,18.7 V 57.4 C 211.9,46.1 202.7,36.9 191.4,36.9 Z m -38.6,129.5 c 0,0 -3.6,-4.3 -6.6,-8 13.1,-3.7 18.1,-11.8 18.1,-11.8 -4.1,2.7 -8,4.6 -11.5,5.9 -5,2.1 -9.8,3.4 -14.5,4.3 -9.6,1.8 -18.4,1.3 -25.9,-0.1 -5.7,-1.1 -10.6,-2.6 -14.7,-4.3 -2.3,-0.9 -4.8,-2 -7.3,-3.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.3,-0.2 -0.4,-0.2 -1.8,-1 -2.8,-1.7 -2.8,-1.7 0,0 4.8,7.9 17.5,11.7 -3,3.8 -6.7,8.2 -6.7,8.2 C 75,165.8 66.6,151.4 66.6,151.4 66.6,119.5 81,93.6 81,93.6 95.4,82.9 109,83.2 109,83.2 l 1,1.2 c -18,5.1 -26.2,13 -26.2,13 0,0 2.2,-1.2 5.9,-2.8 10.7,-4.7 19.2,-5.9 22.7,-6.3 0.6,-0.1 1.1,-0.2 1.7,-0.2 6.1,-0.8 13,-1 20.2,-0.2 9.5,1.1 19.7,3.9 30.1,9.5 0,0 -7.9,-7.5 -24.9,-12.6 l 1.4,-1.6 c 0,0 13.7,-0.3 28,10.4 0,0 14.4,25.9 14.4,57.8 0,-0.1 -8.4,14.3 -30.5,15 z m 151,-86.7 H 270.6 V 117 l 22.1,19.9 v -36.2 h 11.8 c 7.5,0 11.2,3.6 11.2,9.4 v 27.7 c 0,5.8 -3.5,9.7 -11.2,9.7 h -34 v 21.1 h 33.2 c 17.8,0.1 34.5,-8.8 34.5,-29.2 V 109.6 C 338.3,88.8 321.6,79.7 303.8,79.7 Z m 174,59.7 v -30.6 c 0,-11 19.8,-13.5 25.8,-2.5 l 18.3,-7.4 c -7.2,-15.8 -20.3,-20.4 -31.2,-20.4 -17.8,0 -35.4,10.3 -35.4,30.3 v 30.6 c 0,20.2 17.6,30.3 35,30.3 11.2,0 24.6,-5.5 32,-19.9 l -19.6,-9 c -4.8,12.3 -24.9,9.3 -24.9,-1.4 z M 417.3,113 c -6.9,-1.5 -11.5,-4 -11.8,-8.3 0.4,-10.3 16.3,-10.7 25.6,-0.8 l 14.7,-11.3 c -9.2,-11.2 -19.6,-14.2 -30.3,-14.2 -16.3,0 -32.1,9.2 -32.1,26.6 0,16.9 13,26 27.3,28.2 7.3,1 15.4,3.9 15.2,8.9 -0.6,9.5 -20.2,9 -29.1,-1.8 l -14.2,13.3 c 8.3,10.7 19.6,16.1 30.2,16.1 16.3,0 34.4,-9.4 35.1,-26.6 1,-21.7 -14.8,-27.2 -30.6,-30.1 z m -67,55.5 h 22.4 V 79.7 H 350.3 Z M 728,79.7 H 694.8 V 117 l 22.1,19.9 v -36.2 h 11.8 c 7.5,0 11.2,3.6 11.2,9.4 v 27.7 c 0,5.8 -3.5,9.7 -11.2,9.7 h -34 v 21.1 H 728 c 17.8,0.1 34.5,-8.8 34.5,-29.2 V 109.6 C 762.5,88.8 745.8,79.7 728,79.7 Z M 565.1,78.5 c -18.4,0 -36.7,10 -36.7,30.5 v 30.3 c 0,20.3 18.4,30.5 36.9,30.5 18.4,0 36.7,-10.2 36.7,-30.5 V 109 C 602,88.6 583.5,78.5 565.1,78.5 Z m 14.4,60.8 c 0,6.4 -7.2,9.7 -14.3,9.7 -7.2,0 -14.4,-3.1 -14.4,-9.7 V 109 c 0,-6.5 7,-10 14,-10 7.3,0 14.7,3.1 14.7,10 z M 682.4,109 c -0.5,-20.8 -14.7,-29.2 -33,-29.2 h -35.5 v 88.8 h 22.7 v -28.2 h 4 l 20.6,28.2 h 28 L 665,138.1 c 10.7,-3.4 17.4,-12.7 17.4,-29.1 z m -32.6,12 h -13.2 v -20.3 h 13.2 c 14.1,0 14.1,20.3 0,20.3 z"
+ id="path838" />
+ </g>
+ <path
+ id="path4789-6"
+ class=""
+ d="m 167.72059,90.383029 -3.19204,3.19205 c -0.15408,0.15408 -0.40352,0.15408 -0.55746,0 l -0.37229,-0.37231 c -0.15368,-0.15369 -0.15408,-0.40277 -4.9e-4,-0.55681 l 2.52975,-2.54167 -2.52975,-2.54164 c -0.15329,-0.15408 -0.15309,-0.40312 4.9e-4,-0.55681 l 0.37229,-0.37228 c 0.15408,-0.15408 0.40353,-0.15408 0.55746,0 l 3.19204,3.19201 c 0.15408,0.15407 0.15408,0.40354 0,0.55746 z"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1;stroke-width:0.0164247" />
+ </g>
+ <g
+ id="g904"
+ transform="matrix(0.90000009,0,0,0.90000009,10.464254,9.7980333)">
+ <g
+ id="g850-3"
+ transform="matrix(0.06491223,0,0,0.06491223,52.083661,82.07218)">
+ <path
+ class="st0"
+ d="m 142.8,120.1 c -5.7,0 -10.2,4.9 -10.2,11 0,6.1 4.6,11 10.2,11 5.7,0 10.2,-4.9 10.2,-11 0,-6.1 -4.6,-11 -10.2,-11 z m -36.5,0 c -5.7,0 -10.2,4.9 -10.2,11 0,6.1 4.6,11 10.2,11 5.7,0 10.2,-4.9 10.2,-11 0.1,-6.1 -4.5,-11 -10.2,-11 z"
+ id="path836-5"
+ style="fill:#7289da;fill-opacity:1" />
+ <path
+ class="st0"
+ d="m 191.4,36.9 h -134 c -11.3,0 -20.5,9.2 -20.5,20.5 v 134 c 0,11.3 9.2,20.5 20.5,20.5 h 113.4 l -5.3,-18.3 12.8,11.8 12.1,11.1 21.6,18.7 V 57.4 C 211.9,46.1 202.7,36.9 191.4,36.9 Z m -38.6,129.5 c 0,0 -3.6,-4.3 -6.6,-8 13.1,-3.7 18.1,-11.8 18.1,-11.8 -4.1,2.7 -8,4.6 -11.5,5.9 -5,2.1 -9.8,3.4 -14.5,4.3 -9.6,1.8 -18.4,1.3 -25.9,-0.1 -5.7,-1.1 -10.6,-2.6 -14.7,-4.3 -2.3,-0.9 -4.8,-2 -7.3,-3.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.3,-0.2 -0.4,-0.2 -1.8,-1 -2.8,-1.7 -2.8,-1.7 0,0 4.8,7.9 17.5,11.7 -3,3.8 -6.7,8.2 -6.7,8.2 C 75,165.8 66.6,151.4 66.6,151.4 66.6,119.5 81,93.6 81,93.6 95.4,82.9 109,83.2 109,83.2 l 1,1.2 c -18,5.1 -26.2,13 -26.2,13 0,0 2.2,-1.2 5.9,-2.8 10.7,-4.7 19.2,-5.9 22.7,-6.3 0.6,-0.1 1.1,-0.2 1.7,-0.2 6.1,-0.8 13,-1 20.2,-0.2 9.5,1.1 19.7,3.9 30.1,9.5 0,0 -7.9,-7.5 -24.9,-12.6 l 1.4,-1.6 c 0,0 13.7,-0.3 28,10.4 0,0 14.4,25.9 14.4,57.8 0,-0.1 -8.4,14.3 -30.5,15 z"
+ id="path838-6"
+ style="fill:#7289da;fill-opacity:1"
+ sodipodi:nodetypes="sssssccccccscccccccccccccccccccccccccccc" />
+ </g>
+ <path
+ id="path4789-6-2"
+ class=""
+ d="m 107.16039,90.382629 -3.19204,3.19205 c -0.15408,0.15408 -0.40352,0.15408 -0.55746,0 l -0.37229,-0.37231 c -0.15368,-0.15369 -0.15408,-0.40277 -5.3e-4,-0.55681 l 2.52975,-2.54167 -2.52975,-2.54164 c -0.15329,-0.15408 -0.15309,-0.40312 5.3e-4,-0.55681 l 0.37229,-0.37228 c 0.15408,-0.15408 0.40353,-0.15408 0.55746,0 l 3.19204,3.19201 c 0.15408,0.15407 0.15408,0.40354 0,0.55746 z"
+ inkscape:connector-curvature="0"
+ style="fill:#7289da;fill-opacity:1;stroke-width:0.0164247" />
+ <g
+ aria-label="JOIN US"
+ transform="matrix(1.2501707,0,0,1.2501707,-25.160061,-36.966352)"
+ id="text951"
+ style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect953-0);fill:#7289da;fill-opacity:1;stroke:none">
+ <path
+ d="m 75.839362,102.56309 c 0.127,0.9525 0.89535,1.3843 1.67005,1.3843 0.85725,0 1.7145,-0.55245 1.7145,-1.53035 v -3.028953 h -2.1463 v 1.028703 h 1.02235 v 2.00025 c 0,0.26035 -0.2667,0.4318 -0.5461,0.4318 -0.2794,0 -0.57785,-0.14605 -0.64135,-0.508 z"
+ style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:'Uni Sans';-inkscape-font-specification:'Uni Sans Heavy';fill:#7289da;fill-opacity:1"
+ id="path850" />
+ <path
+ d="m 79.795412,102.40434 c 0,1.0287 0.93345,1.54305 1.8669,1.54305 0.93345,0 1.86055,-0.51435 1.86055,-1.54305 v -1.5367 c 0,-1.028703 -0.93345,-1.543053 -1.8669,-1.543053 -0.93345,0 -1.86055,0.508 -1.86055,1.543053 z m 1.13665,-1.5367 c 0,-0.3302 0.3556,-0.508 0.7112,-0.508 0.3683,0 0.74295,0.15875 0.74295,0.508 v 1.5367 c 0,0.32385 -0.36195,0.48895 -0.7239,0.48895 -0.36195,0 -0.73025,-0.15875 -0.73025,-0.48895 z"
+ style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:'Uni Sans';-inkscape-font-specification:'Uni Sans Heavy';fill:#7289da;fill-opacity:1"
+ id="path852" />
+ <path
+ d="m 85.262755,99.388087 h -1.13665 v 4.495803 h 1.13665 z"
+ style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:'Uni Sans';-inkscape-font-specification:'Uni Sans Heavy';fill:#7289da;fill-opacity:1"
+ id="path854" />
+ <path
+ d="m 85.973945,103.88389 h 1.13665 v -1.79705 l -0.14605,-0.86995 0.03175,-0.006 0.3937,0.9017 1.016,1.77165 h 1.14935 v -4.495803 h -1.1303 v 2.038353 c 0.0063,0 0.12065,0.7747 0.127,0.7747 l -0.03175,0.006 -0.381,-0.9017 -1.08585,-1.917703 h -1.0795 z"
+ style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:'Uni Sans';-inkscape-font-specification:'Uni Sans Heavy';fill:#7289da;fill-opacity:1"
+ id="path856" />
+ <path
+ d="m 92.546182,99.388087 h -1.14935 v 2.990853 c -0.0063,2.1082 3.5814,2.1082 3.58775,0 v -2.990853 h -1.14935 v 2.990853 c -0.0064,0.7239 -1.28905,0.7239 -1.28905,0 z"
+ style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:'Uni Sans';-inkscape-font-specification:'Uni Sans Heavy';fill:#7289da;fill-opacity:1"
+ id="path858" />
+ <path
+ d="m 95.44178,103.13459 c 0.4191,0.53975 0.9906,0.8128 1.53035,0.8128 0.8255,0 1.7399,-0.47625 1.778,-1.3462 0.0508,-1.1049 -0.7493,-1.3843 -1.5494,-1.53035 -0.34925,-0.0762 -0.5842,-0.2032 -0.5969,-0.4191 0.01905,-0.5207 0.8255,-0.53975 1.2954,-0.0381 l 0.74295,-0.5715 c -0.46355,-0.565153 -0.9906,-0.717553 -1.5367,-0.717553 -0.8255,0 -1.6256,0.46355 -1.6256,1.346203 0,0.85725 0.6604,1.31445 1.3843,1.42875 0.3683,0.0508 0.78105,0.19685 0.76835,0.45085 -0.03175,0.4826 -1.02235,0.4572 -1.4732,-0.0889 z"
+ style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:'Uni Sans';-inkscape-font-specification:'Uni Sans Heavy';fill:#7289da;fill-opacity:1"
+ id="path860" />
+ </g>
+ </g>
+ </g>
+ <style
+ id="style834">.st0{fill:#FFFFFF;}</style>
+</svg>
diff --git a/pydis_site/static/images/navbar/navbar_discordjoin.svg b/pydis_site/static/images/navbar/navbar_discordjoin.svg
deleted file mode 100644
index 75e6b102..00000000
--- a/pydis_site/static/images/navbar/navbar_discordjoin.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="114.70044mm"
- height="61.897388mm"
- viewBox="0 0 114.70044 61.897388"
- version="1.1"
- id="svg8"
- inkscape:version="0.92.4 5da689c313, 2019-01-14"
- sodipodi:docname="discordjoin.svg">
- <defs
- id="defs2" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.98994949"
- inkscape:cx="-404.01729"
- inkscape:cy="34.494854"
- inkscape:document-units="mm"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:window-width="3440"
- inkscape:window-height="1409"
- inkscape:window-x="2560"
- inkscape:window-y="31"
- inkscape:window-maximized="1"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0" />
- <metadata
- id="metadata5">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-52.233408,-75.88169)">
- <path
- style="opacity:1;vector-effect:none;fill:#697ec4;fill-opacity:1;stroke:none;stroke-width:0.81460673;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- d="m 60.360377,75.88169 -8.126969,61.89739 H 166.93385 V 75.88169 Z"
- id="rect4758-3"
- inkscape:connector-curvature="0" />
- <path
- id="path4789-6"
- class=""
- d="m 157.65213,107.11299 -4.99428,4.9943 c -0.24107,0.24107 -0.63135,0.24107 -0.8722,0 l -0.58249,-0.58252 c -0.24045,-0.24046 -0.24107,-0.63017 -8.3e-4,-0.87119 l 3.95805,-3.9767 -3.95805,-3.97665 c -0.23984,-0.24107 -0.23953,-0.63072 8.3e-4,-0.87118 l 0.58249,-0.58248 c 0.24107,-0.24108 0.63137,-0.24108 0.8722,0 l 4.99428,4.99422 c 0.24107,0.24107 0.24107,0.63138 0,0.8722 z"
- inkscape:connector-curvature="0"
- style="fill:#ffffff;fill-opacity:1;stroke-width:0.02569815" />
- <image
- y="94.290833"
- x="67.190086"
- id="image4856"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAABmCAYAAABxyazLAAAABHNCSVQICAgIfAhkiAAAEexJREFU eJztnXnUnHV1xz83BCGAgIAKkUUCJRxtAUE2EYIIDYgWEAgHMYJQaQkuUJBDOTaVRYIFXFpBLWhs EEVDFcqmKIc1CoHUsCcsTQiQsAbCFiDLt3/c54VhMvPss7x57+ec95xk5vf87p2Z33Of33IXCIIg CIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIg6AOs7g4lrQeMBlaru+8e IOAJYI6ZLe+1MkEw1KnFYEn6K+AcYDfg/XX02We8APwamGRmj/VamSAYqlQ2WJIOwG/md1VXp+95 AzgXOMPMlvRamSAYalQyWJJ2BW4DhtWjzqBhipkd2WslgmCoUdpgSVoDeATYqD51BhUHm9lveq1E EAwlqsyMTmDoGivwpWEQBF2kisE6tDYtBiejJO3YayWCYChRymBJGg5sV7Mug5GP9lqBIBhKlJ1h rYyuC2UY2WsFgmAoUdZgDbVTwXas0msFgmAoEYYnCIJBQxisIAgGDWGwgiAYNITBCoJg0BAGKwiC QUMYrCAIBg3De61AsHIjaTXcwfaDwCbA6sBrwP3AA8BcM1ON8tYEtgc2Bj4ArAUsBeYA083s4bpk JfLWx52oR+Khamskb70O3JvIfLZOmUFBJG2iQJLO7tD3e0YFnV6TNE3SeZL2lJR7Fi1pSkbft+Xs 532Svpbo8WZGn09L+q6k0nGpknaSdK6keyQtz5B3r6TjJK1eUtYISQdJ+oWkeRmyBpgm6TB5hEhe Offk7Lsdj0u6XNJX5Ek188qdWEHmYkl/ko+9vVRg7HUUddZgPSbpe5IOl99w20p6ocD1N0j6hKQT 5TfgnJr1a6QfDVYz8yX9g6TMzByqaLAkrSfpfElvlNDzdUmnqZiBHS3pjhKyJGmupN0LyBom6UuS FpaUJ0mPSvpkTnlVDVYjSyRNlbRFDrlVDFYzCyRNUI6x11HUGYP1WyU/pqTVJH0+eW1xQ5tX5E+1 uyXdKmmm3MAt0jufrHMknSVpVNLfdvKb4c6adR4MBmuAmyW9L0NuaYMlaTP5b1GHnpmhX5K+KL8R q7Bc0sk5ZK0lH291camk1ISXqtdgDbBE0vEZcus0WANMU4UZdGVUr8G6XtLfJP2uLulbkl6SG6aL JI2TtHkOnVaXtIOkYyT9SG/fPH+QtG9Du0/JlwV1MJgMluSG/IMpcksZLEkbSXqiRj2fkbRlip6H KHvpV4TTUmStJWl6jbIGmK6UpZo6Y7AGODZFbicMluRjr+1v2lFUj8F6UtIhSX8m6Qj50/UMSdvX pOdWkk6WNEPS7ZK2S14fLunr8v2eKgw2gyW5sW4ZA6nyBut3HdDz/ySt2kLWh1R9ZtXMMkkfb/PZ rqhZViNXpIyBThqsNyVt1kZupwyWJM1SgX28VvRyU2xfM7s8+eLGAw+b2Rgzm2hm/1uHADN7yMzO M7MdgKOAz8mfLsvM7Fw8CeFQ46+Bk+rqTNL+wNi6+ktYCHyxOW++3ND+gvpPt4cBk9VkyCUdARxQ s6xGDkhkdJtV6U0CytHAN6p00CuDdbWZ3SvfjHvSzKaY2fROCjSzWWZ2CnApsEHy8s+A+Z2U26ec 2nxzVuDvc7SZDZwK7A8cC/wEN0qtuBPYxsxubvHegcC2ZZTMwZbAhIH/JGOzGzf1xC7IaMVnVeD0 sEZOUskTWuidH9b5AIn/zdJuCjazV4FXk3+/Kenf8RJlg4mXgL80vbYmMArIMwjfA3wKuKqKEonR 2z+j2TRgj6a6jhdJOg74AnA67i8FcAFwgpm1GxNH5VBrOXAxcAvwJF63YBfgCODDba6Zm1zzq4bX 9iFfCvDpwPeA683s+cTQbQP8LfB14L0Z128laRczuz2HrEaeB+5rem0Y7uu2Gdn1GlYBDgYuKij3 ZaB5BbQGPvbWz3H9WviD57KCcsujantY93ZN0RzIj+LL7mX1ag/rTynXjpH0cA7dL2hxbaE9LEmj csgZk/FZN5TvLx6S0W64sveuXpG0U5vrTX6yOOAXtkTSbySNVYtjd0kX5vhsP1CKG4akdSVdm6Of U1pcm7WHdWWK3NGSHskh9+IW12btYd2ZIneMpNk55P5Xuz6y6MUM66c9kNkWM1soaSr+tB/0mNnN cveQ+/GnWTs+kPJeXtbN0abd0g8AM3sKnwFlsTHZ4/X0dlsLyWx+sqSl+CzkYjN7JqWvURmyHgW+ mlYR3MxelHQwsABYJ6WvTTJkFcLMZkvaC3iI9Arsdcu9WdIngFnAu1OablxWRrf3sJbhe0j9RtFp cV9jZvOAOzKa1ZHe+akcbc6VlGY485Ln5mo78xzAzC4xs7MzjBXAphnvX5dmrBrkLQbuzmhWq+FI 5M4Dfp7RrLThSJE7n+zfofTDstsG68YcA6XrmNlt+BNzZWJuxvtr1iDjGeDNjDZjgdmSjpLH+ZVl RI42L1Tov6i8Vwr09VrG+6U3oTN4IOP9ZR2SOzfj/dLjoNsG67ddlleE/+m1AjWT+fSvSrI5/rsc TUcCk4EX5Y68/6jenFANNbJmiUWMbhE6NvbCYL1NPxmsxb1WoABFTnuGA3sDPwSelYdWfT/ZrO1t vNlKhqQRwGEZzR5v8Vpfj71uGqy7zWxBF+UV5VZgUa+VSDgPaHsK1Gf8ihWP1/MwDPep+ipwE/CI cgYGB+lI2gS4Atgwo2mrJeN3gKm1K1UT3TRYf8jbUNJIebjHi/KwmuOVw9FR0t7JU/sleUhFy3CL VpjZMnJs2naDxMP7IHwm0tckG8/jcd+wKowC/ijp29W1GhLsJummpr9bJM0BHsP9wLK4qfkFM1tm ZuPo07HXTbeGVp7LKyBpbfyEa+AEY/vk71Bgz5Tr9gWu4W0jfAAe+vAlM1vB36QN04D9crbtKMkx /ARJjwMd8feqCzObKfe3+j2QmhEiB6dIereZTchuOqRZH0j1ccvgOdy5tiVmNiExfv9WQUbtdGuG JVpY8zacRevj1jGS/i7luv+k9ef5tqQ1Wrzeir6YYTViZpOAz9OFTfQqmNlM4CPAn2vo7jhJK4Vf XB/zjaxMr0m87Tg6d5pYmG4ZrAfNLO+JxG4p77Wc/UjamPa+LOuRzzERsn2XeoKZXQp8Gk+727ck Pji7AUcD8yp29x1J76muVdCCG/EHfCZmNhXYlz4Ze90yWA8VaJvmPb1Bm9ezBnZmQjgAM3sNeCJP 225jZtcBu9M/BwMtMTOZ2WRgczzOcDLljNf6dDZTwlBlJnBokTz6ZvZHfOylRi10g24ZrCKJ/+8q 8d79pB/Hto1/asHsAm27ipndBeyMh3r0NWa23MyuNbOjzWwz3Lv5cDyqIK8B+3THFByaXA3sbmbP F70wGXs70eMHej8arHYpPebj0fwrkJxUfb/NdT8zs0cKyO9bgwUeJ4ZnHshs2mldimBm883sMjM7 NjFgxwNLMi77UBdUGwrcCYwzs88U2JpZATN7FPhcnqZlZWTRLYM1J2/DxJIfR5ICJmEuMCbjyz4b uKTptalJX0XIrWuvMLM8+wlZaaXfqEOXZiTtrBz5jszsQtznJ43GgOE8nzkzvYky8to3kOVAWSQ+ Mqttmf2h5/GT9zzLtPcD15eQsQJJbGQWHRt73TJYhWK8zOxH+Gb5R/AshVtkzZLM7GUz+wK+B7Yz MNLMxuW8uRt5uWD7vkNeK69lmpUGak9cKGk//Ca6UvlS4WbNfBtv9DzL4APT3kyCsB+QF0XIyuOV 9f3sL6+5mIq8oEbWb/FkVj8tmGZme+L7fFn7UZsCl3cjmkDSumQfcpUee90yWIWNgJm9aWYzkzTH uY/0zWyRmU2v4FXfqfiqriBpND7TTEvvATUbLEmH4uFNq+FOizMkfSyl/QjgmIxuG2e7efQ9QVJL h0lJ6+Az7vWBjwFXJ07Gh6l1TqusvZrNgRvVJjd6InNtPKVzaoWcHLLakgTuT8rRdG/gX8vKyUMy 9n5OeiodqDD2uuU42tYLOhnU2wI/MbOsyP9KJE+YccAsM2uX8qPnMyx5Ns6sOLBmimR9BHeSrQVJ R+MZOxuf4NsA0yTdhwdIP4B7YC8HtgJOBLbO6HrGwD/M7FVJd+FVpNsxDPi9pLuBX+JuKsOAj+Op nJtdX7bFYyHPTDzspzTkkb8BODJDv12BWZIuwyM5Gm/Ew3D/uTxLxxtztEnjX3CDlDWTmyjptuTU ryXymgd59qkaWQM34O1O8ZupbezlQsUzjqYmepOXbfqLpJ07pK9JOlDSXZLGZbQdW+BzdSrj6HkF v9+iLFaLHFUqUTVH0gkd1HPHJllf7qAsSfpxg6zV5RlMO03LQx4VzDgqaWPlKzj8olIKqko6p+Ln yWKp8u8jrkC3loQnpr1pZpfja/Gz5D/U6fLy45XW3PJ6ef+Euz38B3CSmf06pf0I+jwMpiYmVzkt GkAerPzdGvRpxa1m1uyOcgnwdIfkLcJnKsBbBxvnd0hWI9+qoxMze4J8p8frANcof/RH3VxWJSde twzWREmnpjUws3lmtg8+aPbDp/PPSvpv+ZN158QAtcq//S5JmyZtxstnKDfhewNn4vsIW7epxPJW H/jyoJaaiH3MU8AKOcTLYGY34BVw6mYRvpxqlrcI+HIH5C0DDmlxI50J3NMBeQNcZ2ZT6urMzK4F LszRdGCfs9u8CHyt61JVvgjFFElZm8EDMo5u08cSeVXoP8uLgj7Xpt0yebn7zCeJvMz6tBKfZ7At CV+RtEeK3DJLwmGSrqxRx8Vqs3Heoe9nqaTxKbK21NtVxOvkQUltK+qoZBEK+cP7/pw6rLDyUeeW hK/LT5Er0e0EfuPxdLlHKGW5Jz9taLfUGI5vnu6CFwVtt8k8DH9Kt3VrkDRCPvN7ED85WplZgHs5 t43QL0NygjsOd9ytGqC9ENcx1WfIzE4G/pnqQbkvAvuYWdvZRuJOswMpmQ1KMAsvffZsjX0CfrqO u3dkpWUGz7efN862Cs8Bn0zCyyrRi0KqG+FHn/dJOk5NTxn58fNVwNo1yBqLZ39o7H9ded6sb+IO qZPIly98sPIMXh9vCzNrrmVYC2b2hpmdgN/YM0t08Roe4TA6cRzOI/Mc3E8vV/sWXJ7IyzyhM7Pn 8NRGx1Atnm4pXsNwx04YqwHM7GE8kiCLVXCfuToKkrRiIV7peXMz6+7JYCOqVpewmeWS7pA0VdIF 8sR9dfNjSVdJmltzv/24JFwiX8LcIulY5XBubJBbeEnYog+TtJ+ka+S/bTsWSbpa0pHKuU2QIu8z km7O8d08IU/JPLqCvDXlD9qHcsgbYLakSZKy3Dga5ZSuS9jQxy9z6jdD0qrJNVWWhEskPS7pNklf kR9i1UqpUzh5Ctaq6UNWBiaZ2Wl1dyo/di5S+kn4RvV84NkikfhNcrcmPa3uoiKzNEmb4/5Y78UT +72MH4TMxlMOldIzRd6GuC/SNrzTx/BVvDJzVrmtovI2w/3CtsELbYzEl6kLcO/1mcAMMyvsyS7p o6T7cD1nZqmpqeVVinZMa9PAveaVq0eRXbziHWJwP8sFwNN1/6bNhMGqRkcMVhAErenFHlYQBEEp wmAFQTBoCIMVBMGgIQxWEASDhjBYQRAMGsJgBUEwaChrsDrqaxEEQdCKsgarUyk+uslTvVYgCIJi lDJYSVbGx2rWpdtMAm7vtRJBEOSnyh7W1bVp0Rt2A/bCU+EGQTAIqGKwzqZDpaK6xFg89cx+QGYg aRAEvae0wTKz+cDJNerSbdYBdk2Wt58FLu2xPkEQZFDJrcHMfgCcRnYF335lX3grCd144Ie9VScI gjQq+2GZ2STgw/iyqmoGyG7zVspWM5OZTcDzeAdB0IfUUpcwyXB4oKQNgD3wenNZxSP7geWSrDGH j5lNlLSQzlWDCYIgqBd5EYy0jJlShzKOBkHQmgjNaYOZ/RQ4iJQiFkEQdJcwWCmY2ZV4mfPneq1L EARhsDIxsxl4NZiHeq1LEAx1wmDlwMzm4cUNMqvGBEHQOcJg5SQpk74XXs4+CIIeEAarAGa2xMwO B07vtS5BMBSpxQ9rqGFm35Q0C/c3C4Ig6H86Udk2CIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIgCIIg CIIgCIIgCIIgCIIgCIIgCIIgCII+5/8B+E0haQri5CUAAAAASUVORK5CYII= "
- preserveAspectRatio="none"
- height="26.987499"
- width="79.375" />
- </g>
-</svg>
diff --git a/pydis_site/static/images/sponsors/adafruit.png b/pydis_site/static/images/sponsors/adafruit.png
deleted file mode 100644
index eb14cf5d..00000000
--- a/pydis_site/static/images/sponsors/adafruit.png
+++ /dev/null
Binary files differ
diff --git a/pydis_site/static/images/sponsors/notion.png b/pydis_site/static/images/sponsors/notion.png
new file mode 100644
index 00000000..44ae9244
--- /dev/null
+++ b/pydis_site/static/images/sponsors/notion.png
Binary files differ
diff --git a/pydis_site/static/images/sponsors/streamyard.png b/pydis_site/static/images/sponsors/streamyard.png
new file mode 100644
index 00000000..a1527e8d
--- /dev/null
+++ b/pydis_site/static/images/sponsors/streamyard.png
Binary files differ
diff --git a/pydis_site/static/images/timeline/cd-icon-location.svg b/pydis_site/static/images/timeline/cd-icon-location.svg
new file mode 100755
index 00000000..6128fecd
--- /dev/null
+++ b/pydis_site/static/images/timeline/cd-icon-location.svg
@@ -0,0 +1,4 @@
+<svg class="nc-icon glyph" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24">
+<path fill="#ffffff" d="M12,0C7.6,0,3,3.4,3,9c0,5.3,8,13.4,8.3,13.7c0.2,0.2,0.4,0.3,0.7,0.3s0.5-0.1,0.7-0.3C13,22.4,21,14.3,21,9
+ C21,3.4,16.4,0,12,0z M12,12c-1.7,0-3-1.3-3-3s1.3-3,3-3s3,1.3,3,3S13.7,12,12,12z"></path>
+</svg>
diff --git a/pydis_site/static/images/timeline/cd-icon-movie.svg b/pydis_site/static/images/timeline/cd-icon-movie.svg
new file mode 100755
index 00000000..498a93fa
--- /dev/null
+++ b/pydis_site/static/images/timeline/cd-icon-movie.svg
@@ -0,0 +1,4 @@
+<svg class="nc-icon glyph" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24"><g>
+<path fill="#ffffff" d="M23.6,6.2c-0.3-0.2-0.6-0.2-0.9-0.1L17,8.5V5c0-0.6-0.4-1-1-1H1C0.4,4,0,4.4,0,5v14c0,0.6,0.4,1,1,1h15
+ c0.6,0,1-0.4,1-1v-3.5l5.6,2.4C22.7,18,22.9,18,23,18c0.2,0,0.4-0.1,0.6-0.2c0.3-0.2,0.4-0.5,0.4-0.8V7C24,6.7,23.8,6.4,23.6,6.2z"></path>
+</g></svg>
diff --git a/pydis_site/static/images/timeline/cd-icon-picture.svg b/pydis_site/static/images/timeline/cd-icon-picture.svg
new file mode 100755
index 00000000..015718a8
--- /dev/null
+++ b/pydis_site/static/images/timeline/cd-icon-picture.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ enable-background="new 0 0 438 438"
+ version="1.1"
+ viewBox="0 0 346.16486 345.72064"
+ xml:space="preserve"
+ id="svg6016"
+ sodipodi:docname="logo_solo.svg"
+ inkscape:version="0.91 r13725"
+ inkscape:export-filename="/home/scragly/Github/PyDisBranding/logos/logo_solo/logo_full_512.png"
+ inkscape:export-xdpi="112.21918"
+ inkscape:export-ydpi="112.21918"
+ width="346.16486"
+ height="345.72064"><defs
+ id="defs6020" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1859"
+ inkscape:window-height="1056"
+ id="namedview6018"
+ showgrid="false"
+ inkscape:zoom="2.1552511"
+ inkscape:cx="150.03331"
+ inkscape:cy="193.10048"
+ inkscape:window-x="61"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg6016"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" /><metadata
+ id="metadata6004"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><style
+ type="text/css"
+ id="style6006">
+ .st0{fill:#7289DA;}
+ .st1{fill:#5B6DAE;}
+ .st2{fill:#CAD6FF;}
+ .st3{fill:#FFFFFF;}
+</style><path
+ d="m 228.38807,14.3068 -11.506,3.3086 c -12.223,-1.8051 -24.757,-2.5971 -36.895,-2.5078 -13.5,0.1 -26.498,1.1992 -37.898,3.1992 -3.6998,0.6516 -7.0474,1.386 -10.107,2.1992 l -35.893004,0 0,18.801 4.500004,0 0,7.6992 2.7832,0 c -0.63936,3.7142 -0.88476,7.7997 -0.88476,12.301 l 0,4 -15.398004,0 -2.2012,11 17.600004,15.014 0,0.0859 79.201,0 0,10 -108.900004,0 c -23,0 -43.2,13.8 -49.5,40 -7.3,30 -7.6,48.801 0,80.201 0.49734,2.0782 1.0605,4.0985 1.6836,6.0625 l -1.1836,10.438 13.346,11.549 c 7.032,7.5103 16.371,11.951 28.254,11.951 l 27.201,0 0,-36 c 0,-26 22.600004,-49 49.500004,-49 l 79.199,0 c 22,0 39.6,-18.102 39.6,-40.102 l 0,-75.199 c 0,-12.9 -6.5819,-23.831 -16.516,-31.273 z m 76.801,77.6 -14.301,7.4004 -20.1,0 0,35.1 c 0,27.2 -23.1,50 -49.5,50 l -79.1,0 c -21.7,0 -39.6,18.5 -39.6,40.1 l 0,75.102 c 0,21.4 18.7,34 39.6,40.1 25.1,7.3 49.1,8.7 79.1,0 19.9,-5.7 39.6,-17.3 39.6,-40.1 l 0,-30.102 -0.11914,0 -11.721,-10 51.439,0 c 23,0 31.602,-16 39.602,-40 8.3,-24.7 7.9,-48.499 0,-80.199 -3.6226,-14.491 -9.3525,-26.71 -18.947,-33.699 z m -123.4,167.6 57.5,0 0,10 -57.5,0 z"
+ id="path6010"
+ inkscape:label="shadow"
+ style="fill:#5b6dae;fill-opacity:1"
+ inkscape:connector-curvature="0" /><path
+ class="st2"
+ d="m 162.28807,0.00679951 c -13.5,0.1 -26.5,1.19999999 -37.9,3.19999999 C 90.888066,9.1067995 84.788066,21.4068 84.788066,44.2068 l 0,30.1 79.200004,0 0,10 -108.900004,0 c -23,0 -43.2,13.8 -49.4999998,40 -7.3,30 -7.6,48.8 0,80.2 5.5999998,23.4 19.0999998,40 42.0999998,40 l 27.2,0 0,-36 c 0,-26 22.6,-49 49.500004,-49 l 79.1,0 c 22,0 39.6,-18.1 39.6,-40.1 l 0,-75.2 c 0,-21.4 -18.1,-37.4000005 -39.6,-41.0000005 -13.5,-2.29999999 -27.6,-3.29999999 -41.2,-3.19999999 z m -42.8,24.20000049 c 8.2,0 14.9,6.8 14.9,15.1 0,8.3 -6.7,15 -14.9,15 -8.2,0 -14.9,-6.7 -14.9,-15 0,-8.4 6.7,-15.1 14.9,-15.1 z"
+ id="path6012"
+ inkscape:label="upper_snake"
+ inkscape:connector-curvature="0"
+ style="fill:#cad6ff" /><path
+ class="st3"
+ d="m 253.08807,84.3068 0,35 c 0,27.2 -23.1,50 -49.5,50 l -79.1,0 c -21.7,0 -39.600004,18.5 -39.600004,40.1 l 0,75.1 c 0,21.4 18.700004,34 39.600004,40.1 25.1,7.3 49.1,8.7 79.1,0 19.9,-5.7 39.6,-17.3 39.6,-40.1 l 0,-30.1 -79.1,0 0,-10 118.7,0 c 23,0 31.6,-16 39.6,-40 8.3,-24.7 7.9,-48.5 0,-80.2 -5.7,-22.8 -16.6,-40 -39.6,-40 l -29.7,0 z m -44.5,190.2 c 8.2,0 14.9,6.7 14.9,15 0,8.3 -6.7,15.1 -14.9,15.1 -8.2,0 -14.9,-6.8 -14.9,-15.1 0,-8.3 6.7,-15 14.9,-15 z"
+ id="path6014"
+ inkscape:label="lower_snake"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /></svg>
diff --git a/pydis_site/static/images/waves/wave_dark.svg b/pydis_site/static/images/waves/wave_dark.svg
new file mode 100644
index 00000000..35174c47
--- /dev/null
+++ b/pydis_site/static/images/waves/wave_dark.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1600"
+ height="198"
+ version="1.1"
+ id="svg11"
+ sodipodi:docname="wave.svg"
+ inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+ <metadata
+ id="metadata15">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="2560"
+ inkscape:window-height="1409"
+ id="namedview13"
+ showgrid="false"
+ inkscape:zoom="1.44625"
+ inkscape:cx="757.49384"
+ inkscape:cy="107.38903"
+ inkscape:window-x="4880"
+ inkscape:window-y="677"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg11" />
+ <defs
+ id="defs7">
+ <linearGradient
+ id="a"
+ x1="50%"
+ x2="50%"
+ y1="-10.959%"
+ y2="100%">
+ <stop
+ stop-color="#57BBC1"
+ stop-opacity=".25"
+ offset="0%"
+ id="stop2" />
+ <stop
+ stop-color="#015871"
+ offset="100%"
+ id="stop4" />
+ </linearGradient>
+ </defs>
+ <path
+ fill="url(#a)"
+ fill-rule="evenodd"
+ d="M.005 121C311 121 409.898-.25 811 0c400 0 500 121 789 121v77H0s.005-48 .005-77z"
+ transform="matrix(-1 0 0 1 1600 0)"
+ id="path9"
+ style="fill:#5b6daf;fill-opacity:1" />
+</svg>
diff --git a/pydis_site/static/images/waves/wave_white.svg b/pydis_site/static/images/waves/wave_white.svg
new file mode 100644
index 00000000..441dacff
--- /dev/null
+++ b/pydis_site/static/images/waves/wave_white.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1600"
+ height="28.745832"
+ version="1.1"
+ id="svg11"
+ sodipodi:docname="wavew.svg"
+ inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+ <metadata
+ id="metadata15">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="2560"
+ inkscape:window-height="1409"
+ id="namedview13"
+ showgrid="false"
+ inkscape:zoom="1.44625"
+ inkscape:cx="884.40031"
+ inkscape:cy="-61.865141"
+ inkscape:window-x="4880"
+ inkscape:window-y="677"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg11"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <defs
+ id="defs7">
+ <linearGradient
+ id="a"
+ x1="0.5"
+ x2="0.5"
+ y1="-0.10958999"
+ y2="1">
+ <stop
+ stop-color="#57BBC1"
+ stop-opacity=".25"
+ offset="0%"
+ id="stop2" />
+ <stop
+ stop-color="#015871"
+ offset="100%"
+ id="stop4" />
+ </linearGradient>
+ </defs>
+ <path
+ fill="url(#a)"
+ fill-rule="evenodd"
+ d="M 1599.995,17.566918 C 1289,17.566918 1190.102,-0.03623696 789,5.6042811e-5 389,5.6042811e-5 289,17.566918 0,17.566918 v 11.178914 h 1600 c 0,0 -0.01,-6.968673 -0.01,-11.178914 z"
+ id="path9"
+ style="fill:#ffffff;fill-opacity:1;stroke-width:0.381026" />
+</svg>
diff --git a/pydis_site/static/js/timeline/main.js b/pydis_site/static/js/timeline/main.js
new file mode 100644
index 00000000..2ff7df57
--- /dev/null
+++ b/pydis_site/static/js/timeline/main.js
@@ -0,0 +1,104 @@
+(function(){
+ // Vertical Timeline - by CodyHouse.co (modified)
+ function VerticalTimeline( element ) {
+ this.element = element;
+ this.blocks = this.element.getElementsByClassName("cd-timeline__block");
+ this.images = this.element.getElementsByClassName("cd-timeline__img");
+ this.contents = this.element.getElementsByClassName("cd-timeline__content");
+ this.offset = 0.8;
+ this.hideBlocks();
+ };
+
+ VerticalTimeline.prototype.hideBlocks = function() {
+ if ( !"classList" in document.documentElement ) {
+ return; // no animation on older browsers
+ }
+ //hide timeline blocks which are outside the viewport
+ var self = this;
+ for( var i = 0; i < this.blocks.length; i++) {
+ (function(i){
+ if( self.blocks[i].getBoundingClientRect().top > window.innerHeight*self.offset ) {
+ self.images[i].classList.add("cd-timeline__img--hidden");
+ self.contents[i].classList.add("cd-timeline__content--hidden");
+ }
+ })(i);
+ }
+ };
+
+ VerticalTimeline.prototype.showBlocks = function() {
+ if ( ! "classList" in document.documentElement ) {
+ return;
+ }
+ var self = this;
+ for( var i = 0; i < this.blocks.length; i++) {
+ (function(i){
+ if((self.contents[i].classList.contains("cd-timeline__content--hidden") || self.contents[i].classList.contains("cd-timeline__content--bounce-out")) && self.blocks[i].getBoundingClientRect().top <= window.innerHeight*self.offset ) {
+ // add bounce-in animation
+ self.images[i].classList.add("cd-timeline__img--bounce-in");
+ self.contents[i].classList.add("cd-timeline__content--bounce-in");
+ self.images[i].classList.remove("cd-timeline__img--hidden");
+ self.contents[i].classList.remove("cd-timeline__content--hidden");
+ self.images[i].classList.remove("cd-timeline__img--bounce-out");
+ self.contents[i].classList.remove("cd-timeline__content--bounce-out");
+ }
+ })(i);
+ }
+ };
+
+ VerticalTimeline.prototype.hideBlocksScroll = function () {
+ if ( ! "classList" in document.documentElement ) {
+ return;
+ }
+ var self = this;
+ for( var i = 0; i < this.blocks.length; i++) {
+ (function(i){
+ if(self.contents[i].classList.contains("cd-timeline__content--bounce-in") && self.blocks[i].getBoundingClientRect().top > window.innerHeight*self.offset ) {
+ self.images[i].classList.remove("cd-timeline__img--bounce-in");
+ self.contents[i].classList.remove("cd-timeline__content--bounce-in");
+ self.images[i].classList.add("cd-timeline__img--bounce-out");
+ self.contents[i].classList.add("cd-timeline__content--bounce-out");
+ }
+ })(i);
+ }
+ }
+
+ var verticalTimelines = document.getElementsByClassName("js-cd-timeline"),
+ verticalTimelinesArray = [],
+ scrolling = false;
+ if( verticalTimelines.length > 0 ) {
+ for( var i = 0; i < verticalTimelines.length; i++) {
+ (function(i){
+ verticalTimelinesArray.push(new VerticalTimeline(verticalTimelines[i]));
+ })(i);
+ }
+
+ //show timeline blocks on scrolling
+ window.addEventListener("scroll", function(event) {
+ if( !scrolling ) {
+ scrolling = true;
+ (!window.requestAnimationFrame) ? setTimeout(checkTimelineScroll, 250) : window.requestAnimationFrame(checkTimelineScroll);
+ }
+ });
+
+ function animationEnd(event) {
+ if (event.target.classList.contains("cd-timeline__img--bounce-out")) {
+ event.target.classList.add("cd-timeline__img--hidden");
+ event.target.classList.remove("cd-timeline__img--bounce-out");
+ } else if (event.target.classList.contains("cd-timeline__content--bounce-out")) {
+ event.target.classList.add("cd-timeline__content--hidden");
+ event.target.classList.remove("cd-timeline__content--bounce-out");
+ }
+ }
+
+ window.addEventListener("animationend", animationEnd);
+ window.addEventListener("webkitAnimationEnd", animationEnd);
+ }
+
+ function checkTimelineScroll() {
+ verticalTimelinesArray.forEach(function(timeline){
+ timeline.showBlocks();
+ timeline.hideBlocksScroll();
+ });
+ scrolling = false;
+ };
+})();
diff --git a/pydis_site/templates/404.html b/pydis_site/templates/404.html
new file mode 100644
index 00000000..42e317d2
--- /dev/null
+++ b/pydis_site/templates/404.html
@@ -0,0 +1,34 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+ <title>Python Discord | 404</title>
+
+ <meta charset="UTF-8">
+
+ <link rel="preconnect" href="https://fonts.gstatic.com">
+ <link href="https://fonts.googleapis.com/css2?family=Hind:wght@400;600&display=swap" rel="stylesheet">
+ <link rel="stylesheet" href="{% static "css/error_pages.css" %}">
+</head>
+
+<body>
+ <div class="error-box">
+ <div class="logo-box">
+ <img src="https://raw.githubusercontent.com/python-discord/branding/b67897df93e572c1576a9026eb78c785a794d226/logos/logo_banner/logo_site_banner.svg"
+ alt="Python Discord banner" />
+ </div>
+ <div class="content-box">
+ <h1>404 — Not Found</h1>
+ <p>We couldn't find the page you're looking for. Here are a few things to try out:</p>
+ <ul>
+ <li>Double check the URL. Are you sure you typed it out correctly?
+ <li>Come join <a href="https://discord.gg/python">our Discord Server</a>. Maybe we can help you out over
+ there
+ </ul>
+ </div>
+ </div>
+</body>
+
+</html>
diff --git a/pydis_site/templates/500.html b/pydis_site/templates/500.html
new file mode 100644
index 00000000..869892ec
--- /dev/null
+++ b/pydis_site/templates/500.html
@@ -0,0 +1,29 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+ <title>Python Discord | 500</title>
+
+ <meta charset="UTF-8">
+
+ <link rel="preconnect" href="https://fonts.gstatic.com">
+ <link href="https://fonts.googleapis.com/css2?family=Hind:wght@400;600&display=swap" rel="stylesheet">
+ <link rel="stylesheet" href="{% static "css/error_pages.css" %}">
+</head>
+
+<body>
+ <div class="error-box">
+ <div class="logo-box">
+ <img src="https://raw.githubusercontent.com/python-discord/branding/b67897df93e572c1576a9026eb78c785a794d226/logos/logo_banner/logo_site_banner.svg"
+ alt="Python Discord banner" />
+ </div>
+ <div class="content-box">
+ <h1>500 — Internal Server Error</h1>
+ <p>Something went wrong at our end. Please try again shortly, or if the problem persists, please let us know <a href="https://discord.gg/python">on Discord</a>.</p>
+ </div>
+ </div>
+</body>
+
+</html>
diff --git a/pydis_site/templates/base/base.html b/pydis_site/templates/base/base.html
index 6fc0c6bb..906fc577 100644
--- a/pydis_site/templates/base/base.html
+++ b/pydis_site/templates/base/base.html
@@ -27,7 +27,6 @@
{# Font-awesome here is defined explicitly so that we can have Pro #}
<script src="https://kit.fontawesome.com/ae6a3152d8.js"></script>
- <script src="{% static "js/base/modal.js" %}"></script>
<link rel="stylesheet" href="{% static "css/base/base.css" %}">
{% block head %}{% endblock %}
diff --git a/pydis_site/templates/base/footer.html b/pydis_site/templates/base/footer.html
index 90f06f3c..bca43b5d 100644
--- a/pydis_site/templates/base/footer.html
+++ b/pydis_site/templates/base/footer.html
@@ -1,7 +1,7 @@
<footer class="footer has-background-dark has-text-light">
<div class="content has-text-centered">
<p>
- Built with <a href="https://www.djangoproject.com/"><span id="django-logo">django</span></a> and <a href="https://bulma.io"><span id="bulma-logo">Bulma</span></a> <br/> &copy; {% now "Y" %} <span id="pydis-text">Python Discord</span>
+ Powered by <a href="https://www.linode.com/?r=3bc18ce876ff43ea31f201b91e8e119c9753f085"><span id="linode-logo">Linode</span></a><br>Built with <a href="https://www.djangoproject.com/"><span id="django-logo">django</span></a> and <a href="https://bulma.io"><span id="bulma-logo">Bulma</span></a> <br/> &copy; {% now "Y" %} <span id="pydis-text">Python Discord</span>
</p>
</div>
</footer>
diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html
index ebafa269..f19706cd 100644
--- a/pydis_site/templates/base/navbar.html
+++ b/pydis_site/templates/base/navbar.html
@@ -19,7 +19,7 @@
<div class="navbar-menu is-paddingless" id="navbar_menu">
<div class="navbar-end">
- {# Discord invite - only visible in the hamburger on mobile sizes. #}
+ {# Burger-menu Discord #}
<a class="navbar-item is-hidden-desktop" href="https://discord.gg/python">
<span class="icon is-size-4 is-medium"><i class="fab fa-discord"></i></span>
<span>&nbsp;Discord</span>
@@ -56,7 +56,7 @@
</a>
{# More #}
- <div class="navbar-item has-dropdown is-hoverable has-left-margin-1">
+ <div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link">
More
</a>
@@ -73,6 +73,9 @@
<a class="navbar-item" href="{% url "content:page_category" location="frequently-asked-questions" %}">
FAQ
</a>
+ <a class="navbar-item" href="{% url 'timeline' %}">
+ Timeline
+ </a>
<a class="navbar-item" href="{% url "content:page_category" location="rules" %}">
Rules
</a>
@@ -94,11 +97,13 @@
</a>
</div>
</div>
+
+ {# Desktop Nav Discord #}
+ <div id="discord-btn" class="buttons is-hidden-touch">
+ <a href="https://discord.gg/python" class="button is-large is-primary">Discord</a>
+ </div>
+
</div>
- {# Join us on Discord! #}
- <a class="navbar-item is-fullsize has-no-highlight has-left-margin-1" href="https://discord.gg/python">
- <img class="is-hidden-touch" src="{% static "images/navbar/navbar_discordjoin.svg" %}" alt="Join us on Discord!"/>
- </a>
</div>
</nav>
diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html
index f31363a4..18f6b77b 100644
--- a/pydis_site/templates/home/index.html
+++ b/pydis_site/templates/home/index.html
@@ -9,12 +9,63 @@
{% block content %}
{% include "base/navbar.html" %}
- <section class="section">
+ <!-- Mobile-only Notice -->
+ <section id="mobile-notice" class="message is-primary is-hidden-tablet">
+ <div class="message-header">
+ <p>100K Member Milestone!</p>
+ </div>
+ <div class="message-body">
+ Thanks to all our members for helping us create this friendly and helpful community!
+ <br><br>
+ As a nice treat, we've created a <a href="{% url 'timeline' %}">Timeline page</a> for people
+ to discover the events that made our community what it is today. Be sure to check it out!
+ </div>
+ </section>
+
+ <!-- Wave Hero -->
+ <section id="wave-hero" class="section is-hidden-mobile">
+
+ <div class="container">
+ <div class="columns is-variable is-8">
+
+ {# Embedded Welcome video #}
+ <div id="wave-hero-centered" class="column is-half">
+ <div class="force-aspect-container">
+ <iframe
+ class="force-aspect-content"
+ src="https://www.youtube.com/embed/ZH26PuX3re0"
+ srcdoc="
+ <style>
+ *{padding:0;margin:0;overflow:hidden}
+ html,body{height:100%}
+ img,span{position:absolute;width:100%;top:0;bottom:0;margin:auto}
+ span{height:1.5em;text-align:center;font:68px/1.5 sans-serif;color:#FFFFFFEE;text-shadow:0 0 0.1em #00000020}
+ </style>
+ <a href=https://www.youtube.com/embed/ZH26PuX3re0?autoplay=1>
+ <img src='{% static "images/frontpage/welcome.jpg" %}' alt='Welcome to Python Discord'>
+ <span>▶</span>
+ </a>"
+ allow="autoplay; accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+ allowfullscreen
+ ></iframe>
+ </div>
+ </div>
+ </div>
+ </div>
- {# Who are we? #}
- <div class="container is-spaced">
+ {# Animated wave elements #}
+ <span id="front-wave" class="wave"></span>
+ <span id="back-wave" class="wave"></span>
+ <span id="bottom-wave" class="wave"></span>
+
+ </section>
+
+ <!-- Main Body -->
+ <section id="body" class="section">
+
+ <div class="container">
<h1 class="is-size-1">Who are we?</h1>
- <br>
+
<div class="columns is-desktop">
<div class="column is-half-desktop content">
<p>
@@ -31,68 +82,125 @@
</p>
<p>
You can find help with most Python-related problems in one of our help channels.
- Our staff of over 50 dedicated expert Helpers are available around the clock
+ Our staff of over 100 dedicated expert Helpers are available around the clock
in every timezone. Whether you're looking to learn the language or working on a
complex project, we've got someone who can help you if you get stuck.
</p>
</div>
- {# Right column container #}
- <div class="column is-half-desktop">
- <iframe width="560" height="315" src="https://www.youtube.com/embed/ZH26PuX3re0" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
- </div>
- </div>
+ {# Showcase box #}
+ <section id="showcase" class="column is-half-desktop has-text-centered">
+ <article class="box">
+
+ <header class="title">Interactive timeline</header>
- {# Projects #}
- <h1 class="is-size-1">Projects</h1>
- <br>
- <div class="columns is-multiline is-tablet">
-
- {# Display projects from HomeView.repos #}
- {% for repo in repo_data %}
- <div class="column is-one-third-desktop is-half-tablet">
- <div class="card has-equal-height github-card">
- <div class="card-content">
- <div class="repo-headline">
- <i class="fab fa-github"></i>
- <a href="https://github.com/{{ repo.repo_name }}"> <strong>{{ repo.repo_name }}</strong></a>
- </div>
- <div>
- {{ repo.description }}
- <br><br>
- </span><span class="repo-language-dot {{ repo.language | lower }}"></span> {{ repo.language }}
- <span id="repo-footer-item"><i class="fas fa-star"></i> {{ repo.stargazers }}</span>
- <span id="repo-footer-item"><i class="fas fa-code-branch"></i> {{ repo.forks }}</span>
- </div>
- </div>
+ <div class="mini-timeline">
+ <i class="fa fa-asterisk"></i>
+ <i class="fa fa-code"></i>
+ <i class="fab fa-python"></i>
+ <i class="fa fa-alien-monster"></i>
+ <i class="fa fa-duck"></i>
+ <i class="fa fa-bug"></i>
</div>
- </div>
- {% endfor %}
+
+ <p class="subtitle">
+ Discover the history of our community, and learn about the events that made our community what it is today.
+ </p>
+
+ <div class="buttons are-large is-centered">
+ <a href="{% url 'timeline' %}" class="button is-primary">
+ <span>Check it out!</span>
+ <span class="icon">
+ <i class="fas fa-arrow-right"></i>
+ </span>
+ </a>
+ </div>
+
+ </article>
+ </section>
</div>
</div>
</section>
- {# Sponsors #}
- <section class="section-sp hero is-light">
- <div id="sponsors-hero" class="hero-body">
+ <!-- Projects -->
+ {% if repo_data %}
+ <section id="projects" class="section">
+ <div class="container">
+ <h1 class="is-size-1">Projects</h1>
+
+ <div class="columns is-multiline is-tablet">
+
+ {# Generate project data from HomeView.repos #}
+ {% for repo in repo_data %}
+ <div class="column is-one-third-desktop is-half-tablet">
+
+ <a href="https://github.com/{{ repo.repo_name }}">
+ <article class="card">
+
+ <header class="card-header">
+ <span class="card-header-icon">
+ <span class="icon"><i class="fab fa-github"></i></span>
+ </span>
+ <div class="card-header-title">
+ {{ repo.repo_name|cut:"python-discord/" }}
+ </div>
+ </header>
+
+ <p class="card-content">
+ {{ repo.description }}
+ </p>
+
+ <footer class="card-footer">
+ <div class="card-footer-item">
+ <i class="repo-language-dot {{ repo.language | lower }}"></i>
+ {{ repo.language }}
+ </div>
+ <div class="card-footer-item">
+ <i class="fas fa-star"></i>
+ {{ repo.stargazers }}
+ </div>
+ <div class="card-footer-item">
+ <i class="fas fa-code-branch"></i>
+ {{ repo.forks }}
+ </div>
+ </footer>
+
+ </article>
+ </a>
+
+ </div>
+ {% endfor %}
+
+ </div>
+
+ </div>
+ </section>
+ {% endif %}
+
+ <!-- Sponsors -->
+ <section id="sponsors" class="hero is-light">
+ <div class="hero-body">
<div class="container">
<h1 class="title is-6 has-text-grey">
Sponsors
</h1>
<div class="columns is-mobile is-multiline">
- <a href="https://linode.com" class="column is-narrow">
+ <a href="https://www.linode.com/?r=3bc18ce876ff43ea31f201b91e8e119c9753f085" class="column is-narrow">
<img src="{% static "images/sponsors/linode.png" %}" alt="Linode"/>
</a>
<a href="https://jetbrains.com" class="column is-narrow">
<img src="{% static "images/sponsors/jetbrains.png" %}" alt="JetBrains"/>
</a>
- <a href="https://adafruit.com" class="column is-narrow">
- <img src="{% static "images/sponsors/adafruit.png" %}" alt="Adafruit"/>
- </a>
<a href="https://sentry.io" class="column is-narrow">
<img src="{% static "images/sponsors/sentry.png" %}" alt="Sentry"/>
</a>
+ <a href="https://notion.so" class="column is-narrow">
+ <img src="{% static "images/sponsors/notion.png" %}" alt="Notion"/>
+ </a>
+ <a href="https://streamyard.com" class="column is-narrow">
+ <img src="{% static "images/sponsors/streamyard.png" %}" alt="StreamYard"/>
+ </a>
</div>
</div>
</div>
diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html
new file mode 100644
index 00000000..d9069aca
--- /dev/null
+++ b/pydis_site/templates/home/timeline.html
@@ -0,0 +1,693 @@
+{% extends 'base/base.html' %}
+{% load static %}
+
+{% block title %}Timeline{% endblock %}
+{% block head %}
+ <link rel="stylesheet" href="{% static "css/home/timeline.css" %}">
+ <link rel="stylesheet" href="{% static "css/home/index.css" %}">
+{% endblock %}
+
+{% block content %}
+ {% include "base/navbar.html" %}
+
+ <section class="cd-timeline js-cd-timeline">
+ <div class="container max-width-lg cd-timeline__container">
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img cd-timeline__img--picture">
+ <img src="{% static "images/timeline/cd-icon-picture.svg" %}" alt="Picture">
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Python Discord is created</h2>
+ <p class="color-contrast-medium"><strong>Joe Banks</strong> becomes one of the owners around 3 days after it
+ is created, and <strong>Leon Sandøy</strong> (lemon) joins the owner team later in the year, when the community
+ has around 300 members.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Jan 8th, 2017</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-dark-blue cd-timeline__img--picture">
+ <i class="fa fa-users"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Python Discord hits 1,000 members</h2>
+ <p class="color-contrast-medium">Our main source of new users at this point is a post on Reddit that
+ happens to get very good SEO. We are one of the top 10 search engine hits for the search term
+ "python discord".</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Nov 10th, 2017</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img cd-timeline__img--picture">
+ <img src={% static "images/timeline/cd-icon-picture.svg" %} alt="Picture">
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Our logo is born. Thanks @Aperture!</h2>
+ <p class="pydis-logo-banner"><img
+ src="https://raw.githubusercontent.com/python-discord/branding/main/logos/logo_banner/logo_site_banner.svg">
+ </p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Feb 3rd, 2018</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-dark-blue cd-timeline__img--picture">
+ <i class="fa fa-users"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>PyDis hits 2,000 members; pythondiscord.com and @Python are live</h2>
+ <p class="color-contrast-medium">The public moderation bot we're using at the time, Rowboat, announces
+ it will be shutting down. We decide that we'll write our own bot to handle moderation, so that we
+ can have more control over its features. We also buy a domain and start making a website in Flask.
+ </p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Mar 4th, 2018</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-blue cd-timeline__img--picture">
+ <i class="fa fa-dice"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>First code jam with the theme “snakes”</h2>
+ <p class="color-contrast-medium">Our very first Code Jam attracts a handful of users who work in random
+ teams of 2. We ask our participants to write a snake-themed Discord bot. Most of the code written
+ for this jam still lives on in Sir Lancebot, and you can play with it by using the
+ <code>.snakes</code> command. For more information on this event, see <a
+ href="https://pythondiscord.com/pages/code-jams/code-jam-1-snakes-bot/">the event page</a></p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Mar 23rd, 2018</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-lime cd-timeline__img--picture">
+ <i class="fa fa-scroll"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>The privacy policy is created</h2>
+ <p class="color-contrast-medium">Since data privacy is quite important to us, we create a privacy page
+ pretty much as soon as our new bot and site starts collecting some data. To this day, we keep <a
+ href="https://pythondiscord.com/pages/privacy/">our privacy policy</a> up to date with all
+ changes, and since April 2020 we've started doing <a
+ href="https://pythondiscord.com/pages/data-reviews/">monthly data reviews</a>.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">May 21st, 2018</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-pink cd-timeline__img--picture">
+ <i class="fa fa-handshake"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Do You Even Python and PyDis merger</h2>
+ <p class="color-contrast-medium">At this point in time, there are only two serious Python communities on
+ Discord - Ours, and one called Do You Even Python. We approach the owners of DYEP with a bold
+ proposal - let's shut down their community, replace it with links to ours, and in return we will let
+ their staff join our staff. This gives us a big boost in members, and eventually leads to @eivl and
+ @Mr. Hemlock joining our Admin team</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Jun 9th, 2018</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-dark-blue cd-timeline__img--picture">
+ <i class="fa fa-users"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>PyDis hits 5,000 members and partners with r/Python</h2>
+ <p class="color-contrast-medium">As we continue to grow, we approach the r/Python subreddit and ask to
+ become their official Discord community. They agree, and we become listed in their sidebar, giving
+ us yet another source of new members.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Jun 20th, 2018</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-pink cd-timeline__img--picture">
+ <i class="fa fa-handshake"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>PyDis is now partnered with Discord; the vanity URL discord.gg/python is created</h2>
+ <p class="color-contrast-medium">After being rejected for their Partner program several times, we
+ finally get approved. The recent partnership with the r/Python subreddit plays a significant role in
+ qualifying us for this partnership.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Jul 10th, 2018</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-blue cd-timeline__img--picture">
+ <i class="fa fa-dice"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>First Hacktoberfest PyDis event; @Sir Lancebot is created</h2>
+ <p class="color-contrast-medium">We create a second bot for our community and fill it up with simple,
+ fun and relatively easy issues. The idea is to create an approachable arena for our members to cut
+ their open-source teeth on, and to provide lots of help and hand-holding for those who get stuck.
+ We're training our members to be productive contributors in the open-source ecosystem.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Oct 1st, 2018</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-dark-blue cd-timeline__img--picture">
+ <i class="fa fa-users"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>PyDis hits 10,000 members</h2>
+ <p class="color-contrast-medium">We partner with RLBot, move from GitLab to GitHub, and start putting
+ together the first Advent of Code event.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Nov 24th, 2018</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-orange cd-timeline__img--picture">
+ <i class="fa fa-code"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>django-simple-bulma is released on PyPi</h2>
+ <p class="color-contrast-medium">Our very first package on PyPI, <a
+ href="https://pypi.org/project/django-simple-bulma/">django-simple-bulma</a> is a package that
+ sets up the Bulma CSS framework for your Django application and lets you configure everything in
+ settings.py.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Dec 19th, 2018</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-dark-blue cd-timeline__img--picture">
+ <i class="fa fa-users"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>PyDis hits 15,000 members; the “hot ones special” video is released</h2>
+ <div class="force-aspect-container">
+ <iframe class="force-aspect-content" src="https://www.youtube.com/embed/DIBXg8Qh7bA" frameborder="0"
+ allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+ allowfullscreen></iframe>
+ </div>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Apr 8th, 2019</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-orange cd-timeline__img--picture">
+ <i class="fa fa-code"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>The Django rewrite of pythondiscord.com is now live!</h2>
+ <p class="color-contrast-medium">The site is getting more and more complex, and it's time for a rewrite.
+ We decide to go for a different stack, and build a website based on Django, DRF, Bulma and
+ PostgreSQL.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Sep 15, 2019</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-lime cd-timeline__img--picture">
+ <i class="fa fa-scroll"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>The code of conduct is created</h2>
+ <p class="color-contrast-medium">Inspired by the Adafruit, Rust and Django communities, an essential
+ community pillar is created; Our <a href="https://pythondiscord.com/pages/code-of-conduct/">Code of
+ Conduct.</a></p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Oct 26th, 2019</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img cd-timeline__img--picture">
+ <img src={% static "images/timeline/cd-icon-picture.svg" %} alt="Picture">
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Sebastiaan Zeef becomes an owner</h2>
+ <p class="color-contrast-medium">After being a long time active contributor to our projects and the driving
+ force behind many of our events, Sebastiaan Zeef joins the Owners Team alongside Joe & Leon.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Sept 22nd, 2019</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-dark-blue cd-timeline__img--picture">
+ <i class="fa fa-users"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>PyDis hits 30,000 members</h2>
+ <p class="color-contrast-medium">More than tripling in size since the year before, the community hits
+ 30000 users. At this point, we're probably the largest Python chat community on the planet.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Dec 22nd, 2019</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-blue cd-timeline__img--picture">
+ <i class="fa fa-dice"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>PyDis sixth code jam with the theme “Ancient technology” and the technology Kivy</h2>
+ <p class="color-contrast-medium">Our Code Jams are becoming an increasingly big deal, and the Kivy core
+ developers join us to judge the event and help out our members during the event. One of them,
+ @tshirtman, even joins our staff!</p>
+
+ <div class="force-aspect-container">
+ <iframe class="force-aspect-content" src="https://www.youtube.com/embed/8fbZsGrqBzo" frameborder="0"
+ allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+ allowfullscreen></iframe>
+ </div>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Jan 17, 2020</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-green cd-timeline__img--picture">
+ <i class="fa fa-comments"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>The new help channel system is live</h2>
+ <p class="color-contrast-medium">We release our dynamic help-channel system, which allows you to claim
+ your very own help channel instead of fighting over the static help channels. We release a <a
+ href="https://pythondiscord.com/pages/resources/guides/help-channels/">Help Channel Guide</a> to
+ help our members fully understand how the system works.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Apr 5th, 2020</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-dark-blue cd-timeline__img--picture">
+ <i class="fa fa-users"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Python Discord hits 40,000 members, and is now bigger than Liechtenstein.</h2>
+ <p class="color-contrast-medium"><img
+ src="https://cdn.discordapp.com/attachments/354619224620138496/699666518476324954/unknown.png">
+ </p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Apr 14, 2020</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-purple cd-timeline__img--picture">
+ <i class="fa fa-gamepad"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>PyDis Game Jam 2020 with the “Three of a Kind” theme and Arcade as the technology</h2>
+ <p class="color-contrast-medium">The creator of Arcade, Paul Vincent Craven, joins us as a judge.
+ Several of the Code Jam participants also end up getting involved contributing to the Arcade
+ repository.</p>
+
+ <div class="force-aspect-container">
+ <iframe class="force-aspect-content" src="https://www.youtube.com/embed/KkLXMvKfEgs" frameborder="0"
+ allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+ allowfullscreen></iframe>
+ </div>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Apr 17th, 2020</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-green cd-timeline__img--picture">
+ <i class="fa fa-comments"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>ModMail is now live</h2>
+ <p class="color-contrast-medium">Having originally planned to write our own ModMail bot from scratch, we
+ come across an exceptionally good <a href="https://github.com/kyb3r/modmail">ModMail bot by
+ kyb3r</a> and decide to just self-host that one instead.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">May 25th, 2020</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-pink cd-timeline__img--picture">
+ <i class="fa fa-handshake"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Python Discord is now listed on python.org/community</h2>
+ <p class="color-contrast-medium">After working towards this goal for months, we finally work out an
+ arrangement with the PSF that allows us to be listed on that most holiest of websites:
+ https://python.org/. <a href="https://youtu.be/yciX2meIkXI?t=3">There was much rejoicing.</a></p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">May 28th, 2020</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-red cd-timeline__img--picture">
+ <i class="fa fa-chart-bar"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Python Discord Public Statistics are now live</h2>
+ <p class="color-contrast-medium">After getting numerous requests to publish beautiful data on member
+ count and channel use, we create <a href="https://stats.pythondiscord.com/">stats.pythondiscord.com</a> for
+ all to enjoy.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Jun 4th, 2020</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-blue cd-timeline__img--picture">
+ <i class="fa fa-dice"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>PyDis summer code jam 2020 with the theme “Early Internet” and Django as the technology</h2>
+ <p class="color-contrast-medium">Sponsored by the Django Software Foundation and JetBrains, the Summer
+ Code Jam for 2020 attracts hundreds of participants, and sees the creation of some fantastic
+ projects. Check them out in our judge stream below:</p>
+
+ <div class="force-aspect-container">
+ <iframe class="force-aspect-content" src="https://www.youtube.com/embed/OFtm8f2iu6c" frameborder="0"
+ allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+ allowfullscreen></iframe>
+ </div>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Jul 31st, 2020</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-pink cd-timeline__img--picture">
+ <i class="fa fa-handshake"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Python Discord is now the new home of the PyWeek event!</h2>
+ <p class="color-contrast-medium">PyWeek, a game jam that has been running since 2005, joins Python
+ Discord as one of our official events. Find more information about PyWeek on <a
+ href="https://pyweek.org/">their official website</a>.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Aug 16th, 2020</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img cd-timeline__img--picture">
+ <img src="{% static "images/timeline/cd-icon-picture.svg" %}" alt="Picture">
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Python Discord hosts the 2020 CPython Core Developer Q&A</h2>
+ <div class="force-aspect-container">
+ <iframe class="force-aspect-content" src="https://www.youtube.com/embed/gXMdfBTcOfQ" frameborder="0"
+ allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+ allowfullscreen></iframe>
+ </div>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Oct 21st, 2020</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-dark-blue cd-timeline__img--picture">
+ <i class="fa fa-users"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Python Discord hits 100,000 members!</h2>
+ <p class="color-contrast-medium">Only six months after hitting 40,000 users, we hit 100,000 users. A
+ monumental milestone,
+ and one we're very proud of. To commemorate it, we create this timeline.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Oct 22nd, 2020</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-orange cd-timeline__img--picture">
+ <i class="fa fa-wrench"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>We migrate all our infrastructure to Kubernetes</h2>
+ <p class="color-contrast-medium">As our tech stack grows, we decide to migrate all our services over to a
+ container orchestration paradigm via Kubernetes. This gives us better control and scalability.
+ <b>Joe Banks</b> takes on the role as DevOps Lead.
+ </p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Nov 29th, 2020</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-red cd-timeline__img--picture">
+ <i class="fa fa-snowflake-o"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Advent of Code attracts hundreds of participants</h2>
+ <p class="color-contrast-medium">
+ A total of 443 Python Discord members sign up to be part of
+ <a href="https://adventofcode.com/">Eric Wastl's excellent Advent of Code event</a>.
+ As always, we provide dedicated announcements, scoreboards, bot commands and channels for our members
+ to enjoy the event in.
+
+ </p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">December 1st - 25th, 2020</span>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-blue cd-timeline__img--picture">
+ <i class="fa fa-music"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>We release The PEP 8 song</h2>
+ <p class="color-contrast-medium">We release the PEP 8 song on our YouTube channel, which finds tens of
+ thousands of listeners!</p>
+
+ <div class="force-aspect-container">
+ <iframe class="force-aspect-content" src="https://www.youtube.com/embed/hgI0p1zf31k" frameborder="0"
+ allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+ allowfullscreen></iframe>
+ </div>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">February 8th, 2021</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-dark-blue cd-timeline__img--picture">
+ <i class="fa fa-users"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>We now have 150,000 members!</h2>
+ <p class="color-contrast-medium">Our growth continues to accelerate.</p>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Feb 18th, 2021</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-green cd-timeline__img--picture">
+ <i class="fa fa-microphone"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Leon Sandøy appears on Talk Python To Me</h2>
+ <p class="color-contrast-medium">Leon goes on the Talk Python to Me podcast with Michael Kennedy
+ to discuss the history of Python Discord, the critical importance of culture, and how to run a massive
+ community. You can find the episode <a href="https://talkpython.fm/episodes/show/305/python-community-at-python-discord"> at talkpython.fm</a>.
+ </p>
+
+ <iframe width="100%" height="166" scrolling="no" frameborder="no"
+ src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/996083146&color=ff5500&auto_play=false&hide_related=false&show_comments=true&show_user=true&show_reposts=false">
+ </iframe>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Mar 1st, 2021</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-pink cd-timeline__img--picture">
+ <i class="fa fa-microphone"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>We're on the Teaching Python podcast!</h2>
+ <p class="color-contrast-medium">Leon joins Sean and Kelly on the Teaching Python podcast to discuss how the pandemic has
+ changed the way we learn, and what role communities like Python Discord can play in this new world.
+ You can find the episode <a href="https://teachingpython.fm/63"> at teachingpython.fm</a>.
+ </p>
+
+ <iframe width="100%" height="166" frameborder="0" scrolling="no"
+ src="https://player.fireside.fm/v2/UIYXtbeL+qOjGAsKi?theme=dark"
+ ></iframe>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Mar 13th, 2021</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-purple cd-timeline__img--picture">
+ <i class="fa fa-comment"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>New feature: Weekly discussion channel</h2>
+ <p class="color-contrast-medium">Every week (or two weeks), we'll be posting a new topic to discuss in a
+ channel called <b>#weekly-topic-discussion</b>. Our inaugural topic is a PyCon talk by Anthony Shaw called
+ <b>Wily Python: Writing simpler and more maintainable Python.</b></a>.
+ </p>
+
+ <div class="force-aspect-container">
+ <iframe class="force-aspect-content" src="https://www.youtube.com/embed/dqdsNoApJ80" frameborder="0"
+ allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+ allowfullscreen></iframe>
+ </div>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Mar 13th, 2021</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img pastel-red cd-timeline__img--picture">
+ <i class="fa fa-youtube-play"></i>
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Summer Code Jam 2020 Highlights</h2>
+ <p class="color-contrast-medium">
+ We release a new video to our YouTube showing the best projects from the Summer Code Jam 2020.
+ Better late than never!
+ </p>
+
+ <div class="force-aspect-container">
+ <iframe class="force-aspect-content" src="https://www.youtube.com/embed/g9cnp4W0P54" frameborder="0"
+ allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+ allowfullscreen></iframe>
+ </div>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Mar 21st, 2021</span>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </section>
+
+ <script src="{% static "js/timeline/main.js" %}"></script>
+{% endblock %}