aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar wookie184 <[email protected]>2022-07-16 01:27:59 +0100
committerGravatar GitHub <[email protected]>2022-07-16 01:27:59 +0100
commit57a36d7e722167bb32a9f86cdeae093f60820c14 (patch)
tree9d63ed5b4ea8c98517d3d335c012c0a68c09ab6c
parentMerge pull request #740 from python-discord/update-django (diff)
parentRemove trailing space in codejam rules (diff)
Merge pull request #743 from python-discord/cj9-changes
Make finalizing codejam 9 changes
-rw-r--r--pydis_site/templates/events/index.html3
-rw-r--r--pydis_site/templates/events/pages/code-jams/9/_index.html4
-rw-r--r--pydis_site/templates/events/pages/code-jams/9/frameworks.html40
-rw-r--r--pydis_site/templates/events/pages/code-jams/9/rules.html11
-rw-r--r--pydis_site/templates/events/pages/code-jams/_index.html6
-rw-r--r--pydis_site/templates/home/index.html4
6 files changed, 35 insertions, 33 deletions
diff --git a/pydis_site/templates/events/index.html b/pydis_site/templates/events/index.html
index db3e32f7..796a2e34 100644
--- a/pydis_site/templates/events/index.html
+++ b/pydis_site/templates/events/index.html
@@ -9,9 +9,6 @@
{% block event_content %}
<div class="box">
<h2 class="title is-4"><a href="{% url "events:page" path="code-jams" %}">Code Jams</a></h2>
- <div class="notification is-success">
- The <b>2022 Summer Code Jam</b> is currently underway and you can still enter! <b>The qualifier is open until July 13</b>; check out the details <a href="{% url "events:page" path="code-jams/9" %}">here</a>.
- </div>
<p>Every year we hold a community-wide Summer Code Jam. For this event, members of our community are assigned to teams to collaborate and create something amazing using a technology we picked for them. One such technology that was picked for the Summer 2021 Code Jam was text user interfaces (TUIs), where teams could pick from a pre-approved list of frameworks.</p>
<p>To help fuel the creative process, we provide a specific theme, like <strong>Think Inside the Box</strong> or <strong>Early Internet</strong>. At the end of the Code Jam, the projects are judged by Python Discord server staff members and guest judges from the larger Python community. The judges will consider creativity, code quality, teamwork, and adherence to the theme.</p>
<p>If you want to read more about Code Jams, visit our <a href="{% url "events:page" path="code-jams" %}">Code Jam info page</a> or watch this video showcasing the best projects created during the <strong>Winter Code Jam 2020: Ancient Technology</strong>:</p>
diff --git a/pydis_site/templates/events/pages/code-jams/9/_index.html b/pydis_site/templates/events/pages/code-jams/9/_index.html
index 7c57b799..f8d6e88b 100644
--- a/pydis_site/templates/events/pages/code-jams/9/_index.html
+++ b/pydis_site/templates/events/pages/code-jams/9/_index.html
@@ -24,8 +24,8 @@
<ul>
<li><strike>Saturday, June 18 - Form to submit theme suggestions opens</strike></li>
<li><strike>Wednesday, June 29 - The Qualifier is released</strike></li>
- <li>Wednesday, July 6 - Voting for the theme opens</li>
- <li>Wednesday, July 13 - The Qualifier closes</li>
+ <li><strike>Wednesday, July 6 - Voting for the theme opens</strike></li>
+ <li><strike>Wednesday, July 13 - The Qualifier closes</strike></li>
<li>Thursday, July 21 - Code Jam Begins</li>
<li>Sunday, July 31 - Coding portion of the jam ends</li>
<li>Sunday, August 4 - Code Jam submissions are closed</li>
diff --git a/pydis_site/templates/events/pages/code-jams/9/frameworks.html b/pydis_site/templates/events/pages/code-jams/9/frameworks.html
index 355bf9c3..b462c733 100644
--- a/pydis_site/templates/events/pages/code-jams/9/frameworks.html
+++ b/pydis_site/templates/events/pages/code-jams/9/frameworks.html
@@ -71,70 +71,70 @@
<div class="card mb-4">
<div class="card-content">
<div class="content">
- <p class="subtitle">Django Channels</p>
- <p>Django Channels adds WebSocket-support to Django - built on ASGI like other web frameworks.
+ <p class="subtitle">aiohttp</p>
+ <p>aiohttp provides both a client and server WebSocket implementation, while avoiding callback-hell.
</p>
</div>
</div>
<div class="card-footer">
- <a href="https://channels.readthedocs.io/en/stable" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
- <a href="https://github.com/django/channels" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
+ <a href="https://docs.aiohttp.org/en/stable/client_quickstart.html#websockets" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
+ <a href="https://github.com/aio-libs/aiohttp" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
</div>
</div>
<div class="card mb-4">
<div class="card-content">
<div class="content">
- <p class="subtitle">Flask-SocketIO</p>
- <p>Flask-SocketIO gives Flask applications access to low latency bi-directional communications between the clients and the server.
+ <p class="subtitle">Django Channels</p>
+ <p>Django Channels adds WebSocket-support to Django - built on ASGI like other web frameworks.
</p>
</div>
</div>
<div class="card-footer">
- <a href="https://flask-socketio.readthedocs.io/en/latest" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
- <a href="https://github.com/miguelgrinberg/flask-socketio" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
+ <a href="https://channels.readthedocs.io/en/stable" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
+ <a href="https://github.com/django/channels" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
</div>
</div>
<div class="card mb-4">
<div class="card-content">
<div class="content">
- <p class="subtitle">wsproto</p>
- <p>wsproto is a pure-Python WebSocket protocol stack written to be as flexible as possible by having the user build the bridge to the I/O.
+ <p class="subtitle">Starlite</p>
+ <p>Starlite is a light and flexible ASGI API framework, using Starlette and Pydantic as foundations.
</p>
</div>
</div>
<div class="card-footer">
- <a href="https://python-hyper.org/projects/wsproto/en/stable" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
- <a href="https://github.com/python-hyper/wsproto" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
+ <a href="https://starlite-api.github.io/starlite" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
+ <a href="https://github.com/starlite-api/starlite" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
</div>
</div>
<div class="card mb-4">
<div class="card-content">
<div class="content">
- <p class="subtitle">Starlite</p>
- <p>Starlite is a light and flexible ASGI API framework, using Starlette and Pydantic as foundations.
+ <p class="subtitle">Sanic</p>
+ <p>Sanic is an ASGI compliant web framework designed for speed and simplicity.
</p>
</div>
</div>
<div class="card-footer">
- <a href="https://starlite-api.github.io/starlite" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
- <a href="https://github.com/starlite-api/starlite" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
+ <a href="https://sanic.dev/en/guide/advanced/websockets.html" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
+ <a href="https://github.com/sanic-org/sanic" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
</div>
</div>
<div class="card mb-4">
<div class="card-content">
<div class="content">
- <p class="subtitle">Sanic</p>
- <p>Sanic is an ASGI compliant web framework designed for speed and simplicity.
+ <p class="subtitle">wsproto</p>
+ <p>wsproto is a pure-Python WebSocket protocol stack written to be as flexible as possible by having the user build the bridge to the I/O.
</p>
</div>
</div>
<div class="card-footer">
- <a href="https://sanic.dev/en/guide/advanced/websockets.html" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
- <a href="https://github.com/sanic-org/sanic" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
+ <a href="https://python-hyper.org/projects/wsproto/en/stable" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
+ <a href="https://github.com/python-hyper/wsproto" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
</div>
</div>
diff --git a/pydis_site/templates/events/pages/code-jams/9/rules.html b/pydis_site/templates/events/pages/code-jams/9/rules.html
index 72c0372e..5ad75d67 100644
--- a/pydis_site/templates/events/pages/code-jams/9/rules.html
+++ b/pydis_site/templates/events/pages/code-jams/9/rules.html
@@ -12,6 +12,17 @@
{% block event_content %}
<ol>
<li><p>Your solution must use one of the approved frameworks (a list will be released soon). It is not permitted to circumvent this rule by e.g. using the approved framework as a wrapper for another framework.</p></li>
+ <li>
+ <p><strong>Your solution must only communicate through WebSockets</strong>. Any communication between the client and server (or any two server workers), must utilize WebSockets.</p>
+
+ <p>
+ An exception to this rule is that communication with databases and files is allowed for accessing resources or for storage purposes.
+ For example, you may use PostgreSQL as a database but not its `NOTIFY` command.
+ Working with subprocesses (through stdin/stdout or <code>multiprocessing.Pool()</code>/<code>concurrent.futures.ProcessPoolExecutor()</code>) is also allowed.
+ </p>
+
+ <p>If you're interested in utilizing a particular non-WebSocket method of communication, reach out to the Events Team for discussion and approval</p>
+ </li>
<li><p>Your solution should be platform agnostic. For example, if you use filepaths in your submission, use <code>pathlib</code> to create platform agnostic Path objects instead of hardcoding the paths.</p></li>
<li>
<p>
diff --git a/pydis_site/templates/events/pages/code-jams/_index.html b/pydis_site/templates/events/pages/code-jams/_index.html
index 74efcfaa..c7975679 100644
--- a/pydis_site/templates/events/pages/code-jams/_index.html
+++ b/pydis_site/templates/events/pages/code-jams/_index.html
@@ -8,12 +8,6 @@
{% block title %}Code Jams{% endblock %}
{% block event_content %}
- <div class="block">
- <div class="notification is-success">
- The <b>2022 Summer Code Jam</b> is currently underway and you can still enter! <b>The qualifier is open until July 13</b>; check out the details <a href="{% url "events:page" path="code-jams/9" %}">here</a>.
- </div>
- </div>
-
<p>
If you've been around the server for a while, or you just happened to join at the right time,
you may have heard of something known as a Code Jam.
diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html
index cdbac830..cf6ff8cd 100644
--- a/pydis_site/templates/home/index.html
+++ b/pydis_site/templates/home/index.html
@@ -12,7 +12,7 @@
<!-- Mobile-only Code Jam Banner -->
<section id="mobile-notice" class="is-primary is-hidden-tablet">
<a href="/events/code-jams/9/">
- <img src="{% static "images/events/summer_code_jam_2022/front_page_banners/sign_up.png" %}" alt="Summer Code Jam 2022">
+ <img src="{% static "images/events/summer_code_jam_2022/site_banner.png" %}" alt="Summer Code Jam 2022">
</a>
</section>
@@ -48,7 +48,7 @@
{# Code Jam Banner #}
<div id="wave-hero-right" class="column is-half">
<a href="/events/code-jams/9/">
- <img src="{% static "images/events/summer_code_jam_2022/front_page_banners/sign_up.png" %}" alt="Summer Code Jam 2022">
+ <img src="{% static "images/events/summer_code_jam_2022/site_banner.png" %}" alt="Summer Code Jam 2022">
</a>
</div>
</div>