laravel 6 support

Author: keriat

changelog.md

@@ -2,6 +2,12 @@
 
 All notable changes to `LaravelSurveyJs` will be documented in this file.
 
+## Version 1.0.0
+
+### Changes
+- Added Laravel 6.* support 
+
+
 ## Version 0.3.0
 
 ### Changes

composer.json

@@ -1,44 +1,52 @@
 {
-    "name": "aidynmakhataev/laravelsurveyjs",
-    "description": "Laravel wrapper for surveyjs library",
+    "name": "fruitware/laravel-surveyjs",
+    "version": "1.0.0",
+    "description": "Up-to-date Laravel wrapper for surveyjs library",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Serge Beresnev",
+            "email": "serge@fruitware.ry",
+            "homepage": "https://github.com/keriat"
+        },
         {
             "name": "Aidyn Makhataev",
             "email": "makataev.7@gmail.com",
             "homepage": "https://github.com/AidynMakhataev"
         }
     ],
-    "homepage": "https://github.com/aidynmakhataev/laravelsurveyjs",
+    "homepage": "https://github.com/Fruitware/laravel-surveyjs",
     "keywords": [
-        "Laravel", "LaravelSurveyJs", "surveyjs", "survey manager", "laravel survey", "survey editor", "surveyjs builder", "aidynmakhataev"
+        "Laravel", "LaravelSurveyJs", "surveyjs", "survey manager", "laravel survey", "survey editor", "surveyjs builder", "fruitware"
     ],
     "require": {
-        "illuminate/support": "~5",
-        "cviebrock/eloquent-sluggable": "^4.0"
+        "php": "^7.2",
+        "cviebrock/eloquent-sluggable": "*",
+        "illuminate/database": "6.1.*",
+        "ext-json": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.0",
-        "orchestra/testbench": "~3.0"
+        "orchestra/testbench": "*"
     },
     "autoload": {
         "psr-4": {
-            "AidynMakhataev\\LaravelSurveyJs\\": "src/"
+            "Fruitware\\LaravelSurveyJS\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "AidynMakhataev\\LaravelSurveyJs\\Tests\\": "tests"
+            "Fruitware\\LaravelSurveyJS\\Tests\\": "tests"
         }
     },
     "extra": {
         "laravel": {
             "providers": [
-                "AidynMakhataev\\LaravelSurveyJs\\LaravelSurveyJsServiceProvider"
+                "Fruitware\\LaravelSurveyJS\\LaravelSurveyJsServiceProvider"
             ],
             "aliases": {
-                "LaravelSurveyJs": "AidynMakhataev\\LaravelSurveyJs\\Facades\\LaravelSurveyJs"
+                "LaravelSurveyJs": "Fruitware\\LaravelSurveyJS\\Facades\\LaravelSurveyJs"
             }
         }
     }
-}
+}

config/survey-manager.php

@@ -9,13 +9,13 @@
     */
 
     // The prefix used in all base routes
-    'route_prefix'              =>  'survey',
+    'route_prefix'       => 'survey',
 
     // The prefix used in api endpoints
-    'api_prefix'                =>  'api',
+    'api_prefix'         => 'api',
 
     // The prefix used in admin route
-    'admin_prefix'              =>  'admin',
+    'admin_prefix'       => 'admin',
 
     /*
     |--------------------------------------------------------------------------
@@ -24,13 +24,13 @@
     */
 
     // route middleware
-    'route_middleware'          =>  ['web'],
+    'route_middleware'   => ['web'],
 
     // api middleware
-    'api_middleware'            =>  ['api'],
+    'api_middleware'     => ['api'],
 
     // admin middleware
-    'admin_middleware'          =>  ['web'],
+    'admin_middleware'   => ['web'],
 
     /*
     |--------------------------------------------------------------------------
@@ -39,16 +39,16 @@
     */
 
     // Pagination in admin section
-    'pagination_perPage'        =>  12,
+    'pagination_perPage' => 12,
 
     // User model
-    'user_model'                =>  'App\User',
+    'user_model'         => 'App\User',
 
     // Default locale for survey
-    'locale'                    =>  'en',
+    'locale'             => 'en',
 
     // Default theme for survey
-    'theme'                     =>  'darkblue',
+    'theme'              => 'darkblue',
 
     /*
     |--------------------------------------------------------------------------
@@ -57,54 +57,68 @@
     |--------------------------------------------------------------------------
     */
 
-    'builder'                   =>  [
+    'builder'  => [
 
-        'theme'                 =>  'darkblue',
+        'theme' => 'darkblue',
 
-        'showEmbededSurveyTab'  =>  false,
+        'showEmbededSurveyTab' => false,
 
-        'showJSONEditorTab'     =>  false,
+        'showJSONEditorTab' => false,
 
-        'showTestSurveyTab'     =>  true,
+        'showTestSurveyTab' => true,
 
-        'showPropertyGrid'      =>  true,
+        'showPropertyGrid' => true,
 
-        'showOptions'           =>  false,
+        'showOptions' => false,
 
-        'showState'             =>  false,
+        'showState' => false,
 
-        'haveCommercialLicense' =>  false,
+        'haveCommercialLicense' => false,
     ],
 
     /*
     |--------------------------------------------------------------------------
     | SurveyJS Custom Widgets
     |--------------------------------------------------------------------------
     */
-    'widgets'                   =>  [
+    'widgets'  => [
 
-        'icheck'                =>  false,
+        'icheck' => false,
 
-        'select2'               =>  false,
+        'select2' => false,
 
-        'inputmask'             =>  false,
+        'inputmask' => false,
 
-        'jquerybarrating'       =>  false,
+        'jquerybarrating' => false,
 
-        'jqueryuidatepicker'    =>  false,
+        'jqueryuidatepicker' => false,
 
-        'nouislider'            =>  false,
+        'nouislider' => false,
 
-        'select2tagbox'         =>  false,
+        'select2tagbox' => false,
 
-        'signaturepad'          =>  false,
+        'signaturepad' => false,
 
-        'sortablejs'            =>  false,
+        'sortablejs' => false,
 
-        'ckeditor'              =>  false,
+        'ckeditor' => false,
 
-        'autocomplete'          =>  false,
+        'autocomplete' => false,
 
-        'bootstrapslider'       =>  false,
+        'bootstrapslider' => false,
+    ],
+
+    /*
+     * Database related configurations.
+     */
+    'database' => [
+        /*
+         * Name of the tables created by the migrations
+         * and used by the models of this package.
+         */
+        'tables' => [
+            'surveys'   => 'surveyjs_surveys',
+            'survey_results'  => 'surveyjs_survey_results',
+        ],
     ],
 ];

contributing.md

@@ -7,9 +7,9 @@ Contributions are accepted via Pull Requests on [Github](https://github.com/aidy
 # TODO
 If you want to contribute but do not know where to start, this list provides some starting points.
 
+— Add supporting for Laravel < 5.5
 - Add theme support
 - Add analytics and reports for survey results
-- Add supporting for Laravel < 5.5
 - Localization for Survey Builder
 - Set up TravisCI, StyleCI, ScrutinizerCI
 - Write a comprehensive ReadMe

database/migrations/2018_02_21_000001_create_surveys_table.php

@@ -4,6 +4,9 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
+/**
+ * Class CreateSurveysTable
+ */
 class CreateSurveysTable extends Migration
 {
     /**
@@ -13,7 +16,7 @@ class CreateSurveysTable extends Migration
      */
     public function up()
     {
-        Schema::create('surveys', function (Blueprint $table) {
+        Schema::create(config('survey.database.tables.surveys'), function (Blueprint $table) {
             $table->increments('id');
             $table->string('name');
             $table->string('slug');
@@ -30,6 +33,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('surveys');
+        Schema::dropIfExists(config('survey.database.tables.surveys'));
     }
 }

database/migrations/2018_05_25_053226_create_survey_results_table.php

@@ -4,6 +4,9 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
+/**
+ * Class CreateSurveyResultsTable
+ */
 class CreateSurveyResultsTable extends Migration
 {
     /**
@@ -13,7 +16,7 @@ class CreateSurveyResultsTable extends Migration
      */
     public function up()
     {
-        Schema::create('survey_results', function (Blueprint $table) {
+        Schema::create(config('survey.database.tables.survey_results'), function (Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger('survey_id');
             $table->unsignedInteger('user_id')->nullable();
@@ -30,6 +33,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('survey_results');
+        Schema::dropIfExists(config('survey.database.tables.survey_results'));
     }
 }

license.md

@@ -1,5 +1,6 @@
 # The license
 
-Copyright (c) Aidyn Makhataev <makataev.7@gmail.com>
+Copyright for updated version (c) Fruitware <open-source@fruitware>
+initial creation (c) Aidyn Makhataev <makataev.7@gmail.com>
 
-...Add your license text here...
+...Licence text coming soon...

readme.md

@@ -1,4 +1,4 @@
-# LaravelSurveyJs
+# Laravel 6.* SurveyJs package
 
 [![Latest Version on Packagist][ico-version]][link-packagist]
 [![Total Downloads][ico-downloads]][link-downloads]
@@ -18,7 +18,7 @@ $ composer require aidynmakhataev/laravelsurveyjs
 2) Publish the config file & run the migrations 
 
 ```bash
-php artisan vendor:publish --provider="AidynMakhataev\LaravelSurveyJs\LaravelSurveyJsServiceProvider"
+php artisan vendor:publish --provider="Fruitware\LaravelSurveyJS\LaravelSurveyJsServiceProvider"
 php artisan migrate
 ```
 

src/app/Http/Controllers/API/SurveyAPIController.php renamed to src/LaravelSurveyJS/Http/Controllers/API/SurveyAPIController.php

@@ -1,13 +1,18 @@
 <?php
 
-namespace AidynMakhataev\LaravelSurveyJs\app\Http\Controllers\API;
+namespace Fruitware\LaravelSurveyJS\LaravelSurveyJS\Http\Controllers\API;
 
 use Illuminate\Routing\Controller;
-use AidynMakhataev\LaravelSurveyJs\app\Models\Survey;
-use AidynMakhataev\LaravelSurveyJs\app\Http\Resources\SurveyResource;
-use AidynMakhataev\LaravelSurveyJs\app\Http\Requests\CreateSurveyRequest;
-use AidynMakhataev\LaravelSurveyJs\app\Http\Requests\UpdateSurveyRequest;
-
+use Fruitware\LaravelSurveyJS\LaravelSurveyJS\Models\Survey;
+use Fruitware\LaravelSurveyJS\LaravelSurveyJS\Http\Resources\SurveyResource;
+use Fruitware\LaravelSurveyJS\LaravelSurveyJS\Http\Requests\CreateSurveyRequest;
+use Fruitware\LaravelSurveyJS\LaravelSurveyJS\Http\Requests\UpdateSurveyRequest;
+
+/**
+ * Class SurveyAPIController
+ *
+ * @package Fruitware/LaravelSurveyJS
+ */
 class SurveyAPIController extends Controller
 {
     public function index()

src/app/Http/Controllers/API/SurveyResultAPIController.php renamed to src/LaravelSurveyJS/Http/Controllers/API/SurveyResultAPIController.php

@@ -1,13 +1,18 @@
 <?php
 
-namespace AidynMakhataev\LaravelSurveyJs\app\Http\Controllers\API;
+namespace Fruitware\LaravelSurveyJS\LaravelSurveyJS\Http\Controllers\API;
 
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
-use AidynMakhataev\LaravelSurveyJs\app\Models\Survey;
-use AidynMakhataev\LaravelSurveyJs\app\Http\Resources\SurveyResource;
-use AidynMakhataev\LaravelSurveyJs\app\Http\Resources\SurveyResultResource;
+use Fruitware\LaravelSurveyJS\LaravelSurveyJS\Models\Survey;
+use Fruitware\LaravelSurveyJS\LaravelSurveyJS\Http\Resources\SurveyResource;
+use Fruitware\LaravelSurveyJS\LaravelSurveyJS\Http\Resources\SurveyResultResource;
 
+/**
+ * Class SurveyResultAPIController
+ *
+ * @package Fruitware/LaravelSurveyJS
+ */
 class SurveyResultAPIController extends Controller
 {
     public function index(Survey $survey)