From e81ab50e8ce59f8cf26f7662737f250df998db7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sun, 29 Jul 2018 12:45:59 +0200
Subject: [PATCH] fix greeter cookie expiration, move greeter to own file

---
 app/Http/Controllers/DashController.php |  2 +-
 resources/views/greeter.blade.php       | 36 +++++++++++++++++++++++++
 resources/views/welcome.blade.php       | 32 +---------------------
 3 files changed, 38 insertions(+), 32 deletions(-)
 create mode 100644 resources/views/greeter.blade.php

diff --git a/app/Http/Controllers/DashController.php b/app/Http/Controllers/DashController.php
index ac2a07f..dbf25c7 100644
--- a/app/Http/Controllers/DashController.php
+++ b/app/Http/Controllers/DashController.php
@@ -16,7 +16,7 @@ class DashController extends Controller
         $dismiss = false;
         if ($request->has('dismiss-greeter')) {
             $dismiss = Utils::parseBool01($request->get('dismiss-greeter'));
-            \Cookie::queue('dismiss-greeter', $dismiss);
+            \Cookie::queue('dismiss-greeter', $dismiss, 24*60*365*10);
             return back();
         }
 
diff --git a/resources/views/greeter.blade.php b/resources/views/greeter.blade.php
new file mode 100644
index 0000000..191efab
--- /dev/null
+++ b/resources/views/greeter.blade.php
@@ -0,0 +1,36 @@
+<div class="row justify-content-center">
+  <div class="col-md-12 mb-2 mb-md-4">
+
+    <div class="card">
+      <div class="card-body">
+        <a href="{{ route('dash', ['dismiss-greeter' => 1]) }}" class="button close" aria-label="Close">
+          <span aria-hidden="true">&times;</span>@sr(Close)
+        </a>
+
+        <h2>Welcome to datatable.directory!</h2>
+
+        <p>
+          This website is a place for sharing useful tables of structured data.
+          These can be cipher tables, character maps, lists of electronic components,
+          paper grades, page formats, or scientific datasets, such as lists of countries,
+          geographic features, celestial bodies, elements, nutrition values, etc.
+          Anything you can put in a table can be shared here, as long as it conforms to our
+          <a href="{{route('terms')}}">Terms of Service</a>. You can search, filter, and export
+          data from our tables to many different formats, such as JSON, XML, C structs, or CSV.
+        </p>
+
+        @guest
+        <p>
+          The table directory is open to anyone, and can be used without login. However,
+          you will miss out on some features, like the ability to create or edit tables,
+          post comments, or save export presets. You can <a href="/register">register</a> using
+          your e-mail and a password, or through <a href="{{route('oauth-google-authorize')}}">Google</a>,
+          <a href="{{route('oauth-github-authorize')}}">GitHub</a>,
+          or <a href="{{route('oauth-facebook-authorize')}}">Facebook</a>.
+        </p>
+        @endif
+      </div>{{-- end body --}}
+    </div>{{-- end card --}}
+
+  </div>{{-- end col --}}
+</div>{{-- end row --}}
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 07fb236..0bf2126 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -4,37 +4,7 @@
 
 @section('content')
   @if($showGreeter)
-    <div class="row justify-content-center">
-      <div class="col-md-12 mb-2 mb-md-4">
-        <div class="card">
-          <div class="card-body">
-            <a href="{{ route('dash', ['dismiss-greeter' => 1]) }}" class="button close" aria-label="Close">
-              <span aria-hidden="true">&times;</span>@sr(Close)
-            </a>
-
-            <h2>Welcome to datatable.directory!</h2>
-
-            <p>
-              This website is a place for sharing useful tables of structured data.
-              These can be cipher tables, character maps, lists of electronic components,
-              paper grades, page formats, or scientific datasets, such as lists of countries,
-              geographic features, celestial bodies, elements, nutrition values, etc.
-              Anything you can put in a table can be shared here, as long as it conforms to our
-              <a href="{{route('terms')}}">Terms of Service</a>. You can search, filter, and export
-              data from our tables to many different formats, such as JSON, XML, C structs, or CSV.
-            </p>
-            <p>
-              The table directory is open to anyone, and can be used without login. However,
-              you will miss out on some features, like the ability to create or edit tables,
-              post comments, or save export presets. You can <a href="/register">register</a> using
-              your e-mail and a password, or through <a href="{{route('oauth-google-authorize')}}">Google</a>,
-              <a href="{{route('oauth-github-authorize')}}">GitHub</a>,
-              or <a href="{{route('oauth-facebook-authorize')}}">Facebook</a>.
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
+    @include('greeter')
   @endif
 
   <div class="row justify-content-center">