Reorder twig files (#162)

* feat: move twigs into subfolders * feat: update html of twig files * feat: simplified php template files in getting the context Co-authored-by: Lukas Gaechter <[email protected]>
timber · May 21, 2024 · 2ddc5b9 · 2ddc5b9
1 parent 0a6cb4d
commit 2ddc5b9
Show file tree

Hide file tree

Showing 40 changed files with 314 additions and 312 deletions.
diff --git a/404.php b/404.php
@@ -9,4 +9,4 @@
 use Timber\Timber;
 
 $context = Timber::context();
-Timber::render('404.twig', $context);
+Timber::render('templates/404.twig', $context);
diff --git a/archive.php b/archive.php
@@ -14,7 +14,7 @@
 
 use Timber\Timber;
 
-$templates = array('archive.twig', 'index.twig');
+$templates = array('templates/archive.twig', 'templates/index.twig');
 
 $title = 'Archive';
 if (is_day()) {
@@ -27,10 +27,9 @@
 	$title = single_tag_title('', false);
 } elseif (is_category()) {
 	$title = single_cat_title('', false);
-	array_unshift($templates, 'archive-' . get_query_var('cat') . '.twig');
 } elseif (is_post_type_archive()) {
 	$title = post_type_archive_title('', false);
-	array_unshift($templates, 'archive-' . get_post_type() . '.twig');
+	array_unshift($templates, 'templates/archive-' . get_post_type() . '.twig');
 }
 
 $context = Timber::context([

diff --git a/author.php b/author.php
@@ -11,17 +11,10 @@
 
 use Timber\Timber;
 
-global $wp_query;
+$context = Timber::context();
 
-$title = false;
-if (isset($wp_query->query_vars['author'])) {
-	$author = Timber::get_user($wp_query->query_vars['author']);
-	$title  = 'Author Archives: ' . $author->name();
+if (isset($context['author'])) {
+	 $context['title'] = sprintf(__('Archive of %s', 'timber-starter'), $context['author']->name());
 }
 
-$context = Timber::context([
-	'title'  => $title,
-	'author' => $author,
-]);
-
-Timber::render(array('author.twig', 'archive.twig'), $context);
+Timber::render(array('templates/author.twig', 'templates/archive.twig'), $context);
diff --git a/index.php b/index.php
@@ -13,10 +13,10 @@
 
 use Timber\Timber;
 
-$templates = array('index.twig');
+$templates = array('templates/index.twig');
 
 if (is_home()) {
-	array_unshift($templates, 'front-page.twig', 'home.twig');
+	array_unshift( $templates, 'templates/front-page.twig', 'templates/home.twig' );
 }
 
 $context = Timber::context([

diff --git a/page.php b/page.php
@@ -15,6 +15,5 @@
 use Timber\Timber;
 
 $context = Timber::context();
-$post = $context['post'];
 
-Timber::render(array('page-' . $post->post_name . '.twig', 'page.twig'), $context);
+Timber::render('templates/page.twig', $context);
diff --git a/search.php b/search.php
@@ -7,7 +7,7 @@
 
 use Timber\Timber;
 
-$templates = array('search.twig', 'archive.twig', 'index.twig');
+$templates = array( 'templates/search.twig', 'templates/archive.twig', 'templates/index.twig' );
 
 $context = Timber::context([
    'title' => 'Search results for ' . get_search_query(),

diff --git a/single.php b/single.php
@@ -11,9 +11,10 @@
 
 $context = Timber::context();
 $post = $context['post'];
+$templates = array('templates/single-' . $post->post_type . '.twig', 'templates/single.twig');
 
 if (post_password_required($post->ID)) {
-	Timber::render('single-password.twig', $context);
-} else {
-	Timber::render(array('single-' . $post->ID . '.twig', 'single-' . $post->post_type . '.twig', 'single-' . $post->slug . '.twig', 'single.twig'), $context);
-}
+	$templates = 'templates/single-password.twig';
+} 
+
+Timber::render($templates, $context);
diff --git a/views/404.twig b/views/404.twig
diff --git a/views/archive.twig b/views/archive.twig
diff --git a/views/author.twig b/views/author.twig
diff --git a/views/base.twig b/views/base.twig
diff --git a/views/comment.twig b/views/comment.twig
diff --git a/views/footer.twig b/views/footer.twig
diff --git a/views/head.twig b/views/head.twig
diff --git a/views/index.twig b/views/index.twig
diff --git a/views/layouts/base.twig b/views/layouts/base.twig
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html {{ site.language_attributes }}>
+    {% block head %}
+        {% include 'partials/head.twig' %}
+    {% endblock %}
+
+    <body class="{{ body_class }}">
+        {{ function('wp_body_open') }}
+        <a class="skip-link screen-reader-text" href="#content">{{ _e('Skip to content') }}</a>
+        <header class="header">
+            {% block header %}
+                <div class="wrapper">
+                    <h1 class="hdr-logo">
+                        <a class="hdr-logo-link" href="{{ site.url }}">{{ site.name }}</a>
+                    </h1>
+                    <nav id="nav-main" class="nav-main">
+                        {% include 'partials/menu.twig' with {
+                            items: menu.get_items
+                        } %}
+                    </nav>
+                    <!-- #nav -->
+                </div>
+            {% endblock %}
+        </header>
+
+        <section id="content" class="content-wrapper">
+            {% if title %}
+                <h1>{{ title }}</h1>
+            {% endif %}
+            <div class="wrapper">
+                {% block content %}
+                    Sorry, no content
+                {% endblock %}
+            </div>
+        </section>
+
+        {% block footer %}
+            {% include 'partials/footer.twig' %}
+        {% endblock %}
+        {{ function('wp_footer') }}
+        {% do action('get_footer') %}
+    </body>
+</html>
diff --git a/views/menu.twig b/views/menu.twig
diff --git a/views/page.twig b/views/page.twig
diff --git a/views/partial/pagination.twig b/views/partial/pagination.twig
diff --git a/views/comment-form.twig → views/partials/comment-form.twig b/views/comment-form.twig → views/partials/comment-form.twig
@@ -1,26 +1,30 @@
 <div class="comment-form">
     <h3>Add comment</h3>
-    <form class="comment-form" method="post" action="{{ site.site_url~'/wp-comments-post.php' }}">
-        {% if  user %}
-            <input type="hidden" name="email" value="{{ user.email }}">
-            <input type="hidden" name="author" value="{{ user.name }}">
-            <input type="hidden" name="url" value="{{ user.link }}">
+    <form class="comment-form" method="post" action="{{ site.link ~ '/wp-comments-post.php' }}">
+        {% if user %}
+            <input type="hidden" name="email" value="{{ user.email }}" />
+            <input type="hidden" name="author" value="{{ user.name }}" />
+            <input type="hidden" name="url" value="{{ user.link }}" />
         {% else %}
-            <label>Email<br>
-                <input required name="email" type="email" id="email">
+            <label>
+                Email<br />
+                <input required name="email" type="email" id="email" />
             </label>
-            <label>Name<br>
-                <input required name="author" type="text">
+            <label>
+                Name<br />
+                <input required name="author" type="text" />
             </label>
-            <label>Website<br>
-                <input name="url" type="url">
+            <label>
+                Website<br />
+                <input name="url" type="url" />
             </label>
         {% endif %}
-        <label>Comment<br>
+        <label>
+            Comment<br />
             <textarea placeholder="Leave a comment..." name="comment" cols="60" rows="3"></textarea>
         </label>
-        <input name="comment_post_ID" value="{{ post.id }}" type="hidden">
-        <input name="comment_parent"  value="{{ comment.ID|default('0') }}" type="hidden">
+        <input name="comment_post_ID" value="{{ post.id }}" type="hidden" />
+        <input name="comment_parent" value="{{ comment.id|default('0') }}" type="hidden" />
         <button type="submit" name="Submit" class="btn">Send</button>
         <button type="reset">Cancel</button>
         <p>Your comment will be revised by the site if needed.</p>