Merge pull request #102 from antaresproject/0.9.2

0.9.4
antaresproject · Jan 11, 2018 · a0b38d8 · a0b38d8
2 parents 1334b38 + 50bf953
commit a0b38d8
Show file tree

Hide file tree

Showing 21 changed files with 202 additions and 80 deletions.
diff --git a/.htaccess b/.htaccess
@@ -1,4 +1,3 @@
-Header set Access-Control-Allow-Origin "*"
 <IfModule mod_rewrite.c>
 	RewriteEngine on
 

diff --git a/app/Console/Commands/Inspire.php b/app/Console/Commands/Inspire.php
@@ -1,10 +1,13 @@
-<?php namespace App\Console\Commands;
+<?php
+
+namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Inspiring;
 
 class Inspire extends Command
 {
+
     /**
      * The name and signature of the console command.
      *
@@ -26,6 +29,7 @@ class Inspire extends Command
      */
     public function handle()
     {
-        $this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
+        $this->comment(PHP_EOL . Inspiring::quote() . PHP_EOL);
     }
+
 }
diff --git a/app/Console/Commands/Reset.php b/app/Console/Commands/Reset.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Support\Facades\Artisan;
+use Symfony\Component\Process\Process;
+use Illuminate\Console\Command;
+use File;
+
+class Reset extends Command
+{
+
+    /**
+     * human readable command name
+     *
+     * @var String
+     */
+    protected $title = 'Sync Automation Job';
+
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $signature = 'reset:app';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Reset app instance using fresh database instance.';
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        if (!$this->requirement()) {
+            return;
+        }
+        Artisan::call('down');
+
+        File::cleanDirectory(storage_path('logs'));
+        File::cleanDirectory(storage_path('framework/sessions'));
+        File::cleanDirectory(storage_path('framework/cache'));
+        File::cleanDirectory(storage_path('framework/temp'));
+
+
+        $command = 'mysql demo < ' . storage_path('db/dump.sql');
+        $process = new Process($command);
+        $process->run();
+        if (!$process->isSuccessful()) {
+            $this->error($process->getErrorOutput());
+        }
+
+        Artisan::call('up');
+    }
+
+    /**
+     * Checks mysqldump availability
+     * 
+     * @return boolean
+     */
+    protected function requirement()
+    {
+        $process = new Process('mysqldump --version');
+        $process->run();
+        if (!$process->isSuccessful()) {
+            $this->error($process->getErrorOutput());
+            return false;
+        }
+        return true;
+    }
+
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -14,7 +14,7 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        'App\Console\Commands\Inspire',
+        'App\Console\Commands\Inspire'
     ];
 
     /**

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -4,6 +4,7 @@
 
 use Antares\Extension\Traits\DomainAwareTrait;
 use Illuminate\Support\ServiceProvider;
+use App\Console\Commands\Reset;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -17,6 +18,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+
         //
     }
 
@@ -31,7 +33,7 @@ public function boot()
      */
     public function register()
     {
-
+        $this->commands([Reset::class]);
     }
 
 }
diff --git a/public/.htaccess b/public/.htaccess
@@ -1,15 +1,18 @@
+Header always set Access-Control-Allow-Origin "http://demo.antaresproject.io"
+Header always set Access-Control-Allow-Methods "POST, GET, OPTIONS, DELETE, PUT"
+Header always set Access-Control-Max-Age "1000"
+Header always set Access-Control-Expose-Headers "X-Mashery-Error-Code, X-Mashery-Responder"
+Header always set Access-Control-Allow-Headers "x-requested-with, Content-Type, origin, authorization, accept, client-security-token"
+
+#RewriteEngine On
 
-Header always set Access-Control-Allow-Origin "http://demo.antaresproject.io"                   
-#Header always set Access-Control-Allow-Methods "PUT, GET, POST, DELETE, OPTIONS"
-#Header set Access-Control-Allow-Headers "authorization,Authorization ,origin, x-requested-with, content-type"
 
-Header always set Access-Control-Allow-Methods "POST, GET, PUT, OPTIONS, PATCH, DELETE" 
-#Header always set Access-Control-Allow-Origin "%{ORIGIN}e"
-Header always set Access-Control-Allow-Credentials "true"
-Header always set Access-Control-Allow-Headers "Authorization,X-Accept-Charset,X-Accept,Content-Type"
 
 <IfModule mod_rewrite.c>
 	RewriteEngine On
+        RewriteCond %{REQUEST_METHOD} OPTIONS
+        RewriteRule ^(.*)$ $1 [R=200,L]
+
 #        RewriteCond %{REQUEST_METHOD} OPTIONS 
 #        RewriteRule ^(.*)$ $1 [R=200,L] 
         RewriteCond %{REQUEST_METHOD} OPTIONS

diff --git a/public/packages/core/js/datatables.js b/public/packages/core/js/datatables.js
@@ -1,4 +1,6 @@
 $(function () {
     var $params = null, $instanceName = null;
+    console.log($params, $instanceName);
+
     window.antaresEvents.emit('dt_reinit', $('#' + $instanceName), $params.options);
 });
diff --git a/resources/views/default/forgot/index.twig b/resources/views/default/forgot/index.twig
@@ -6,7 +6,6 @@
             <div class="login-box">
                 {{ set_meta('header::class', 'main-header') }}
                 {% set formbuilder=app('form') %}   
-                {% set request=app('request') %}   
                 {{ formbuilder.open({'url':handles('antares::forgot'), 'method':'POST'})|raw }}
                 <fieldset name="MDLForms">
                     <div class="form-block">

diff --git a/resources/views/default/forgot/reset.twig b/resources/views/default/forgot/reset.twig
@@ -1,7 +1,6 @@
 {% extends "antares/foundation::layouts.quest.main" %}   
 {% block content %}
     {% set formbuilder=app('form') %}   
-    {% set request=app('request') %}   
     <div id="app-wrapper">
         <div class="app-content page-login">
             <section class="main-content">

diff --git a/resources/views/default/form/controls/configured_dropzone.twig b/resources/views/default/form/controls/configured_dropzone.twig
@@ -0,0 +1,20 @@
+<div id="{{ control.getName() }}" {{ control.getAttributes()|stringify }} data-options="{{ options|json_encode }}">
+    <div class="dz-message" data-dz-message>
+        <div class="dz-m__current" >
+            {% if current_image_path %}
+                <img height="80" src="{{ current_image_path }}" />
+            {% endif %}
+        </div>
+
+        <div class="dz-m__header">
+            <i class="zmdi zmdi-wallpaper"></i>
+        </div>
+
+        <div class="dz-m__content">
+            <span>Drag &amp; drop,</span>
+            <span>or click to upload</span>
+        </div>
+    </div>
+
+    <input type="hidden" name="{{ control.getName() }}" value="{{ control.getValue() }}" />
+</div>
diff --git a/resources/views/default/form/controls/switch.twig b/resources/views/default/form/controls/switch.twig
@@ -0,0 +1,6 @@
+<label class="switch">
+    <input class="switch-checkbox" name="{{ control.getName() }}" type="checkbox" value="{{ control.getValue() }}" {{ control.getAttributes()|stringify }} >
+    <div class="switch-container">
+        <div class="switch-handle"></div>
+    </div>
+</label>
diff --git a/resources/views/default/layouts/antares/main.twig b/resources/views/default/layouts/antares/main.twig
@@ -26,7 +26,12 @@
                         {% if not brand_composition('short_top_menu') %}
                             <div class="item-grp item-grp--40 mainhead-control-btns">        
                                 <div class="client-area">
-                                    {% block sidebar_top_widgets %}                                
+                                    {% block sidebar_top_widgets %}       
+                                        <div class="item-grp-single is-hidden mainhead-btn--widget-edit"  data-tooltip-inline="{{ trans('Widget Edit Toggle') }}">
+                                            <div class="mdl-js-button mdl-js-ripple-effect widget-edit" id="widgets-edit">
+                                                <i class="icon--widgets-edit"></i>
+                                            </div>
+                                        </div>
                                     {% endblock %}                        
                                     {% include 'antares/foundation::layouts.antares.partials._sidebar_top' %}
                                 </div>

diff --git a/resources/views/default/layouts/antares/partials/form/horizontal.twig b/resources/views/default/layouts/antares/partials/form/horizontal.twig
@@ -15,12 +15,16 @@
                 <legend>{{ fieldset.legend|raw }}</legend>
             {% endif %}
             {% for control in fieldset.controls() %}
-                <div class="form-block {{control.getBlock('class')}}" role="{{control.getBlock('role')}}">                    
-                    {% include 'antares/foundation::layouts.antares.partials.form.horizontal._'~control.type|replace({':': '_'}) with {control: control} %}
-                    {% if control.inlineHelp|length>1 or control.help|length>1 %}
-                        {% include 'antares/foundation::layouts.antares.partials.form.horizontal._description' %}             
-                    {% endif %}
-                </div>                        
+                {% if control is instanceof('Antares\\Form\\Controls\\AbstractType') %}
+                    {{ control|raw }}
+                {% else %}
+                    <div class="form-block {{control.getBlock('class')}}" role="{{control.getBlock('role')}}">
+                        {% include 'antares/foundation::layouts.antares.partials.form.horizontal._'~control.type|replace({':': '_'}) with {control: control} %}
+                        {% if control.inlineHelp|length>1 or control.help|length>1 %}
+                            {% include 'antares/foundation::layouts.antares.partials.form.horizontal._description' %}
+                        {% endif %}
+                    </div>
+                {% endif %}
             {%endfor %}
         </fieldset>
     {% endif %}

diff --git a/resources/views/default/layouts/antares/partials/form/horizontal/_description.twig b/resources/views/default/layouts/antares/partials/form/horizontal/_description.twig
@@ -1,8 +1,8 @@
 <div class="col-group ">
-    <div class="col-mb-8 col-6 col-dt-4 col-ld-3 {{ control.getLabelWrapper('class') }}">
+    <div class="{{ control.getLabelWrapper('class')|default('col-mb-8 col-6 col-dt-4 col-ld-3') }}">
         <label class="form-block__name">&nbsp;</label>
     </div>
-    <div class="col-mb-16 col-16 col-dt-16 col-ld-16">
+    <div class="{{ control.getWrapper('class')|default('col-mb-16 col-18 col-dt-10 col-ld-4') }}">
         {% if control.inlineHelp|length>1 %}
             <div class="input-field__desc">
                 {{ control.inlineHelp|raw }}

diff --git a/resources/views/default/layouts/antares/partials/form/horizontal/_radio_btns.twig b/resources/views/default/layouts/antares/partials/form/horizontal/_radio_btns.twig
@@ -1,28 +1,28 @@
 {% if control.hasWrapper %}
-    <div class="{{ control.getWrapper('class') }}" >
+<div class="{{ control.getWrapper('class') }}" >
     {% endif %}
-    <div class="col-dt-3 col-5 col-mb-5 {{ control.getLabelWrapper('class') }}">
-        {{ Form.htmlLabel(control)|raw }}    
+    <div class="col-mb-8 col-6 col-dt-4 col-ld-3 {{ control.getLabelWrapper('class') }}">
+        {{ Form.htmlLabel(control)|raw }}
     </div>
-    <div class="col-dt-14 col-13 col-mb-11 {{ control.getWrapper('class') }}">
-        <div class="radio-btns">            
+    <div class="col-mb-16 col-18 col-dt-10 col-ld-4">
+        <div class="radio-btns">
             {% for value,name in control.options %}
                 <label data-type="radio-btn">
                     <input type="radio" name="{{ control.name }}" value="{{value}}" {{ (value==control.value) ? 'checked="checked"' :''  }}/>
                     <span class="btn btn--md btn--default mdl-button mdl-js-button mdl-js-ripple-effect">
                         {{name|raw}}
                     </span>
                 </label>
-            {% endfor %}    
+            {% endfor %}
         </div>
         {% if control.inlineHelp|length>1 or control.help|length>1 %}
-            {% include 'antares/foundation::layouts.antares.partials.form.horizontal._description' %}             
+            {% include 'antares/foundation::layouts.antares.partials.form.horizontal._description' %}
         {% endif %}
         <span id="{{ control.id }}_error" class="error col-13 col-mb-11">
             {{ errors.first(control.name, format)|raw }}
         </span>
     </div>
     {% if control.hasWrapper %}
-    </div>    
+</div>
 {% endif %}
 
diff --git a/resources/views/default/layouts/antares/partials/navigation/_navigation_mobile.twig b/resources/views/default/layouts/antares/partials/navigation/_navigation_mobile.twig
@@ -1,39 +1,43 @@
-<div class="mobile-ddowns__sgl ddown--logged">
-    <div class="mobile-ddowns__desc">
-        <div class="mobile-ddowns__label">Logged as:</div>
-        <div class="mobile-ddowns__text">{{ auth_user().fullname }}</div>
-    </div>
-    <div class="mobile-ddowns__icon">
-        <i class="zmdi zmdi-caret-down"></i>
-    </div>
-    <ul class="mobile-ddowns__menu mobile-ddowns__menu--user">
+{% if auth_user() %}
+    <div class="mobile-ddowns__sgl ddown--logged">
 
-        <li class="mobile-ddowns__menu-header">
-            <a href="{{ handles('antares/foundation::account') }}">
-                <div class="flex-block">
-                    <div class="avatar avatar--xs">
-                        <img src="{{ profile_picture(auth_user().email,60,60) }}" alt="Avatar" />
-                    </div>
-                    <div class="flex-block__content">
-                        <span class="flex-block__title">{{ auth_user().email }}</span>
-                        <span class="flex-block__desc">{{ auth_user().fullname }}</span>
+        <div class="mobile-ddowns__desc">
+            <div class="mobile-ddowns__label">Logged as:</div>
+            <div class="mobile-ddowns__text">{{ auth_user().fullname }}</div>
+        </div>
+
+        <div class="mobile-ddowns__icon">
+            <i class="zmdi zmdi-caret-down"></i>
+        </div>
+        <ul class="mobile-ddowns__menu mobile-ddowns__menu--user">
+
+            <li class="mobile-ddowns__menu-header">
+                <a href="{{ handles('antares/foundation::account') }}">
+                    <div class="flex-block">
+                        <div class="avatar avatar--xs">
+                            <img src="{{ profile_picture(auth_user().email,60,60) }}" alt="Avatar" />
+                        </div>
+                        <div class="flex-block__content">
+                            <span class="flex-block__title">{{ auth_user().email }}</span>
+                            <span class="flex-block__desc">{{ auth_user().fullname }}</span>
+                        </div>
+                        <div class="flex-block__badge"><i class="zmdi zmdi-check"></i></div>
                     </div>
-                    <div class="flex-block__badge"><i class="zmdi zmdi-check"></i></div>
-                </div>
-            </a>
-        </li>
-        <li>
-            <a href="{{ handles('antares/foundation::account') }}">
-                <span>My Account</span>
-            </a>
-        </li>
-        <li>
-            <a href="{{ handles('antares/foundation::logout') }}">
-                <span>Sign Out</span>
-            </a>
-        </li>
-    </ul>
-</div>    
+                </a>
+            </li>
+            <li>
+                <a href="{{ handles('antares/foundation::account') }}">
+                    <span>My Account</span>
+                </a>
+            </li>
+            <li>
+                <a href="{{ handles('antares/foundation::logout') }}">
+                    <span>Sign Out</span>
+                </a>
+            </li>
+        </ul>
+    </div>    
+{% endif %}
 {% if can('antares/brands::add-brand') %}   
 
 

diff --git a/resources/views/default/users/partials/_multiuser.twig b/resources/views/default/users/partials/_multiuser.twig
@@ -1,5 +1,6 @@
 <div class="text-right ml16">
-    <a href="{{ url }}" class="btn btn--md btn--red mdl-button mdl-js-button mdl-js-ripple-effect" >
-        Back to admin area
+    <a href="{{ url }}" class="btn btn--md btn--red mdl-button mdl-js-button mdl-js-ripple-effect back-to-admin" >        
+        <span class="btn-text">Back to admin area</span>        
+        <i class="zmdi zmdi-close-circle"></i>
     </a>
 </div>
diff --git a/src/core b/src/core