[FIX] Version number and composer package name

RatMD · Aug 23, 2022 · 2e0b09f · 2e0b09f
1 parent 65b8710
commit 2e0b09f
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
-    "name": "rat.md/newshub-theme",
+    "name": "ratmd/newshub-theme",
     "type": "october-theme",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "A simple, minimalistic and responsive blog / magazine template, designed with Bootstrap 5.2.",
     "keywords": [
         "october", 

diff --git a/pages/blog/post.htm b/pages/blog/post.htm
@@ -21,10 +21,10 @@
 
         $this['newshub'] = [
             "meta_author" => $this->post->user->bloghub_display(),
-            "meta_keywords" => implode(', ', $this->post->bloghub_tags->map(fn ($el) => $el['slug'])->all())
+            "meta_keywords" => implode(', ', $this->post->ratmd_bloghub_tags->map(fn ($el) => $el['slug'])->all())
         ];
 
-        $layout = $this->post->bloghub_meta->where('name', 'layout')->first()['value'] ?? 'default';
+        $layout = $this->post->ratmd_bloghub_meta->where('name', 'layout')->first()['value'] ?? 'default';
         if ($layout === 'heroimage') {
             $this['bodyClasses'] = 'overlay-navbar';
         }
@@ -35,7 +35,7 @@
 }
 ?>
 ==
-{% set layout = post.bloghub_meta_data.layout | default('default') %}
+{% set layout = post.ratmd_bloghub_meta_data.layout | default('default') %}
 
 <div class="post-single post-layout-{{ layout }}">
     {% if layout != '' and layout != 'default' and hasPartial('blog/post-single-' ~ layout) %}

diff --git a/partials/blog/post-single-fullwidth.htm b/partials/blog/post-single-fullwidth.htm
@@ -22,10 +22,10 @@ <h1 class="post-title">{{ post.title }}</h1>
             <div class="post-content px-lg-6">
                 {{ post.content_html | raw }}
 
-                {% if post.bloghub_meta_data.images and post.featured_images|length > 1 %}
-                    {% if post.bloghub_meta_data.images == 'carousel' %}
+                {% if post.ratmd_bloghub_meta_data.images and post.featured_images|length > 1 %}
+                    {% if post.ratmd_bloghub_meta_data.images == 'carousel' %}
                         {% partial "blog/components/carousel" images=post.featured_images|slice(1) %}
-                    {% elseif post.bloghub_meta_data.images == 'gallery' %}
+                    {% elseif post.ratmd_bloghub_meta_data.images == 'gallery' %}
                         {% partial "blog/components/gallery" images=post.featured_images|slice(1) %}
                     {% endif %}
                 {% endif %}

diff --git a/partials/blog/post-single-heroimage.htm b/partials/blog/post-single-heroimage.htm
@@ -16,10 +16,10 @@ <h1 class="post-title">{{ post.title }}</h1>
             <div class="main-area post-content py-4 py-lg-0">
                 {{ post.content_html | raw }}
 
-                {% if post.bloghub_meta_data.images and post.featured_images|length > 1 %}
-                    {% if post.bloghub_meta_data.images == 'carousel' %}
+                {% if post.ratmd_bloghub_meta_meta_data.images and post.featured_images|length > 1 %}
+                    {% if post.ratmd_bloghub_meta_meta_data.images == 'carousel' %}
                         {% partial "blog/components/carousel" images=post.featured_images|slice(1) %}
-                    {% elseif post.bloghub_meta_data.images == 'gallery' %}
+                    {% elseif post.ratmd_bloghub_meta_meta_data.images == 'gallery' %}
                         {% partial "blog/components/gallery" images=post.featured_images|slice(1) %}
                     {% endif %}
                 {% endif %}

diff --git a/partials/blog/post-single.htm b/partials/blog/post-single.htm
@@ -22,10 +22,10 @@ <h1 class="post-title">{{ post.title }}</h1>
             <div class="main-area post-content py-4 py-lg-0">
                 {{ post.content_html | raw }}
 
-                {% if post.bloghub_meta_data.images and post.featured_images|length > 1 %}
-                    {% if post.bloghub_meta_data.images == 'carousel' %}
+                {% if post.ratmd_bloghub_meta_data.images and post.featured_images|length > 1 %}
+                    {% if post.ratmd_bloghub_meta_data.images == 'carousel' %}
                         {% partial "blog/components/carousel" images=post.featured_images|slice(1) %}
-                    {% elseif post.bloghub_meta_data.images == 'gallery' %}
+                    {% elseif post.ratmd_bloghub_meta_data.images == 'gallery' %}
                         {% partial "blog/components/gallery" images=post.featured_images|slice(1) %}
                     {% endif %}
                 {% endif %}

diff --git a/partials/page/hero-slider.htm b/partials/page/hero-slider.htm
@@ -18,15 +18,15 @@
                             <img src="{{ post.featured_images.0.getPath() }}" alt="{{ post.title }}" />
                         </div>
                         <div class="slide-content">
-                            {% if post.bloghub_meta_data.simple_title and post.bloghub_meta_data.simple_subtitle %}
-                                <div class="content-subtitle">{{ post.bloghub_meta_data.simple_subtitle }}</div>
-                                <div class="content-title">{{ post.bloghub_meta_data.simple_title }}</div>
+                            {% if post.ratmd_bloghub_meta_data.simple_title and post.ratmd_bloghub_meta_data.simple_subtitle %}
+                                <div class="content-subtitle">{{ post.ratmd_bloghub_meta_data.simple_subtitle }}</div>
+                                <div class="content-title">{{ post.ratmd_bloghub_meta_data.simple_title }}</div>
                             {% else %}
                                 <div class="content-title">{{ post.title }}</div>
                             {% endif %}
 
                             <div class="content-badges">
-                                {% for tag in post.bloghub_tags %}
+                                {% for tag in post.ratmd_bloghub_tags %}
                                     {% if tag.promote %}
                                         <span class="badge{% if not tag.color %} bg-primary{% endif %}" {% if tag.color %}style="background-color: {{ tag.color }}"{% endif %}>
                                             {% if not tag.title %}

diff --git a/partials/sidebars/widgets/articles.htm b/partials/sidebars/widgets/articles.htm
@@ -8,7 +8,7 @@
 
     // Main Posts Query
     $prefix = 'widget-posts-';
-    $posts = \RainLab\Blog\Models\Post::with(['categories', 'featured_images', 'bloghub_tags'])
+    $posts = \RainLab\Blog\Models\Post::with(['categories', 'featured_images', 'ratmd_bloghub_tags'])
         ->where('published', '1')
         ->limit($limit);
 
@@ -35,7 +35,7 @@
             break;
         case "by_tag":
             $tag = $config['widget_articles_by_tag'];
-            $posts->whereHas('bloghub_tags', function($query) use ($tag) {
+            $posts->whereHas('ratmd_bloghub_tags', function($query) use ($tag) {
                 return $query->where('ratmd_bloghub_tags.id', $tag);
             });
             $prefix = 'widget-bytag-';

diff --git a/partials/sidebars/widgets/current_author.htm b/partials/sidebars/widgets/current_author.htm
@@ -31,7 +31,7 @@
 }
 ?>
 ==
-{% if post.bloghub_tags|length > 0 %}
+{% if post.ratmd_bloghub_tags|length > 0 %}
     {% if wrap %}<div class="{{ wrap }}">{% endif %}
     <div class="card card-simple">
         {% if widget.widget_title or widget.widget_subtitle %}

diff --git a/partials/sidebars/widgets/current_tags.htm b/partials/sidebars/widgets/current_tags.htm
@@ -1,4 +1,4 @@
-{% if post.bloghub_tags|length > 0 %}
+{% if post.ratmd_bloghub_tags|length > 0 %}
     {% if wrap %}<div class="{{ wrap }}">{% endif %}
     <div class="card card-simple">
         {% if widget.widget_title or widget.widget_subtitle %}
@@ -14,7 +14,7 @@ <h2 class="card-title">{{ widget.widget_title }}</h2>
 
         <div class="card-body">
             <ul class="list-group list-group-flush">
-                {% for tag in post.bloghub_tags %}
+                {% for tag in post.ratmd_bloghub_tags %}
                     <li class="list-group-item">
                         <a href="{{ tag.url }}" title="{{ 'archive.tag_archive' | _ }}: {{ tag.title }}">
                             {{ tag.title | default(tag.slug | title) }}

diff --git a/version.yaml b/version.yaml
@@ -19,4 +19,8 @@ v1.1.0:
     - "Add: Next | Previous posts widget for post sidebar."
     - "Add: Table of Contents widget for page sidebar."
     - "Fix: Table of Contents generator skipped the last header element."
-    - "Fix: Missing dark header settings on static page layouts."
+    - "Fix: Missing dark header settings on static page layouts."
+v1.1.1:
+    - "Update: Use OctoberCMS VScode Syntax."
+    - "Fix: Use Socials folder before Bootstrap icons."
+    - "Fix: Wrong condition on author archive page."