diff --git a/app/Http/routes.php b/app/Http/routes.php index ce9715d8..ada638d5 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -12,6 +12,13 @@ */ +Route::get('emailtest', function(){ + return View::make('Emails.Layouts.Master', [ + 'message' => 'Hello.', + 'email_logo' => asset('assets/images/logo-email.png') + ]); +}); + /* * Installer */ diff --git a/config/app.php b/config/app.php index 8ce9bc8c..7f29fbbc 100644 --- a/config/app.php +++ b/config/app.php @@ -122,17 +122,11 @@ return [ 'Illuminate\View\ViewServiceProvider', 'Illuminate\Html\HtmlServiceProvider', 'Illuminate\Broadcasting\BroadcastServiceProvider', -// 'Thomaswelton\LaravelGravatar\LaravelGravatarServiceProvider', -// 'Webpatser\Countries\CountriesServiceProvider', -// 'Vinelab\Http\HttpServiceProvider', -// 'Vinelab\Http\HttpServiceProvider', 'Milon\Barcode\BarcodeServiceProvider', 'Intervention\Image\ImageServiceProvider', - 'Nitmedia\Wkhtml2pdf\L5Wkhtml2pdfServiceProvider', 'Maatwebsite\Excel\ExcelServiceProvider', 'Laravel\Socialite\SocialiteServiceProvider', -// 'Bugsnag\BugsnagLaravel\BugsnagLaravelServiceProvider::class', 'Barryvdh\Debugbar\ServiceProvider', 'Nitmedia\Wkhtml2pdf\L5Wkhtml2pdfServiceProvider', 'Mews\Purifier\PurifierServiceProvider', @@ -203,9 +197,7 @@ return [ 'HTML' => 'Illuminate\Html\HtmlFacade', 'Str' => 'Illuminate\Support\Str', 'Utils' => 'App\Attendize\Utils', - 'Countries' => 'Webpatser\Countries\CountriesFacade', 'Carbon' => 'Carbon\Carbon', - //'PDF' => 'Barryvdh\DomPDF\Facade', 'PDF' => 'Nitmedia\Wkhtml2pdf\Facades\Wkhtml2pdf', 'DNS1D' => 'Milon\Barcode\Facades\DNS1DFacade', 'DNS2D' => 'Milon\Barcode\Facades\DNS2DFacade', @@ -213,7 +205,6 @@ return [ 'Excel' => 'Maatwebsite\Excel\Facades\Excel', 'Socialize' => 'Laravel\Socialite\Facades\Socialite', 'HttpClient' => 'Vinelab\Http\Facades\Client', - //'Purifier' => 'Mews\Purifier\Facades\Purifier', 'Purifier' => 'Mews\Purifier\Facades\Purifier', 'Markdown' => 'MaxHoffmann\Parsedown\ParsedownFacade', diff --git a/config/bugsnag.php b/config/bugsnag.php deleted file mode 100644 index 114205a8..00000000 --- a/config/bugsnag.php +++ /dev/null @@ -1,5 +0,0 @@ - 'b663417807397a325bcd5a9b3d5048b5' -]; \ No newline at end of file diff --git a/config/mail.php b/config/mail.php index a8a97f4e..f3e93058 100644 --- a/config/mail.php +++ b/config/mail.php @@ -15,7 +15,7 @@ return [ | */ - 'driver' => env('MAIL_DRIVER', 'smtp'), + 'driver' => env('MAIL_DRIVER', 'mail'), /* |-------------------------------------------------------------------------- @@ -28,7 +28,7 @@ return [ | */ - 'host' => env('MAIL_HOST', 'smtp.mandrillapp.com'), + 'host' => env('MAIL_HOST', 'smtp.sendgrid.net'), /* |-------------------------------------------------------------------------- @@ -80,7 +80,7 @@ return [ | */ - 'username' => 'dave.m.earley@gmail.com', + 'username' => env('MAIL_USERNAME'), /* |-------------------------------------------------------------------------- @@ -93,7 +93,7 @@ return [ | */ - 'password' => 'b038a015-8162-4a7a-bb8b-abb63fa7c112', + 'password' => env('MAIL_PASSWORD'), /* |-------------------------------------------------------------------------- diff --git a/public/assets/images/splash.jpg b/public/assets/images/splash.jpg new file mode 100644 index 00000000..682a1624 Binary files /dev/null and b/public/assets/images/splash.jpg differ diff --git a/public/assets/javascript/app.js b/public/assets/javascript/app.js index 3eeb4545..b533adae 100644 --- a/public/assets/javascript/app.js +++ b/public/assets/javascript/app.js @@ -181,8 +181,6 @@ $(function () { success: function (data) { hideMessage(); - //history.pushState({}, '', window.location + '#' + modalId); - $('body').append(data); var $modal = $('#' + modalId); diff --git a/resources/views/Emails/Layouts/Master.blade.php b/resources/views/Emails/Layouts/Master.blade.php index 79e157eb..e8b216eb 100644 --- a/resources/views/Emails/Layouts/Master.blade.php +++ b/resources/views/Emails/Layouts/Master.blade.php @@ -1,222 +1,69 @@ - - + - - - - @section('subject') - Attendize.com Email - @show - - + + + + @section('subject') + Attendize.com Email + @show + - - + + - - - -
- + + + + - +
+ -
- - - - - - - -
- -
- @yield('message_content') -
+
+ + + + + + + +
+ +
+ @yield('message_content') +
- +
- - - -