From 983536e505c55872406a023a04ac688838c49c23 Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Tue, 26 Sep 2017 11:42:00 -0400
Subject: [PATCH] Rename SITE_NAME and SITE_DESC to APP_NAME and APP_DESC

---
 .env.example                                     |  5 ++---
 app/Http/Controllers/ContactController.php       |  2 +-
 config/app.php                                   |  2 +-
 config/excel.php                                 | 10 +++++-----
 config/mail.php                                  |  2 +-
 resources/views/dashboard/elements/nav.blade.php |  2 +-
 resources/views/elements/footer.blade.php        |  2 +-
 resources/views/layouts/base.blade.php           | 10 +++++-----
 resources/views/layouts/error.blade.php          |  2 +-
 9 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.env.example b/.env.example
index 16880dd..a6002d0 100644
--- a/.env.example
+++ b/.env.example
@@ -1,8 +1,7 @@
-SITE_NAME='Hypothetical Template'
-SITE_DESC='A website template'
-
 DEFAULT_LANGUAGE=en
 
+APP_NAME='Hypothetical Template'
+APP_DESC='A website template'
 APP_ENV=local
 APP_DEBUG=true
 APP_LOG_LEVEL=debug
diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php
index 8dfc4b4..be99deb 100644
--- a/app/Http/Controllers/ContactController.php
+++ b/app/Http/Controllers/ContactController.php
@@ -23,7 +23,7 @@ class ContactController extends Controller {
         // Send the email if the MAIL_SENDTO variable is set
         if (env('MAIL_SENDTO') != null) {
             Mail::send('email.contact', [ 'contact' => $contact ], function($mail) use ($contact) {
-                $mail->from(env('MAIL_SENDFROM'), env('SITE_NAME'))
+                $mail->from(env('MAIL_SENDFROM'), env('APP_NAME'))
                     ->to(env('MAIL_SENDTO'))
                     ->subject('Contact form submission');
             });
diff --git a/config/app.php b/config/app.php
index 1033fad..7a66761 100644
--- a/config/app.php
+++ b/config/app.php
@@ -12,7 +12,7 @@ return [
     | any other location as required by the application or its packages.
     */
 
-    'name' => env('SITE_NAME', 'Laravel'),
+    'name' => env('APP_NAME', 'Laravel'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/excel.php b/config/excel.php
index 60df6ef..6df3b84 100644
--- a/config/excel.php
+++ b/config/excel.php
@@ -58,15 +58,15 @@ return array(
     ),
 
     'properties' => array(
-        'creator'        => env('SITE_NAME', 'Dashboard'),
-        'lastModifiedBy' => env('SITE_NAME', 'Dashboard'),
+        'creator'        => env('APP_NAME', 'Dashboard'),
+        'lastModifiedBy' => env('APP_NAME', 'Dashboard'),
         'title'          => 'Spreadsheet Export',
         'description'    => 'Exported Spreadsheet Data',
         'subject'        => 'Spreadsheet export',
         'keywords'       => 'excel, export',
         'category'       => 'Excel',
-        'manager'        => env('SITE_NAME', 'Dashboard'),
-        'company'        => env('SITE_NAME', 'Dashboard'),
+        'manager'        => env('APP_NAME', 'Dashboard'),
+        'company'        => env('APP_NAME', 'Dashboard'),
     ),
 
     /*
@@ -106,7 +106,7 @@ return array(
     |
     */
 
-    'creator'    => env('SITE_NAME', 'Dashboard'),
+    'creator'    => env('APP_NAME', 'Dashboard'),
 
     'csv'        => array(
         /*
diff --git a/config/mail.php b/config/mail.php
index 6226bbf..cde91b7 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -57,7 +57,7 @@ return [
 
     'from' => [
         'address' => env('MAIL_SENDFROM', null),
-        'name' => env('SITE_NAME', null),
+        'name' => env('APP_NAME', null),
     ],
 
     /*
diff --git a/resources/views/dashboard/elements/nav.blade.php b/resources/views/dashboard/elements/nav.blade.php
index e2da42a..df3ea44 100644
--- a/resources/views/dashboard/elements/nav.blade.php
+++ b/resources/views/dashboard/elements/nav.blade.php
@@ -9,7 +9,7 @@
             </button>
 
             <a class="navbar-brand" href="{{ url('/dashboard') }}">
-                {{ env('SITE_NAME') }} Dashboard
+                {{ env('APP_NAME') }} Dashboard
             </a>
         </div>
 
diff --git a/resources/views/elements/footer.blade.php b/resources/views/elements/footer.blade.php
index bbc0e03..942022a 100644
--- a/resources/views/elements/footer.blade.php
+++ b/resources/views/elements/footer.blade.php
@@ -1 +1 @@
-<footer>&copy; {{ date('Y') }} {{ env('SITE_NAME') }}</footer>
+<footer>&copy; {{ date('Y') }} {{ env('APP_NAME') }}</footer>
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 4952b09..c9562dd 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="{{ Language::getSessionLanguage() }}">
-    @set('page_title', (isset($title) ? $title . ' - ' : '') . env('SITE_NAME'))
+    @set('page_title', (isset($title) ? $title . ' - ' : '') . env('APP_NAME'))
     @set('device_mobile', preg_match('/Mobi/', Request::header('User-Agent')) || preg_match('/iP(hone|ad|od);/', Request::header('User-Agent')))
 
     <head>
@@ -12,19 +12,19 @@
         <meta name="theme-color" content="#fcfcfc" />
 
         <meta name="title" content="{{ $page_title }}" />
-        <meta name="description" content="{{ env('SITE_DESC') }}" />
+        <meta name="description" content="{{ env('APP_DESC') }}" />
         <meta name="dc:title" content="{{ $page_title }}" />
-        <meta name="dc:description" content="{{ env('SITE_DESC') }}" />
+        <meta name="dc:description" content="{{ env('APP_DESC') }}" />
 
         <meta property="og:type" content="article" />
         <meta property="og:title" content="{{ $page_title }}" />
-        <meta property="og:description" content="{{ env('SITE_DESC') }}" />
+        <meta property="og:description" content="{{ env('APP_DESC') }}" />
         <meta property="og:url" content="{{ Request::url() }}" />
         <meta property="og:image" content="{{ asset('/img/logo.png') }}" />
 
         <meta name="twitter:card" content="summary" />
         <meta name="twitter:title" content="{{ $page_title }}" />
-        <meta name="twitter:description" content="{{ env('SITE_DESC') }}" />
+        <meta name="twitter:description" content="{{ env('APP_DESC') }}" />
         <meta name="twitter:image" content="{{ asset('/img/logo.png') }}" />
 
         <link rel="shortcut icon" href="{{ URL::to('/') }}/favicon.ico" />
diff --git a/resources/views/layouts/error.blade.php b/resources/views/layouts/error.blade.php
index 90d85a6..318fcdd 100644
--- a/resources/views/layouts/error.blade.php
+++ b/resources/views/layouts/error.blade.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title>@yield('error-title') - {{ env('SITE_NAME') }}</title>
+        <title>@yield('error-title') - {{ env('APP_NAME') }}</title>
 
         <style>
             html, body {