Merge pull request #7 from vivek-webkul/patch-1

[Added models contracts and missing translation.]

Author: jitendra-webkul

CHANGELOG for v0.1.x.md

@@ -2,6 +2,14 @@
 
 #### This changelog consists the bug & security fixes and new features being included in the releases listed below.
 
+## **v0.1.3(26th of December, 2019)** - *Release*
+
+* [Update] Added missing language translations.
+
+* [Update] Added contract for the PushNotificaton Model.
+
+* [Update] composer.json file added.
+
 ## **v0.1.2(7th of August, 2019)** - *Release*
 
 * [feature] Push Notifications added.

README.md

@@ -34,10 +34,16 @@ It packs in lots of demanding features that allows your business to scale in no
 Webkul\PWA\Providers\PWAServiceProvider::class
 ~~~
 
+* Goto config/concord.php file and add following line under 'modules'
+
+~~~
+\Webkul\PWA\Providers\ModuleServiceProvider::class
+~~~
+
 * Goto composer.json file and add following line under 'psr-4'
 
 ~~~
-"Webkul\\PWA\\": "packages/Webkul/PWA"
+"Webkul\\PWA\\": "packages/Webkul/PWA/src"
 ~~~
 
 * Install Jenssegers Agent via following command
@@ -64,6 +70,10 @@ Jenssegers\Agent\AgentServiceProvider::class
 composer dump-autoload
 ~~~
 
+~~~
+php artisan migrate
+~~~
+
 ~~~
 php artisan route:cache
 ~~~

packages/Webkul/PWA/composer.json

@@ -0,0 +1,26 @@
+{
+    "name": "Bagisto/Laravel-Progressive-Web-App",
+    "description": "Progressive Web Application transform your website like Mobile Application",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "viveksharma-webkul",
+            "email": "[email protected]"
+        }
+    ],
+    "require": {},
+    "autoload": {
+        "psr-4": {
+            "Webkul\\Pos\\": "src/"
+        }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Webkul\\PWA\\Providers\\PWAServiceProvider"
+            ],
+            "aliases": {}
+        }
+    },
+    "minimum-stability": "dev"
+}

packages/Webkul/PWA/src/Config/menu.php

@@ -9,7 +9,7 @@
     ], [
         'key' => 'PWA.index',
         'route' => 'pwa.pushnotification.index',
-        'name' => 'Push Notification',
+        'name' => 'pwa::app.admin.layouts.push-notification',
         'sort' => 1
     ]
 ];

packages/Webkul/PWA/src/Contracts/PushNotification.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Webkul\PWA\Contracts;
+
+interface PushNotification
+{
+}

packages/Webkul/PWA/src/DataGrids/PushNotificationDataGrid.php

@@ -3,27 +3,21 @@
 namespace Webkul\PWA\DataGrids;
 
 use Webkul\Ui\DataGrid\DataGrid;
-use LaravelFCM\Message\OptionsBuilder;
-use LaravelFCM\Message\PayloadDataBuilder;
-use LaravelFCM\Message\PayloadNotificationBuilder;
-use FCM;
 use DB;
 
 /**
  * OrderDataGrid Class
  *
  * @author Aayush Bhatt <[email protected]>
+ * @author Vivek Sharma <[email protected]>
  * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
  */
-
 class PushNotificationDataGrid extends DataGrid
 {
     protected $index = 'id';            // the column that needs to be treated as index column
 
     protected $sortOrder = 'desc';      // asc or desc
 
-    protected $itemsPerPage = 5;        // enables the pagination
-
     public function prepareQueryBuilder()
     {
         $queryBuilder = DB::table('push_notifications')
@@ -36,7 +30,7 @@ public function addColumns()
     {
         $this->addColumn([
             'index' => 'id',
-            'label' => trans('pwa::app.admin.system.id'),
+            'label' => trans('pwa::app.admin.datagrid.id'),
             'type' => 'number',
             'searchable' => true,
             'sortable' => true,
@@ -45,7 +39,7 @@ public function addColumns()
 
         $this->addColumn([
             'index' => 'title',
-            'label' => trans('pwa::app.admin.system.pushnotificationtitle'),
+            'label' => trans('pwa::app.admin.datagrid.title'),
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
@@ -54,7 +48,7 @@ public function addColumns()
 
         $this->addColumn([
             'index' => 'description',
-            'label' => trans('pwa::app.admin.system.pushnotificationdescription'),
+            'label' => trans('pwa::app.admin.datagrid.description'),
             'type' => 'string',
             'searchable' => false,
             'sortable' => false,
@@ -63,9 +57,9 @@ public function addColumns()
 
         $this->addColumn([
             'index' => 'targeturl',
-            'label' => trans('pwa::app.admin.system.targeturl'),
+            'label' => trans('pwa::app.admin.datagrid.target-url'),
             'type' => 'string',
-            'searchable' => false,
+            'searchable' => true,
             'sortable' => false,
             'filterable' => false
         ]);

packages/Webkul/PWA/src/Http/Controllers/PushNotificationController.php

@@ -3,24 +3,43 @@
 namespace Webkul\PWA\Http\Controllers;
 
 use Illuminate\Http\Request;
-use Webkul\PWA\Models\PushNotification as PushNotification;
 use Webkul\PWA\Repositories\PushNotificationRepository as PushNotificationRepository;
-use LaravelFCM\Message\OptionsBuilder;
-use LaravelFCM\Message\PayloadDataBuilder;
-use LaravelFCM\Message\PayloadNotificationBuilder;
-use FCM;
-use DB;
 
+/**
+ * Push Notification controller
+ *
+ * @author    Vivek Sharma <[email protected]>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
 class PushNotificationController extends Controller
 {
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
     protected $_config;
 
-    public function __construct(PushNotificationRepository $PushNotificationRepository)
+    /**
+     * PushNotificationRepository object
+     *
+     * @var array
+     */
+    protected $pushNotificationRepository;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @param  \Webkul\Core\Repositories\CoreConfigRepository  $coreConfig
+     * @return void
+     */
+    public function __construct(PushNotificationRepository $pushNotificationRepository)
     {
-        $this->PushNotificationRepository = $PushNotificationRepository;
+        $this->pushNotificationRepository = $pushNotificationRepository;
 
         $this->_config = request('_config');
     }
+
     /**
      * Display a listing of the resource.
      *
@@ -49,7 +68,6 @@ public function create()
      */
     public function store(Request $request)
     {
-
         // $this->validate($request, [
         //     'title'   => 'required',
         //     'description' => 'required',
@@ -61,25 +79,14 @@ public function store(Request $request)
          $data = $request->all();
 
         // call the repository
-        $pushnotification = $this->PushNotificationRepository->create($data);
+        $this->pushNotificationRepository->create($data);
 
          // flash message
          session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Push Notification']));
 
          return redirect()->route($this->_config['redirect']);
     }
 
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-
-    }
-
     /**
      * Show the form for editing the specified resource.
      *
@@ -88,8 +95,7 @@ public function show($id)
      */
     public function edit($id)
     {
-
-        $pushnotification = $this->PushNotificationRepository->find($id);
+        $pushnotification = $this->pushNotificationRepository->find($id);
 
         return view($this->_config['view'], compact('pushnotification'));
     }
@@ -103,8 +109,7 @@ public function edit($id)
      */
     public function update(Request $request, $id)
     {
-
-        $pushnotification = $this->PushNotificationRepository->update(request()->all(), $id);
+        $this->pushNotificationRepository->update(request()->all(), $id);
 
         session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Push Notification']));
 
@@ -119,65 +124,68 @@ public function update(Request $request, $id)
      */
     public function destroy($id)
     {
-        $pushnotification = $this->PushNotificationRepository->findOrFail($id);
-        $this->PushNotificationRepository->delete($id);
+        $pushnotification = $this->pushNotificationRepository->findOrFail($id);
+
+        $this->pushNotificationRepository->delete($id);
+
         session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Push Notification']));
+        
         return redirect()->back();
     }
 
     public function pushtofirebase($id) // send push notification to multiple devices
     {
-        $pushnotification = \DB::table('push_notifications')->find($id);
+        $pushnotification = $this->pushNotificationRepository->findOrFail($id);
+        
         $title = $pushnotification->title;
         $body = $pushnotification->description;
         $badge = $pushnotification->imageurl;
         $targeturl = $pushnotification->targeturl;
 
         $url = 'https://fcm.googleapis.com/fcm/send';
 
-            $topic = 'bagisto';
-
-            $fields = array(
-                'to' => '/topics/bagisto',
-                'data' => [
-                    'body' => $body,
-                    'title' => $title,
-                    'click_action' => $targeturl
-                ]
+        $topic = 'bagisto';
 
-            );
+        $fields = array(
+            'to' => '/topics/' . $topic,
+            'data' => [
+                'body' => $body,
+                'title' => $title,
+                'click_action' => $targeturl
+            ]
+        );
 
-            $server_key = "AIzaSyBjbet3YzHEAp-YEkRN50zWx3asw0d07MA";
+        $server_key = "AIzaSyBjbet3YzHEAp-YEkRN50zWx3asw0d07MA";
 
-            $headers = array(
-                'Content-Type:application/json',
-                'Authorization:key='.$server_key,
-            );
+        $headers = array(
+            'Content-Type:application/json',
+            'Authorization:key=' . $server_key,
+        );
 
-            // Open connection
-            $ch = curl_init();
+        // Open connection
+        $ch = curl_init();
 
-            curl_setopt( $ch, CURLOPT_URL, $url );
+        curl_setopt( $ch, CURLOPT_URL, $url );
 
-            curl_setopt( $ch, CURLOPT_POST, true );
+        curl_setopt( $ch, CURLOPT_POST, true );
 
-            curl_setopt( $ch, CURLOPT_HTTPHEADER, $headers );
+        curl_setopt( $ch, CURLOPT_HTTPHEADER, $headers );
 
-            curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
-            // Disabling SSL Certificate support temporarly
-            curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, true );
+        curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
+        // Disabling SSL Certificate support temporarly
+        curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, true );
 
-            curl_setopt( $ch, CURLOPT_POSTFIELDS, json_encode( $fields ) );
-            // Execute post
-            $result = curl_exec( $ch );
+        curl_setopt( $ch, CURLOPT_POSTFIELDS, json_encode( $fields ) );
+        // Execute post
+        $result = curl_exec( $ch );
 
-            if ( $result === false ) {
-                die('Curl failed: ' . curl_error($ch));
-            }
+        if ( $result === false ) {
+            die('Curl failed: ' . curl_error($ch));
+        }
 
-            curl_close( $ch );
+        curl_close( $ch );
 
-            // Close connection
-            return redirect()->back();
+        // Close connection
+        return redirect()->back();
     }
 }

packages/Webkul/PWA/src/Models/PushNotification.php

@@ -3,10 +3,11 @@
 namespace Webkul\PWA\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Webkul\PWA\Contracts\PushNotification as PushNotificationContract;
 
-class PushNotification extends Model
+class PushNotification extends Model implements PushNotificationContract
 {
-    protected $table = "push_notifications";
+    protected $table = 'push_notifications';
 
     public $primaryKey = 'id';
 

packages/Webkul/PWA/src/Providers/ModuleServiceProvider.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Webkul\PWA\Providers;
+
+use Konekt\Concord\BaseModuleServiceProvider;
+
+class ModuleServiceProvider extends BaseModuleServiceProvider
+{
+    protected $models = [
+        \Webkul\PWA\Models\PushNotification::class
+    ];
+}