Merge branch 'new'

LaravelRUS · Aug 10, 2018 · 9a31ef1 · 9a31ef1
2 parents 7289162 + aec5d81
commit 9a31ef1
Show file tree

Hide file tree

Showing 135 changed files with 3,780 additions and 13,511 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,5 @@ composer.phar
 composer.lock
 .DS_Store
 /.idea
-webpack.mix.js
 yarn.lock
+package-lock.json
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,16 @@
 dist: precise
 
+env:
+  global:
+  - CC_TEST_REPORTER_ID=fe38890ec6e6c37613e6f4442ce3fcb9d2b0b8a9374eae9cb6b058c0b5f7fcef
+  - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
+
 language: php
 
 php:
   - 7.0
   - 7.1
   - 7.2
-  - nightly
 
 allow_failures:
   - php: nightly
@@ -16,9 +20,13 @@ before_install:
 
 before_script:
   - travis_wait travis_retry composer self-update
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
 
 script:
-  - vendor/bin/phpunit
+  - vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
 
 install:
   - travis_retry composer install --no-interaction --prefer-dist

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,36 @@
 <p align="center"><h2>[Unreleased] (Only in <code class=" language-php">development</code> branch)</h2></p>
 
- #coming soon....
-
+ * [Feature] Добавлен ENV-редактор
+             Для тех кто уже с нами:
+             В sleeping_owl.php
+             ```
+             /*
+              |--------------------------------------------------------------------------
+              | Middleware to use in admin routes
+              |--------------------------------------------------------------------------
+              | Url for env editor
+              |
+              */
+              'env_editor_url' => 'env/editor',
+
+              /*
+               *
+               *
+               */
+              'env_editor_excluded_keys' => [
+                  'APP_KEY', 'DB_*'
+              ],
+
+
+              'env_editor_middlewares' => [],
+
+              'env_editor_policy' => Policy::class,
+
+              'show_editor' => false,
+
+             ```
+             
+             
  * [Feature] Subdomain routes for admin
              Вы должны добавить в sleeping_owl.php ключ 'domain' => 'admin.example.com' где example.com и будет ваш домен.
  * [Feature] Добавлено поведение для коламнов `text`, `link` и `relatedLink`. Может быть пропущен.

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
 [![Official Site](https://img.shields.io/badge/official-site-blue.svg)](https://sleepingowl.ru)
 [![Demo Site](https://img.shields.io/badge/demo-site-blue.svg)](https://demo.sleepingowl.ru)
 [![Join the chat at https://gitter.im/LaravelRUS/SleepingOwlAdmin](https://img.shields.io/badge/gitter-chat-yellowgreen.svg)](https://gitter.im/LaravelRUS/SleepingOwlAdmin)
-[![Telegram Chat](https://img.shields.io/badge/telegram-chat-blue.svg)](https://t.me/sleeping_owl)
+[![Telegram Chat](https://img.shields.io/badge/telegram-chat-blue.svg)](https://t.me/prtcls)
 [![Latest Stable Version](https://poser.pugx.org/laravelrus/sleepingowl/v/stable)](https://packagist.org/packages/laravelrus/sleepingowl)
 [![Total Downloads](https://poser.pugx.org/laravelrus/sleepingowl/downloads)](https://packagist.org/packages/laravelrus/sleepingowl)
 [![License](https://poser.pugx.org/laravelrus/sleepingowl/license)](https://packagist.org/packages/laravelrus/sleepingowl)
@@ -35,32 +35,15 @@ SleepingOwl Admin is an administrative interface builder for Laravel.
 
  1. Require this package in your composer.json and run composer update:
 
-  	`composer require laravelrus/sleepingowl:4.x-dev`
+  	`composer require laravelrus/sleepingowl:4.x-new`
 
 
- 2. After composer update, insert service provider in config/app.php
-	```
-    ...
-    /*
-     * SleepingOwl Service Provider
-     */
-      SleepingOwl\Admin\Providers\SleepingOwlServiceProvider::class,
-
-    /*
-     * Application Service Providers...
-     */
-    App\Providers\AppServiceProvider::class,
-    ...
-	```
-
-
-
- 3. Run this command in the terminal (if you want to know more about what exactly this command does, see [install command documentation](https://en.sleepingowladmin.ru/docs/installation)):
+ 2. Run this command in the terminal (if you want to know more about what exactly this command does, see [install command documentation](https://en.sleepingowladmin.ru/docs/installation)):
 
     ```
     $ php artisan sleepingowl:install
     ```
- 4. After you have to update in `composer.json` post-update section:
+ 3. After you have to update in `composer.json` post-update section:
     
     __Example__:
     ```
@@ -117,39 +100,6 @@ and append middleware `auth` to `config/sleeping_owl.php`
       'middleware' => ['web', 'permission:admin'],
       ```
 
-
-## Npm Packages
-* ```js
-  "devDependencies": {
-    "admin-lte": "^2.3.5",
-    "bootstrap": "^3.3.7",
-    "bootstrap-daterangepicker": "^2.1.24",
-    "datatables.net": "^1.10.12",
-    "dropzone": "4.3.0",
-    "eonasdan-bootstrap-datetimepicker": "^4.15.35",
-    "font-awesome": "^4.6.3",
-    "gulp": "^3.9.1",
-    "i18next": "^3.4.1",
-    "imports-loader": "^0.6.5",
-    "jquery": "^2.1.1",
-    "laravel-elixir": "^6.0.0-11",
-    "laravel-elixir-vue-2": "^0.3.0",
-    "laravel-elixir-webpack-official": "^1.0.2",
-    "lodash": "^4.17.4",
-    "magnific-popup": "^1.1.0",
-    "metismenu": "^2.5.2",
-    "moment": "^2.14.1",
-    "nestable": "^0.2.0",
-    "noty": "^2.3.8",
-    "select2": "^4.0.3",
-    "sortablejs": "1.4.2",
-    "sweetalert2": "^4.1.0",
-    "vue": "^2.3.3",
-    "vue-multiselect": "^2.0.2",
-    "vue-resource": "^1.3.3",
-    "x-editable": "^1.5.1"
-  }
-  ```
 ## Copyright and License
 
 Admin was written by Sleeping Owl for the Laravel framework and is released under the MIT License. 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "laravelrus/sleepingowl",
   "description": "Administrative interface builder for Laravel.",
-  "homepage": "http://sleepingowl.ru",
+  "homepage": "http://sleepingowladmin.ru",
   "keywords": [
     "laravel",
     "admin",
@@ -26,10 +26,15 @@
     {
       "name": "Dave Gabrielyan",
       "email": "[email protected]"
+    },
+    {
+      "name": "TheArdent",
+      "email": "[email protected]"
     }
   ],
   "require": {
     "php": ">=7.0",
+    "ext-json": "*",
     "laravel/framework": "~5.5",
     "kodicomponents/support": "0.*",
     "kodicomponents/navigation": "0.*",
@@ -58,7 +63,8 @@
   }, 
   "extra": {
     "branch-alias": {
-      "dev-development": "4.x-dev"
+      "dev-development": "4.x-dev",
+      "dev-new": "4.x-new"
     },
     "laravel": {
       "providers": [

diff --git a/config/sleeping_owl.php b/config/sleeping_owl.php
@@ -52,6 +52,39 @@
 
     'middleware' => ['web'],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Env Editor
+    |--------------------------------------------------------------------------
+    | Url for env editor
+    |
+    */
+    'env_editor_url' => 'env/editor',
+
+    /*
+     * Excluded keys
+     */
+    'env_editor_excluded_keys' => [
+        'APP_KEY', 'DB_*',
+    ],
+
+    /*
+     * Env editor middlewares
+     */
+    'env_editor_middlewares' => [],
+
+    /*
+     * Show link in navigation
+     */
+    'show_editor' => false,
+
+    /*
+     * --------------------------------------------------------------------------
+     * Add your policy class here.
+     * --------------------------------------------------------------------------
+     */
+//    'env_editor_policy' => \Admin\Policies\EnvPolicy::class,
+
     /*
     |--------------------------------------------------------------------------
     | Authentication default provider
@@ -104,8 +137,8 @@
     |--------------------------------------------------------------------------
     */
 
-    'datetimeFormat' => 'd.m.Y H:i',
-    'dateFormat'     => 'd.m.Y',
+    'datetimeFormat' => 'd-m-Y H:i',
+    'dateFormat'     => 'd-m-Y',
     'timeFormat'     => 'H:i',
     'timezone'       => 'UTC',
 
@@ -125,6 +158,7 @@
          * See http://docs.ckeditor.com/#!/api/CKEDITOR.config
          */
         'ckeditor'  => [
+            'defaultLanguage' => config('app.locale'),
             'height'       => 200,
             'extraPlugins' => 'uploadimage,image2,justify,youtube,uploadfile',
             /*