Skip to content

Commit 7e8d29c

Browse files
ToxicKidzToxicKidz
authored
Merge branch 'main' into jb3/navbar-spans
2 parents d2112a8 + b74f8c7 commit 7e8d29c

File tree

7 files changed

+157
-24
lines changed

7 files changed

+157
-24
lines changed

‎pydis_site/apps/api/migrations/0070_auto_20210618_2114.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Generated by Django 3.0.14 on 2021-06-18 21:14
2+
3+
import django.core.validators
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('api', '0069_documentationlink_validators'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='role',
16+
name='permissions',
17+
field=models.BigIntegerField(help_text='The integer value of the permission bitset of this role from Discord.', validators=[django.core.validators.MinValueValidator(limit_value=0, message='Role permissions cannot be negative.')]),
18+
),
19+
]

‎pydis_site/apps/api/models/bot/role.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import annotations
22

3-
from django.core.validators import MaxValueValidator, MinValueValidator
3+
from django.core.validators import MinValueValidator
44
from django.db import models
55

66
from pydis_site.apps.api.models.mixins import ModelReprMixin
@@ -38,16 +38,12 @@ class Role(ModelReprMixin, models.Model):
3838
),
3939
help_text="The integer value of the colour of this role from Discord."
4040
)
41-
permissions = models.IntegerField(
41+
permissions = models.BigIntegerField(
4242
validators=(
4343
MinValueValidator(
4444
limit_value=0,
4545
message="Role permissions cannot be negative."
4646
),
47-
MaxValueValidator(
48-
limit_value=2 << 32,
49-
message="Role permission bitset exceeds value of having all permissions"
50-
)
5147
),
5248
help_text="The integer value of the permission bitset of this role from Discord."
5349
)

‎pydis_site/apps/resources/resources/communities/rlbot.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎pydis_site/static/images/events/Tabnine.png

10.3 KB
Loading

‎pydis_site/templates/events/pages/code-jams/8/_index.html

Lines changed: 87 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{% extends "events/base_sidebar.html" %}
22

3+
{% load static %}
4+
35
{% block title %}Summer Code Jam 2021{% endblock %}
46

57
{% block breadcrumb %}
@@ -21,9 +23,9 @@
2123
<h3 id="important-dates"><a href="#important-dates">Important Dates</a></h3>
2224
<ul>
2325
<li>Tuesday, June 15 - Form to submit theme suggestions opens</li>
24-
<li>Monday, June 21 - The Qualifier is released</li>
26+
<li>Monday, June 21 - <a href="https://github.com/python-discord/cj8-qualifier">The Qualifier</a> is released</li>
2527
<li>Friday, June 25 - Voting for the theme opens</li>
26-
<li>Sunday, June 27 - GitHub Bootcamp</li>
28+
<li>Saturday, June 26 @ 4PM UTC- <a class="has-text-link" href="{% url "events:page" path="code-jams/8/github-bootcamp" %}">GitHub Bootcamp</a></li>
2729
<li>Wednesday, June 30 - The Qualifier closes</li>
2830
<li>Friday, July 9 - Code Jam begins</li>
2931
<li>Friday, July 16 - Coding portion of the jam ends</li>
@@ -36,10 +38,90 @@ <h3 id="technology"><a href="#technology">Technology</a></h3>
3638
Each team must create a program with one of <a href="{% url "events:page" path="code-jams/8/frameworks" %}">the approved frameworks</a> that creates a user interface that is text based.
3739
For more information of TUIs and what's involved with such an interface, check out <a href="https://en.wikipedia.org/wiki/Text-based_user_interface">this wikipedia article</a>.
3840
</p>
39-
41+
<h3 if="qualifier"><a href="#qualifier">The Qualifier</a></h3>
42+
<p>
43+
The qualifier is a coding challenge that you are required to complete before registering for the code jam.
44+
This is meant as a basic assessment of your skills to ensure you have enough python knowledge to effectively contribute in a team environment.
45+
</p>
46+
<p class="has-text-centered"><a class="button is-link" href="https://github.com/python-discord/cj8-qualifier" target="_blank">View the Qualifier</a></p
47+
<p>
48+
Please note the requirements for the qualifier.
49+
<ul>
50+
<li>The qualifier must be completed using Python 3.9</li>
51+
<li>No external modules are allowed, only those available through the standard library.</li>
52+
<li>The Qualifier must be submitted through the Code Jam sign-up form.</li>
53+
</ul>
54+
</p>
4055
<h3 id="how-to-join"><a href="#how-to-join">How to Join</a></h3>
41-
<p>The Qualifier isn't released yet, but to receive the most up-to-date information and to get notified
42-
when the Qualifier is released you can join us on Discord at <a href="https://discord.gg/python">discord.gg/python</a>.</p>
56+
<p>
57+
To enter into the code jam you must complete <a href="#qualifier">The Qualifier</a> and submit the sign-up form.
58+
Don't forget to join us on Discord at <a href="https://discord.gg/python">discord.gg/python</a>!
59+
<div class="has-text-centered"><a class="button is-link" href="https://form.jotform.com/211714357615050" target="_blank">Sign up for the Code Jam</a></div>
60+
</p>
61+
<h3 id="prizes"><a href="#prizes">Prizes</a></h3>
62+
<p>
63+
Our Code Jam Sponsors have provided prizes for the winners of the code jam.
64+
Also, a big thank you to our Patreon patrons for supporting this server and allowing us
65+
to provide our prizes as well.
66+
</p>
67+
<!-- This is going to be the sponsor section -->
68+
<div class="card mb-4">
69+
<div class="card-content">
70+
<div class="media">
71+
<div class="media-left" style="max-width:150px">
72+
<img src="{% static "images/events/DO_Logo_Vertical_Blue.png" %}" alt="Digital Ocean">
73+
</div>
74+
<div class="media-content">
75+
<p class="subtitle has-link"><a href="https://www.digitalocean.com/">DigitalOcean</a></p>
76+
<p class="is-italic">
77+
Scalable compute platform with add-on storage, security, and monitoring capabilities.
78+
We make it simple to launch in the cloud and scale up as you grow—whether you’re running one virtual machine or ten thousand.
79+
</p>
80+
<p><strong>Prizes</strong><br>
81+
$250 in DigitalOcean credits to the members of a winning team.</p>
82+
</div>
83+
</div>
84+
</div>
85+
</div>
86+
87+
<div class="card mb-4">
88+
<div class="card-content">
89+
<div class="media">
90+
<div class="media-left" style="max-width:150px">
91+
<img src="{% static "images/sponsors/jetbrains.png" %}" alt="JetBrains">
92+
</div>
93+
<div class="media-content">
94+
<p class="subtitle has-link"><a href="https://www.jetbrains.com/">JetBrains</a></p>
95+
<p class="is-italic">
96+
Whatever platform or language you work with, JetBrains has a development tool for you.
97+
We help developers work faster by automating common, repetitive tasks to enable them to stay focused on code design and the big picture.
98+
We provide tools to explore and familiarize with code bases faster. Our products make it easy for you to take care of quality during all stages of development and spend less time on maintenance tasks.
99+
</p>
100+
<p><strong>Prizes</strong><br>
101+
1-year JetBrain licenses to the members of a winning team.</p>
102+
</div>
103+
</div>
104+
</div>
105+
</div>
106+
<div class="card mb">
107+
<div class="card-content">
108+
<div class="media">
109+
<div class="media-left" style="max-width:150px">
110+
<img src="{% static "images/events/Tabnine.png" %}" alt="Tabnine">
111+
</div>
112+
<div class="media-content">
113+
<p class="subtitle has-link"><a href="https://www.tabnine.com/now?utm_source=discord&utm_medium=Ins&utm_campaign=PythonDis">Tabnine</a></p>
114+
<p class="is-italic">Tabnine is an AI-powered code completion tool used by millions of devs around the world every day
115+
- Tabnine supports dozens of programming languages, in all of your favorite IDEs, saving you tons of time - so that you can type less and code more.
116+
Tabnine comes as a plugin and has a free-forever basic plan, so you can get started with it right away!
117+
</p>
118+
<p><strong>Prizes</strong><br>
119+
1-year Pro Licenses to Tabnine to the members of a winning team.</p>
120+
</div>
121+
</div>
122+
</div>
123+
</div>
124+
43125
{% endblock %}
44126

45127
{% block sidebar %}

‎pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{% extends "events/base_sidebar.html" %}
2+
3+
{% load static %}
4+
5+
{% block title %}Summer Code Jam 2021{% endblock %}
6+
7+
{% block breadcrumb %}
8+
<li><a href="{% url "events:index" %}">Events</a></li>
9+
<li><a href="{% url "events:page" path="code-jams" %}">Code Jams</a></li>
10+
<li><a href="{% url "events:page" path="code-jams/8" %}">Summer Code Jam 2021</a></li>
11+
<li class="is-active"><a href="#">GitHub Bootcamp</a></li>
12+
{% endblock %}
13+
14+
{% block event_content %}
15+
<p>
16+
<strong>This year we'll be running a GitHub Bootcamp on Saturday, June 26th at 4PM UTC.</strong>
17+
This bootcamp is intended to be an interactive workshop session where we help participants
18+
get setup with git and using it in a team environment. If you are new to git or would like to brush up on it,
19+
then this is the perfect event for you.
20+
</p>
21+
<p>
22+
The instructional parts of this bootcamp will be recorded. We'll also be providing a cheatsheet / reference guide to all attendees that will
23+
be made available here for download.
24+
</p>
25+
<h3>Session 1: Setting up Git</h3>
26+
<p>
27+
This first session will run for an hour starting at 4PM UTC. It will be focused on installing and setting up git for the first time.
28+
We'll have helpers available to help you set up git and integrated with your editor of choice.
29+
Whether it's PyCharm, VSCode, or vim, we can help you get rolling with version control.
30+
</p>
31+
<h3>Session 2: Using git and github in a team environment</h3>
32+
<p>
33+
This session will run for an hour starting at 5PM UTC. It will be focused on using git and GitHub in a team environment.
34+
You'll be put in a group with other attendees and use the common git commands for working in a repo.
35+
You'll learn how to set-up a GitHub repository with other contributors, how to make branches, make commits, pull down changes, and then make pull requests.
36+
We'll also be going over different strategies for creating branches and best practices for commits and pull requests.
37+
</p>
38+
39+
{% endblock %}
40+
41+
{% block sidebar %}
42+
43+
{% include "events/sidebar/code-jams/8.html" %}
44+
45+
{% endblock %}

‎pydis_site/templates/events/sidebar/code-jams/8.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<p class="panel-heading">Important Links</p>
44
<a class="panel-block has-text-link" href="{% url "events:page" path="code-jams/8/rules" %}">Rules</a>
55
<a class="panel-block has-text-link" href="{% url "events:page" path="code-jams/8/frameworks" %}">Approved Frameworks</a>
6+
<a class="panel-block has-text-link" href="{% url "events:page" path="code-jams/8/github-bootcamp" %}">GitHub Bootcamp</a>
67
</ul>
78
</div>
89
<div class="box">
@@ -14,4 +15,7 @@ <h4 class="menu-label">Our Sponsors</h4>
1415
<a href="https://jetbrains.com" target="_blank">
1516
<img src="{% static "images/sponsors/jetbrains.png" %}" alt="JetBrains">
1617
</a>
18+
<a href="https://www.tabnine.com/now?utm_source=discord&utm_medium=Ins&utm_campaign=PythonDis" target="_blank">
19+
<img src="{% static "images/events/Tabnine.png" %}" alt="Tabnine">
20+
</a>
1721
</div>

0 commit comments

Comments
 (0)