Laravel 5.4 upgrade

Author: bpocallaghan

.env.live

@@ -0,0 +1 @@
+APP_ENV=productionAPP_DEBUG=trueAPP_KEY=base64:xbpZ9i+Z/cFebsPXhrAnwzIdoQLFA7GZne/iC6bDKL4=APP_URL=http://bpocallaghan.co.za/PUBLIC_FOLDER=public_htmlAPP_TITLE="Titan"APP_DESCRIPTION="Awesome Admin Portal"APP_AUTHOR="Ben-Piet O'Callaghan"APP_KEYWORDS="titan awesome admin portal cms"DB_CONNECTION=mysqlDB_HOST=127.0.0.1DB_PORT=3306DB_DATABASE=bpocasgt_titanDB_USERNAME=bpocasgt_adminDB_PASSWORD=6FDvkPMwFDK6}Mf812PoCACHE_DRIVER=fileSESSION_DRIVER=fileQUEUE_DRIVER=databaseREDIS_HOST=127.0.0.1REDIS_PASSWORD=nullREDIS_PORT=6379MAIL_DRIVER=mailgunMAIL_HOST=smtp.mailgun.orgMAIL_PORT=587MAIL_USERNAME=bpocallaghan@gmailcomMAIL_PASSWORD=nullMAIL_ENCRYPTION=nullMAIL_ADMIN="Ben-Piet O'Callaghan"MAIL_ADMIN_EMAIL="[email protected]"MAIL_NAME="Titan"[email protected]_SECRET=key-f05f2773140c5d89ddaf65e80ddc73a0MAILGUN_DOMAIN=bpocallaghan.co.zaFACEBOOK_APP_ID=1677524729160990RECAPTCHA_PUBLIC_KEY=6LfBNBwTAAAAAHqppepAnU6GQNbIPyv1NGObpt2xRECAPTCHA_PRIVATE_KEY=6LfBNBwTAAAAALJTGzeIjqLx76wUkDOlP_EeLZBsGOOGLE_ANALYTICS="UA-52694956-1"GOOGLE_MAP_KEY=AIzaSyBP1upSrIhapVgjswZtb125ZbXD_u4hooAANALYTICS_SITE_ID="ga:88378678"ANALYTICS_SERVICE_EMAIL="[email protected]"

.gitignore

@@ -9,5 +9,7 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 .env
-_ide_helper.php
 .phpstorm.meta.php
+_ide_helper.php
+public/mix-manifest.json
+storage/google-analytics.p12

README.md

@@ -13,12 +13,15 @@ A Laravel CMS Starter project with AdminLTE theme and core features.
 - Authorization
 	- login / forgot password
 	- register via authorization (admin invite user)
-- Dashboard
-	- google analytics
-	- list activities
+- Google Analytics Reports (with charts)
+	- visitors
+	- devices
+	- keywords
+	- pages
 - Admin Navigation
 - Website Navigation
-- Tag resource
+- Log Actions (if contact us was submitted, etc)
+- Notifications (Laravel 5.4 notifications)
 - Log Activities (user, resource, before, after)
 - Bootstrap Alerts and Form Error messages. package; bpocallaghan/alert
 - Flash a Notification after a CRUD resource action. package; bpocallaghan/notify

app/Events/ActionWasTriggered.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Events;
+
+class ActionWasTriggered extends BaseEvent
+{
+    public $type;
+
+    public $message;
+
+    /**
+     * Create a new event instance.
+     * @param string $type
+     * @param string $message
+     * @param        $subject
+     */
+    public function __construct($type = '', $message = '', $subject)
+    {
+        $this->type = $type;
+        $this->eloquent = $subject;
+        $this->message = $message;
+    }
+}

app/Events/BaseEvent.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Support\Facades\Event;
+use Illuminate\Queue\SerializesModels;
+
+class BaseEvent extends Event
+{
+    use SerializesModels;
+
+    public $eloquent;
+
+    /**
+     * Get the channels the event should be broadcast on.
+     *
+     * @return array
+     */
+    public function broadcastOn()
+    {
+        return [];
+    }
+}

app/Events/ContactUsFeedback.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Events;
+
+use App\Events\Event;
+use App\Models\FeedbackContactUs;
+
+class ContactUsFeedback extends BaseEvent
+{
+    /**
+     * Create a new event instance.
+     *
+     * @param FeedbackContactUs $row
+     */
+    public function __construct(FeedbackContactUs $row)
+    {
+        $row->type = 'Contact Us';
+        $this->eloquent = $row;
+    }
+}

app/Http/Controllers/Admin/AdminController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use Illuminate\Http\Request;
+
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
+use Titan\Controllers\TitanAdminController;
+
+class AdminController extends TitanAdminController
+{
+
+}

app/Http/Controllers/Admin/AnalyticsController.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Requests;
+
+class AnalyticsController extends AdminController
+{
+    public function summary()
+    {
+        return $this->view('analytics.summary');
+    }
+
+    public function devices()
+    {
+        return $this->view('analytics.devices');
+    }
+
+    public function visitsReferrals()
+    {
+        return $this->view('analytics.visits_referrals');
+    }
+
+    public function interests()
+    {
+        return $this->view('analytics.interests');
+    }
+
+    public function demographics()
+    {
+        return $this->view('analytics.demographics');
+    }
+}

app/Http/Controllers/Admin/DashboardController.php

@@ -2,22 +2,16 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Models\LogAdminActivity;
 use Illuminate\Http\Request;
 
 use App\Http\Requests;
-use LaravelAnalytics;
+use App\Http\Controllers\Controller;
 use Titan\Controllers\TitanAdminController;
-use Titan\Controllers\Traits\Analytics;
 
-class DashboardController extends TitanAdminController
+class DashboardController extends AdminController
 {
-    use Analytics;
-
-    public function index()
-    {
-        $activities = LogAdminActivity::getLatest();
-
-        return $this->view('dashboard', compact('activities'));
-    }
-}
+	public function index()
+	{
+		return $this->view('dashboard');
+	}
+}

app/Http/Controllers/Admin/General/BannersController.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use Redirect;
+use App\Http\Requests;
+use App\Models\Banner;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Admin\AdminController;
+use Titan\Controllers\Traits\UploadFile;
+
+class BannersController extends AdminController
+{
+    use UploadFile;
+
+    /**
+     * Display a listing of banner.
+     *
+     * @return Response
+     */
+    public function index()
+    {
+        save_resource_url();
+
+        return $this->view('banners.index')->with('items', Banner::all());
+    }
+
+    /**
+     * Show the form for creating a new banner.
+     *
+     * @return Response
+     */
+    public function create()
+    {
+        return $this->view('banners.add_edit');
+    }
+
+    /**
+     * Store a newly created banner in storage.
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public function store(Request $request)
+    {
+        $this->validate($request, Banner::$rules, Banner::$messages);
+
+        $photo = $this->uploadBanner($request->file('photo'));
+        if ($photo) {
+            $request->merge(['image' => $photo]);
+            $banner = $this->createEntry(Banner::class, $request->except('photo'));
+        }
+
+        log_action('Banner Created', 'Banner was created ' . $banner->title);
+
+        return redirect_to_resource();
+    }
+
+    /**
+     * Display the specified banner.
+     *
+     * @param Banner $banner
+     * @return Response
+     */
+    public function show(Banner $banner)
+    {
+        return $this->view('banners.show')->with('item', $banner);
+    }
+
+    /**
+     * Show the form for editing the specified banner.
+     *
+     * @param Banner $banner
+     * @return Response
+     */
+    public function edit(Banner $banner)
+    {
+        return $this->view('banners.add_edit')->with('item', $banner);
+    }
+
+    /**
+     * Update the specified banner in storage.
+     *
+     * @param Banner  $banner
+     * @param Request $request
+     * @return Response
+     */
+    public function update(Banner $banner, Request $request)
+    {
+        if (is_null($request->file('photo'))) {
+            $this->validate($request, array_except(Banner::$rules, 'photo'), Banner::$messages);
+        }
+        else {
+            $this->validate($request, Banner::$rules, Banner::$messages);
+
+            $photo = $this->uploadBanner($request->file('photo'));
+            $request->merge(['image' => $photo]);
+        }
+
+        $this->updateEntry($banner, $request->except('photo'));
+
+        log_action('Banner Updated', 'Banner was updated. ' . $banner->title);
+
+        return redirect_to_resource();
+    }
+
+    /**
+     * Remove the specified banner from storage.
+     *
+     * @param Banner  $banner
+     * @param Request $request
+     * @return Response
+     */
+    public function destroy(Banner $banner, Request $request)
+    {
+        $this->deleteEntry($banner, $request);
+
+        return redirect_to_resource();
+    }
+}