From 51bfa2cb88dd5c29f80bb8f9aa9d724d33a87d45 Mon Sep 17 00:00:00 2001 From: hedy Date: Sat, 20 Jan 2024 14:27:42 +0800 Subject: Events: Initial redesign - Added standalone pages for each event - Added initial design of new layout - Refactored some sidebars and templates to update current/upcoming event - Put two CJ10 assets into their own dedicated folder Includes dummy text for event descriptions and content that is not up-to-date: Current and Upcoming event components. --- pydis_site/static/css/events/base.css | 15 +- .../static/images/events/cj10_2023_banner2.png | Bin 157845 -> 0 bytes .../static/images/events/cj10_2023_banner3.png | Bin 205921 -> 0 bytes .../images/events/pixels_logo_transparent.gif | Bin 0 -> 101270 bytes .../images/events/pixels_logo_transparent.png | Bin 0 -> 10009 bytes .../images/events/summer_code_jam_2023/banner2.png | Bin 0 -> 157845 bytes .../images/events/summer_code_jam_2023/banner3.png | Bin 0 -> 205921 bytes pydis_site/templates/events/current_event.html | 18 +++ pydis_site/templates/events/index.html | 157 +++++++++++---------- .../events/pages/adventofcode/_index.html | 32 +++++ .../templates/events/pages/game-jams/_index.html | 22 ++- .../templates/events/pages/pixels/_index.html | 18 +++ .../templates/events/pages/pyweek/_index.html | 30 ++++ .../events/pages/revivalofcode/_index.html | 24 ++++ .../events/sidebar/adventofcode/useful-links.html | 10 ++ .../events/sidebar/code-jams/ongoing-code-jam.html | 2 +- .../templates/events/sidebar/events-list.html | 17 --- .../templates/events/sidebar/events_list.html | 21 +++ .../templates/events/sidebar/ongoing-event.html | 8 -- pydis_site/templates/events/sidebar/pixels.html | 1 + .../events/sidebar/pyweek/useful-links.html | 11 ++ .../templates/events/sidebar/revivalofcode.html | 10 ++ pydis_site/templates/events/upcoming_event.html | 18 +++ pydis_site/templates/home/index.html | 4 +- 24 files changed, 310 insertions(+), 108 deletions(-) delete mode 100644 pydis_site/static/images/events/cj10_2023_banner2.png delete mode 100644 pydis_site/static/images/events/cj10_2023_banner3.png create mode 100644 pydis_site/static/images/events/pixels_logo_transparent.gif create mode 100644 pydis_site/static/images/events/pixels_logo_transparent.png create mode 100644 pydis_site/static/images/events/summer_code_jam_2023/banner2.png create mode 100644 pydis_site/static/images/events/summer_code_jam_2023/banner3.png create mode 100644 pydis_site/templates/events/current_event.html create mode 100644 pydis_site/templates/events/pages/adventofcode/_index.html create mode 100644 pydis_site/templates/events/pages/pixels/_index.html create mode 100644 pydis_site/templates/events/pages/pyweek/_index.html create mode 100644 pydis_site/templates/events/pages/revivalofcode/_index.html create mode 100644 pydis_site/templates/events/sidebar/adventofcode/useful-links.html delete mode 100644 pydis_site/templates/events/sidebar/events-list.html create mode 100644 pydis_site/templates/events/sidebar/events_list.html delete mode 100644 pydis_site/templates/events/sidebar/ongoing-event.html create mode 100644 pydis_site/templates/events/sidebar/pixels.html create mode 100644 pydis_site/templates/events/sidebar/pyweek/useful-links.html create mode 100644 pydis_site/templates/events/sidebar/revivalofcode.html create mode 100644 pydis_site/templates/events/upcoming_event.html diff --git a/pydis_site/static/css/events/base.css b/pydis_site/static/css/events/base.css index 9e244ed9..3708bd57 100644 --- a/pydis_site/static/css/events/base.css +++ b/pydis_site/static/css/events/base.css @@ -12,9 +12,14 @@ pre { } .panel .panel-heading { - /* - * Remove whitespace between the panel heading and the first item in a panel, - * since it makes the first panel item taller than the others. - */ - margin-bottom: 0 !important + /* + * Remove whitespace between the panel heading and the first item in a panel, + * since it makes the first panel item taller than the others. + */ + margin-bottom: 0 !important +} + +.event-gallery img { + border-radius: 10px; + max-width: 50%; } diff --git a/pydis_site/static/images/events/cj10_2023_banner2.png b/pydis_site/static/images/events/cj10_2023_banner2.png deleted file mode 100644 index 92cae4f6..00000000 Binary files a/pydis_site/static/images/events/cj10_2023_banner2.png and /dev/null differ diff --git a/pydis_site/static/images/events/cj10_2023_banner3.png b/pydis_site/static/images/events/cj10_2023_banner3.png deleted file mode 100644 index 9d808f07..00000000 Binary files a/pydis_site/static/images/events/cj10_2023_banner3.png and /dev/null differ diff --git a/pydis_site/static/images/events/pixels_logo_transparent.gif b/pydis_site/static/images/events/pixels_logo_transparent.gif new file mode 100644 index 00000000..3f410773 Binary files /dev/null and b/pydis_site/static/images/events/pixels_logo_transparent.gif differ diff --git a/pydis_site/static/images/events/pixels_logo_transparent.png b/pydis_site/static/images/events/pixels_logo_transparent.png new file mode 100644 index 00000000..5892edcc Binary files /dev/null and b/pydis_site/static/images/events/pixels_logo_transparent.png differ diff --git a/pydis_site/static/images/events/summer_code_jam_2023/banner2.png b/pydis_site/static/images/events/summer_code_jam_2023/banner2.png new file mode 100644 index 00000000..92cae4f6 Binary files /dev/null and b/pydis_site/static/images/events/summer_code_jam_2023/banner2.png differ diff --git a/pydis_site/static/images/events/summer_code_jam_2023/banner3.png b/pydis_site/static/images/events/summer_code_jam_2023/banner3.png new file mode 100644 index 00000000..9d808f07 Binary files /dev/null and b/pydis_site/static/images/events/summer_code_jam_2023/banner3.png differ diff --git a/pydis_site/templates/events/current_event.html b/pydis_site/templates/events/current_event.html new file mode 100644 index 00000000..11a98343 --- /dev/null +++ b/pydis_site/templates/events/current_event.html @@ -0,0 +1,18 @@ +{# Current or ongoing event #} + +{% load static %} +

Current event

+
+

Code Jam 2023

+
+
+

Once a year we host a code jam for members of our server to participate in. The code jam is an event where we place you in a team with 5 other random server members. You then have 11 days to code some sort of application or program in Python. Your program must use the specified technology/framework and incorporate the theme chosen by the server.

+ + Join now + +
+
+ Code Jam 2023 +
+
+
diff --git a/pydis_site/templates/events/index.html b/pydis_site/templates/events/index.html index 071feb35..547368da 100644 --- a/pydis_site/templates/events/index.html +++ b/pydis_site/templates/events/index.html @@ -1,4 +1,4 @@ -{% extends "events/base_sidebar.html" %} +{% extends "events/base.html" %} {% block title %}Events{% endblock %} @@ -6,95 +6,104 @@
  • Events
    • {% endblock %} -{% block event_content %} -
    -

    Code Jams

    -

    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.

    -

    To help fuel the creative process, we provide a specific theme, like Think Inside the Box or Early Internet. 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.

    -

    If you want to read more about Code Jams, visit our Code Jam info page or watch this video showcasing the best projects created during the Winter Code Jam 2020: Ancient Technology:

    - -
    +{% block event_base_content %} +
    +
    +

    Briefly describe events. Explain how to subscribe to updates from the #roles channel.

    + + {% include "events/current_event.html" %} + + {% include "events/upcoming_event.html" %} -
    -

    PyWeek

    +

    Scheduled events

    -

    - For the past 15 years, PyWeek has been running a bi-annual game jam for the - Python language. As of 2020, we are excited to say we are officially partnered with PyWeek to co-run these - events. -

    -

    - During each PyWeek event, we open a special discussion channel in which our members can discuss their - submissions, meet other participants, and talk to PyWeek staff. The PyWeek organizer, - Daniel Pope (@lordmauve) will be present during the entire event to answer - questions and post announcements and information in our community. -

    -

    - Unlike our other events, the community will select the winner from all the submissions - during PyWeek. We may release YouTube content showcasing the best submissions after the events are finished. -

    +
    +

    January-June

    + +
    -
    - +
    +
    +

    July-December

    + +
    +
    + {% include "events/sidebar/events_list.html" %} +
    +
    -
    -

    Advent of Code

    -
    -
    -

    - Each year, many of our members take part of an online coding competition called - Advent of Code that takes place in December. Advent of Code is an - Advent calendar of small programming puzzles for a variety of skill sets and skill levels that can be solved - in any programming language you like, including Python. -

    -

    - During the event, we will open a special discussion channel in which our members can discuss the puzzles - and compare their solutions. We will also open a private leaderboard and may even reward the best scoring - members on that board with prizes! -

    -

    - However, this event isn't purely competitive. You can also join in just to see how far you'll get, to - challenge yourself, as a way of learning Python, or just for the fun of it. In 2019, almost 200 members - signed up for our private leaderboard, but many more took on the challenge without focusing on the - competitive aspect. -

    + +

    All events

    +
    + +
    +
    +

    Code Jams

    +

    Once a year we host a code jam for members of our server to participate in. The code jam is an event where we place you in a team with 5 other random server members. You then have 11 days to code some sort of application or program in Python. Your program must use the specified technology/framework and incorporate the theme chosen by the server.

    +
    +
    + +
    +
    +

    Pyweek

    +

    For the past 15 years, PyWeek has been running a bi-annual game jam for the Python language. As of 2020, we are excited to say we are officially partnered with PyWeek to co-run these events.

    +
    + Pyweek logo
    -
    - +
    +
    + +
    +
    +

    Pixels

    +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur.

    +
    + Logo for pixels
    -
    -

    Game Jam

    -
    -
    -

    - The Game Jam is similar to our Code Jams, but smaller in scope. Instead of having to complete a qualifier - and being teamed up with random strangers, members of our community can just sign-up individually or pair up - with whoever they like. -

    -

    - The participants will have ten days to create a game using the technology we've selected, and drawing - inspiration from a provided theme. After the event, a panel of judges will play all the games and select a - winner. The top 5 will featured in a special video on our YouTube channel. -

    -

    - The first edition of the Game Jam ran from - April 17, 2020 to April 26, 2020. -

    +
    +
    +

    Advent of code

    +

    An advent calendar of small programming puzzles for a variety of skill sets and skill levels that can be solved in any programming language you like, including Python.

    +
    + Server icon for AoC
    -
    - +
    +
    + +
    +
    +

    Revival of Code

    +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur.

    +
    + Server icon for AoC
    -{% endblock %} -{% block sidebar %} - {% include "events/sidebar/events-list.html" %} +
    +
    +

    Game Jams

    +

    The Game Jam is similar to our Code Jams, but smaller in scope. Instead of having to complete a qualifier + and being teamed up with random strangers, members of our community can just sign-up individually or pair up + with whoever they like.

    +
    + Game Jam 2020 +
    +
    +
    +
    {% endblock %} diff --git a/pydis_site/templates/events/pages/adventofcode/_index.html b/pydis_site/templates/events/pages/adventofcode/_index.html new file mode 100644 index 00000000..b45ef33b --- /dev/null +++ b/pydis_site/templates/events/pages/adventofcode/_index.html @@ -0,0 +1,32 @@ +{% extends "events/base_sidebar.html" %} + +{% block breadcrumb %} +
  • Events
    • +
  • Advent of Code
    • +{% endblock %} + +{% block title %}Advent of Code{% endblock %} + +{% block event_content %} +

    + Each year, many of our members take part of an online coding competition called + Advent of Code that takes place in December. Advent of Code is an + Advent calendar of small programming puzzles for a variety of skill sets and skill levels that can be solved + in any programming language you like, including Python. +

    +

    + During the event, we will open a special discussion channel in which our members can discuss the puzzles + and compare their solutions. We will also open a private leaderboard and may even reward the best scoring + members on that board with prizes! +

    +

    + However, this event isn't purely competitive. You can also join in just to see how far you'll get, to + challenge yourself, as a way of learning Python, or just for the fun of it. In 2019, almost 200 members + signed up for our private leaderboard, but many more took on the challenge without focusing on the + competitive aspect. +

    +{% endblock %} + +{% block sidebar %} + {% include "events/sidebar/adventofcode/useful-links.html" %} +{% endblock %} diff --git a/pydis_site/templates/events/pages/game-jams/_index.html b/pydis_site/templates/events/pages/game-jams/_index.html index 85048cf1..95505b47 100644 --- a/pydis_site/templates/events/pages/game-jams/_index.html +++ b/pydis_site/templates/events/pages/game-jams/_index.html @@ -8,5 +8,25 @@ {% endblock %} {% block event_content %} -

    Sorry, this page is not ready yet.

    +
    +
    +

    + The Game Jam is similar to our Code Jams, but smaller in scope. Instead of having to complete a qualifier + and being teamed up with random strangers, members of our community can just sign-up individually or pair up + with whoever they like. +

    +

    + The participants will have ten days to create a game using the technology we've selected, and drawing + inspiration from a provided theme. After the event, a panel of judges will play all the games and select a + winner. The top 5 will featured in a special video on our YouTube channel. +

    +

    + The first edition of the Game Jam ran from + April 17, 2020 to April 26, 2020. +

    +
    +
    + Game Jam 2020 +
    +
    {% endblock %} diff --git a/pydis_site/templates/events/pages/pixels/_index.html b/pydis_site/templates/events/pages/pixels/_index.html new file mode 100644 index 00000000..4ecc7417 --- /dev/null +++ b/pydis_site/templates/events/pages/pixels/_index.html @@ -0,0 +1,18 @@ +{% extends "events/base_sidebar.html" %} + +{% block breadcrumb %} +
  • Events
    • +
  • Pixels
    • +{% endblock %} + +{% block title %}Pixels{% endblock %} + +{% block event_content %} +

    + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. +

    +{% endblock %} + +{% block sidebar %} + {% include "events/sidebar/pixels.html" %} +{% endblock %} diff --git a/pydis_site/templates/events/pages/pyweek/_index.html b/pydis_site/templates/events/pages/pyweek/_index.html new file mode 100644 index 00000000..16881463 --- /dev/null +++ b/pydis_site/templates/events/pages/pyweek/_index.html @@ -0,0 +1,30 @@ +{% extends "events/base_sidebar.html" %} + +{% block breadcrumb %} +
  • Events
    • +
  • Pyweek
    • +{% endblock %} + +{% block title %}Pyweek{% endblock %} + +{% block event_content %} +

    + For the past 15 years, PyWeek has been running a bi-annual game jam for the + Python language. As of 2020, we are excited to say we are officially partnered with PyWeek to co-run these + events. +

    +

    + During each PyWeek event, we open a special discussion channel in which our members can discuss their + submissions, meet other participants, and talk to PyWeek staff. The PyWeek organizer, + Daniel Pope (@lordmauve) will be present during the entire event to answer + questions and post announcements and information in our community. +

    +

    + Unlike our other events, the community will select the winner from all the submissions + during PyWeek. We may release YouTube content showcasing the best submissions after the events are finished. +

    +{% endblock %} + +{% block sidebar %} + {% include "events/sidebar/pyweek/useful-links.html" %} +{% endblock %} diff --git a/pydis_site/templates/events/pages/revivalofcode/_index.html b/pydis_site/templates/events/pages/revivalofcode/_index.html new file mode 100644 index 00000000..bc33c722 --- /dev/null +++ b/pydis_site/templates/events/pages/revivalofcode/_index.html @@ -0,0 +1,24 @@ +{% extends "events/base_sidebar.html" %} + +{% block breadcrumb %} +
  • Events
    • +
  • Revival of Code
    • +{% endblock %} + +{% block title %}Revival of Code{% endblock %} + +{% block event_content %} +

    + Each year, many of our members take part of an online coding competition called + Advent of Code that takes place in December. Advent of Code is an + Advent calendar of small programming puzzles for a variety of skill sets and skill levels that can be solved + in any programming language you like, including Python. +

    +

    + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. +

    +{% endblock %} + +{% block sidebar %} + {% include "events/sidebar/revivalofcode.html" %} +{% endblock %} diff --git a/pydis_site/templates/events/sidebar/adventofcode/useful-links.html b/pydis_site/templates/events/sidebar/adventofcode/useful-links.html new file mode 100644 index 00000000..8b0b3c6f --- /dev/null +++ b/pydis_site/templates/events/sidebar/adventofcode/useful-links.html @@ -0,0 +1,10 @@ +
    +
    + Server icon for AoC +
    +

    Advent of Code Links

    + +
    diff --git a/pydis_site/templates/events/sidebar/code-jams/ongoing-code-jam.html b/pydis_site/templates/events/sidebar/code-jams/ongoing-code-jam.html index d74470cc..8734064b 100644 --- a/pydis_site/templates/events/sidebar/code-jams/ongoing-code-jam.html +++ b/pydis_site/templates/events/sidebar/code-jams/ongoing-code-jam.html @@ -3,6 +3,6 @@

    Upcoming Code Jam

    - Code Jam 2023 + Code Jam 2023
    diff --git a/pydis_site/templates/events/sidebar/events-list.html b/pydis_site/templates/events/sidebar/events-list.html deleted file mode 100644 index 14034702..00000000 --- a/pydis_site/templates/events/sidebar/events-list.html +++ /dev/null @@ -1,17 +0,0 @@ -
    -

    Event Calendar 2023

    - -
    - -
    -

    Related Links

    - -
    diff --git a/pydis_site/templates/events/sidebar/events_list.html b/pydis_site/templates/events/sidebar/events_list.html new file mode 100644 index 00000000..3f517028 --- /dev/null +++ b/pydis_site/templates/events/sidebar/events_list.html @@ -0,0 +1,21 @@ +
    +

    Recent events (2023)

    + +
    + +
    +

    All events

    + +
    diff --git a/pydis_site/templates/events/sidebar/ongoing-event.html b/pydis_site/templates/events/sidebar/ongoing-event.html deleted file mode 100644 index 782ef23c..00000000 --- a/pydis_site/templates/events/sidebar/ongoing-event.html +++ /dev/null @@ -1,8 +0,0 @@ -{% load static %} - -
    -

    Upcoming Event

    - - Code Jam 2023 - -
    diff --git a/pydis_site/templates/events/sidebar/pixels.html b/pydis_site/templates/events/sidebar/pixels.html new file mode 100644 index 00000000..b8b0e46b --- /dev/null +++ b/pydis_site/templates/events/sidebar/pixels.html @@ -0,0 +1 @@ +Server icon for Pixels diff --git a/pydis_site/templates/events/sidebar/pyweek/useful-links.html b/pydis_site/templates/events/sidebar/pyweek/useful-links.html new file mode 100644 index 00000000..a049fda2 --- /dev/null +++ b/pydis_site/templates/events/sidebar/pyweek/useful-links.html @@ -0,0 +1,11 @@ +
    + +

    Pyweek links

    + +
    diff --git a/pydis_site/templates/events/sidebar/revivalofcode.html b/pydis_site/templates/events/sidebar/revivalofcode.html new file mode 100644 index 00000000..8b0b3c6f --- /dev/null +++ b/pydis_site/templates/events/sidebar/revivalofcode.html @@ -0,0 +1,10 @@ +
    +
    + Server icon for AoC +
    +

    Advent of Code Links

    + +
    diff --git a/pydis_site/templates/events/upcoming_event.html b/pydis_site/templates/events/upcoming_event.html new file mode 100644 index 00000000..9c027243 --- /dev/null +++ b/pydis_site/templates/events/upcoming_event.html @@ -0,0 +1,18 @@ +{% load static %} + +

    Upcoming event

    +
    +

    Pyweek 37

    +

    March 17-24

    +
    +
    +

    Once a year we host a code jam for members of our server to participate in. The code jam is an event where we place you in a team with 5 other random server members. You then have 11 days to code some sort of application or program in Python. Your program must use the specified technology/framework and incorporate the theme chosen by the server.

    + + Join now + +
    +
    + Pyweek logo +
    +
    +
    diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index d246190b..347fa111 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -12,7 +12,7 @@
    - Code Jam 2023 + Code Jam 2023
    @@ -48,7 +48,7 @@ {# Code Jam Banner #}
    -- cgit v1.2.3