Merge branch 'master' of gitlab.artweb.com.ua:root/test_1

Mihail
2 parents 4044fc30 a17d3afc
Showing 50 changed files with 369 additions and 45 deletions Show diff stats
.gitignore
backend/components/.gitignore
backend/components/FieldEditor/FieldEditor.php
backend/components/FieldEditor/views/phone_field.php
backend/components/FieldEditor/views/video_field.php
backend/components/ImgResizer.php
backend/controllers/NewsController.php
backend/models/ImageSizerForm.php
backend/models/UploadForm.php
backend/views/accounts/_form.php
backend/views/news/_form.php
codeception.yml
common/models/DetailsCriteria.php
common/models/DetailsDescription.php
common/models/News.php
composer.json
console/migrations/m151116_153942_add_field_to_news.php
frontend/views/news/one_item.php
frontend/views/news/view.php
frontend/web/css/news_all.css
 .idea
 /uploads
 /vendor
-tests/_output/*
 \ No newline at end of file
+tests/_output/*
+composer.lock
 \ No newline at end of file
+<?php
+namespace backend\components;
+
+use yii\web\UploadedFile;
+use backend\models\ImageSizerForm;
+use yii\base\Widget;
+use Imagine\Image\Box;
+use yii\imagine\Image;
+use Yii;
+use Imagine\Gd\Imagine;
+
+class ImgResizer extends Widget
+{
+
+    public $height;
+    public $width;
+
+    public function init(){
+
+        parent::init();
+
+    }
+
+    public function run(){
+
+        $model = new ImageSizerForm();
+
+        $request = Yii::$app->request->post();
+
+        if ($request) {
+
+            if(isset($request['old_img'])){
+                $this->deleteImages($request['old_img']);
+            }
+
+
+            $model->file = UploadedFile::getInstance($model, 'file');
+
+            $md5_file = md5_file($model->file->tempName);
+
+            $imgDir = Yii::getAlias('@storage/'.$md5_file.'/');
+
+            $imageOrigAlias = Yii::getAlias($imgDir.'original'.'.'.$model->file->extension);
+
+            if(!is_dir($imgDir)) {
+                mkdir($imgDir, 0755, true);
+            }
+
+            $model->file->saveAs($imageOrigAlias);
+
+            if($request['width'] && $request['height']){
+
+                $imageAlias = Yii::getAlias($imgDir.$request['width'].'x'.$request['height'].'.'.$model->file->extension);
+
+                $imageLink = '/storage/'.$md5_file.'/'.$request['width'].'x'.$request['height'].'.'.$model->file->extension;
+
+                $this->resizeImg($request['width'],$request['height'], $imageOrigAlias,$imageAlias);
+
+            } else {
+
+                $imageLink = '/storage/'.$md5_file.'/'.'original'.'.'.$model->file->extension;
+
+            }
+
+
+            if($model->multi){
+//                $view = $this->renderPartial('@app/components/views/_gallery_item', [
+//                    'item' => ['image'=>$imageLink],
+//                ]);
+//
+//                return json_encode(['link'=>$imageLink, 'view' =>$view]);
+
+
+            } else {
+                $p1[0] = "<img style='height:160px' src='$imageLink' class='file-preview-image'>";
+                return json_encode(['success','initialPreview' => $p1, 'append' => false, 'name' =>$imageLink,]);
+            }
+
+
+        } else {
+            return json_encode(['error']);
+        }
+
+
+
+
+    }
+
+
+    public function isBigger($width,$height,$w,$h)
+    {
+        if($width>$w){
+            return true;
+        }else if($height >$h) {
+            return true;
+        }
+        return false;
+    }
+
+
+    public function getImgSize($width,$height,$e){
+        if($e>1){
+            if($height>$width){
+                $this->width = $width;
+                $this->height = $height/$e;
+            } else {
+                $this->height  = $height;
+                $this->width= $width/$e;
+            }
+
+        } else {
+            if($width >$height ){
+                $this->height = $height;
+                $this->width = $width*$e;
+            } else {
+                $this->width = $width;
+                $this->height = $height*$e;
+            }
+
+        }
+    }
+
+
+
+
+    public function resizeImg($w, $h, $imageAlias,$imageAliasSave)
+    {
+        $img = Image::getImagine()->open(Yii::getAlias($imageAlias));
+
+        $size = $img->getSize();
+
+        $width = $size->getWidth();
+        $height = $size->getHeight();
+
+        $e = $w/$h;
+
+        if($this->isBigger($width,$height,$w,$h)){
+            if($height > $width) {
+
+                $x = 0;
+                $y = ($height - $width) / 2;
+                $e1 = $width/$height;
+
+                $height = $height*($e1/$e);
+
+            }else if($height == $width){
+                $x = 0;
+                $y = ($height - $width) / 2;
+
+
+                $height = $height/$e;
+            }else {
+                $y = 0;
+                $x = ($width - $height) / 2;
+                $e1 = $width/$height;
+
+                $width = $width*($e/$e1);
+            }
+        } else {
+            $img->save($imageAliasSave, array('flatten' => false));
+            return true;
+        }
+
+
+
+
+
+        Image::crop($imageAlias, $width, $height,[$x,$y])
+            ->save(Yii::getAlias($imageAliasSave), ['quality' =>
+                100]);
+
+
+        $imagine = new Imagine();
+        $imagine->open($imageAliasSave)
+            ->resize(new Box($w, $h))
+            ->save($imageAliasSave, array('flatten' => false));
+
+
+
+    }
+
+
+    private function deleteImages($old_img){
+
+        if(!empty($old_img) && file_exists($_SERVER['DOCUMENT_ROOT'].$old_img)){
+
+            $rootDir = explode("/", $old_img);
+
+            $row = $_SERVER['DOCUMENT_ROOT'].'/'.$rootDir[1].'/'.$rootDir[2].'/';
+
+            $allFiles = scandir($row);
+
+            $allFiles = array_slice($allFiles, 2);
+
+            foreach($allFiles as $oldFile){
+
+                unlink($row.$oldFile);
+
+            }
+
+        }
+    }
+
+    public function actionDeleteImage(){
+        $old_img = Yii::$app->request->post('old_img');
+
+        if ($old_img) {
+            $this->deleteImages($old_img);
+        }
+    }
+
+
+
+}
 \ No newline at end of file
@@ -2,12 +2,16 @@
 namespace backend\controllers;
+use backend\models\ImageSizerForm;
+use backend\models\UploadForm;
 use Yii;
 use common\models\News;
 use common\models\NewsSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use yii\web\UploadedFile;
+use backend\components\ImgResizer;
 /**
  * NewsController implements the CRUD actions for News model.
@@ -120,4 +124,11 @@ class NewsController extends Controller
             throw new NotFoundHttpException('The requested page does not exist.');
         }
     }
+
+
+    public function actionFileUpload(){
+
+        echo ImgResizer::widget();
+
+    }
 }
@@ -20,6 +20,8 @@ class ImageSizerForm extends Model
     public $form;
     public $multi;
     public $old_img;
+    public $img;
+    public $price_list;
     /**
      * @return array the validation rules.
@@ -30,7 +32,7 @@ class ImageSizerForm extends Model
             [['width', 'height'], 'integer'],
             [['field', 'multi','old_img'], 'string', 'max' => 255],
             [['model', 'form',], 'string'],
-            [['file'], 'file'],
+            [['file','img','price_list'], 'file'],
         ];
     }
 }
 \ No newline at end of file
+<?php
+namespace backend\models;
+
+use yii\base\Model;
+use yii\web\UploadedFile;
+
+/**
+ * UploadForm is the model behind the upload form.
+ */
+class UploadForm extends Model
+{
+    /**
+     * @var UploadedFile file attribute
+     */
+    public $file;
+    public $img;
+
+    /**
+     * @return array the validation rules.
+     */
+    public function rules()
+    {
+        return [
+            [['file','img'], 'file'],
+        ];
+    }
+}
 \ No newline at end of file
@@ -75,33 +75,6 @@ use yii\helpers\ArrayHelper;
-
-
-
-
-
-<!--    --><?//= $form->field($model, 'country')->textInput() ?>
-<!--    -->
-<!--    --><?//= $form->field($model, 'rating')->textInput() ?>
-<!--    -->
-<!--    --><?//= $form->field($model, 'last_loginin')->textInput(['maxlength' => true]) ?>
-<!--    -->
-<!--    --><?//= $form->field($model, 'balance')->textInput() ?>
-<!---->
-<!--    --><?//= $form->field($model, 'office_id')->textInput() ?>
-<!---->
-<!--    --><?//= $form->field($model, 'car')->textInput() ?>
-<!---->
-<!--    --><?//= $form->field($model, 'mod')->textInput() ?>
-<!---->
-<!--    --><?//= $form->field($model, 'snumb')->textInput(['maxlength' => true]) ?>
-<!---->
-<!--    --><?//= $form->field($model, 'deliveries')->textInput() ?>
-
-
-
-
-
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
@@ -3,7 +3,8 @@
 use yii\helpers\Html;
 use mihaildev\ckeditor\CKEditor;
 use yii\widgets\ActiveForm;
-
+use kartik\file\FileInput;
+use \yii\helpers\Url;
 /* @var $this yii\web\View */
 /* @var $model common\models\News */
 /* @var $form yii\widgets\ActiveForm */
@@ -49,9 +50,48 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'mails_count')->textInput() ?>
-    <?= $form->field($model, 'img')->textInput(['maxlength' => true]) ?>
-    <?= $form->field($model, 'img')->widget(FileInput::classname(), [
-    'options' => ['accept' => 'image/*'],
+    <?=  Html::activeHiddenInput($model, 'img');?>
+
+    <?= $form->field(new \backend\models\ImageSizerForm(), 'file')->widget(FileInput::classname(), [
+        'name' => 'file',
+        'options' => [
+            ['accept' => 'image/*']
+        ],
+        'pluginOptions' => [
+            'initialPreview'=>[
+                Html::img($model->img, ['class'=>'file-preview-image']),
+            ],
+            'uploadUrl' => Url::to(['/news/file-upload']),
+            'overwriteInitial'=>true,
+            'uploadExtraData'=> ['width' => 240, 'height' => 160]
+
+        ],
+        'pluginEvents' => [
+            'fileuploaded' => 'function(event, key) { document.getElementsByName("News[img]")[0].value = key.response.name }',
+        ]
+
+
+    ]);?>
+
+    <?= $form->field(new \backend\models\ImageSizerForm(), 'price_list')->widget(FileInput::classname(), [
+        'name' => 'file',
+        'options' => [
+            ['accept' => 'image/*']
+        ],
+        'pluginOptions' => [
+            'initialPreview'=>[
+                Html::img($model->price_list, ['class'=>'file-preview-image']),
+            ],
+            'uploadUrl' => Url::to(['/news/file-upload']),
+            'overwriteInitial'=>true,
+            'uploadExtraData'=> ['width' => 240, 'height' => 160]
+
+        ],
+        'pluginEvents' => [
+            'fileuploaded' => 'function(event, key) { document.getElementsByName("News[img]")[0].value = key.response.name }',
+        ]
+
+
     ]); ?>
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
@@ -21,6 +21,7 @@ use Yii;
  * @property integer $mail_send
  * @property integer $mails_count
  * @property string $img
+ * @property string $price_list
  */
 class News extends \yii\db\ActiveRecord
 {
@@ -42,8 +43,9 @@ class News extends \yii\db\ActiveRecord
         return [
             [['name', 'code', 'brief', 'content', 'title', 'kwords', 'descr', 'dt', 'is_active', 'img'], 'required'],
             [['brief', 'content'], 'string'],
+            [['img'], 'file'],
             [['sort_delete', 'is_active', 'mail_send', 'mails_count'], 'integer'],
-            [['name', 'code', 'title', 'kwords', 'descr', 'img'], 'string', 'max' => 254],
+            [['name', 'code', 'title', 'kwords', 'descr', 'img','price_list'], 'string', 'max' => 254],
             [['dt'], 'string', 'max' => 15],
             [['code'], 'unique']
         ];
@@ -54,6 +56,25 @@ class News extends \yii\db\ActiveRecord
     }
+    function minImg($dir, $width, $height=null){
+        if($width=='original'){
+            $preg = '/\/(.[^\/]*)$/';
+            preg_match('/\.(.[^.]*)$/', $dir, $type);
+            $row = preg_replace( $preg, '/original.'.$type[1],  $dir);
+        } else {
+            $preg = '/\/(.[^\/]*)$/';
+            preg_match('/\.(.[^.]*)$/', $dir, $type);
+            $row =  preg_replace( $preg, '/'.$width.'X'.$height.'.'.$type[1],  $dir);
+        }
+        return $row;
+//        if(file_exists($_SERVER['DOCUMENT_ROOT'].$row)){
+//            return $row;
+//        } else {
+//            return "/storage/no-image.png";
+//        }
+
+    }
+
     /**
      * @inheritdoc
      */
@@ -74,6 +95,7 @@ class News extends \yii\db\ActiveRecord
             'mail_send' => 'Mail Send',
             'mails_count' => 'Mails Count',
             'img' => 'Img',
+            'price_list' => 'price_list',
         ];
     }
 }
@@ -25,7 +25,8 @@
         "kartik-v/yii2-datecontrol": "dev-master",
         "codeception/codeception": "*",
         "2amigos/yii2-ckeditor-widget": "~1.0",
-        "mihaildev/yii2-ckeditor": "*"
+        "mihaildev/yii2-ckeditor": "*",
+        "kartik-v/yii2-widget-fileinput": "@dev"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151116_153942_add_field_to_news extends Migration
+{
+    public function up()
+    {
+
+        $view = <<< MySQL
+        ALTER TABLE `italautocomua`.`w_news`
+            ADD COLUMN `price_list` VARCHAR(255) NULL AFTER `img`;
+MySQL;
+        $this->execute($view);
+
+    }
+
+    public function down()
+    {
+        echo "m151116_153942_add_field_to_news cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
@@ -4,7 +4,7 @@ use \yii\helpers\Html;
 <div class="news">
-    <?=  Html::a(Html::img('/storage/files/load/normal-'.$model->img),['news/view', 'translit' =>$model->code ])  ?>
+    <?=  Html::a(Html::img($model->img),['news/view', 'translit' =>$model->code ])  ?>
     <span class='date'><?= $model->date?></span><br>
     <?=  Html::a("<p class='article'>".$model->name."</p>",['news/view', 'translit' =>$model->code ])  ?>
     <?=  Html::a("<p class='short_news'>".$model->brief."</p>",['news/view', 'translit' =>$model->code ])  ?>
@@ -10,7 +10,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 	<p class="vin_article"><?= $model->name ?></p>
 	</div>	    
 <div class="choose_tovar">
-<img src="/images/news_big.png" class="big_article">
+<img src="<?= $model->img ?>" class="big_article">
 <div class="one_article">
     <?= $model->content ?>
 <div class="download_catalog">
@@ -40,11 +40,3 @@ p, a, label, span{
 }
-.news{
-    width: 480px;
-    display: inline-block;
-}
-
-.news img{
-    border:1px solid #dfdfdf;
-}
 \ No newline at end of file
@@ -226,4 +226,9 @@ p, a, label, span{
 .small_menu_width {
+}
+
+.news a img{
+    width: 120px;
+    height: 80px;
 }
 \ No newline at end of file