The GitHub API stuff is done now, including data caching. Just a couple of minor bugfixes left before this is PR-ready.

2 files changed, 30 insertions, 99 deletions

diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html
index f9f576df..842d29d5 100644
--- a/pydis_site/templates/base/navbar.html
+++ b/pydis_site/templates/base/navbar.html
@@ -19,10 +19,10 @@
   {# Content on the right side of the navbar #}
   <div class="navbar-menu is-paddingless" id="navbar_menu">
     <div class="navbar-end">
-      {# Wiki #}
+      {# Rules #}
       <a class="navbar-item" href="#">
         <span class="icon is-size-4 is-medium"><i class="fas fa-book"></i></span>
-        <span>&nbsp;Wiki</span>
+        <span>&nbsp;Rules</span>
       </a>
 
       {# Reddit #}
@@ -31,22 +31,22 @@
         <span>&nbsp;Reddit</span>
       </a>
 
-      {# Patreon #}
-      <a class="navbar-item" href="#">
-        <span class="icon is-size-4 is-medium"><i class="fab fa-patreon"></i></span>
-        <span>&nbsp;Patreon</span>
-      </a>
-
       {# YouTube #}
       <a class="navbar-item" href="#">
         <span class="icon is-size-4 is-medium"><i class="fab fa-youtube"></i></span>
         <span>&nbsp;YouTube</span>
       </a>
 
+      {# Patreon #}
+      <a class="navbar-item" href="#">
+        <span class="icon is-size-4 is-medium"><i class="fab fa-patreon"></i></span>
+        <span>&nbsp;Patreon</span>
+      </a>
+
       {# RedBubble #}
       <a class="navbar-item" href="#">
         <span class="icon is-size-4 is-medium"><i class="fas fa-tshirt"></i></span>
-        <span>&nbsp;RedBubble</span>
+        <span>&nbsp;Merch</span>
       </a>
 
       {# More #}
@@ -56,13 +56,13 @@
         </a>
         <div class="navbar-dropdown">
           <a class="navbar-item">
-            About
+            Code Jams
           </a>
           <a class="navbar-item">
-            Jobs
+            FAQ
           </a>
           <a class="navbar-item">
-            Contact
+            Privacy
           </a>
           <hr class="navbar-divider">
           <a class="navbar-item">
diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html
index 93361580..6bbf5444 100644
--- a/pydis_site/templates/home/index.html
+++ b/pydis_site/templates/home/index.html
@@ -52,95 +52,26 @@
       <br>
       <div class="columns is-multiline">
 
-        <!-- Site -->
-        <div class="column is-one-third">
-          <div class="card has-equal-height">
-            <div class="card-content">
-              <i class="fab fa-github"></i> <a href="https://github.com/python-discord/site"> python-discord/site</a>
-              <br><br>
-              <em>Source code for our website</em>
-              <br><br>
-              </span><span class="repo-language-dot python"></span> Python
-              <span id="repo-footer-item"><i class="fas fa-star"></i> 566</span>
-              <span id="repo-footer-item"><i class="fas fa-code-branch"></i> 27</span>
+        <!-- Display projects from settings.HOMEPAGE_REPOS -->
+        {% for repo in repo_data %}
+          <div class="column is-one-third">
+            <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>
           </div>
-        </div>
-
-        <!-- Bot -->
-        <div class="column is-one-third">
-          <div class="card has-equal-height">
-            <div class="card-content">
-              <i class="fab fa-github"></i> <a href="https://github.com/python-discord/bot"> python-discord/bot</a>
-              <br><br>
-              <em>Source code for our Discord bot</em>
-              <br><br>
-              </span><span class="repo-language-dot python"></span> Python
-              <span id="repo-footer-item"><i class="fas fa-star"></i> 566</span>
-              <span id="repo-footer-item"><i class="fas fa-code-branch"></i> 27</span>
-            </div>
-          </div>
-        </div>
-
-        <!-- Snekbox -->
-        <div class="column is-one-third">
-          <div class="card has-equal-height">
-            <div class="card-content">
-              <i class="fab fa-github"></i> <a href="https://github.com/python-discord/snekbox"> python-discord/snekbox</a>
-              <br><br>
-              <em>Easy, safe evaluation of arbitrary Python code</em>
-              <br><br>
-              </span><span class="repo-language-dot python"></span> Python
-              <span id="repo-footer-item"><i class="fas fa-star"></i> 566</span>
-              <span id="repo-footer-item"><i class="fas fa-code-branch"></i> 27</span>
-            </div>
-          </div>
-        </div>
-
-        <!-- SeasonalBot -->
-        <div class="column is-one-third">
-          <div class="card has-equal-height">
-            <div class="card-content">
-              <i class="fab fa-github"></i> <a href="https://github.com/python-discord/seasonalbot"> python-discord/seasonalbot</a>
-              <br><br>
-              <em>A Discord bot that changes with the seasons. Meant as a beginner-friendly learning project.</em>
-              <br><br>
-              </span><span class="repo-language-dot python"></span> Python
-              <span id="repo-footer-item"><i class="fas fa-star"></i> 566</span>
-              <span id="repo-footer-item"><i class="fas fa-code-branch"></i> 27</span>
-            </div>
-          </div>
-        </div>
-
-        <!-- django-simple-bulma -->
-        <div class="column is-one-third">
-          <div class="card has-equal-height">
-            <div class="card-content">
-              <i class="fab fa-github"></i> <a href="https://github.com/python-discord/django-simple-bulma"> python-discord/django-simple-bulma</a>
-              <br><br>
-              <em>Django application to add the Bulma CSS framework and its extensions</em>
-              <br><br>
-              </span><span class="repo-language-dot css"></span> CSS
-              <span id="repo-footer-item"><i class="fas fa-star"></i> 566</span>
-              <span id="repo-footer-item"><i class="fas fa-code-branch"></i> 27</span>
-            </div>
-          </div>
-        </div>
-
-        <!-- django-crispy-bulma -->
-        <div class="column is-one-third">
-          <div class="card has-equal-height">
-            <div class="card-content">
-              <i class="fab fa-github"></i> <a href="https://github.com/python-discord/django-crispy-bulma"> python-discord/django-crispy-bulma</a>
-              <br><br>
-              <em>Django application to add 'django-crispy-forms' layout objects for Bulma.io</em>
-              <br><br>
-              </span><span class="repo-language-dot html"></span> HTML
-              <span id="repo-footer-item"><i class="fas fa-star"></i> 566</span>
-              <span id="repo-footer-item"><i class="fas fa-code-branch"></i> 27</span>
-            </div>
-          </div>
-        </div>
+        {% endfor %}
 
       </div>
     </div>