From c9faf3f25baaef81fe0cbd25d4e5b303861df7f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82?= <michasstrzelecki@gmail.com>
Date: Mon, 13 Mar 2017 12:30:17 +0100
Subject: [PATCH] Add some fixes. (#53)

* Add some fixes.

* Change to check if app_env equals production.
---
 .env.example                                      |  3 +++
 resources/views/home.blade.php                    |  1 +
 resources/views/includes/alternateLinks.blade.php | 14 +++++++++-----
 resources/views/includes/head.blade.php           |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.env.example b/.env.example
index 08570a6b..f9e7bd07 100644
--- a/.env.example
+++ b/.env.example
@@ -4,6 +4,9 @@ APP_DEBUG=true
 APP_LOG_LEVEL=debug
 APP_URL=http://localhost
 
+SITE_NAME="G-ZERO CMS"
+SITE_DESC="Content management system."
+
 DOMAIN=dev.gzero.pl
 SESSION_DOMAIN=.dev.gzero.pl
 SESSION_SECURE_COOKIE=false
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 7d1c4ee9..fb2fac95 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -6,6 +6,7 @@
         @include('includes.canonical', ['paginator' => $contents])
     @endif
     @if(config('gzero.multilang.enabled'))
+        <link rel="alternate" href="{{env('APP_URL')}}" hreflang="x-default" />
         @foreach($langs as $availableLang)
             <link rel="alternate" href="{{url('/') . '/' . $availableLang->code}}" hreflang="{{$availableLang->code}}"/>
         @endforeach
diff --git a/resources/views/includes/alternateLinks.blade.php b/resources/views/includes/alternateLinks.blade.php
index 4be6b9a0..a0569572 100644
--- a/resources/views/includes/alternateLinks.blade.php
+++ b/resources/views/includes/alternateLinks.blade.php
@@ -1,6 +1,10 @@
-@if(config('gzero.multilang.enabled') && !empty($content))
-    @foreach($content->route->translations as $translation)
-        <link rel="alternate" href="{{$content->routeUrl($translation->langCode)}}"
-              hreflang="{{$translation->langCode}}"/>
-    @endforeach
+@if(config('gzero.multilang.enabled'))
+    <link rel="alternate" href="{{env('APP_URL')}}" hreflang="x-default" />
+    @if(empty($content))
+        <link rel="alternate" href="{{url()->current()}}" hreflang="{{$lang->code}}"/>
+    @else
+        @foreach($content->route->translations as $translation)
+            <link rel="alternate" href="{{$content->routeUrl($translation->lang_code)}}" hreflang="{{$translation->lang_code}}"/>
+        @endforeach
+    @endif
 @endif
diff --git a/resources/views/includes/head.blade.php b/resources/views/includes/head.blade.php
index 10ae959a..b47afb79 100644
--- a/resources/views/includes/head.blade.php
+++ b/resources/views/includes/head.blade.php
@@ -17,7 +17,7 @@
 
 </script>
 
-@if(option('seo', 'google_analytics_id'))
+@if(option('seo', 'google_analytics_id') && env('APP_ENV') === 'production')
 <!-- Google Analytics web tracking code -->
 <script type="text/javascript">
     (function(i, s, o, g, r, a, m) {