Merge remote-tracking branch 'remotes/origin/master' into blocks_secu…

…rity_test

# Conflicts:
#	composer.json

.env.example

@@ -2,14 +2,16 @@ APP_ENV=testing
 APP_KEY=base64:aQH6a/dWOf67PeU3MW1K/ynoLdxJkOov5WY6LrAsHlo=
 APP_DEBUG=true
 APP_LOG_LEVEL=debug
-APP_URL=http://localhost
+APP_URL=http://dev.gzero.pl
 
-DOMAIN=localhost
-SESSION_DOMAIN=.localhost
+DOMAIN=dev.gzero.pl
+SESSION_DOMAIN=.dev.gzero.pl
 
 DB_CONNECTION=pgsql
 DB_HOST=localhost
 DB_PORT=5432
 DB_DATABASE=gzero_cms
 DB_USERNAME=postgres
-DB_PASSWORD=
+DB_PASSWORD=
+
+UPLOAD_DISK=uploads

.gitattributes

@@ -1,2 +1 @@
-/build export-ignore
-/tests export-ignore
+/build export-ignore

.release.json → .release-it.json

@@ -7,12 +7,12 @@
   "increment": "patch",
   "prereleaseId": null,
   "commitMessage": "Release %s",
-  "tagName": "v%s",
   "tagAnnotation": "Release %s",
   "buildCommand": false,
   "changelogCommand": "git log --pretty=format:'* %s (%h)' `git describe --tags --abbrev=0`..HEAD",
   "requireCleanWorkingDir": false,
   "src": {
+    "tagName": "v%s",
     "pushRepo": null,
     "beforeStartCommand": false,
     "beforeStageCommand": false,
@@ -22,7 +22,7 @@
     "publish": false,
     "publishPath": ".",
     "tag": "latest",
-    "private": false,
+    "private": true,
     "forcePublishSourceRepo": false
   },
   "github": {

composer.json

@@ -16,7 +16,7 @@
     "require": {
         "php": ">=7.1.0",
         "davejamesmiller/laravel-breadcrumbs": "3.0.*",
-        "gzero/core": "dev-master",
+        "gzero/core": "3.0.0-alpha2",
         "bkwld/croppa": "~4.0"
     },
     "require-dev": {
@@ -39,7 +39,7 @@
     },
     "scripts": {
         "test": "./vendor/bin/codecept run",
-        "test-debug": "./vendor/bin/codecept run --debug"
+        "test-debug": "./vendor/bin/codecept --debug run"
     },
     "extra": {
         "laravel": {

database/migrations/2015_11_26_115322_create_block.php

@@ -62,18 +62,6 @@ function (Blueprint $table) {
             }
         );
 
-        Schema::create(
-            'widgets',
-            function (Blueprint $table) {
-                $table->increments('id');
-                $table->string('name')->unique();
-                $table->text('args')->nullable();
-                $table->boolean('is_active')->default(false);
-                $table->boolean('is_cacheable')->default(false);
-                $table->timestamps();
-            }
-        );
-
         // Seed block types
         $this->seedBlockTypes();
     }
@@ -88,7 +76,6 @@ public function down()
         Schema::dropIfExists('block_translations');
         Schema::dropIfExists('blocks');
         Schema::dropIfExists('block_types');
-        Schema::dropIfExists('widgets');
     }
 
     /**
@@ -101,7 +88,6 @@ private function seedBlockTypes()
         BlockType::firstOrCreate(['name' => 'basic', 'handler' => Gzero\Cms\Handlers\Block\Basic::class]);
         BlockType::firstOrCreate(['name' => 'menu', 'handler' => Gzero\Cms\Handlers\Block\Menu::class]);
         BlockType::firstOrCreate(['name' => 'slider', 'handler' => Gzero\Cms\Handlers\Block\Slider::class]);
-        BlockType::firstOrCreate(['name' => 'widget', 'handler' => Gzero\Cms\Handlers\Block\Widget::class]);
     }
 
 }

package.json

@@ -0,0 +1,4 @@
+{
+  "name": "cms",
+  "version": "3.0.0-alpha2"
+}

resources/views/home.blade.php

@@ -0,0 +1,61 @@
+@extends('gzero-core::layouts.withRegions')
+
+@section('bodyClass', 'home')
+
+@section('header')
+    <section class="jumbotron text-center">
+        <div class="container">
+            <h1 class="jumbotron-heading">Page example</h1>
+            <p class="lead text-muted">Something short and leading about the collection below—its contents, the
+                creator, etc. Make it short and sweet, but not too short so folks don't simply skip over it
+                entirely.
+            </p>
+            @guest
+                <p>
+                    <a href="{{route('login')}}" class="btn btn-primary">@lang('gzero-core::common.login')</a>
+                    <a href="{{route('register')}}" class="btn btn-secondary"> @lang('gzero-core::common.register')</a>
+                </p>
+            @endguest
+        </div>
+
+        @unless (Auth::check())
+            You are not signed in.
+        @endunless
+
+        @auth
+            <p>
+                {{ Auth::user()->name }}
+            </p>
+            <p>
+                <a href="{{route('account')}}" class="btn btn-primary">@lang('gzero-core::common.account')</a>
+                <a href="{{route('logout')}}" class="btn btn-secondary">@lang('gzero-core::common.logout')</a>
+            </p>
+        @endauth
+
+    </section>
+@stop
+
+@section('mainContent')
+    @if(!empty($blocks['homepage']))
+        <section id="homepage-region" class="block-region clearfix container-fluid mb-4">
+            <div class="row">
+                @foreach($blocks['homepage'] as $index => $block)
+                    {!! $block->view() !!}
+                @endforeach
+            </div>
+        </section>
+    @endif
+    @parent
+@stop
+
+@section('content')
+    @if(!empty($contents))
+        @foreach($contents as $index => $content)
+            @include('gzero-cms::contents._article', ['child' => $content])
+        @endforeach
+        {!! $contents->render() !!}
+    @endif
+    <div class="w-100 my-4"></div>
+@stop
+
+

routes/api.php

@@ -13,6 +13,8 @@
     ],
     function ($router) {
         /** @var \Illuminate\Routing\Router $router */
+
+        // ======== Contents ========
         $router->get('contents', 'ContentController@index');
         $router->post('contents', 'ContentController@store');
         $router->patch('contents/{id}', 'ContentController@update');
@@ -28,6 +30,7 @@ function ($router) {
         $router->delete('deleted-contents/{id}', 'DeletedContentController@destroy');
         $router->post('deleted-contents/{id}/restore', 'DeletedContentController@restore');
 
+        // ======== Blocks ========
         $router->get('blocks', 'BlockController@index');
         $router->post('blocks', 'BlockController@store');
         $router->patch('blocks/{id}', 'BlockController@update');