Merge b7b38c0 into 4063892

arbory · Sep 16, 2019 · 0462a7c · 0462a7c
2 parents 4063892 + b7b38c0
commit 0462a7c
Show file tree

Hide file tree

Showing 461 changed files with 18,623 additions and 10,488 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
+/.idea
 /vendor
 /node_modules
 .DS_Store
 /tests/coverage
+composer.lock
diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1 @@
+preset: laravel
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,11 @@ language: php
 php:
 - '7.1'
 - '7.2'
-- nightly
+- '7.3'
 branches:
   only:
   - master
+  - 1.0
 install:
 - composer install
 notifications:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1 @@
+## Changelog
diff --git a/README.md b/README.md
@@ -1,12 +1,13 @@
 [![Packagist](https://img.shields.io/packagist/v/arbory/arbory.svg)](https://packagist.org/packages/arbory/arbory)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/arbory/arbory/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/arbory/arbory/?branch=master)
 [![Build Status](https://travis-ci.org/arbory/arbory.svg?branch=master)](https://travis-ci.org/arbory/arbory)
+[![StyleCI](https://github.styleci.io/repos/44740139/shield?branch=master&style=flat)](https://github.styleci.io/repos/44740139)
 [![Coverage Status](https://coveralls.io/repos/github/arbory/arbory/badge.svg?branch=master)](https://coveralls.io/github/arbory/arbory?branch=master)
 
 ## Installation
 #### Create new Laravel project
 ```bash
-composer create-project --prefer-dist laravel/laravel my-project "5.6.*"
+composer create-project --prefer-dist laravel/laravel=5.6 my-project
 ```
 
 #### Go to project root
@@ -16,7 +17,7 @@ cd my-project
 
 #### Require Arbory package
 ```bash
-composer require arbory/arbory "0.2.*"
+composer require arbory/arbory
 ```
 
 #### Fill in database info
@@ -29,6 +30,11 @@ vi .env
 php artisan arbory:install
 ```
 
+#### That's it!
+```bash
+Visit http://localhost/admin
+```
+
 ## Usage
 
 ### Registering new pages
@@ -177,30 +183,16 @@ return [
 ]
 ```
 
-## Generators
-
-### Quick generator
+## Generate admin User 
 
 ```bash
-php artisan arbory:generate {type?} {--T|table=}
-```
-
-Generators available for
-
-* Model
-* Page
-* Controller
-* View
-* AdminController - appends a new route to `routes/admin.php`
-
-### Verbose Generator
-
-```bash
-php artisan arbory:generator
+php artisan arbory:create-user 
 ```
 
 ## Coding style
 
+Use PSR-1/2
+
 ### JS
 
 We use `airbnb` coding style for both JS and SASS (links below).

diff --git a/composer.json b/composer.json
@@ -1,8 +1,13 @@
 {
     "name": "arbory/arbory",
     "description": "Administration interface for Laravel",
+    "keywords": ["laravel", "admin", "cms", "arbory"],
     "type": "library",
     "license": "MIT",
+    "support": {
+        "issues": "https://github.com/arbory/arbory/issues",
+        "source": "https://github.com/arbory/arbory"
+    },
     "authors": [
         {
             "name": "Roberts",
@@ -11,6 +16,7 @@
     ],
     "require": {
         "php": "^7.1",
+        "ext-json": "*",
         "laravel/framework": "^5.5.0|^5.6.0",
         "laravelcollective/html": "^5.5.0|^5.6.0",
         "doctrine/dbal": "^2.5",
@@ -26,7 +32,7 @@
         "roboc/laravel-glide": "^1.1.0",
         "spatie/laravel-sluggable": "^2.1.0",
         "maatwebsite/excel": "^3.0.5",
-        "unisharp/laravel-filemanager": "^1.8.0"
+        "unisharp/laravel-filemanager": "^1.8.5"
     },
     "require-dev" : {
         "satooshi/php-coveralls": "^1.0",
@@ -42,12 +48,35 @@
         "laravel": {
             "providers": [
                 "Arbory\\Base\\Providers\\ArboryServiceProvider",
-                "Arbory\\Base\\Providers\\NodeServiceProvider"
+                "Arbory\\Base\\Providers\\NodeServiceProvider",
+                "Arbory\\Base\\Providers\\TranslationServiceProvider",
+                "Dimsav\\Translatable\\TranslatableServiceProvider",
+                "Arbory\\Base\\Providers\\FileServiceProvider",
+                "Arbory\\Base\\Providers\\AuthServiceProvider",
+                "Roboc\\Glide\\GlideImageServiceProvider",
+                "Arbory\\Base\\Providers\\SettingsServiceProvider",
+                "Maatwebsite\\Excel\\ExcelServiceProvider",
+                "Arbory\\Base\\Providers\\FormBuilderServiceProvider",
+                "Arbory\\Base\\Providers\\FileManagerServiceProvider",
+                "Arbory\\Base\\Providers\\RoutesServiceProvider",
+                "Arbory\\Base\\Providers\\LayoutServiceProvider",
+                "Arbory\\Base\\Providers\\ValidationRulesServiceProvider",
+                "Arbory\\Base\\Providers\\ConstructorServiceProvider"
             ],
+            "aliases": {
+                "Activation": "Cartalyst\\Sentinel\\Laravel\\Facades\\Activation",
+                "Reminder": "Cartalyst\\Sentinel\\Laravel\\Facades\\Reminde",
+                "Sentinel": "Cartalyst\\Sentinel\\Laravel\\Facades\\Sentinel",
+                "GlideImage": "Roboc\\Glide\\Support\\Facades\\GlideImage",
+                "Excel": "Maatwebsite\\Excel\\Facades\\Excel"
+            },
             "dont-discover": [
                 "waavi/translation",
                 "cartalyst/sentinel"
             ]
         }
+    },
+    "config": {
+        "component-dir": "vendor/components"
     }
 }
diff --git a/config/arbory.php b/config/arbory.php
@@ -1,10 +1,11 @@
 <?php
 
 return [
+    'title' => 'Arbory',
     'uri' => 'admin',
 
     'locales' => [
-        'en'
+        'en',
     ],
 
     'menu' => [
@@ -15,7 +16,7 @@
         Arbory\Base\Http\Controllers\Admin\RedirectsController::class,
         [
             Arbory\Base\Http\Controllers\Admin\UsersController::class,
-            Arbory\Base\Http\Controllers\Admin\RolesController::class
+            Arbory\Base\Http\Controllers\Admin\RolesController::class,
         ],
     ],
 
@@ -29,24 +30,61 @@
             'coordinates' => [
                 'lat' => 56.94725473000847,
                 'lng' => 24.099142639160167,
-            ]
+            ],
         ],
         'sprite_icon' => [
-            'path' => base_path( 'resources/assets/svg/icons.svg' ),
+            'path' => base_path('resources/assets/svg/icons.svg'),
         ],
     ],
 
+    'field_types' => [
+        'belongsTo' => Arbory\Base\Admin\Form\Fields\BelongsTo::class,
+        'belongsToMany' => Arbory\Base\Admin\Form\Fields\BelongsToMany::class,
+        'boolean' => Arbory\Base\Admin\Form\Fields\Boolean::class,
+        'checkbox' => Arbory\Base\Admin\Form\Fields\Checkbox::class,
+        'dateTime' => Arbory\Base\Admin\Form\Fields\DateTime::class,
+        'file' => Arbory\Base\Admin\Form\Fields\ArboryFile::class,
+        'hasMany' => Arbory\Base\Admin\Form\Fields\HasMany::class,
+        'hasOne' => Arbory\Base\Admin\Form\Fields\HasOne::class,
+        'hidden' => Arbory\Base\Admin\Form\Fields\Hidden::class,
+        'icon' => Arbory\Base\Admin\Form\Fields\IconPicker::class,
+        'image' => Arbory\Base\Admin\Form\Fields\ArboryImage::class,
+        'link' => Arbory\Base\Admin\Form\Fields\Link::class,
+        'mapCoordinates' => Arbory\Base\Admin\Form\Fields\MapCoordinates::class,
+        'markup' => Arbory\Base\Admin\Form\Fields\CompactRichtext::class,
+        'multipleSelect' => Arbory\Base\Admin\Form\Fields\MultipleSelect::class,
+        'objectRelation' => Arbory\Base\Admin\Form\Fields\ObjectRelation::class,
+        'password' => Arbory\Base\Admin\Form\Fields\Password::class,
+        'richtext' => Arbory\Base\Admin\Form\Fields\Richtext::class,
+        'select' => Arbory\Base\Admin\Form\Fields\Select::class,
+        'slug' => Arbory\Base\Admin\Form\Fields\Slug::class,
+        'text' => Arbory\Base\Admin\Form\Fields\Text::class,
+        'textarea' => Arbory\Base\Admin\Form\Fields\Textarea::class,
+        'translatable' => Arbory\Base\Admin\Form\Fields\Translatable::class,
+        'constructor' => Arbory\Base\Admin\Form\Fields\Constructor::class,
+    ],
+
+    'field_styles' => [
+        'normal' => \Arbory\Base\Admin\Form\Fields\Renderer\Styles\LabeledFieldStyle::class,
+        'basic' => \Arbory\Base\Admin\Form\Fields\Renderer\Styles\BasicFieldStyle::class,
+        'raw' => \Arbory\Base\Admin\Form\Fields\Renderer\Styles\RawFieldStyle::class,
+        'nested' => \Arbory\Base\Admin\Form\Fields\Renderer\Styles\NestedFieldStyle::class,
+        'section' => \Arbory\Base\Admin\Form\Fields\Renderer\Styles\SectionFieldStyle::class,
+    ],
+
+    'default_field_style' => 'normal',
+
     'auth' => [
         'ip' => [
-            'allowed' => []
+            'allowed' => [],
         ],
         'activations' => [
             'expires' => 259200,
-            'lottery' => [ 2, 100 ],
+            'lottery' => [2, 100],
         ],
         'reminders' => [
             'expires' => 14400,
-            'lottery' => [ 2, 100 ],
+            'lottery' => [2, 100],
         ],
         'throttling' => [
             'global' => [
@@ -57,7 +95,7 @@
                     30 => 4,
                     40 => 8,
                     50 => 16,
-                    60 => 12
+                    60 => 12,
                 ],
             ],
             'ip' => [
@@ -73,7 +111,12 @@
 
     'services' => [
         'google' => [
-            'maps_api_key' => env('GOOGLE_MAPS_API_KEY')
-        ]
-    ]
+            'maps_api_key' => env('GOOGLE_MAPS_API_KEY'),
+        ],
+    ],
+
+    'preview' => [
+        'enabled' => true,
+        'slug_salt' => env('APP_KEY'),
+    ],
 ];
diff --git a/config/settings.php b/config/settings.php
@@ -1,4 +1,4 @@
 <?php
 
 return [
-];
+];
diff --git a/database/migrations/2013_07_25_145943_create_languages_table.php b/database/migrations/2013_07_25_145943_create_languages_table.php
@@ -4,7 +4,6 @@
 
 class CreateLanguagesTable extends Migration
 {
-
     /**
      * Run the migrations.
      *
@@ -30,5 +29,4 @@ public function down()
     {
         Schema::drop('translator_languages');
     }
-
 }
diff --git a/database/migrations/2013_07_25_145958_create_translations_table.php b/database/migrations/2013_07_25_145958_create_translations_table.php
@@ -4,7 +4,6 @@
 
 class CreateTranslationsTable extends Migration
 {
-
     /**
      * Run the migrations.
      *
@@ -36,5 +35,4 @@ public function down()
     {
         Schema::drop('translator_translations');
     }
-
 }