feat: reworked the template structure

www/src/db_handler/post.php

@@ -6,8 +6,6 @@ class Post implements ArrayAccess {
     private $content_html;
     private $content_markdown;
 
-    private $site_defaults;
-
     public $data;
 
     public $html_data;
@@ -67,13 +65,11 @@ class Post implements ArrayAccess {
         $this->content_html = null;
         $this->content_markdown  = null;
 
-        $this->site_defaults = $site_defaults;
-
         if(!isset($post_data) or !isset($post_data['id'])) {
             $post_data = $this->_generate_404($post_data);
         }
     
-        $data = $post_data;
+        $data = array_merge($site_defaults, $post_data);
 
         if($data['path'] == '') {
             $data['path'] = '/';
@@ -127,11 +123,7 @@ class Post implements ArrayAccess {
             return $this->data[$name];
         }
 
-        if(is_null($this->site_defaults)) {
-            throw new RuntimeException("Post site defaults have not been set properly!");
-        }
-
-        return $this->site_defaults[$name] ?? null;
+       return null;
     }
 
     public function offsetGet($offset) : mixed {
@@ -141,9 +133,6 @@ class Post implements ArrayAccess {
         if(isset($this->data[$offset])) {
             return true;
         }
-        if(isset($this->site_defaults[$offset])) {
-            return true;
-        }
 
         return !is_null($this->offsetGet($offset));
     }
@@ -179,7 +168,7 @@ class Post implements ArrayAccess {
     }
 
     public function to_array($options = []) {
-        $out_data = array_merge($this->site_defaults, $this->data);
+        $out_data = $this->data;
 
         if(isset($options['markdown'])) {
             $out_data['markdown'] = $this->get_markdown();

www/src/dbtest.php

@@ -61,6 +61,8 @@ $db_connection->execute_query("DELETE FROM posts;");
 $sql_adapter = new MySQLHandler($db_connection, $SERVER_HOST);
 $adapter = new PostHandler($sql_adapter);
 
+$adapter->site_defaults = [];
+
 $sql_adapter->debugging = true;
 
 function test_accounce($title) {
@@ -127,15 +129,23 @@ test_accounce("Setting post markdown...");
 $sql_adapter->set_postdata([
     'path' => '/testing/markdowntest',
     'markdown' => 'Inline markdown test should work...',
-    'title' => "A Markdown Test"
+    'title' => "A Markdown Test",
+    'brief' => "The dragons explore markdown, sort of properly... Maybe.",
+    'tags' => ['one', 'two', 'three', 'sexee']
 ]);
 $post = $sql_adapter->get_postdata('/testing/markdowntest');
 var_dump($sql_adapter->get_post_markdown($post['id']));
 
 $sql_adapter->set_post_markdown($post['id'],
     '
-    This is one hell of a cute test!
+
+This is one hell of a cute test!
+
 > Just checking in...
+
+{{
+template: fragments/blog/card.html
+}}
     '
 );
 var_dump($sql_adapter->get_post_markdown($post['id']));

www/src/dergdown.php

@@ -1,14 +1,85 @@
 <?php
 
+use Symfony\Component\Yaml\Yaml;
 use Highlight\Highlighter;
 
 class Dergdown extends ParsedownExtra
 {
     protected $highlighter;
 
+    protected $dergInsertRenderer;
+
     public function __construct()
     {
-        $this->highlighter = new Highlighter();
+        $this->highlighter = null;
+        $this->BlockTypes['{'] []= 'DergInsert';
+
+        $this->dergInsertRenderer = null;
+    }
+
+    public function setDergRenderer($dergRenderer) {
+        $this->dergInsertRenderer = $dergRenderer;
+    }
+
+    protected function blockDergInsert($Line, $currentBlock) {
+        if (preg_match('/^{{\s?(.*)$/', $Line['body'], $match)) {
+            return array(
+                'text' => $match[1] ?? ''
+            );
+        }
+    }
+
+    protected function blockDergInsertContinue($Line, $Block) {
+        if(isset($Block['complete'])) {
+            return;
+        }
+
+        if(preg_match('/(.*)}}/', $Line['body'], $match)) {
+            $Block['text'] .= "\n" . $match[1];
+            $Block['complete'] = true;
+            return $Block;
+        }
+
+        $Block['text'] .= "\n" . $Line['body'];
+
+        return $Block;
+    }
+
+    protected function blockDergInsertComplete($Block) {
+        try {
+            $parsed_data = Yaml::parse($Block['text']);
+        }
+        catch (Exception $ex) {
+            return array(
+                'markup' => '
+                    <div class="derg-insert-error">
+                        <h3> Error in a dergen template! </h3>
+                        YAML could not be parsed properly: <br>
+                    <code>
+                ' . $ex->getMessage() . '</code> </div>'
+            );
+        }
+
+        try {
+            if(!isset($this->dergInsertRenderer)) {
+                throw new Exception("No Dergen Renderer was set!");
+            }
+
+            $render_output = $this->dergInsertRenderer->dergRender($parsed_data);
+        } catch (Exception $ex) {
+            return array(
+                'markup' => '
+                    <div class="derg-insert-error">
+                        <h3> Error in a dergen template! </h3>
+                        Rendering engine threw an error: <br>
+                    <code>
+                ' . $ex->getMessage() . '</code> </div>'
+            );
+        }
+
+        return array(
+            'markup' => $render_output
+        );
     }
 
     protected function blockFencedCodeComplete($block)
@@ -17,6 +88,10 @@ class Dergdown extends ParsedownExtra
             return $block;
         }
 
+        if(!isset($this->highlighter)) {
+            $this->highlighter = new Highlighter();
+        }
+
         $code = $block['element']['text']['text'];
         $languageClass = $block['element']['text']['attributes']['class'];
         $language = explode('-', $languageClass);

www/src/serve/ajax.php

@@ -21,6 +21,8 @@ if(isset($REQUEST_QUERY['page'])) {
 $ajax_args['fa'] = $FONT_AWESOME_ARRAY;
 $ajax_args['page'] ??= $SITE_CONFIG['site_defaults'];
 
-echo $twig->render('/ajax/' . $AJAX_REQUEST_TEMPLATE, $ajax_args);
+$ajax_args['post'] ??= $ajax_args['page'];
+
+echo $twig->render($AJAX_REQUEST_TEMPLATE, $ajax_args);
 
 ?>

www/src/setup/db.php

@@ -29,14 +29,27 @@ $sql_adapter = new MySQLHandler($db_connection, $SERVER_HOST);
 $adapter = new PostHandler($sql_adapter);
 
 require_once 'dergdown.php';
+require_once 'setup/derg_insert.php';
 
-function dergdown_to_html($text) {
+function dergdown_to_html($post) {
+    $DergInsert = new DergInsertRenderer($post);
     $Parsedown = new Dergdown();
+    $Parsedown->setDergRenderer($DergInsert);
 
-    return $Parsedown->text($text);
+    $markdown = $post->markdown;
+
+    if($markdown == '') {
+        $markdown = '
+{{
+template: fragments/directory/inline.html
+}}
+';
+    }
+
+    return $Parsedown->text($markdown);
 }
 function post_to_html($post) {
-    return dergdown_to_html($post->markdown);
+    return dergdown_to_html($post);
 }
 $adapter->markdown_engine = "post_to_html";
 

www/src/setup/derg_insert.php

@@ -0,0 +1,43 @@
+<?php
+
+class DergInsertRenderer {
+    protected $twig;
+    protected $post;
+    protected $postAdapter;
+
+    public function __construct($post) {
+        global $twig;
+        global $adapter;
+
+        $this->twig = $twig;
+        $this->post = $post;
+        $this->postAdapter = $adapter;
+    }
+
+    public function dergRender($renderConfig) {
+        global $FONT_AWESOME_ARRAY;
+
+        if(!isset($renderConfig['template'])) {
+            throw new Exception("No template type given!");
+        }
+
+        $template = $renderConfig['template'];
+
+        $args = [
+            'post' => $this->post,
+            'page' => $this->post,
+            'fa' => $FONT_AWESOME_ARRAY
+        ];
+
+        if(isset($renderConfig['post'])) {
+            $args['post'] = $this->postAdapter->get_post($renderConfig['post']);
+        }
+        if(isset($renderConfig['page'])) {
+            $args['page'] = $this->postAdapter->get_post($renderConfig['page']);
+        }
+
+        return $this->twig->render($template, $args);
+    }
+}
+
+?>

www/static/banner.js

@@ -1,6 +1,8 @@
 
 const BANNER_TIME = 600 * 1000.0
-const BANNER_ANIMATION = "opacity 0.8s linear, transform 0.1s linear"
+// const BANNER_ANIMATION = "opacity 0.8s linear, transform 0.1s linear"
+const BANNER_ANIMATION = "opacity 0.8s linear"
+
 
 class BannerHandler {
     constructor(banner_container, banner_image, banner_link) {
@@ -32,7 +34,7 @@ class BannerHandler {
 
         console.log("Starting tick")
 
-        this.bannerUpdateTimer = setInterval(() => { this.updateTick() }, 100);
+        this.bannerUpdateTimer = setInterval(() => { this.updateTick() }, 1000);
     }
     stopUpdateTick() {
         if(this.bannerUpdateTimer === null) {

www/templates/ajax/compact_filelist/listing.html

@@ -1,4 +0,0 @@
-
-{% for post in page.child_posts %}
-{{ include('ajax/compact_filelist/entry.html') }}
-{% endfor %}

www/templates/fragments/blog/card.html

@@ -1,5 +1,4 @@
 
-
 <a href="{{post.url}}">
     <div class="article_blop">
         <div class="article_blop_bg" style="background-image:url({{post.preview_image}});"></div> 
@@ -16,7 +15,7 @@
             </ul>
     
             <span class="article_blop_excerpt">
-                {{post.excerpt}}
+                {{ post.brief }}
             </span>
         </div>
     </div>

www/templates/fragments/decoration/blog_header.html

@@ -0,0 +1,10 @@
+
+<div>
+    <h1>
+        {{ post.title }}
+    </h1>
+
+    {% if post.authors %}
+        Written by {{ post.authors }}
+    {% endif %}
+</div>

www/templates/fragments/decoration/navbar.html

@@ -61,7 +61,7 @@
                 <a href={{page.parent.path}}>..</a>
             </li>
 
-            {{ include('ajax/compact_filelist/listing.html') }}
+            {{ include('fragments/directory/compact/listing.html') }}
         </ul>
     </div>
 </div>

www/templates/fragments/directory/compact/entry.html

@@ -6,7 +6,7 @@
     <input type="checkbox" id="folder-open-{{folder_key}}" name="folder-open-{{folder_key}}">
     <label for="folder-open-{{folder_key}}"
         hx-trigger="click once queue:last, mouseenter once queue:all, intersect once queue:all"
-        hx-get="/ajax/compact_filelist/listing.html?page={{ post.path }}"
+        hx-get="/ajax/fragments/directory/compact/listing.html?page={{ post.path }}"
         hx-target="next ul">
 
         {{ fa['folder'] | raw }}

www/templates/fragments/directory/compact/listing.html

@@ -0,0 +1,4 @@
+
+{% for post in page.child_posts %}
+{{ include('fragments/directory/compact/entry.html') }}
+{% endfor %}

www/templates/fragments/directory/inline.html

@@ -0,0 +1,39 @@
+<h3>Directory contents for {{page.basename}}:</h3>
+<table class="directory">
+    <tr>
+        <th></th>
+        <th class="hsmol_hide">Name</th>
+        <th>Title</th>
+        <th class="entry_update_time hsmol_hide">Modified</th>
+    </tr>
+
+    <tr class="entry">
+        <td>
+            {{ fa['turn-up'] | raw }} 
+        </td>
+        <td class="hsmol_hide">
+            <a href={{page.parent.path}}> .. </a>
+        </td>
+        <td class="entry_title">
+            <a href={{page.parent.path}}> .. </a>
+        </td>
+        <td class="entry_update_time hsmol_hide">
+        </td>
+    </tr>
+    {% for post in page.child_posts %}
+        <tr class="entry">
+            <td>
+                {{ fa[post.icon] | raw }}
+            </td>
+            <td class="hsmol_hide">
+                <a href={{post.path}}>{{post.basename}}</a>
+            </td>
+            <td class="entry_title">
+                <a href={{post.path}}>{{ post.title }}</a>
+            </td>
+            <td class="entry_update_time hsmol_hide">
+                {{ post.updated_at }}
+            </td>
+        </tr>
+    {% endfor %}
+</table>

www/templates/gallery/gallery_entry.html

@@ -1,28 +0,0 @@
-
-{% extends "root.html" %}
-
-{% block extra_head %}
-    <link rel="stylesheet" href="/static/gallerystyle.css">
-{% endblock %}
-
-{% block second_title %}
-<h2> Gallery </h2>
-{% endblock %}
-
-{%block main_content%}
-    <figure>
-
-        <a href="{{ image_url }}" target="_blank">
-            <img id="gallery_image" src="{{ image_url }}"> </img>
-        </a>
-        
-        <article>
-            <figcaption id="gallery_title"> {{ image_title }} </figcaption>
-            <span>  {{ image_desc }} </span>
-            <br>
-            <a href="{{ artist_src_link }}"> Artist: {{ artist_name }} </a>
-            <br>
-            <a href="{{ image_src_link }}"> Source link </a>
-        </article>
-    </figure>
-{%endblock%}

www/templates/gallery/gallery_overview.html

@@ -1,18 +0,0 @@
-
-{% extends "root.html" %}
-
-{% block extra_head %}
-    <link rel="stylesheet" href="/static/gallerystyle.css">
-{% endblock %}
-
-{% block second_title %}
-<h2> Gallery </h2>
-{% endblock %}
-
-{%block main_content%}
-    <div id="gallery_root_grid">
-        {% for key,value in array_path %}
-           <div class=""
-        {% endfor %}
-    </div>
-{%endblock%}

www/templates/old_post_types/markdown.html

@@ -9,7 +9,7 @@
 {%endblock %}
 
 {%block content_article%}
-	{% if page.title %}
+	{% if page.title and (page.title != page.basename) %}
 		<h1 class="content-title"> {{ page.title }} </h1>
 	{% endif %}
 

www/templates/pathed_content.html

@@ -15,7 +15,7 @@
 
 {%block main_content%}
 	
-    {{ include('fragments/filepath_bar.html') }}
+    {{ include('fragments/decoration/navbar.html') }}
 
 	<article id="content_article">
 		{%block content_article %}