Merge pull request #130 from nsosnsos/dev

REFACTOR: ORGANIZE STATIC AND TEMPLATES
nsosnsos · Oct 14, 2023 · 899d851 · 899d851
2 parents 4aff084 + 6f157e9
commit 899d851
Show file tree

Hide file tree

Showing 21 changed files with 96 additions and 35 deletions.
diff --git a/hallelujah/static/css/style.css b/hallelujah/static/css/style.css
@@ -44,35 +44,89 @@ a {
     transform: translate(-50%, -50%);
 }
 
+/* thumbnail image */
+.thumbnail-image {
+  position: relative;
+  width: 100%;
+}
+
 /* gallery */
 .gallery {
     display: flex;
     flex-wrap: wrap;
 }
-
 .gallery>a, .gallery::after {
     flex-basis: var(--w);
 }
-
 .gallery>a {
     margin: 0.1rem;
     flex-grow: calc(var(--w) / var(--h) * 100);
     width: calc(var(--w) * 1px);
 }
-
 .gallery::after {
   --w: 2;
   --h: 1;
   content: '';
   flex-grow: 1000000;
 }
-
 .gallery>a>div {
   position: relative;
 }
 
-.thumbnail-image {
-  position: relative;
-  width: 100%;
+/* markdown body */
+.markdown-body {
+    background-color: transparent;
+    box-sizing: border-box;
+    padding: 15px;
+}
+.markdown-body table tr {
+    background-color: transparent;
+}
+.markdown-body table tr:nth-child(2n) {
+    background-color: transparent;
+    opacity: 1.0;
+}
+.markdown-body pre {
+    margin-top, margin-bottom: 5px;
+    padding: 0;
+    background-color: #cccccc;
+}
+.markdown-body code.hljs {
+    white-space: pre-wrap;
+    overflow: auto;
+}
+.markdown-body code.hljs table.hljs-ln {
+    width: 100%;
+    border-collapse: collapse;
+    margin: 0;
+    border: 0;
+    padding: 2px;
+}
+.markdown-body code.hljs table.hljs-ln tbody {
+    width: 100%;
+    min-width: 200px;
+    display: table;
+}
+.markdown-body code.hljs table.hljs-ln tr {
+    border: 0;
+}
+.markdown-body code.hljs table.hljs-ln td.hljs-ln-line {
+    border: 0;
+    padding: 0 5px;
+}
+.markdown-body code.hljs table.hljs-ln td.hljs-ln-numbers {
+    font-family: inherit;
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    text-align: right;
+    vertical-align: top;
+    color: #373737;
+    border-right: 1px solid #373737;
+    width: 1rem;
+    min-width: 1rem;
 }
 
diff --git a/hallelujah/templates/auth/login.html b/hallelujah/templates/auth/login.html
@@ -1,5 +1,5 @@
-{% extends '_base.html' %}
-{% from '_form.html' import render_field %}
+{% extends 'base.html' %}
+{% from 'macros/form.html' import render_field %}
 
 {% block content %}
     <div class="row justify-content-center">

diff --git a/hallelujah/templates/auth/profile.html b/hallelujah/templates/auth/profile.html
@@ -1,4 +1,4 @@
-{% extends '_base.html' %}
+{% extends 'base.html' %}
 
 {% block content %}
     <div class="row justify-content-center">

diff --git a/hallelujah/templates/auth/register.html b/hallelujah/templates/auth/register.html
@@ -1,5 +1,5 @@
-{% extends '_base.html' %}
-{% from '_form.html' import render_field %}
+{% extends 'base.html' %}
+{% from 'macros/form.html' import render_field %}
 
 {% block content %}
     <div class="row justify-content-center">

diff --git a/hallelujah/templates/auth/setting.html b/hallelujah/templates/auth/setting.html
@@ -1,5 +1,5 @@
-{% extends '_base.html' %}
-{% from '_form.html' import render_field %}
+{% extends 'base.html' %}
+{% from 'macros/form.html' import render_field %}
 
 {% block content %}
     <div class="row justify-content-center">

diff --git a/hallelujah/templates/_base.html → hallelujah/templates/base.html b/hallelujah/templates/_base.html → hallelujah/templates/base.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-{% from '_nav.html' import render_nav_item %}
+{% from 'macros/nav.html' import render_nav_item %}
 <html lang="en">
     <head>
         {% block metas %}

diff --git a/hallelujah/templates/_form.html → hallelujah/templates/macros/form.html b/hallelujah/templates/_form.html → hallelujah/templates/macros/form.html
@@ -357,3 +357,4 @@
   {% endfor %}
 </div>
 {% endmacro %}
+
diff --git a/hallelujah/templates/_modal.html → hallelujah/templates/macros/modal.html b/hallelujah/templates/_modal.html → hallelujah/templates/macros/modal.html
@@ -1,3 +1,6 @@
+{# render modal html #}
+
+
 {% macro render_modal(modal_title, resource_title, resource_del_uri, resource_id='') %}
     <button type="button" class="btn btn-primary btn-sm my-1 my-auto float-end" data-bs-toggle="modal" data-bs-target="#modal_{{ resource_id }}"><i class="bi-trash">Delete</i></button>
     <div class="modal fade" id="modal_{{ resource_id }}" tabindex="-1" role="dialog" aria-labelledby="modal_{{ resource_id }}" aria-hidden="true">
@@ -20,3 +23,4 @@ <h5 class="modal-title" id="modal_{{ resource_id }}">{{ modal_title }}</h5>
         </div>
     </div>
 {% endmacro %}
+
diff --git a/hallelujah/templates/_nav.html → hallelujah/templates/macros/nav.html b/hallelujah/templates/_nav.html → hallelujah/templates/macros/nav.html
@@ -1,3 +1,6 @@
+{# render navigation item #}
+
+
 {% macro render_nav_item(endpoint, text, badge='', use_li=True, icon='') %}
     {% set active = True if request.endpoint and request.endpoint == endpoint else False %}
     {% if use_li %}<li class="nav-item">{% endif %}

diff --git a/hallelujah/templates/main/about.html b/hallelujah/templates/main/about.html
@@ -1,4 +1,4 @@
-{% extends '_base.html' %}
+{% extends 'base.html' %}
 
 {% block content %}
     <div class="row justify-content-center">

diff --git a/hallelujah/templates/main/articles.html b/hallelujah/templates/main/articles.html
@@ -1,4 +1,4 @@
-{% extends '_base.html' %}
+{% extends 'base.html' %}
 
 {% block content %}
     <div class="row mt-5">

diff --git a/hallelujah/templates/main/edit_article.html b/hallelujah/templates/main/edit_article.html
@@ -1,5 +1,5 @@
-{% extends '_simplemde.html' %}
-{% from '_form.html' import render_simple, render_field %}
+{% extends 'plugins/simplemde.html' %}
+{% from 'macros/form.html' import render_simple, render_field %}
 
 {% block content %}
     <div class="row justify-content-center">

diff --git a/hallelujah/templates/main/medias.html b/hallelujah/templates/main/medias.html
@@ -1,9 +1,9 @@
 {% if form %}
-    {% extends '_dropzone.html' %}
-    {% from '_form.html' import render_field %}
-    {% from '_modal.html' import render_modal %}
+    {% extends 'plugins/dropzone.html' %}
+    {% from 'macros/form.html' import render_field %}
+    {% from 'macros/modal.html' import render_modal %}
 {% else %}
-    {% extends '_base.html' %}
+    {% extends 'base.html' %}
 {% endif %}
 
 {% block content %}

diff --git a/hallelujah/templates/main/resources.html b/hallelujah/templates/main/resources.html
@@ -1,8 +1,8 @@
 {% if not columns and not form %}
-    {% extends '_base.html' %}
+    {% extends 'base.html' %}
 {% else %}
-    {% extends '_gridjs.html' %}
-    {% from '_form.html' import render_field %}
+    {% extends 'plugins/gridjs.html' %}
+    {% from 'macros/form.html' import render_field %}
 {% endif %}
 
 {% block content %}

diff --git a/hallelujah/templates/main/search.html b/hallelujah/templates/main/search.html
@@ -1,4 +1,4 @@
-{% extends '_base.html' %}
+{% extends 'base.html' %}
 
 {% block content %}
     <div class="row mt-5">

diff --git a/hallelujah/templates/main/user.html b/hallelujah/templates/main/user.html
@@ -1,4 +1,4 @@
-{% extends '_base.html' %}
+{% extends 'base.html' %}
 
 {% block content %}
     <div class="row justify-content-center">

diff --git a/hallelujah/templates/main/view_article.html b/hallelujah/templates/main/view_article.html
@@ -1,5 +1,5 @@
-{% extends '_highlight.html' %}
-{% from '_modal.html' import render_modal %}
+{% extends 'plugins/highlight.html' %}
+{% from 'macros/modal.html' import render_modal %}
 
 {% block content %}
     <div class="row justify-content-center my-5">

diff --git a/hallelujah/templates/_dropzone.html → hallelujah/templates/plugins/dropzone.html b/hallelujah/templates/_dropzone.html → hallelujah/templates/plugins/dropzone.html
@@ -1,4 +1,4 @@
-{% extends '_base.html' %}
+{% extends 'base.html' %}
 
 {% block styles %}
     <link rel="stylesheet" href="https://unpkg.com/dropzone@6.0.0-beta.1/dist/dropzone.css">

diff --git a/hallelujah/templates/_gridjs.html → hallelujah/templates/plugins/gridjs.html b/hallelujah/templates/_gridjs.html → hallelujah/templates/plugins/gridjs.html
@@ -1,4 +1,4 @@
-{% extends '_base.html' %}
+{% extends 'base.html' %}
 
 {% block styles %}
     {{ super() }}

diff --git a/hallelujah/templates/_highlight.html → hallelujah/templates/plugins/highlight.html b/hallelujah/templates/_highlight.html → hallelujah/templates/plugins/highlight.html
@@ -1,10 +1,9 @@
-{% extends '_base.html' %}
+{% extends 'base.html' %}
 
 {% block styles %}
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.6.0/build/styles/googlecode.min.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/github-markdown-css@5.1.0/github-markdown.min.css">
     {{ super() }}
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/markdown_patch.css', _external=True) }}">
 {% endblock styles %}
 
 {% block scripts %}

diff --git a/hallelujah/templates/_simplemde.html → hallelujah/templates/plugins/simplemde.html b/hallelujah/templates/_simplemde.html → hallelujah/templates/plugins/simplemde.html
@@ -1,4 +1,4 @@
-{% extends '_highlight.html' %}
+{% extends 'plugins/highlight.html' %}
 
 {% block styles %}
     {{ super() }}