wip #3706 @1

diff --git a/app/Models/BackpackUser.php b/app/Models/BackpackUser.php
deleted file mode 100644 (file)
index eac1bf6..0000000
--- a/app/Models/BackpackUser.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\User;
-use Backpack\CRUD\app\Models\Traits\InheritsRelationsFromParentModel;
-use Backpack\CRUD\app\Notifications\ResetPasswordNotification as ResetPasswordNotification;
-use Illuminate\Notifications\Notifiable;
-
-class BackpackUser extends User
-{
-    use InheritsRelationsFromParentModel;
-    use Notifiable;
-
-    protected $table = 'users';
-
-    /**
-     * Send the password reset notification.
-     *
-     * @param string $token
-     *
-     * @return void
-     */
-    public function sendPasswordResetNotification($token)
-    {
-        $this->notify(new ResetPasswordNotification($token));
-    }
-
-    /**
-     * Get the e-mail address where password reset links are sent.
-     *
-     * @return string
-     */
-    public function getEmailForPasswordReset()
-    {
-        return $this->email;
-    }
-}

diff --git a/app/Models/User.php b/app/Models/User.php
new file mode 100644 (file)
index 0000000..e6fecc1
--- /dev/null
+++ b/app/Models/User.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Cubist\Backpack\app\Magic\Models\CubistMagicAuthenticatable;
+
+class User extends CubistMagicAuthenticatable
+{
+    protected $table = 'users';
+    protected $_options = ['name' => 'users',
+        'singular' => 'user',
+        'plural' => 'users'];
+}

diff --git a/app/User.php b/app/User.php
deleted file mode 100644 (file)
index f3505e6..0000000
--- a/app/User.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace App;
-
-use Backpack\CRUD\app\Models\Traits\CrudTrait;
-use Illuminate\Contracts\Auth\MustVerifyEmail;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Notifications\Notifiable;
-use Spatie\Permission\Traits\HasRoles;
-
-class User extends Authenticatable
-{
-    use Notifiable;
-    use CrudTrait; // <----- this
-    use HasRoles;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
-    protected $fillable = [
-        'name', 'email', 'password',
-    ];
-
-    /**
-     * The attributes that should be hidden for arrays.
-     *
-     * @var array
-     */
-    protected $hidden = [
-        'password', 'remember_token',
-    ];
-
-    /**
-     * The attributes that should be cast to native types.
-     *
-     * @var array
-     */
-    protected $casts = [
-        'email_verified_at' => 'datetime',
-    ];
-}

diff --git a/config/backpack/base.php b/config/backpack/base.php
index 6750b314f8cb9264adb1b5b41ac31ca22530210b..93b9083a579cbe9998bf1d41c4284d7531007b0c 100644 (file)
--- a/config/backpack/base.php
+++ b/config/backpack/base.php
@@ -201,7 +201,7 @@ return [
     */
 
     // Fully qualified namespace of the User model
-    'user_model_fqn' => App\Models\BackpackUser::class,
+    'user_model_fqn' => App\Models\User::class,
 
     // The classes for the middleware to check if the visitor is an admin
     // Can be a single class or an array of clases

diff --git a/config/elfinder.php b/config/elfinder.php
deleted file mode 100644 (file)
index 4515d5e..0000000
--- a/config/elfinder.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Upload dir
-    |--------------------------------------------------------------------------
-    |
-    | The dir where to store the images (relative from public).
-    |
-    */
-    'dir' => ['uploads'],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Filesystem disks (Flysytem)
-    |--------------------------------------------------------------------------
-    |
-    | Define an array of Filesystem disks, which use Flysystem.
-    | You can set extra options, example:
-    |
-    | 'my-disk' => [
-    |        'URL' => url('to/disk'),
-    |        'alias' => 'Local storage',
-    |    ]
-    */
-    'disks' => [
-        // 'uploads',
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Routes group config
-    |--------------------------------------------------------------------------
-    |
-    | The default group settings for the elFinder routes.
-    |
-    */
-
-    'route' => [
-        'prefix'     => config('backpack.base.route_prefix', 'admin').'/elfinder',
-        'middleware' => ['web', config('backpack.base.middleware_key', 'admin')], //Set to null to disable middleware filter
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Access filter
-    |--------------------------------------------------------------------------
-    |
-    | Filter callback to check the files
-    |
-    */
-
-    'access' => 'Barryvdh\Elfinder\Elfinder::checkAccess',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Roots
-    |--------------------------------------------------------------------------
-    |
-    | By default, the roots file is LocalFileSystem, with the above public dir.
-    | If you want custom options, you can set your own roots below.
-    |
-    */
-
-    'roots' => null,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Options
-    |--------------------------------------------------------------------------
-    |
-    | These options are merged, together with 'roots' and passed to the Connector.
-    | See https://github.com/Studio-42/elFinder/wiki/Connector-configuration-options-2.1
-    |
-    */
-
-    'options' => [],
-
-];

diff --git a/public/images/logo.svg b/public/images/logo.svg
index 355f80f66a6aaae7abd168a3146754670649b2b1..26863ff23e483e60c8b0692dd63a0f4c4509d8d4 100644 (file)
--- a/public/images/logo.svg
+++ b/public/images/logo.svg
@@ -1,95 +1,118 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 224.6 34" style="enable-background:new 0 0 224.6 34;" xml:space="preserve">
+        viewBox="0 0 232.5 34" style="enable-background:new 0 0 232.5 34;" xml:space="preserve">
 <style type="text/css">
        .st0{fill:#FFFFFF;}
        .st1{fill:url(#SVGID_1_);}
        .st2{fill:url(#SVGID_2_);}
        .st3{opacity:0.8;fill:url(#SVGID_3_);}
+       .st4{fill:#9EC400;}
 </style>
 <g>
        <g>
+               <path class="st0" d="M31.4,8.9C28.3,4.5,21.1,4.4,16.3,1c-1.4,7.9-1.2,13.6,1,17.4c-0.7,0.1-1.4,0.1-2.1,0
+                       c2.6,7.6,5.7,11,10.7,10.2c5-0.7,7.4-0.1,7.4-0.1c0,0,0,0,0,0c0,0,0,0,0,0C34.7,17.7,34.6,13.3,31.4,8.9z"/>
                <g>
-                       <path class="st0" d="M149.8,31.4c-0.5,0.7-1,1.3-2,1.3c-1.1,0-1.6-0.8-1.6-2.6v-8.4h3.3v-1h-3.3v-3.5h-0.6l0,0.1
-                               c-0.5,1.4-1.6,2.6-3.4,3.7l-0.1,0v0.7h1.5v9c0,2.1,1.2,3.2,3.6,3.2c1.7,0,3-0.7,3.4-2l0-0.1L149.8,31.4L149.8,31.4z"/>
-                       <path class="st0" d="M224.5,32.7c-1.1-0.2-1.5-0.7-2.1-1.4c-0.1-0.1-0.2-0.2-0.3-0.4l-3.9-4.7l2.7-3.3c0.8-1,1.3-1.6,2.7-1.7
-                               l0.1,0v-0.8l-0.1,0c-0.4,0-0.8,0-1.2,0.1c-0.4,0-0.8,0-1.2,0.1c-0.4,0-0.9,0-1.3-0.1c-0.4,0-0.9,0-1.3-0.1l-0.1,0v0.8h0.1
-                               c0.5,0,1.4,0.2,1.4,0.8c0,0.4-0.6,1.1-0.9,1.5c-0.1,0.1-0.1,0.2-0.2,0.2l-1.3,1.7l-1.4-1.7l-0.1-0.2c-0.3-0.4-1.3-1.6-1.3-1.9
-                               c0-0.3,0.7-0.4,1.1-0.5c0.2,0,0.3,0,0.4-0.1l0.1,0v-0.8l-0.1,0c-0.5,0-1,0-1.6,0.1c-0.5,0-1,0-1.5,0.1c-0.5,0-1,0-1.5-0.1
-                               c-0.5,0-1,0-1.5-0.1l-0.1,0v0.8l0.1,0c0.9,0.1,1.2,0.5,1.7,1.2l3.9,5.1l-2.2,2.8c-1,1.3-1.8,2.3-3.4,2.4l-0.1,0v0.8l0.1,0
-                               c0.4,0,0.9,0,1.3-0.1c0.4,0,0.9,0,1.3-0.1c0.4,0,0.9,0,1.3,0.1c0.4,0,0.9,0,1.3,0.1l0.1,0v-0.8l-0.1,0c-0.7-0.1-1.4-0.2-1.4-0.8
-                               c0-0.6,0.9-1.7,1.3-2.1l1.1-1.4l2.3,2.9l0.1,0.1c0.2,0.2,0.5,0.6,0.5,0.9c0,0.1,0,0.2-0.1,0.2c-0.2,0.2-0.8,0.2-1.2,0.2
-                               c-0.1,0-0.2,0-0.3,0l-0.1,0v0.8l0.1,0c0.6,0,1.1,0,1.7-0.1c0.6,0,1.1,0,1.7-0.1c0.5,0,1.1,0,1.6,0.1c0.5,0,1.1,0,1.6,0.1l0.1,0
-                               L224.5,32.7L224.5,32.7z"/>
+                       <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="15.4464" y1="14.7192" x2="34.1555" y2="14.7192">
+                               <stop  offset="0" style="stop-color:#B1D348"/>
+                               <stop  offset="1" style="stop-color:#57772B"/>
+                       </linearGradient>
+                       <path class="st1" d="M33.3,28.4c1.4-10.7,1.3-15.1-1.9-19.5C28.3,4.5,21.1,4.4,16.3,1c-2.2,12.3-0.6,19.3,6.9,22.1
+                               C30.6,25.8,33.3,28.4,33.3,28.4z"/>
+                       <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="18.0039" y1="18.9978" x2="33.313" y2="18.9978">
+                               <stop  offset="0" style="stop-color:#57772B"/>
+                               <stop  offset="1" style="stop-color:#B1D348"/>
+                       </linearGradient>
+                       <path class="st2" d="M33.3,28.4c0-8.1-0.5-11.4-3.2-14.4c-2.8-3-8.1-2.4-12-4.5c-0.4,9.4,1.4,14.4,7.2,15.8
+                               C31.1,26.7,33.3,28.4,33.3,28.4z"/>
+                       <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="15.2405" y1="23.1046" x2="33.3205" y2="23.1046">
+                               <stop  offset="0" style="stop-color:#B1D348"/>
+                               <stop  offset="1" style="stop-color:#57772B"/>
+                       </linearGradient>
+                       <path class="st3" d="M33.3,28.5c-2.6-6.4-4-8.8-7.2-10.3c-3.1-1.5-7.2,0.6-10.9,0.2c2.6,7.6,5.7,11,10.7,10.2
+                               C31,27.8,33.3,28.5,33.3,28.5z"/>
+               </g>
+               <g>
+                       <g>
+                               <path class="st0" d="M50.9,10.5c0-1.8-2.6-2.2-4.1-2.2c-4.2,0-6.2,2.2-6.2,6.9c0,0,0,4.8,0,5.2c-0.4,0-3.3,0-3.3,0v1.3
+                                       c0,0,3,0,3.3,0v8.2c0,2.2-0.8,2.8-3.3,3l-0.2,0v1.1l5.4-0.1l2.3,0.1l2.5,0.1l0-0.2l0-0.9l-0.7,0c-1,0-2.1,0-2.5-1
+                                       c-0.1-0.4-0.3-1.1-0.3-1.9c0,0,0-7.8,0-8.2c0.4,0,3.9,0,3.9,0v-1.3c0,0-3.5,0-3.9,0c0-0.4,0-5.7,0-5.7c0-1.2,0-2.7,0.5-3.8
+                                       c0.4-1,1.1-1.4,2.3-1.4c1,0,1.3,0.4,1.6,1.3c0.2,0.4,0.5,1,1.3,1C50.3,11.7,50.9,11.1,50.9,10.5z M70.2,32.2
+                                       c-0.8,0-0.9-0.8-0.9-1.7V21L68,21.1c0,0-1.1,0.1-1.1,0.1c0,0-2.6-0.2-2.6-0.2l0,0.2V22l0.2,0c2,0.3,2,0.7,2,2.6l0,0.4v3.8
+                                       c0,1-0.4,2.1-1.1,2.8c-0.7,0.8-1.7,1.2-2.7,1.2c-1.9,0-2.2-1.8-2.2-3.8v-8l-1.3,0.1l-1.2,0.1c0,0-1.2-0.1-1.2-0.1l-1.4-0.1
+                                       l0,0.2V22l0.2,0c2,0.3,2,0.7,2,2.6l0,0.4v4.9c0,2.9,1.4,4.3,4.2,4.3c1.8,0,3.6-0.9,4.7-2.4c0.1,0.6,0.6,2.5,0.6,2.5l4.3-1.1v-1
+                                       l-0.6,0.1C70.7,32.2,70.4,32.2,70.2,32.2z M79.3,32.9l-0.2,0c-1.8-0.1-1.8-0.6-1.8-2l0-0.7v-9.5l-4.9,1v1l0.2,0
+                                       c0.5,0,1.6-0.1,1.8,0.5c0,0.1,0.1,0.8,0.1,3.1v4.1l0,0.4c0,1.6,0,2-1.8,2.1l-0.2,0v1l3.6-0.1l1.6,0.1l1.7,0.1l0-0.2V32.9z
+                                        M55.8,32.9l-0.2,0c-1.8-0.1-1.8-0.6-1.8-2l0-0.7V15.4l-5,1v0.9l0.5,0.1c0.6,0.1,1.1,0.1,1.4,0.6c0.3,0.6,0.3,2.3,0.3,3v9.5
+                                       l0,0.3c0,1.6,0,2.1-1.8,2.2l-0.2,0v1l3.4-0.1c0,0,1.6,0.1,1.6,0.1l1.9,0.1l0-0.2V32.9z M75.6,17.6c0.9,0,1.7-0.8,1.7-1.7
+                                       c0-1-0.8-1.8-1.7-1.8c-1,0-1.8,0.8-1.8,1.8C73.8,16.9,74.6,17.6,75.6,17.6z M114.1,20.8c-3.2,0-6.6,2.6-6.6,6.5
+                                       c0,3.8,3,6.9,6.6,6.9c3.8,0,6.7-2.9,6.7-6.7C120.8,23.9,117.7,20.8,114.1,20.8z M117,31.4c-0.6,1.2-1.5,1.8-2.7,1.8
+                                       c-3.2,0-3.7-3.6-3.7-5.7c0-1.3,0.2-5.6,3.4-5.6c3,0,3.7,3.1,3.7,5.8C117.7,28.7,117.6,30.2,117,31.4z M148.8,33.7V33l-0.2,0
+                                       c-0.8-0.1-1-0.4-1.5-0.8l-0.4-0.4c0,0-5.1-5-5.4-5.3c0.2-0.3,2.5-2.8,2.5-2.8c0,0,0.3-0.3,0.3-0.3c0.8-0.9,1.1-1.2,2.4-1.3
+                                       l0.2,0v-1l-2.6,0.1c0,0-1.2-0.1-1.2-0.1l-1.5-0.1l0,0.2V22h0.2c0.9,0,1.3,0.2,1.3,0.5c0,0.2-0.3,0.8-2.1,2.7
+                                       c0,0-1.2,1.2-1.6,1.7c0-0.9,0-13.2,0-13.2l-5,1v0.9l0.4,0c0.6,0.1,1.2,0.1,1.5,0.6c0.3,0.5,0.3,2,0.3,2.6v11.4l0,0.3
+                                       c0,1.6,0,2.1-1.8,2.2l-0.2,0v1l1.9-0.1l1.5-0.1c0,0,1.6,0.1,1.6,0.1l1.8,0.1l0-0.2v-0.8l-0.2,0c-1.7-0.1-1.8-0.5-1.8-1.7
+                                       c0-0.1,0-0.3,0-0.4l0-0.5c0,0,0-1.5,0-1.7c0.1-0.1,0.2-0.2,0.4-0.4c0.3,0.3,5.4,5.7,5.4,5.7s1.8-0.1,1.9-0.1c0,0,2,0.1,2,0.1
+                                       L148.8,33.7z M128,20.8c-3.2,0-6.6,2.6-6.6,6.5c0,3.8,3,6.9,6.6,6.9c3.8,0,6.7-2.9,6.7-6.7C134.6,23.9,131.6,20.8,128,20.8z
+                                        M130.8,31.4c-0.6,1.2-1.5,1.8-2.7,1.8c-3.2,0-3.7-3.6-3.7-5.7c0-1.3,0.2-5.6,3.4-5.6c3,0,3.7,3.1,3.7,5.8
+                                       C131.5,28.7,131.4,30.2,130.8,31.4z M92.5,28.6V13.8l-5,1v0.9l0.2,0c1.9,0.1,2,0.8,2,2.5c0,0,0,3.2,0,4c-1-1-2.4-1.5-3.9-1.5
+                                       c-4,0-6.3,3.5-6.3,6.9c0,3.8,2.7,6.5,6.3,6.5c1.9,0,3.3-0.7,4.6-2.2c0.1,0,2.5-0.3,2.5-0.3l-0.1-0.2
+                                       C92.5,30.8,92.5,29.3,92.5,28.6z M89.6,28.9c0,1.9-0.6,4.1-3.2,4.1c-3.4,0-3.7-3.8-3.7-5.4c0-1.3,0.3-5.5,3.7-5.5
+                                       c1.5,0,3.2,1,3.2,2.7V28.9z M100.6,20.8c-1.5,0-2.9,0.5-3.9,1.5c0-0.8,0-4,0-4c0-1.7,0.1-2.4,2-2.5l0.2,0v-0.9l-5-1v14.7
+                                       c0,0.8,0,2.2-0.3,2.9l-0.1,0.2c0,0,2.4,0.3,2.5,0.3c1.3,1.5,2.7,2.2,4.6,2.2c3.7,0,6.3-2.8,6.3-6.5
+                                       C106.9,24.3,104.5,20.8,100.6,20.8z M99.9,33c-2.7,0-3.2-2.2-3.2-4.1v-4.1c0-1.7,1.7-2.7,3.2-2.7c3.5,0,3.7,4.2,3.7,5.5
+                                       C103.6,29.3,103.3,33,99.9,33z"/>
+                       </g>
                </g>
-               <path class="st0" d="M184.2,28.2c0,0.8,0,2.2-0.3,3l-0.1,0.2c0,0,2.4,0.3,2.6,0.3c1.3,1.6,2.7,2.2,4.6,2.2c3.7,0,6.4-2.8,6.4-6.6
-                       c0-3.4-2.4-7-6.4-7c-1.6,0-2.9,0.5-4,1.5c0-0.8,0-4.1,0-4.1c0-1.7,0.1-2.5,2-2.5l0.2,0v-0.9l-5.1-1V28.2z M187.1,28.5v-4.1
-                       c0-1.7,1.7-2.8,3.3-2.8c3.5,0,3.8,4.3,3.8,5.6c0,1.6-0.4,5.4-3.8,5.4C187.7,32.7,187.1,30.4,187.1,28.5z"/>
-               <path class="st0" d="M149.8,26.9c0,3.8,3,7,6.7,7c3.8,0,6.7-2.9,6.7-6.8c0-3.7-3.1-6.7-6.7-6.7C153.3,20.3,149.8,23,149.8,26.9z
-                        M152.9,27.1c0-1.3,0.3-5.7,3.5-5.7c3.1,0,3.7,3.2,3.7,5.8c0,1.1-0.1,2.6-0.7,3.8c-0.6,1.2-1.5,1.8-2.8,1.8
-                       C153.4,32.8,152.9,29.2,152.9,27.1z"/>
-               <path class="st0" d="M163.8,26.9c0,3.8,3,7,6.7,7c3.8,0,6.7-2.9,6.7-6.8c0-3.7-3.1-6.7-6.7-6.7C167.3,20.3,163.8,23,163.8,26.9z
-                        M166.9,27.1c0-1.3,0.3-5.7,3.5-5.7c3.1,0,3.7,3.2,3.7,5.8c0,1.1-0.1,2.6-0.7,3.8c-0.6,1.2-1.5,1.8-2.8,1.8
-                       C167.4,32.8,166.9,29.2,166.9,27.1z"/>
-               <path class="st0" d="M198.1,26.9c0,3.8,3,7,6.7,7c3.8,0,6.7-2.9,6.7-6.8c0-3.7-3.1-6.7-6.7-6.7C201.6,20.3,198.1,23,198.1,26.9z
-                        M201.2,27.1c0-1.3,0.3-5.7,3.5-5.7c3.1,0,3.7,3.2,3.7,5.8c0,1.1-0.1,2.6-0.7,3.8c-0.6,1.2-1.5,1.8-2.8,1.8
-                       C201.7,32.8,201.2,29.2,201.2,27.1z"/>
-               <path class="st0" d="M183.9,32.6c0,0-0.1,0-0.1,0l-0.1,0c-0.3,0-0.5-0.1-0.8-0.1c-0.7-0.1-1.5-0.2-1.5-0.2l0.1-0.2
-                       c0.3-0.7,0.3-2.2,0.3-3V14.8l-5.1,1v0.9l0.5,0.1c0.6,0.1,1.1,0.1,1.4,0.6c0.3,0.6,0.3,2.4,0.3,3V30l0,0.3c0,1.7,0,2.1-1.8,2.2
-                       l-0.2,0v1l3.4-0.1c0,0,1.6,0.1,1.6,0.1l1.9,0.1l0-0.2V32.6z"/>
-       </g>
-       <path class="st0" d="M16.5,8.1C13.3,3.6,6,3.5,1.1,0c-1.4,8-1.2,13.8,1,17.7c-0.7,0.1-1.4,0.1-2.1,0c2.7,7.7,5.8,11.2,10.9,10.4
-               c5.1-0.8,7.5-0.1,7.5-0.1c0,0,0,0,0,0c0,0,0,0,0,0C19.8,17.1,19.7,12.6,16.5,8.1z"/>
-       <g>
-               <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="0.21" y1="14.012" x2="19.3028" y2="14.012">
-                       <stop  offset="0" style="stop-color:#B0D247"/>
-                       <stop  offset="1" style="stop-color:#587836"/>
-               </linearGradient>
-               <path class="st1" d="M18.5,28c1.4-10.9,1.3-15.4-1.9-19.9C13.3,3.6,6,3.5,1.1,0c-2.2,12.6-0.6,19.7,7,22.5
-                       C15.7,25.3,18.5,28,18.5,28z"/>
-               <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="2.82" y1="18.3783" x2="18.443" y2="18.3783">
-                       <stop  offset="0" style="stop-color:#587836"/>
-                       <stop  offset="1" style="stop-color:#B0D247"/>
-               </linearGradient>
-               <path class="st2" d="M18.4,28c0-8.3-0.5-11.6-3.3-14.7c-2.8-3.1-8.3-2.5-12.3-4.6c-0.5,9.6,1.4,14.7,7.3,16.1
-                       C16.1,26.3,18.4,28,18.4,28z"/>
-               <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="0" y1="22.5693" x2="18.4507" y2="22.5693">
-                       <stop  offset="0" style="stop-color:#B0D247"/>
-                       <stop  offset="1" style="stop-color:#587836"/>
-               </linearGradient>
-               <path class="st3" d="M18.5,28c-2.6-6.5-4.1-9-7.3-10.6C7.9,15.9,3.8,18.1,0,17.7c2.7,7.7,5.8,11.2,10.9,10.4
-                       C16.1,27.4,18.5,28,18.5,28z"/>
        </g>
        <g>
                <g>
-                       <path class="st0" d="M36.4,9.7c0-1.8-2.6-2.3-4.2-2.3c-4.3,0-6.3,2.2-6.3,7c0,0,0,4.9,0,5.3c-0.4,0-3.4,0-3.4,0v1.3
-                               c0,0,3,0,3.4,0v8.4c0,2.3-0.9,2.9-3.4,3l-0.2,0v1.1l5.5-0.1l2.3,0.1l2.6,0.1l0-0.2l0-0.9l-0.8,0c-1.1,0-2.1,0-2.5-1
-                               c-0.1-0.4-0.3-1.1-0.3-1.9c0,0,0-8,0-8.4c0.4,0,4,0,4,0v-1.3c0,0-3.6,0-4,0c0-0.4,0-5.8,0-5.8c0-1.2,0-2.8,0.5-3.9
-                               C30,9,30.7,8.6,32,8.6c1,0,1.3,0.4,1.7,1.3c0.2,0.5,0.5,1.1,1.4,1.1C35.8,10.9,36.4,10.4,36.4,9.7z M65.4,32.6l-0.2,0
-                               c-1.8-0.1-1.8-0.6-1.8-2.1l0-0.7v-9.6l-5,1v1l0.2,0c0.5,0,1.7-0.1,1.8,0.5c0,0.2,0.1,0.8,0.1,3.2V30l0,0.4c0,1.6,0,2-1.8,2.2
-                               l-0.2,0v1l3.6-0.1l1.6,0.1l1.7,0.1l0-0.2V32.6z M41.4,32.6l-0.2,0c-1.8-0.1-1.8-0.6-1.8-2.1l0-0.7V14.7l-5.1,1v0.9l0.5,0.1
-                               c0.6,0.1,1.1,0.1,1.4,0.6c0.3,0.6,0.3,2.4,0.3,3V30l0,0.3c0,1.7,0,2.1-1.9,2.2l-0.2,0v1l3.4-0.1c0,0,1.6,0.1,1.6,0.1l1.9,0.1
-                               l0-0.2V32.6z M56.1,31.9c-0.8,0-0.9-0.8-0.9-1.8v-9.7l-1.4,0.1c0,0-1.1,0.1-1.1,0.1c0,0-2.6-0.2-2.6-0.2l0,0.2v0.8l0.2,0
-                               c2.1,0.3,2.1,0.7,2.1,2.6l0,0.4v3.9c0,1.1-0.4,2.1-1.1,2.9c-0.7,0.8-1.7,1.3-2.7,1.3c-2,0-2.2-1.9-2.2-3.9v-8.2L45,20.6l-1.2,0.1
-                               c0,0-1.2-0.1-1.2-0.1l-1.4-0.1l0,0.2v0.7l0.2,0c2.1,0.3,2.1,0.7,2.1,2.6l0,0.4v5c0,3,1.4,4.4,4.2,4.4c1.8,0,3.6-1,4.8-2.5
-                               C52.6,32.1,53,34,53,34l4.4-1.1v-1.1l-0.6,0.1C56.6,31.8,56.3,31.9,56.1,31.9z M61.6,17c0.9,0,1.7-0.8,1.7-1.8
-                               c0-1-0.8-1.8-1.8-1.8c-1,0-1.8,0.8-1.8,1.8C59.8,16.2,60.6,17,61.6,17z M136.3,33.4v-0.8l-0.2,0c-0.8-0.1-1-0.4-1.5-0.9l-0.4-0.4
-                               c0,0-5.2-5.1-5.5-5.4c0.2-0.3,2.6-2.9,2.6-2.9c0,0,0.3-0.3,0.3-0.3c0.8-0.9,1.1-1.3,2.5-1.3l0.2,0v-1l-2.7,0.1
-                               c0,0-1.3-0.1-1.3-0.1l-1.5-0.1l0,0.2v0.8h0.2c0.9,0,1.3,0.2,1.3,0.5c0,0.2-0.3,0.8-2.1,2.8c0,0-1.2,1.2-1.7,1.8
-                               c0-1,0-13.5,0-13.5l-5.1,1v0.9l0.4,0.1c0.6,0.1,1.2,0.1,1.5,0.6c0.3,0.5,0.3,2.1,0.3,2.7V30l0,0.3c0,1.7,0,2.1-1.9,2.2l-0.2,0v1
-                               l2-0.1l1.6-0.1c0,0,1.6,0.1,1.6,0.1l1.9,0.1l0-0.2v-0.8l-0.2,0c-1.7-0.1-1.9-0.5-1.9-1.8c0-0.1,0-0.3,0-0.4l0-0.5
-                               c0,0,0-1.6,0-1.7c0.1-0.1,0.2-0.2,0.4-0.4c0.3,0.3,5.5,5.9,5.5,5.9s1.9-0.1,1.9-0.1c0,0,2,0.1,2,0.1L136.3,33.4z M115,20.2
-                               c-3.3,0-6.8,2.7-6.8,6.7c0,3.9,3,7,6.8,7c3.9,0,6.8-3,6.8-6.9C121.8,23.3,118.7,20.2,115,20.2z M118,31c-0.6,1.2-1.5,1.8-2.8,1.8
-                               c-3.3,0-3.8-3.6-3.8-5.8c0-1.3,0.3-5.7,3.5-5.7c3.1,0,3.8,3.2,3.8,5.9C118.7,28.3,118.6,29.8,118,31z M87.1,20.2
-                               c-1.6,0-3,0.5-4,1.5c0-0.8,0-4.1,0-4.1c0-1.7,0.1-2.5,2-2.5l0.2,0v-1l-5.1-1v15c0,0.8,0,2.2-0.3,3l-0.1,0.2c0,0,2.4,0.3,2.6,0.3
-                               c1.3,1.6,2.7,2.2,4.7,2.2c3.7,0,6.4-2.8,6.4-6.7C93.5,23.8,91.1,20.2,87.1,20.2z M86.4,32.7c-2.7,0-3.3-2.3-3.3-4.2v-4.2
-                               c0-1.7,1.7-2.8,3.3-2.8c3.5,0,3.8,4.3,3.8,5.7C90.2,28.9,89.8,32.7,86.4,32.7z M100.9,20.2c-3.3,0-6.8,2.7-6.8,6.7
-                               c0,3.9,3,7,6.8,7c3.9,0,6.8-3,6.8-6.9C107.7,23.3,104.6,20.2,100.9,20.2z M103.8,31c-0.6,1.2-1.5,1.8-2.8,1.8
-                               c-3.3,0-3.8-3.6-3.8-5.8c0-1.3,0.3-5.7,3.5-5.7c3.1,0,3.8,3.2,3.8,5.9C104.6,28.3,104.4,29.8,103.8,31z M78.8,28.1v-15l-5.1,1v1
-                               l0.2,0c1.9,0.1,2,0.8,2,2.5c0,0,0,3.3,0,4.1c-1-1-2.4-1.5-4-1.5c-4,0-6.4,3.6-6.4,7c0,3.9,2.7,6.7,6.4,6.7c2,0,3.4-0.7,4.7-2.2
-                               c0.1,0,2.6-0.3,2.6-0.3l-0.1-0.2C78.8,30.4,78.8,28.9,78.8,28.1z M75.9,28.5c0,1.9-0.6,4.2-3.3,4.2c-3.4,0-3.8-3.8-3.8-5.5
-                               c0-1.3,0.3-5.7,3.8-5.7c1.6,0,3.3,1.1,3.3,2.8V28.5z"/>
+                       <path class="st4" d="M149.7,22.6v-0.9c0.9-0.5,1.5-1,2-1.5c0.5-0.5,0.9-1.1,1.1-1.8h0.7v3h3.2v1.1h-3.2v7.3c0,0.6,0,1,0.1,1.4
+                               c0.1,0.4,0.1,0.7,0.3,0.9c0.1,0.2,0.3,0.4,0.5,0.5c0.2,0.1,0.5,0.1,0.8,0.1c0.4,0,0.7-0.1,1-0.3c0.3-0.2,0.6-0.5,0.8-0.9l0.6,0.5
+                               c-0.2,0.6-0.6,1.1-1.2,1.4c-0.6,0.3-1.2,0.5-2.1,0.5c-1.1,0-1.9-0.3-2.4-0.8s-0.8-1.2-0.8-2.2v-8.6H149.7z"/>
+                       <path class="st4" d="M164.4,20.8c0.9,0,1.8,0.2,2.6,0.5c0.8,0.3,1.5,0.8,2.2,1.4c0.6,0.6,1.1,1.3,1.5,2.1
+                               c0.4,0.8,0.5,1.7,0.5,2.6c0,1-0.2,1.9-0.5,2.7c-0.4,0.8-0.9,1.5-1.5,2.1c-0.6,0.6-1.3,1.1-2.2,1.4c-0.8,0.3-1.7,0.5-2.6,0.5
+                               c-0.9,0-1.8-0.2-2.6-0.5c-0.8-0.3-1.5-0.8-2.1-1.4c-0.6-0.6-1.1-1.3-1.4-2.1c-0.4-0.8-0.5-1.7-0.5-2.7c0-0.9,0.2-1.8,0.5-2.6
+                               c0.4-0.8,0.8-1.5,1.4-2.1c0.6-0.6,1.3-1,2.1-1.4C162.6,21,163.5,20.8,164.4,20.8z M164.4,22c-0.6,0-1.1,0.1-1.6,0.4
+                               c-0.5,0.3-0.9,0.6-1.3,1.1c-0.3,0.5-0.6,1-0.8,1.7c-0.2,0.7-0.3,1.4-0.3,2.2c0,0.8,0.1,1.6,0.3,2.3c0.2,0.7,0.5,1.3,0.8,1.7
+                               c0.3,0.5,0.8,0.8,1.2,1.1c0.5,0.3,1,0.4,1.6,0.4c0.6,0,1.2-0.1,1.7-0.4c0.5-0.3,0.9-0.6,1.3-1.1c0.4-0.5,0.6-1.1,0.8-1.7
+                               c0.2-0.7,0.3-1.4,0.3-2.2c0-0.8-0.1-1.5-0.3-2.2c-0.2-0.7-0.5-1.2-0.8-1.7c-0.4-0.5-0.8-0.8-1.3-1.1C165.5,22.1,165,22,164.4,22z
+                               "/>
+                       <path class="st4" d="M178.4,20.8c0.9,0,1.8,0.2,2.6,0.5c0.8,0.3,1.5,0.8,2.2,1.4c0.6,0.6,1.1,1.3,1.5,2.1
+                               c0.4,0.8,0.5,1.7,0.5,2.6c0,1-0.2,1.9-0.5,2.7c-0.4,0.8-0.9,1.5-1.5,2.1c-0.6,0.6-1.3,1.1-2.2,1.4c-0.8,0.3-1.7,0.5-2.6,0.5
+                               c-0.9,0-1.8-0.2-2.6-0.5c-0.8-0.3-1.5-0.8-2.1-1.4c-0.6-0.6-1.1-1.3-1.4-2.1c-0.4-0.8-0.5-1.7-0.5-2.7c0-0.9,0.2-1.8,0.5-2.6
+                               c0.4-0.8,0.8-1.5,1.4-2.1c0.6-0.6,1.3-1,2.1-1.4C176.6,21,177.5,20.8,178.4,20.8z M178.4,22c-0.6,0-1.1,0.1-1.6,0.4
+                               c-0.5,0.3-0.9,0.6-1.3,1.1c-0.3,0.5-0.6,1-0.8,1.7c-0.2,0.7-0.3,1.4-0.3,2.2c0,0.8,0.1,1.6,0.3,2.3c0.2,0.7,0.5,1.3,0.8,1.7
+                               c0.3,0.5,0.8,0.8,1.2,1.1c0.5,0.3,1,0.4,1.6,0.4c0.6,0,1.2-0.1,1.7-0.4c0.5-0.3,0.9-0.6,1.3-1.1c0.4-0.5,0.6-1.1,0.8-1.7
+                               c0.2-0.7,0.3-1.4,0.3-2.2c0-0.8-0.1-1.5-0.3-2.2c-0.2-0.7-0.5-1.2-0.8-1.7c-0.4-0.5-0.8-0.8-1.3-1.1C179.5,22.1,179,22,178.4,22z
+                               "/>
+                       <path class="st4" d="M189.2,30.1c0,0.6,0,1.1,0.1,1.5c0,0.4,0.1,0.7,0.3,0.9c0.2,0.2,0.4,0.4,0.7,0.4c0.3,0.1,0.7,0.1,1.1,0.1
+                               v0.8h-6.7V33c0.5,0,0.9-0.1,1.2-0.2c0.3-0.1,0.5-0.2,0.7-0.4c0.2-0.2,0.3-0.5,0.3-0.8c0.1-0.3,0.1-0.8,0.1-1.4V19.8
+                               c0-0.9,0-1.6,0-2.2c0-0.6-0.1-1-0.1-1.2c-0.1-0.4-0.3-0.6-0.6-0.7c-0.3-0.1-0.8-0.2-1.6-0.2v-0.8l4.6-0.9V30.1z"/>
+                       <path class="st4" d="M195.1,22.8L195.1,22.8c0.6-0.7,1.2-1.2,1.8-1.5c0.6-0.3,1.3-0.5,2.2-0.5c0.9,0,1.7,0.2,2.4,0.5
+                               s1.4,0.8,2,1.4c0.6,0.6,1,1.3,1.3,2.1c0.3,0.8,0.5,1.7,0.5,2.6c0,1-0.2,1.8-0.5,2.6c-0.3,0.8-0.8,1.5-1.3,2.1
+                               c-0.6,0.6-1.2,1.1-2,1.4c-0.8,0.3-1.6,0.5-2.5,0.5c-0.9,0-1.8-0.2-2.6-0.5c-0.8-0.3-1.5-0.8-2-1.4l-1.1,1.6h-0.5V19.3
+                               c0-1.6-0.1-2.7-0.3-3.1c0-0.1-0.1-0.2-0.2-0.3c-0.1-0.1-0.2-0.1-0.3-0.2c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.5-0.1-0.9-0.1v-0.6
+                               l4.5-1V22.8z M195.2,28.8c0,0.6,0.1,1.2,0.3,1.7c0.2,0.5,0.4,0.9,0.7,1.3c0.3,0.4,0.7,0.6,1.1,0.9c0.4,0.2,0.9,0.3,1.4,0.3
+                               c0.6,0,1.1-0.1,1.5-0.4c0.5-0.3,0.9-0.6,1.2-1.1c0.3-0.5,0.6-1,0.8-1.7c0.2-0.7,0.3-1.4,0.3-2.2c0-0.8-0.1-1.6-0.3-2.3
+                               c-0.2-0.7-0.5-1.3-0.8-1.8c-0.3-0.5-0.7-0.9-1.2-1.1c-0.5-0.3-1-0.4-1.6-0.4c-0.7,0-1.2,0.2-1.8,0.5c-0.5,0.3-0.9,0.8-1.2,1.3
+                               c-0.4,0.7-0.5,1.7-0.5,2.9V28.8z"/>
+                       <path class="st4" d="M212.6,20.8c0.9,0,1.8,0.2,2.6,0.5c0.8,0.3,1.5,0.8,2.2,1.4c0.6,0.6,1.1,1.3,1.5,2.1
+                               c0.4,0.8,0.5,1.7,0.5,2.6c0,1-0.2,1.9-0.5,2.7c-0.4,0.8-0.9,1.5-1.5,2.1c-0.6,0.6-1.3,1.1-2.2,1.4c-0.8,0.3-1.7,0.5-2.6,0.5
+                               c-0.9,0-1.8-0.2-2.6-0.5c-0.8-0.3-1.5-0.8-2.1-1.4c-0.6-0.6-1.1-1.3-1.4-2.1c-0.4-0.8-0.5-1.7-0.5-2.7c0-0.9,0.2-1.8,0.5-2.6
+                               c0.4-0.8,0.8-1.5,1.4-2.1c0.6-0.6,1.3-1,2.1-1.4C210.9,21,211.7,20.8,212.6,20.8z M212.6,22c-0.6,0-1.1,0.1-1.6,0.4
+                               c-0.5,0.3-0.9,0.6-1.3,1.1c-0.3,0.5-0.6,1-0.8,1.7c-0.2,0.7-0.3,1.4-0.3,2.2c0,0.8,0.1,1.6,0.3,2.3c0.2,0.7,0.5,1.3,0.8,1.7
+                               c0.3,0.5,0.8,0.8,1.2,1.1c0.5,0.3,1,0.4,1.6,0.4c0.6,0,1.2-0.1,1.7-0.4c0.5-0.3,0.9-0.6,1.3-1.1c0.4-0.5,0.6-1.1,0.8-1.7
+                               c0.2-0.7,0.3-1.4,0.3-2.2c0-0.8-0.1-1.5-0.3-2.2c-0.2-0.7-0.5-1.2-0.8-1.7c-0.4-0.5-0.8-0.8-1.3-1.1
+                               C213.8,22.1,213.3,22,212.6,22z"/>
+                       <path class="st4" d="M227.5,23.9c0.4-0.5,0.6-0.9,0.6-1.2c0-0.5-0.5-0.8-1.4-0.8V21h5.3v0.8c-0.3,0-0.6,0-0.8,0.1
+                               c-0.2,0.1-0.5,0.2-0.7,0.3c-0.2,0.1-0.5,0.3-0.7,0.6c-0.2,0.2-0.5,0.6-0.8,0.9l-2.5,3.2l3.2,4.2c0.5,0.7,1,1.1,1.4,1.4
+                               c0.4,0.3,0.9,0.4,1.4,0.4v0.8H226V33c0.6,0,1,0,1.2-0.1c0.2-0.1,0.3-0.3,0.3-0.5c0-0.1-0.1-0.3-0.2-0.5c-0.1-0.2-0.4-0.5-0.7-1
+                               l-1.7-2.2l-2.1,2.6c-0.2,0.3-0.4,0.6-0.4,0.9c0,0.2,0.1,0.4,0.3,0.6c0.2,0.2,0.5,0.2,0.9,0.2v0.8h-5.5V33c0.4,0,0.7,0,1-0.1
+                               c0.3-0.1,0.6-0.2,0.8-0.3c0.3-0.2,0.5-0.4,0.8-0.7c0.3-0.3,0.6-0.7,1-1.1l2.5-3l-3.2-4.6c-0.4-0.5-0.7-0.9-1-1.1
+                               c-0.3-0.2-0.7-0.3-1.2-0.3V21h5.9v0.8c-0.4,0-0.7,0.1-0.9,0.2c-0.2,0.1-0.3,0.2-0.3,0.4c0,0.2,0.2,0.6,0.5,1l1.7,2.5L227.5,23.9z
+                               "/>
                </g>
        </g>
 </g>