From aff3a89c3cec04eda096e8f27115e36108ee6286 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sun, 4 Oct 2020 18:55:33 +0300
Subject: Change guides system to content system

As this system will be used for more than just guides,
I had to do some refactoring to match this system with plans.
Basically now there isn't guides, but articles instead.
---
 pydis_site/templates/content/article.html  | 61 ++++++++++++++++++++++++++++++
 pydis_site/templates/content/articles.html | 53 ++++++++++++++++++++++++++
 pydis_site/templates/content/category.html | 44 +++++++++++++++++++++
 pydis_site/templates/guides/category.html  | 44 ---------------------
 pydis_site/templates/guides/guide.html     | 61 ------------------------------
 pydis_site/templates/guides/guides.html    | 53 --------------------------
 6 files changed, 158 insertions(+), 158 deletions(-)
 create mode 100644 pydis_site/templates/content/article.html
 create mode 100644 pydis_site/templates/content/articles.html
 create mode 100644 pydis_site/templates/content/category.html
 delete mode 100644 pydis_site/templates/guides/category.html
 delete mode 100644 pydis_site/templates/guides/guide.html
 delete mode 100644 pydis_site/templates/guides/guides.html

(limited to 'pydis_site/templates')

diff --git a/pydis_site/templates/content/article.html b/pydis_site/templates/content/article.html
new file mode 100644
index 00000000..de6cd28d
--- /dev/null
+++ b/pydis_site/templates/content/article.html
@@ -0,0 +1,61 @@
+{% extends 'base/base.html' %}
+{% load static %}
+
+{% block title %}{{ metadata.title|first }}{% endblock %}
+{% block head %}
+  <meta property="og:title" content="Python Discord - {{ article.metadata.title|first }}" />
+  <meta property="og:type" content="website" />
+  <meta property="og:description" content="{{ article.metadata.shortdescription|first }}" />
+  <link rel="stylesheet" href="{% static "css/content/articles.css" %}">
+  <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.2.0/build/styles/default.min.css">
+  <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.2.0/build/highlight.min.js"></script>
+  <script>hljs.initHighlightingOnLoad();</script>
+{% endblock %}
+
+{% block content %}
+    {% include "base/navbar.html" %}
+
+    <section class="breadcrumb-section section">
+        <div class="container">
+            <nav class="breadcrumb is-pulled-left" aria-label="breadcrumbs">
+                <ul>
+                    <li><a href="/content">Pages</a></li>
+                    {% if category_data.raw_name is not None %}
+                        <li><a href="/content/category/{{ category_data.raw_name }}">{{ category_data.name }}</a></li>
+                    {% endif %}
+                    <li class="is-active"><a href="#">{{ article.metadata.title|first }}</a></li>
+                </ul>
+            </nav>
+        </div>
+    </section>
+
+    <section class="section">
+        <div class="content">
+            <div class="container">
+                <h1 class="title">{{ article.metadata.title|first }}</h1>
+                <div class="columns is-variable is-8">
+                    <div class="column is-two-thirds">
+                        {{ article.article|safe }}
+                        <p class="has-text-weight-light is-size-7">
+                            <strong>Last modified:</strong> {{ last_modified }}<br/>
+                            <strong>Contributors:</strong> {{ article.metadata.contributors|join:", " }}
+                        </p>
+                    </div>
+                    <div class="column">
+                        {% if relevant_links|length > 0 %}
+                        <div class="box">
+                            <p class="menu-label">Relevant links</p>
+                            <ul class="menu-list">
+                                {% for link, value in relevant_links.items %}
+                                    <li><a class="has-text-link" href="{{link}}">{{ value }}</a></li>
+                                {% endfor %}
+                            </ul>
+                        </div>
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+
+{% endblock %}
diff --git a/pydis_site/templates/content/articles.html b/pydis_site/templates/content/articles.html
new file mode 100644
index 00000000..6fea66e5
--- /dev/null
+++ b/pydis_site/templates/content/articles.html
@@ -0,0 +1,53 @@
+{% extends 'base/base.html' %}
+{% load static %}
+
+{% block title %}Guides{% endblock %}
+{% block head %}
+  <link rel="stylesheet" href="{% static "css/content/articles.css" %}">
+{% endblock %}
+
+{% block content %}
+    {% include "base/navbar.html" %}
+
+    <section class="breadcrumb-section section">
+        <div class="container">
+            <nav class="breadcrumb is-pulled-left" aria-label="breadcrumbs">
+                <ul>
+                    <li class="is-active"><a href="/content">Pages</a></li>
+                </ul>
+            </nav>
+        </div>
+    </section>
+
+    <section class="section">
+        <div class="container">
+            <div class="content">
+                <h1>Articles</h1>
+                {% for article, data in content.items %}
+                    <div class="box" style="max-width: 800px;">
+                        <span class="icon is-size-4 is-medium">
+                            <i class="fab fa-python is-size-3 is-black has-icon-padding" aria-hidden="true"></i>
+                        </span>
+                        <a href="{{ article }}/">
+                                <span class="is-size-4 has-text-weight-bold">{{ data.title.0 }}</span>
+                        </a>
+                        <p class="is-italic">{{ data.shortdescription.0 }}</p>
+                    </div>
+                {% endfor %}
+                {% for category, data in categories.items %}
+                    <div class="box" style="max-width: 800px;">
+                        <span class="icon is-size-4 is-medium">
+                            <i class="fas fa-folder is-size-3 is-black has-icon-padding" aria-hidden="true"></i>
+                        </span>
+
+
+                        <a href="category/{{ category }}/">
+                            <span class="is-size-4 has-text-weight-bold">{{ data.name }}</span>
+                        </a>
+                        <p class="is-italic">{{ data.description }}</p>
+                    </div>
+                {% endfor %}
+            </div>
+        </div>
+    </section>
+{% endblock %}
diff --git a/pydis_site/templates/content/category.html b/pydis_site/templates/content/category.html
new file mode 100644
index 00000000..61e20c43
--- /dev/null
+++ b/pydis_site/templates/content/category.html
@@ -0,0 +1,44 @@
+{% extends 'base/base.html' %}
+{% load static %}
+
+{% block title %}{{ category_info.name }}{% endblock %}
+{% block head %}
+  <meta property="og:title" content="Python Discord - {{ category_info.name }}" />
+  <meta property="og:type" content="website" />
+  <meta property="og:description" content="{{ category_info.description }}" />
+  <link rel="stylesheet" href="{% static "css/content/articles.css" %}">
+{% endblock %}
+
+{% block content %}
+    {% include "base/navbar.html" %}
+
+    <section class="breadcrumb-section section">
+        <div class="container">
+            <nav class="breadcrumb is-pulled-left" aria-label="breadcrumbs">
+                <ul>
+                    <li><a href="/content">Pages</a></li>
+                    <li class="is-active"><a href="#">{{ category_info.name }}</a></li>
+                </ul>
+            </nav>
+        </div>
+    </section>
+
+    <section class="section">
+        <div class="container">
+            <div class="content">
+                <h1>{{ category_info.name }}</h1>
+                {% for article, data in content.items %}
+                    <div class="box" style="max-width: 800px;">
+                        <span class="icon is-size-4 is-medium">
+                            <i class="fab fa-python is-size-3 is-black has-icon-padding" aria-hidden="true"></i>
+                        </span>
+                        <a href="/content/category/{{ category_name }}/{{ article }}/">
+                                <span class="is-size-4 has-text-weight-bold">{{ data.title.0 }}</span>
+                        </a>
+                        <p class="is-italic">{{ data.shortdescription.0 }}</p>
+                    </div>
+                {% endfor %}
+            </div>
+        </div>
+    </section>
+{% endblock %}
diff --git a/pydis_site/templates/guides/category.html b/pydis_site/templates/guides/category.html
deleted file mode 100644
index f3a8c2ce..00000000
--- a/pydis_site/templates/guides/category.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{% extends 'base/base.html' %}
-{% load static %}
-
-{% block title %}{{ category_info.name }}{% endblock %}
-{% block head %}
-  <meta property="og:title" content="Python Discord - {{ category_info.name }}" />
-  <meta property="og:type" content="website" />
-  <meta property="og:description" content="{{ category_info.description }}" />
-  <link rel="stylesheet" href="{% static "css/guides/guide.css" %}">
-{% endblock %}
-
-{% block content %}
-    {% include "base/navbar.html" %}
-
-    <section class="breadcrumb-section section">
-        <div class="container">
-            <nav class="breadcrumb is-pulled-left" aria-label="breadcrumbs">
-                <ul>
-                    <li><a href="/guides">Guides</a></li>
-                    <li class="is-active"><a href="#">{{ category_info.name }}</a></li>
-                </ul>
-            </nav>
-        </div>
-    </section>
-
-    <section class="section">
-        <div class="container">
-            <div class="content">
-                <h1>{{ category_info.name }}</h1>
-                {% for guide, data in guides.items %}
-                    <div class="box" style="max-width: 800px;">
-                        <span class="icon is-size-4 is-medium">
-                            <i class="fab fa-python is-size-3 is-black has-icon-padding" aria-hidden="true"></i>
-                        </span>
-                        <a href="/guides/category/{{ category_name }}/{{ guide }}/">
-                                <span class="is-size-4 has-text-weight-bold">{{ data.title.0 }}</span>
-                        </a>
-                        <p class="is-italic">{{ data.shortdescription.0 }}</p>
-                    </div>
-                {% endfor %}
-            </div>
-        </div>
-    </section>
-{% endblock %}
diff --git a/pydis_site/templates/guides/guide.html b/pydis_site/templates/guides/guide.html
deleted file mode 100644
index 97fc8262..00000000
--- a/pydis_site/templates/guides/guide.html
+++ /dev/null
@@ -1,61 +0,0 @@
-{% extends 'base/base.html' %}
-{% load static %}
-
-{% block title %}{{ metadata.title|first }}{% endblock %}
-{% block head %}
-  <meta property="og:title" content="Python Discord - {{ guide.metadata.title|first }}" />
-  <meta property="og:type" content="website" />
-  <meta property="og:description" content="{{ guide.metadata.shortdescription|first }}" />
-  <link rel="stylesheet" href="{% static "css/guides/guide.css" %}">
-  <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.2.0/build/styles/default.min.css">
-  <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.2.0/build/highlight.min.js"></script>
-  <script>hljs.initHighlightingOnLoad();</script>
-{% endblock %}
-
-{% block content %}
-    {% include "base/navbar.html" %}
-
-    <section class="breadcrumb-section section">
-        <div class="container">
-            <nav class="breadcrumb is-pulled-left" aria-label="breadcrumbs">
-                <ul>
-                    <li><a href="/guides">Guides</a></li>
-                    {% if category_data.raw_name is not None %}
-                        <li><a href="/guides/category/{{ category_data.raw_name }}">{{ category_data.name }}</a></li>
-                    {% endif %}
-                    <li class="is-active"><a href="#">{{ guide.metadata.title|first }}</a></li>
-                </ul>
-            </nav>
-        </div>
-    </section>
-
-    <section class="section">
-        <div class="content">
-            <div class="container">
-                <h1 class="title">{{ guide.metadata.title|first }}</h1>
-                <div class="columns is-variable is-8">
-                    <div class="column is-two-thirds">
-                        {{ guide.guide|safe }}
-                        <p class="has-text-weight-light is-size-7">
-                            <strong>Last modified:</strong> {{ last_modified }}<br/>
-                            <strong>Contributors:</strong> {{ guide.metadata.contributors|join:", " }}
-                        </p>
-                    </div>
-                    <div class="column">
-                        {% if relevant_links|length > 0 %}
-                        <div class="box">
-                            <p class="menu-label">Relevant links</p>
-                            <ul class="menu-list">
-                                {% for link, value in relevant_links.items %}
-                                    <li><a class="has-text-link" href="{{link}}">{{ value }}</a></li>
-                                {% endfor %}
-                            </ul>
-                        </div>
-                        {% endif %}
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-
-{% endblock %}
diff --git a/pydis_site/templates/guides/guides.html b/pydis_site/templates/guides/guides.html
deleted file mode 100644
index 0e6f2073..00000000
--- a/pydis_site/templates/guides/guides.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% extends 'base/base.html' %}
-{% load static %}
-
-{% block title %}Guides{% endblock %}
-{% block head %}
-  <link rel="stylesheet" href="{% static "css/guides/guide.css" %}">
-{% endblock %}
-
-{% block content %}
-    {% include "base/navbar.html" %}
-
-    <section class="breadcrumb-section section">
-        <div class="container">
-            <nav class="breadcrumb is-pulled-left" aria-label="breadcrumbs">
-                <ul>
-                    <li class="is-active"><a href="/guides">Guides</a></li>
-                </ul>
-            </nav>
-        </div>
-    </section>
-
-    <section class="section">
-        <div class="container">
-            <div class="content">
-                <h1>Guides</h1>
-                {% for guide, data in guides.items %}
-                    <div class="box" style="max-width: 800px;">
-                        <span class="icon is-size-4 is-medium">
-                            <i class="fab fa-python is-size-3 is-black has-icon-padding" aria-hidden="true"></i>
-                        </span>
-                        <a href="{{ guide }}/">
-                                <span class="is-size-4 has-text-weight-bold">{{ data.title.0 }}</span>
-                        </a>
-                        <p class="is-italic">{{ data.shortdescription.0 }}</p>
-                    </div>
-                {% endfor %}
-                {% for category, data in categories.items %}
-                    <div class="box" style="max-width: 800px;">
-                        <span class="icon is-size-4 is-medium">
-                            <i class="fas fa-folder is-size-3 is-black has-icon-padding" aria-hidden="true"></i>
-                        </span>
-
-
-                        <a href="category/{{ category }}/">
-                            <span class="is-size-4 has-text-weight-bold">{{ data.name }}</span>
-                        </a>
-                        <p class="is-italic">{{ data.description }}</p>
-                    </div>
-                {% endfor %}
-            </div>
-        </div>
-    </section>
-{% endblock %}
-- 
cgit v1.2.3