Language

Yarik
1 parent 7309bdd7
Showing 2 changed files with 21 additions and 5 deletions Show diff stats
backend/views/layouts/main.php
composer.json
@@ -10,6 +10,7 @@
     use artbox\core\models\UserData;
     use artbox\core\widgets\FeedbackWidget;
     use artbox\core\widgets\FlashWidget;
+    use noam148\imagemanager\components\ImageManagerGetPath;
     use yii\bootstrap\Html;
     use yii\web\UrlManager;
     use yii\web\View;
@@ -26,6 +27,11 @@
      * @var UserData $userData
      */
     $userData = $user->ensureExistance();
+    /**
+     * @var ImageManagerGetPath $imageManager
+     */
+    $imageManager = \Yii::$app->get('imagemanager');
+    $avatar = $imageManager->getImagePath($userData->image, 128, 128);
 ?>
 <?php $this->beginPage(); ?>
 <!DOCTYPE html>
@@ -72,7 +78,7 @@
                                 <?php
                                     echo Html::a(
                                         Html::img(
-                                            'http://placehold.it/128x128',
+                                            ( empty( $avatar ) ? 'http://placehold.it/128x128' : $avatar ),
                                             [
                                                 'alt'   => $userData->fullname,
                                                 'title' => \Yii::t('core', 'Change image'),
@@ -171,7 +177,12 @@
                             <ul class="nav navbar-nav navbar-right">
                                 <li class="">
                                     <a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-                                        <img src="http://placehold.it/128x128" alt=""><?= $user->username ?>
+                                        <?php
+                                            echo Html::img(
+                                                ( empty( $avatar ) ? 'http://placehold.it/128x128' : $avatar )
+                                            );
+                                            echo $user->username;
+                                        ?>
                                         <span class=" fa fa-angle-down"></span>
                                     </a>
                                     <ul class="dropdown-menu dropdown-usermenu pull-right">
@@ -18,8 +18,6 @@
   "minimum-stability": "stable",
   "require": {
     "php": ">=7.0",
-    "artweb/artbox-core": "@dev",
-    "artweb/artbox-gentelella": "@dev",
     "yiisoft/yii2": "~2.0",
     "yiisoft/yii2-bootstrap": "~2.0",
     "yiisoft/yii2-swiftmailer": "~2.0",
@@ -28,7 +26,8 @@
     "yii2tech/filedb": "~1.0",
     "hiqdev/yii2-asset-pnotify": "~2.0",
     "hiqdev/yii2-asset-icheck": "~1.0",
-    "google/apiclient": "^2.0"
+    "google/apiclient": "^2.0",
+    "2amigos/yii2-highcharts-widget": "~1.0"
   },
   "require-dev": {
     "yiisoft/yii2-debug": "~2.0.0",
@@ -46,6 +45,12 @@
       "bower-asset-library": "vendor/bower"
     }
   },
+  "autoload": {
+    "psr-4": {
+      "artbox\\core\\": "artweb/artbox-core/",
+      "artbox\\gentelella\\": "artweb/artbox-gentelella/"
+    }
+  },
   "repositories": [
     {
       "type": "vcs",