Resolve conflicts

author: Bryan Kok <[email protected]> 2021-03-04 11:58:05 +0800
committer: Bryan Kok <[email protected]> 2021-03-04 11:58:05 +0800
commit: b5a7dc48cd1ffbb0471858660d58b8b2e6a115fa (patch)
tree: 3d9b98700df69ace83c90a31c8625710639427db /pydis_site/templates
parent: Hide arrow to the right of More below the 1024px breakpoint (diff)
parent: Update Dockerfile (diff)
6 files changed, 253 insertions, 58 deletions
diff --git a/pydis_site/templates/404.html b/pydis_site/templates/404.html
new file mode 100644
index 00000000..42e317d2
--- /dev/null
+++ b/pydis_site/templates/404.html
@@ -0,0 +1,34 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <title>Python Discord | 404</title>
+
+    <meta charset="UTF-8">
+
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+    <link href="https://fonts.googleapis.com/css2?family=Hind:wght@400;600&display=swap" rel="stylesheet">
+    <link rel="stylesheet" href="{% static "css/error_pages.css" %}">
+</head>
+
+<body>
+    <div class="error-box">
+        <div class="logo-box">
+            <img src="https://raw.githubusercontent.com/python-discord/branding/b67897df93e572c1576a9026eb78c785a794d226/logos/logo_banner/logo_site_banner.svg"
+                alt="Python Discord banner" />
+        </div>
+        <div class="content-box">
+            <h1>404 — Not Found</h1>
+            <p>We couldn't find the page you're looking for. Here are a few things to try out:</p>
+            <ul>
+                <li>Double check the URL. Are you sure you typed it out correctly?
+                <li>Come join <a href="https://discord.gg/python">our Discord Server</a>. Maybe we can help you out over
+                    there
+            </ul>
+        </div>
+    </div>
+</body>
+
+</html>
diff --git a/pydis_site/templates/500.html b/pydis_site/templates/500.html
new file mode 100644
index 00000000..869892ec
--- /dev/null
+++ b/pydis_site/templates/500.html
@@ -0,0 +1,29 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <title>Python Discord | 500</title>
+
+    <meta charset="UTF-8">
+
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+    <link href="https://fonts.googleapis.com/css2?family=Hind:wght@400;600&display=swap" rel="stylesheet">
+    <link rel="stylesheet" href="{% static "css/error_pages.css" %}">
+</head>
+
+<body>
+    <div class="error-box">
+        <div class="logo-box">
+            <img src="https://raw.githubusercontent.com/python-discord/branding/b67897df93e572c1576a9026eb78c785a794d226/logos/logo_banner/logo_site_banner.svg"
+                alt="Python Discord banner" />
+        </div>
+        <div class="content-box">
+            <h1>500 — Internal Server Error</h1>
+            <p>Something went wrong at our end. Please try again shortly, or if the problem persists, please let us know <a href="https://discord.gg/python">on Discord</a>.</p>
+        </div>
+    </div>
+</body>
+
+</html>
diff --git a/pydis_site/templates/base/footer.html b/pydis_site/templates/base/footer.html
index 90f06f3c..bca43b5d 100644
--- a/pydis_site/templates/base/footer.html
+++ b/pydis_site/templates/base/footer.html
@@ -1,7 +1,7 @@
 <footer class="footer has-background-dark has-text-light">
   <div class="content has-text-centered">
     <p>
-      Built with <a href="https://www.djangoproject.com/"><span id="django-logo">django</span></a> and <a href="https://bulma.io"><span id="bulma-logo">Bulma</span></a> <br/> &copy; {% now "Y" %} <span id="pydis-text">Python Discord</span>
+      Powered by <a href="https://www.linode.com/?r=3bc18ce876ff43ea31f201b91e8e119c9753f085"><span id="linode-logo">Linode</span></a><br>Built with <a href="https://www.djangoproject.com/"><span id="django-logo">django</span></a> and <a href="https://bulma.io"><span id="bulma-logo">Bulma</span></a> <br/> &copy; {% now "Y" %} <span id="pydis-text">Python Discord</span>
     </p>
   </div>
 </footer>
diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html
index 1bf5b7aa..64e3654b 100644
--- a/pydis_site/templates/base/navbar.html
+++ b/pydis_site/templates/base/navbar.html
@@ -20,7 +20,7 @@
   <div class="navbar-menu is-paddingless" id="navbar_menu">
     <div class="navbar-end">
 
-      {# Discord invite - only visible in the hamburger on mobile sizes. #}
+      {# Burger-menu Discord #}
       <a class="navbar-item is-hidden-desktop" href="https://discord.gg/python">
         <span class="icon is-size-4 is-medium"><i class="fab fa-discord"></i></span>
         <span>&nbsp;Discord</span>
@@ -57,7 +57,7 @@
       </a>
 
       {# More #}
-      <div class="navbar-item has-dropdown is-hoverable has-left-margin-1">
+      <div class="navbar-item has-dropdown is-hoverable">
         <a class="navbar-link is-hidden-touch">
           More
         </a>
@@ -125,12 +125,14 @@
 
         </div>
       </div>
+
+      {# Desktop Nav Discord  #}
+      <div id="discord-btn" class="buttons is-hidden-touch">
+        <a href="https://discord.gg/python" class="button is-large is-primary">Discord</a>
+      </div>
+
     </div>
 
-    {# Join us on Discord! #}
-    <a class="navbar-item is-fullsize has-no-highlight has-left-margin-1" href="https://discord.gg/python">
-      <img class="is-hidden-touch" src="{% static "images/navbar/navbar_discordjoin.svg" %}" alt="Join us on Discord!"/>
-    </a>
   </div>
 </nav>
 
diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html
index f31363a4..04815b7f 100644
--- a/pydis_site/templates/home/index.html
+++ b/pydis_site/templates/home/index.html
@@ -9,12 +9,69 @@
 {% block content %}
   {% include "base/navbar.html" %}
 
-  <section class="section">
+  <!-- Mobile-only Notice -->
+  <section id="mobile-notice" class="message is-primary is-hidden-tablet">
+    <div class="message-header">
+      <p>100K Member Milestone!</p>
+    </div>
+    <div class="message-body">
+      Thanks to all our members for helping us create this friendly and helpful community!
+      <br><br>
+      As a nice treat, we've created a <a href="{% url 'timeline' %}">Timeline page</a> for people
+      to discover the events that made our community what it is today. Be sure to check it out!
+    </div>
+  </section>
+
+  <!-- Wave Hero -->
+  <section id="wave-hero" class="section is-hidden-mobile">
+
+      <div class="container">
+        <div class="columns is-variable is-8">
+
+          {# Embedded Welcome video #}
+          <div id="wave-hero-left" class="column is-half">
+            <div class="force-aspect-container">
+              <iframe
+              class="force-aspect-content"
+              src="https://www.youtube.com/embed/ZH26PuX3re0"
+              srcdoc="
+              <style>
+                *{padding:0;margin:0;overflow:hidden}
+                html,body{height:100%}
+                img,span{position:absolute;width:100%;top:0;bottom:0;margin:auto}
+                span{height:1.5em;text-align:center;font:68px/1.5 sans-serif;color:#FFFFFFEE;text-shadow:0 0 0.1em #00000020}
+              </style>
+              <a href=https://www.youtube.com/embed/ZH26PuX3re0?autoplay=1>
+                <img src='{% static "images/frontpage/welcome.jpg" %}' alt='Welcome to Python Discord'>
+                <span>▶</span>
+              </a>"
+              allow="autoplay; accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+              allowfullscreen
+              ></iframe>
+            </div>
+          </div>
+
+          {# Right side content #}
+          <div id="wave-hero-right" class="column is-half">
+            <img src="{% static "images/events/100k.png" %}" alt="100K members!">
+          </div>
 
-    {# Who are we? #}
-    <div class="container is-spaced">
+        </div>
+      </div>
+
+    {# Animated wave elements #}
+    <span id="front-wave" class="wave"></span>
+    <span id="back-wave" class="wave"></span>
+    <span id="bottom-wave" class="wave"></span>
+
+  </section>
+
+  <!-- Main Body -->
+  <section id="body" class="section">
+
+    <div class="container">
       <h1 class="is-size-1">Who are we?</h1>
-      <br>
+
       <div class="columns is-desktop">
         <div class="column is-half-desktop content">
           <p>
@@ -31,68 +88,122 @@
           </p>
           <p>
             You can find help with most Python-related problems in one of our help channels.
-            Our staff of over 50 dedicated expert Helpers are available around the clock
+            Our staff of over 90 dedicated expert Helpers are available around the clock
             in every timezone. Whether you're looking to learn the language or working on a
             complex project, we've got someone who can help you if you get stuck.
           </p>
         </div>
 
-        {# Right column container #}
-        <div class="column is-half-desktop">
-          <iframe width="560" height="315" src="https://www.youtube.com/embed/ZH26PuX3re0" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-        </div>
-      </div>
+        {# Showcase box #}
+        <section id="showcase" class="column is-half-desktop has-text-centered">
+          <article class="box">
+
+            <header class="title">New Timeline!</header>
 
-      {# Projects #}
-      <h1 class="is-size-1">Projects</h1>
-      <br>
-      <div class="columns is-multiline is-tablet">
-
-        {# Display projects from HomeView.repos #}
-        {% for repo in repo_data %}
-          <div class="column is-one-third-desktop is-half-tablet">
-            <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 class="mini-timeline">
+              <i class="fa fa-asterisk"></i>
+              <i class="fa fa-code"></i>
+              <i class="fab fa-python"></i>
+              <i class="fa fa-alien-monster"></i>
+              <i class="fa fa-duck"></i>
+              <i class="fa fa-bug"></i>
             </div>
-          </div>
-        {% endfor %}
+
+            <p class="subtitle">
+              Start from our humble beginnings to discover the events that made our community what it is today.
+            </p>
+
+            <div class="buttons are-large is-centered">
+              <a href="{% url 'timeline' %}" class="button is-primary">
+                <span>Check it out!</span>
+                <span class="icon">
+                  <i class="fas fa-arrow-right"></i>
+                </span>
+              </a>
+            </div>
+
+          </article>
+        </section>
 
       </div>
     </div>
   </section>
 
-  {# Sponsors #}
-  <section class="section-sp hero is-light">
-    <div id="sponsors-hero" class="hero-body">
+  <!-- Projects -->
+  {%  if repo_data %}
+    <section id="projects" class="section">
+      <div class="container">
+        <h1 class="is-size-1">Projects</h1>
+
+        <div class="columns is-multiline is-tablet">
+
+          {# Generate project data from HomeView.repos #}
+          {% for repo in repo_data %}
+            <div class="column is-one-third-desktop is-half-tablet">
+
+              <a href="https://github.com/{{ repo.repo_name }}">
+                <article class="card">
+
+                  <header class="card-header">
+                    <span class="card-header-icon">
+                      <span class="icon"><i class="fab fa-github"></i></span>
+                    </span>
+                    <div class="card-header-title">
+                      {{ repo.repo_name|cut:"python-discord/" }}
+                    </div>
+                  </header>
+
+                  <p class="card-content">
+                    {{ repo.description }}
+                  </p>
+
+                  <footer class="card-footer">
+                    <div class="card-footer-item">
+                      <i class="repo-language-dot {{ repo.language | lower }}"></i>
+                      {{ repo.language }}
+                    </div>
+                    <div class="card-footer-item">
+                      <i class="fas fa-star"></i>
+                      {{ repo.stargazers }}
+                    </div>
+                    <div class="card-footer-item">
+                      <i class="fas fa-code-branch"></i>
+                      {{ repo.forks }}
+                    </div>
+                  </footer>
+
+                </article>
+              </a>
+
+            </div>
+          {% endfor %}
+
+        </div>
+
+      </div>
+    </section>
+  {% endif %}
+
+  <!-- Sponsors -->
+  <section id="sponsors" class="hero is-light">
+    <div class="hero-body">
       <div class="container">
         <h1 class="title is-6 has-text-grey">
           Sponsors
         </h1>
         <div class="columns is-mobile is-multiline">
-          <a href="https://linode.com" class="column is-narrow">
+          <a href="https://www.linode.com/?r=3bc18ce876ff43ea31f201b91e8e119c9753f085" class="column is-narrow">
             <img src="{% static "images/sponsors/linode.png" %}" alt="Linode"/>
           </a>
           <a href="https://jetbrains.com" class="column is-narrow">
             <img src="{% static "images/sponsors/jetbrains.png" %}" alt="JetBrains"/>
           </a>
-          <a href="https://adafruit.com" class="column is-narrow">
-            <img src="{% static "images/sponsors/adafruit.png" %}" alt="Adafruit"/>
-          </a>
           <a href="https://sentry.io" class="column is-narrow">
             <img src="{% static "images/sponsors/sentry.png" %}" alt="Sentry"/>
           </a>
+          <a href="https://notion.so" class="column is-narrow">
+            <img src="{% static "images/sponsors/notion.png" %}" alt="Notion"/>
+          </a>
         </div>
       </div>
     </div>
diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html
index 5c71f3a7..f3c58fc2 100644
--- a/pydis_site/templates/home/timeline.html
+++ b/pydis_site/templates/home/timeline.html
@@ -14,7 +14,7 @@
     <div class="container max-width-lg cd-timeline__container">
         <div class="cd-timeline__block">
             <div class="cd-timeline__img cd-timeline__img--picture">
-                <img src={% static "images/timeline/cd-icon-picture.svg" %} alt="Picture">
+                <img src="{% static "images/timeline/cd-icon-picture.svg" %}" alt="Picture">
             </div>
 
             <div class="cd-timeline__content text-component">
@@ -231,8 +231,8 @@
 
             <div class="cd-timeline__content text-component">
                 <h2>PyDis hits 15,000 members; the “hot ones special” video is released</h2>
-                <div class="video-container">
-                    <iframe class="video" src="https://www.youtube.com/embed/DIBXg8Qh7bA" frameborder="0"
+                <div class="force-aspect-container">
+                    <iframe class="force-aspect-content" src="https://www.youtube.com/embed/DIBXg8Qh7bA" frameborder="0"
                         allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
                         allowfullscreen></iframe>
                 </div>
@@ -319,8 +319,8 @@
                     developers join us to judge the event and help out our members during the event. One of them,
                     @tshirtman, even joins our staff!</p>
 
-                <div class="video-container">
-                    <iframe class="video" src="https://www.youtube.com/embed/8fbZsGrqBzo" frameborder="0"
+                <div class="force-aspect-container">
+                    <iframe class="force-aspect-content" src="https://www.youtube.com/embed/8fbZsGrqBzo" frameborder="0"
                         allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
                         allowfullscreen></iframe>
                 </div>
@@ -377,8 +377,8 @@
                     Several of the Code Jam participants also end up getting involved contributing to the Arcade
                     repository.</p>
 
-                <div class="video-container">
-                    <iframe class="video" src="https://www.youtube.com/embed/KkLXMvKfEgs" frameborder="0"
+                <div class="force-aspect-container">
+                    <iframe class="force-aspect-content" src="https://www.youtube.com/embed/KkLXMvKfEgs" frameborder="0"
                         allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
                         allowfullscreen></iframe>
                 </div>
@@ -450,8 +450,8 @@
                     Code Jam for 2020 attracts hundreds of participants, and sees the creation of some fantastic
                     projects. Check them out in our judge stream below:</p>
 
-                <div class="video-container">
-                    <iframe class="video" src="https://www.youtube.com/embed/OFtm8f2iu6c" frameborder="0"
+                <div class="force-aspect-container">
+                    <iframe class="force-aspect-content" src="https://www.youtube.com/embed/OFtm8f2iu6c" frameborder="0"
                         allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
                         allowfullscreen></iframe>
                 </div>
@@ -479,6 +479,25 @@
             </div>
         </div>
 
+	<div class="cd-timeline__block">
+            <div class="cd-timeline__img cd-timeline__img--picture">
+                <img src="{% static "images/timeline/cd-icon-picture.svg" %}" alt="Picture">
+            </div>
+
+            <div class="cd-timeline__content text-component">
+                <h2>Python Discord hosts the 2020 CPython Core Developer Q&A</h2>
+                <div class="force-aspect-container">
+                    <iframe class="force-aspect-content" src="https://www.youtube.com/embed/gXMdfBTcOfQ" frameborder="0"
+                        allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+                        allowfullscreen></iframe>
+                </div>
+
+                <div class="flex justify-between items-center">
+                    <span class="cd-timeline__date">Oct 21st, 2020</span>
+                </div>
+            </div>
+        </div>
+
         <div class="cd-timeline__block">
             <div class="cd-timeline__img pastel-dark-blue cd-timeline__img--picture">
                 <i class="fa fa-users"></i>
@@ -490,7 +509,7 @@
                     and one we're very proud of. To commemorate it, we create this timeline.</p>
 
                 <div class="flex justify-between items-center">
-                    <span class="cd-timeline__date">Sep ??, 2020</span>
+                    <span class="cd-timeline__date">Oct 22nd, 2020</span>
                 </div>
             </div>
         </div>
author	Bryan Kok <[email protected]>	2021-03-04 11:58:05 +0800
committer	Bryan Kok <[email protected]>	2021-03-04 11:58:05 +0800
commit	b5a7dc48cd1ffbb0471858660d58b8b2e6a115fa (patch)
tree	3d9b98700df69ace83c90a31c8625710639427db /pydis_site/templates
parent	Hide arrow to the right of More below the 1024px breakpoint (diff)
parent	Update Dockerfile (diff)