Merge branch 'release/0.11.0'

Author: malte-christian

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.11.0 (March 30, 2016)
+
+### Added
+- Added OpenGraph
+
+### Fixed
+- Fixed RSS feed links
+
 ## 0.10.2 (February 24, 2016)
 
 ### Added

app/components/post-meta.vue

@@ -0,0 +1,38 @@
+<template>
+
+    <div class="uk-form-horizontal">
+
+        <div class="uk-form-row">
+            <label for="form-meta-title" class="uk-form-label">{{ 'Title' | trans }}</label>
+            <div class="uk-form-controls">
+                <input id="form-meta-title" class="uk-form-width-large" type="text" v-model="post.data.meta['og:title']">
+            </div>
+        </div>
+
+        <div class="uk-form-row">
+            <label for="form-meta-description" class="uk-form-label">{{ 'Description' | trans }}</label>
+            <div class="uk-form-controls">
+                <textarea id="form-meta-description" class="uk-form-width-large" rows="5" type="text" v-model="post.data.meta['og:description']"></textarea>
+            </div>
+        </div>
+
+    </div>
+
+</template>
+
+<script>
+
+    module.exports = {
+
+        section: {
+            label: 'Meta',
+            priority: 100
+        },
+
+        props: ['post']
+
+    };
+
+    window.Post.components['post-meta'] = module.exports;
+
+</script>

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "pagekit/blog",
     "type": "pagekit-extension",
-    "version": "0.10.2",
+    "version": "0.11.0",
     "title": "Blog",
     "description": "A blog extensions with a built-in comment system.",
     "license": "MIT",

index.php

@@ -163,6 +163,7 @@
 
         'view.scripts' => function ($event, $scripts) {
             $scripts->register('link-blog', 'blog:app/bundle/link-blog.js', '~panel-link');
+            $scripts->register('post-meta', 'blog:app/bundle/post-meta.js', '~post-edit');
         }
 
     ]

src/Controller/SiteController.php

@@ -85,18 +85,18 @@ public function feedAction($type = '')
         $site = App::module('system/site');
         $feed = App::feed()->create($type ?: $this->blog->config('feed.type'), [
             'title' => $site->config('title'),
-            'link' => App::url('@blog', [], true),
+            'link' => App::url('@blog', [], 0),
             'description' => $site->config('description'),
             'element' => ['language', $locale],
-            'selfLink' => App::url('@blog/feed', [], true)
+            'selfLink' => App::url('@blog/feed', [], 0)
         ]);
 
         if ($last = Post::where(['status = ?', 'date < ?'], [Post::STATUS_PUBLISHED, new \DateTime])->limit(1)->orderBy('modified', 'DESC')->first()) {
             $feed->setDate($last->modified);
         }
 
         foreach (Post::where(['status = ?', 'date < ?'], [Post::STATUS_PUBLISHED, new \DateTime])->related('user')->limit($this->blog->config('feed.limit'))->orderBy('date', 'DESC')->get() as $post) {
-            $url = App::url('@blog/id', ['id' => $post->id], true);
+            $url = App::url('@blog/id', ['id' => $post->id], 0);
             $feed->addItem(
                 $feed->createItem([
                     'title' => $post->title,
@@ -133,7 +133,14 @@ public function postAction($id = 0)
         return [
             '$view' => [
                 'title' => __($post->title),
-                'name' => 'blog/post.php'
+                'name' => 'blog/post.php',
+                'og:type' => 'article',
+                'article:published_time' => $post->date->format(\DateTime::ATOM),
+                'article:modified_time' => $post->modified->format(\DateTime::ATOM),
+                'article:author' => $post->user->name,
+                'og:title' => $post->get('meta.og:title') ?: $post->title,
+                'og:description' => $post->get('meta.og:description') ?: $post->excerpt,
+                'og:image' =>  $post->get('image.src') ? App::url()->getStatic($post->get('image.src'), [], 0) : false
             ],
             '$comments' => [
                 'config' => [

webpack.config.js

@@ -9,7 +9,8 @@ module.exports = [
             "comments": "./app/views/comments",
             "post": "./app/views/post",
             "posts": "./app/views/posts",
-            "link-blog": "./app/components/link-blog.vue"
+            "link-blog": "./app/components/link-blog.vue",
+            "post-meta": "./app/components/post-meta.vue"
         },
         output: {
             filename: "./app/bundle/[name].js"