Merge pull request #582 from python-discord/swfarnsworth/smarter-resources/merge-with-main

Smarter Resources

Author: lemonsaurus

poetry.lock

@@ -10,7 +10,7 @@
 )
 
 
-class NotFoundError(Exception):
+class NotFoundError(Exception):  # noqa: N818
     """Raised when an entity cannot be found."""
 
     pass

pydis_site/apps/api/models/bot/metricity.py

@@ -14,10 +14,10 @@ First things first, to run the bot's code and make changes to it, you need a loc
     <button type="button" class="card-header collapsible">
         <span class="card-header-title subtitle is-6 my-2 ml-2">Getting started with Git and GitHub</span>
         <span class="card-header-icon">
-            <i class="fas fa-angle-down title is-5" aria-hidden="true"></i>
+            <i class="fas fa-fw fa-angle-down title is-5" aria-hidden="true"></i>
         </span>
     </button>
-    <div class="collapsible-content">
+    <div class="collapsible-content collapsed">
         <div class="card-content">
               <p>If you don't have Git on your computer already, <a href="https://git-scm.com/downloads">install it</a>. You can additionally install a Git GUI such as <a href="https://www.gitkraken.com/download">GitKraken</a>, or the <a href="https://cli.github.com/manual/installation">GitHub CLI</a>.</p>
               <p>To learn more about Git, you can look into <a href="../working-with-git">our guides</a>, as well as <a href="https://education.github.com/git-cheat-sheet-education.pdf">this cheatsheet</a>, <a href="https://learngitbranching.js.org">Learn Git Branching</a>, and otherwise any guide you can find on the internet. Once you got the basic idea though, the best way to learn Git is to use it.</p>
@@ -78,10 +78,10 @@ See [here](../obtaining-discord-ids) for help with obtaining Discord IDs.
     <button type="button" class="card-header collapsible">
         <span class="card-header-title subtitle is-6 my-2 ml-2">Optional config.yml</span>
         <span class="card-header-icon">
-            <i class="fas fa-angle-down title is-5" aria-hidden="true"></i>
+            <i class="fas fa-fw fa-angle-down title is-5" aria-hidden="true"></i>
         </span>
     </button>
-    <div class="collapsible-content">
+    <div class="collapsible-content collapsed">
         <div class="card-content">
               <p>If you used the provided server template, and you're not sure which channels belong where in the config file, you can use the config below. Pay attention to the comments with several <code>#</code> symbols, and replace the <code>�</code> characters with the right IDs.</p>
               <pre>
@@ -458,10 +458,10 @@ We understand this is tedious and are working on a better solution for setting u
     <button type="button" class="card-header collapsible">
         <span class="card-header-title subtitle is-6 my-2 ml-2">Why do you need a separate config file?</span>
         <span class="card-header-icon">
-            <i class="fas fa-angle-down title is-5" aria-hidden="true"></i>
+            <i class="fas fa-fw fa-angle-down title is-5" aria-hidden="true"></i>
         </span>
     </button>
-    <div class="collapsible-content">
+    <div class="collapsible-content collapsed">
         <div class="card-content">
             While it's technically possible to edit <code>config-default.yml</code> to match your server, it is heavily discouraged.
             This file's purpose is to provide the configurations the Python bot needs to run in the Python server in production, and should remain as such.
@@ -487,10 +487,10 @@ You are now almost ready to run the Python bot. The simplest way to do so is wit
     <button type="button" class="card-header collapsible">
         <span class="card-header-title subtitle is-6 my-2 ml-2">Getting started with Docker</span>
         <span class="card-header-icon">
-            <i class="fas fa-angle-down title is-5" aria-hidden="true"></i>
+            <i class="fas fa-fw fa-angle-down title is-5" aria-hidden="true"></i>
         </span>
     </button>
-    <div class="collapsible-content">
+    <div class="collapsible-content collapsed">
         <div class="card-content">
             The requirements for Docker are:
             <ul>
@@ -541,10 +541,10 @@ With at least the site running in Docker already (see the previous section on ho
     <button type="button" class="card-header collapsible">
         <span class="card-header-title subtitle is-6 my-2 ml-2">Ways to run code</span>
         <span class="card-header-icon">
-            <i class="fas fa-angle-down title is-5" aria-hidden="true"></i>
+            <i class="fas fa-fw fa-angle-down title is-5" aria-hidden="true"></i>
         </span>
     </button>
-    <div class="collapsible-content">
+    <div class="collapsible-content collapsed">
         <div class="card-content">
             Notice that the bot is started as a module. There are several ways to do so:
             <ul>

pydis_site/apps/content/resources/guides/pydis-guides/contributing/bot.md

@@ -30,7 +30,7 @@ def __get_all_files(root: Path, folder: typing.Optional[Path] = None) -> list[st
 
 
 def get_all_pages() -> typing.Iterator[dict[str, str]]:
-    """Yield a dict of all pag categories."""
+    """Yield a dict of all page categories."""
     for location in __get_all_files(Path("pydis_site", "apps", "content", "resources")):
         yield {"location": location}
 

pydis_site/apps/content/urls.py

@@ -87,9 +87,45 @@ resources_index_redirect:
   original_path: pages/resources/
   redirect_route: "resources:index"
 
-resources_resources_redirect:
-  original_path: pages/resources/<str:category>/
-  redirect_route: "resources:resources"
+resources_reading_redirect:
+  original_path: resources/reading/
+  redirect_route: "resources:index"
+  redirect_arguments: ["book"]
+
+resources_books_redirect:
+  original_path: resources/books/
+  redirect_route: "resources:index"
+  redirect_arguments: ["book"]
+
+resources_videos_redirect:
+  original_path: resources/videos/
+  redirect_route: "resources:index"
+  redirect_arguments: ["video"]
+
+resources_courses_redirect:
+  original_path: resources/courses/
+  redirect_route: "resources:index"
+  redirect_arguments: ["course"]
+
+resources_communities_redirect:
+  original_path: resources/communities/
+  redirect_route: "resources:index"
+  redirect_arguments: ["community"]
+
+resources_podcasts_redirect:
+  original_path: resources/podcasts/
+  redirect_route: "resources:index"
+  redirect_arguments: ["podcast"]
+
+resources_tutorials_redirect:
+  original_path: resources/tutorials/
+  redirect_route: "resources:index"
+  redirect_arguments: ["tutorial"]
+
+resources_tools_redirect:
+  original_path: resources/tools/
+  redirect_route: "resources:index"
+  redirect_arguments: ["tool"]
 
 # Events
 events_index_redirect:

pydis_site/apps/redirect/redirects.yaml

@@ -4,12 +4,18 @@ description: Adafruit is an open-source electronics manufacturer
   provide help with your projects,
   and the Adafruit devs do all the CircuitPython Development right out in the open.
 title_image: https://www.mouser.com/images/suppliers/logos/adafruit.png
-title_url: https://discord.gg/adafruit
-position: 4
+title_url: https://adafruit.com/
 urls:
-- icon: branding/discord
-  url: https://discord.gg/adafruit
-  color: blurple
-- icon: regular/link
-  url: https://adafruit.com/
-  color: teal
+  - icon: branding/discord
+    url: https://discord.gg/adafruit
+    color: blurple
+tags:
+  topics:
+    - microcontrollers
+  payment_tiers:
+    - free
+  difficulty:
+    - beginner
+    - intermediate
+  type:
+    - community

pydis_site/apps/resources/resources/communities/adafruit.yaml renamed to pydis_site/apps/resources/resources/adafruit.yaml

@@ -2,4 +2,13 @@ description: A free Electron-based editor, a "hackable text editor for the 21st
   by the GitHub team.
 name: Atom
 title_url: https://atom.io/
-position: 0
+tags:
+  topics:
+    - general
+  payment_tiers:
+    - free
+  difficulty:
+    - beginner
+    - intermediate
+  type:
+    - tool

pydis_site/apps/resources/resources/tools/editors/atom.yaml renamed to pydis_site/apps/resources/resources/atom.yaml

@@ -4,11 +4,18 @@ description: One of the best books out there for Python beginners. This book wil
   the web, manipulating files and automating keyboard and mouse input. Ideal for an
   office worker who wants to make himself more useful.
 name: Automate the Boring Stuff with Python
-position: 2
+title_url: https://automatetheboringstuff.com/
 urls:
-- icon: regular/book
-  url: https://automatetheboringstuff.com/
+- icon: branding/goodreads
+  url: https://www.goodreads.com/book/show/22514127-automate-the-boring-stuff-with-python
   color: black
-- icon: branding/amazon
-  url: https://www.amazon.com/Automate-Boring-Stuff-Python-Programming/dp/1593275994/
-  color: amazon-orange
+tags:
+  topics:
+    - general
+  payment_tiers:
+    - free
+    - paid
+  difficulty:
+    - beginner
+  type:
+    - book

pydis_site/apps/resources/resources/reading/books/automate_the_boring_stuff.yaml renamed to pydis_site/apps/resources/resources/automate_the_boring_stuff_book.yaml

@@ -2,4 +2,13 @@ description: The interactive course version of Al Sweigart's excellent book for
   This link has a discounted version of the course which will always cost 10 dollars. Thanks, Al!
 name: Automate the Boring Stuff with Python
 title_url: https://www.udemy.com/automate/?couponCode=FOR_LIKE_10_BUCKS
-position: 3
+tags:
+  topics:
+    - general
+  payment_tiers:
+    - paid
+  difficulty:
+    - beginner
+  type:
+    - course
+    - interactive

pydis_site/apps/resources/resources/courses/automate_the_boring_stuff_with_python.yaml renamed to pydis_site/apps/resources/resources/automate_the_boring_stuff_course.yaml

@@ -6,4 +6,13 @@ title_icon: branding/github
 title_icon_color: black
 title_url: https://github.com/mhxion/awesome-programming-discord
 name: awesome-programming-discord
-position: 10
+tags:
+  topics:
+    - general
+  payment_tiers:
+    - free
+  difficulty:
+    - beginner
+    - intermediate
+  type:
+    - community