From da1c8652e6be1deb1f8ed6d2e108a31808114d95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Mon, 3 Oct 2016 03:04:03 +0200
Subject: [PATCH] FEATURE: prepare support for blog

---
 .../Providers/ArticleListServiceProvider.php  | 17 --------------
 templates/Binarity/Handler.php                |  9 ++++++++
 .../modules/article/visitor/default.blade.php | 22 +++++++++++++++++++
 .../articlelist/visitor/default.blade.php     | 15 +++++++++++++
 .../Resources/views/visitor/layout.blade.php  | 20 +++++++++++++++++
 5 files changed, 66 insertions(+), 17 deletions(-)
 create mode 100644 templates/Binarity/Resources/views/modules/article/visitor/default.blade.php
 create mode 100644 templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php

diff --git a/modules/Blog/ArticleList/Providers/ArticleListServiceProvider.php b/modules/Blog/ArticleList/Providers/ArticleListServiceProvider.php
index f60ddf45..5bd01754 100644
--- a/modules/Blog/ArticleList/Providers/ArticleListServiceProvider.php
+++ b/modules/Blog/ArticleList/Providers/ArticleListServiceProvider.php
@@ -61,23 +61,6 @@ class ArticleListServiceProvider extends ServiceProvider {
 		$this->loadViewsFrom(array_merge(array_map(function ($path) {
 			return $path . '/modules/articlelist';
 		}, \Config::get('view.paths')), [$sourcePath]), 'articlelist');
-
-
-       /**
-        * @var $registrator TemplateRegistrator
-        */
-       try {
-           // setup some global variables
-           $registrator = $this->app->make('registerTemplateDir');
-           $registrator->setBaseDirectory('resources/views/modules/articlelist/visitor');
-           $registrator->setNamespace('articlelist');
-           $registrator->setModuleId(ArticleList::getModuleId());
-
-           // register path with current template name
-           $registrator->register(config('app.theme'), 'articlelist::module.templatePath');
-       } catch (InvalidArgumentException $e) {
-           // ignore this exception
-       }
 	}
 
 	/**
diff --git a/templates/Binarity/Handler.php b/templates/Binarity/Handler.php
index d5948a36..d6893377 100644
--- a/templates/Binarity/Handler.php
+++ b/templates/Binarity/Handler.php
@@ -69,6 +69,15 @@ class Handler implements TemplateHandler
                 'module'       => 'StaticPages',
                 'templateName' => 'staticpages::admin.templatePath'
             ],
+            [
+                'module'       => 'ArticleList',
+                'templateName' => 'articlelist::admin.templatePath'
+            ],
+            [
+                'module'       => 'Article',
+                'templateName' => 'article::admin.templatePath'
+            ],
+
             [
                 'module'       => 'ContactForm',
                 'templateName' => 'contactform::admin/adminMenu.templatePath'
diff --git a/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php b/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php
new file mode 100644
index 00000000..901e8526
--- /dev/null
+++ b/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php
@@ -0,0 +1,22 @@
+@extendVisitor('layout')
+
+@include(\App\Helpers\Template::name('metaInformation'))
+
+@section('content')
+    <h1 class="text-center uppercase m-b-25">{{$page->title}}</h1>
+
+    <div class="row">
+        {!! $page->content !!}
+
+        @forelse($page->comments as $comment)
+            {{$comment->author}}: {{$comment->content}}
+        @empty
+            <div class="callout info">Nic tu neni.</div>
+        @endforelse
+
+
+
+    </div>
+
+
+@endsection
\ No newline at end of file
diff --git a/templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php b/templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php
new file mode 100644
index 00000000..529720f5
--- /dev/null
+++ b/templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php
@@ -0,0 +1,15 @@
+@extendVisitor('layout')
+
+@include(\App\Helpers\Template::name('metaInformation'))
+
+@section('content')
+    <h1 class="text-center uppercase m-b-25">{{$page->title}}</h1>
+
+    <div class="row">
+        {!! $page->content !!}
+    </div>
+
+    @foreach($articles as $article)
+    <h2><a href="{{route('page.content', ['url' => $article->url])}}">{{$article->title}}</a></h2>
+    @endforeach
+@endsection
\ No newline at end of file
diff --git a/templates/Binarity/Resources/views/visitor/layout.blade.php b/templates/Binarity/Resources/views/visitor/layout.blade.php
index 95a8e266..f3313846 100644
--- a/templates/Binarity/Resources/views/visitor/layout.blade.php
+++ b/templates/Binarity/Resources/views/visitor/layout.blade.php
@@ -20,6 +20,26 @@
     <meta property="og:image" content="@yield('pageTitleImage')">
 
     <title>@yield('pageTitle') | {{setting('pageName')}}</title>
+
+    @if(!empty(setting('googleAnalyticsCode')))
+        <script>
+            (function (i, s, o, g, r, a, m) {
+                i['GoogleAnalyticsObject'] = r;
+                i[r] = i[r] || function () {
+                            (i[r].q = i[r].q || []).push (arguments)
+                        }, i[r].l = 1 * new Date ();
+                a = s.createElement (o),
+                        m = s.getElementsByTagName (o)[0];
+                a.async = 1;
+                a.src = g;
+                m.parentNode.insertBefore (a, m)
+            }) (window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
+
+            ga ('create', '{{setting('googleAnalyticsCode')}}', 'auto');
+            ga ('send', 'pageview');
+
+        </script>
+    @endif
 </head>
 <body>
 <div class="off-canvas-wrapper">