From 06d508f34e1a32f4c97f1d3856f6878c0b9acb96 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Wed, 3 Feb 2016 10:42:51 +0200 Subject: [PATCH] add Vitaliy's widgets --- .gitignore | 1 + backend/assets/AppAsset.php | 4 +++- backend/assets/FileUploadAsset.php | 30 ++++++++++++++++++++++++++++++ backend/controllers/FileController.php | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/controllers/SpecializationController.php | 0 backend/controllers/UserInfoTestController.php | 0 backend/controllers/UserTestController.php | 0 backend/views/specialization/_form.php | 10 +++++++++- backend/views/specialization/_search.php | 0 backend/views/specialization/create.php | 0 backend/views/specialization/index.php | 0 backend/views/specialization/update.php | 0 backend/views/specialization/view.php | 0 backend/web/js/fieldWidget.js | 0 common/config/.gitignore | 0 common/config/main.php | 23 +++++++++++++++++++++++ common/models/Fields.php | 0 common/models/ImageSizerForm.php | 2 +- common/models/Option.php | 0 common/models/OptionLang.php | 0 common/models/OptionLangSearch.php | 0 common/models/OptionSearch.php | 0 common/models/Specialization.php | 1 + common/models/SpecializationSearch.php | 0 common/modules/file/Module.php | 15 +++++++++++++++ common/modules/file/config.php | 3 +++ common/modules/file/controller/DefaultController.php | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ common/widgets/FieldEditor.php | 0 common/widgets/ImageResizer.php | 4 ++-- common/widgets/ImageUploader.php | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ common/widgets/MultiLangForm.php | 0 common/widgets/views/education_field.php | 0 common/widgets/views/image_sizer.php | 14 ++++++-------- common/widgets/views/multi-lang-form.php | 0 console/migrations/m160125_151635_delete_lang_field.php | 0 console/migrations/m160128_101543_fields.php | 0 console/migrations/m160202_084703_specialization.php | 0 console/migrations/m160203_082111_jobs.php | 29 +++++++++++++++++++++++++++++ db-migration/yarik/option_data.backup | Bin 1205 -> 0 bytes frontend/controllers/ChatController.php | 0 frontend/controllers/CompanyController.php | 0 frontend/controllers/FileController.php | 3 +-- frontend/controllers/OptionLangController.php | 0 frontend/controllers/PerformerController.php | 0 frontend/controllers/SearchController.php | 0 frontend/controllers/TenderController.php | 0 frontend/views/accounts/_form.php | 3 ++- frontend/views/accounts/bookmarks.php | 0 frontend/views/accounts/projects.php | 0 frontend/views/chat/list.php | 0 frontend/views/chat/message.php | 0 frontend/views/company/blog-list.php | 0 frontend/views/company/blog-view.php | 0 frontend/views/company/common.php | 0 frontend/views/company/gallery.php | 0 frontend/views/company/portfolio.php | 0 frontend/views/company/review.php | 0 frontend/views/company/team.php | 0 frontend/views/company/vacancy-list.php | 0 frontend/views/company/vacancy-view.php | 0 frontend/views/landing/landing-freelance.php | 0 frontend/views/landing/landing-order-project.php | 0 frontend/views/landing/landing-work.php | 0 frontend/views/layouts/company.php | 0 frontend/views/layouts/gallery-company.php | 0 frontend/views/layouts/gallery.php | 0 frontend/views/layouts/performer.php | 0 frontend/views/option-lang/_form.php | 0 frontend/views/option-lang/_form_ajax.php | 0 frontend/views/option-lang/_search.php | 0 frontend/views/option-lang/create.php | 0 frontend/views/option-lang/index.php | 0 frontend/views/option-lang/update.php | 0 frontend/views/option-lang/view.php | 0 frontend/views/performer/blog-list.php | 0 frontend/views/performer/blog-view.php | 0 frontend/views/performer/common.php | 0 frontend/views/performer/gallery.php | 0 frontend/views/performer/portfolio.php | 0 frontend/views/performer/review.php | 0 frontend/views/performer/workplace.php | 0 frontend/views/search/company.php | 0 frontend/views/search/performer.php | 0 frontend/views/search/project.php | 0 frontend/views/search/vacancy.php | 0 frontend/views/tender/view.php | 0 frontend/views/views/testuser/_form.php | 0 frontend/views/views/testuser/_search.php | 0 frontend/views/views/testuser/create.php | 0 frontend/views/views/testuser/index.php | 0 frontend/views/views/testuser/update.php | 0 frontend/views/views/testuser/view.php | 0 frontend/views/views/testuserinfo/_form.php | 0 frontend/views/views/testuserinfo/_search.php | 0 frontend/views/views/testuserinfo/create.php | 0 frontend/views/views/testuserinfo/index.php | 0 frontend/views/views/testuserinfo/update.php | 0 frontend/views/views/testuserinfo/view.php | 0 frontend/web/css/art_box.css | 0 frontend/web/css/style_min.css | 0 frontend/web/js/_forms.js | 0 frontend/web/js/_jquery.rating.js | 0 frontend/web/js/_script.js | 0 storage/.htaccess | 0 storage/images/731f3def4141ee16d28c15219e46e5d2297.jpg | Bin 89431 -> 0 bytes 105 files changed, 629 insertions(+), 16 deletions(-) create mode 100755 backend/assets/FileUploadAsset.php create mode 100755 backend/controllers/FileController.php mode change 100644 => 100755 backend/controllers/SpecializationController.php mode change 100644 => 100755 backend/controllers/UserInfoTestController.php mode change 100644 => 100755 backend/controllers/UserTestController.php mode change 100644 => 100755 backend/views/specialization/_form.php mode change 100644 => 100755 backend/views/specialization/_search.php mode change 100644 => 100755 backend/views/specialization/create.php mode change 100644 => 100755 backend/views/specialization/index.php mode change 100644 => 100755 backend/views/specialization/update.php mode change 100644 => 100755 backend/views/specialization/view.php mode change 100644 => 100755 backend/web/js/fieldWidget.js mode change 100644 => 100755 common/config/.gitignore mode change 100644 => 100755 common/models/Fields.php mode change 100644 => 100755 common/models/Option.php mode change 100644 => 100755 common/models/OptionLang.php mode change 100644 => 100755 common/models/OptionLangSearch.php mode change 100644 => 100755 common/models/OptionSearch.php mode change 100644 => 100755 common/models/Specialization.php mode change 100644 => 100755 common/models/SpecializationSearch.php create mode 100755 common/modules/file/Module.php create mode 100755 common/modules/file/config.php create mode 100755 common/modules/file/controller/DefaultController.php mode change 100644 => 100755 common/widgets/FieldEditor.php create mode 100755 common/widgets/ImageUploader.php mode change 100644 => 100755 common/widgets/MultiLangForm.php mode change 100644 => 100755 common/widgets/views/education_field.php mode change 100644 => 100755 common/widgets/views/multi-lang-form.php mode change 100644 => 100755 console/migrations/m160125_151635_delete_lang_field.php mode change 100644 => 100755 console/migrations/m160128_101543_fields.php mode change 100644 => 100755 console/migrations/m160202_084703_specialization.php create mode 100644 console/migrations/m160203_082111_jobs.php mode change 100644 => 100755 db-migration/yarik/option_data.backup mode change 100644 => 100755 frontend/controllers/ChatController.php mode change 100644 => 100755 frontend/controllers/CompanyController.php mode change 100644 => 100755 frontend/controllers/FileController.php mode change 100644 => 100755 frontend/controllers/OptionLangController.php mode change 100644 => 100755 frontend/controllers/PerformerController.php mode change 100644 => 100755 frontend/controllers/SearchController.php mode change 100644 => 100755 frontend/controllers/TenderController.php mode change 100644 => 100755 frontend/views/accounts/_form.php mode change 100644 => 100755 frontend/views/accounts/bookmarks.php mode change 100644 => 100755 frontend/views/accounts/projects.php mode change 100644 => 100755 frontend/views/chat/list.php mode change 100644 => 100755 frontend/views/chat/message.php mode change 100644 => 100755 frontend/views/company/blog-list.php mode change 100644 => 100755 frontend/views/company/blog-view.php mode change 100644 => 100755 frontend/views/company/common.php mode change 100644 => 100755 frontend/views/company/gallery.php mode change 100644 => 100755 frontend/views/company/portfolio.php mode change 100644 => 100755 frontend/views/company/review.php mode change 100644 => 100755 frontend/views/company/team.php mode change 100644 => 100755 frontend/views/company/vacancy-list.php mode change 100644 => 100755 frontend/views/company/vacancy-view.php mode change 100644 => 100755 frontend/views/landing/landing-freelance.php mode change 100644 => 100755 frontend/views/landing/landing-order-project.php mode change 100644 => 100755 frontend/views/landing/landing-work.php mode change 100644 => 100755 frontend/views/layouts/company.php mode change 100644 => 100755 frontend/views/layouts/gallery-company.php mode change 100644 => 100755 frontend/views/layouts/gallery.php mode change 100644 => 100755 frontend/views/layouts/performer.php mode change 100644 => 100755 frontend/views/option-lang/_form.php mode change 100644 => 100755 frontend/views/option-lang/_form_ajax.php mode change 100644 => 100755 frontend/views/option-lang/_search.php mode change 100644 => 100755 frontend/views/option-lang/create.php mode change 100644 => 100755 frontend/views/option-lang/index.php mode change 100644 => 100755 frontend/views/option-lang/update.php mode change 100644 => 100755 frontend/views/option-lang/view.php mode change 100644 => 100755 frontend/views/performer/blog-list.php mode change 100644 => 100755 frontend/views/performer/blog-view.php mode change 100644 => 100755 frontend/views/performer/common.php mode change 100644 => 100755 frontend/views/performer/gallery.php mode change 100644 => 100755 frontend/views/performer/portfolio.php mode change 100644 => 100755 frontend/views/performer/review.php mode change 100644 => 100755 frontend/views/performer/workplace.php mode change 100644 => 100755 frontend/views/search/company.php mode change 100644 => 100755 frontend/views/search/performer.php mode change 100644 => 100755 frontend/views/search/project.php mode change 100644 => 100755 frontend/views/search/vacancy.php mode change 100644 => 100755 frontend/views/tender/view.php mode change 100644 => 100755 frontend/views/views/testuser/_form.php mode change 100644 => 100755 frontend/views/views/testuser/_search.php mode change 100644 => 100755 frontend/views/views/testuser/create.php mode change 100644 => 100755 frontend/views/views/testuser/index.php mode change 100644 => 100755 frontend/views/views/testuser/update.php mode change 100644 => 100755 frontend/views/views/testuser/view.php mode change 100644 => 100755 frontend/views/views/testuserinfo/_form.php mode change 100644 => 100755 frontend/views/views/testuserinfo/_search.php mode change 100644 => 100755 frontend/views/views/testuserinfo/create.php mode change 100644 => 100755 frontend/views/views/testuserinfo/index.php mode change 100644 => 100755 frontend/views/views/testuserinfo/update.php mode change 100644 => 100755 frontend/views/views/testuserinfo/view.php mode change 100644 => 100755 frontend/web/css/art_box.css mode change 100644 => 100755 frontend/web/css/style_min.css mode change 100644 => 100755 frontend/web/js/_forms.js mode change 100644 => 100755 frontend/web/js/_jquery.rating.js mode change 100644 => 100755 frontend/web/js/_script.js mode change 100644 => 100755 storage/.htaccess delete mode 100755 storage/images/731f3def4141ee16d28c15219e46e5d2297.jpg diff --git a/.gitignore b/.gitignore index 346d3b2..562a2df 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ composer.phar phpunit.phar # local phpunit config /phpunit.xml +storage \ No newline at end of file diff --git a/backend/assets/AppAsset.php b/backend/assets/AppAsset.php index 5b7678d..1cea55a 100755 --- a/backend/assets/AppAsset.php +++ b/backend/assets/AppAsset.php @@ -17,6 +17,7 @@ class AppAsset extends AssetBundle { public $basePath = '@webroot'; public $baseUrl = '@web'; + public $jsOptions = ['position' => \yii\web\View::POS_HEAD]; public $css = [ 'css/site.css', 'css/flags32.css' @@ -25,8 +26,9 @@ class AppAsset extends AssetBundle 'js/option.js' ]; public $depends = [ + 'yii\web\JqueryAsset', 'yii\web\YiiAsset', 'yii\bootstrap\BootstrapAsset', - 'yii\web\JqueryAsset' + 'backend\assets\FileUploadAsset' ]; } diff --git a/backend/assets/FileUploadAsset.php b/backend/assets/FileUploadAsset.php new file mode 100755 index 0000000..0dd7e42 --- /dev/null +++ b/backend/assets/FileUploadAsset.php @@ -0,0 +1,30 @@ + + * @since 2.0 + */ +class FileUploadAsset extends AssetBundle +{ + public $sourcePath = '@bower/blueimp-file-upload/'; + public $css = [ + 'css/jquery.fileupload.css' + ]; + public $js = [ + 'js/vendor/jquery.ui.widget.js', + 'js/jquery.iframe-transport.js', + 'js/jquery.fileupload.js' + ]; +} diff --git a/backend/controllers/FileController.php b/backend/controllers/FileController.php new file mode 100755 index 0000000..46b8f9b --- /dev/null +++ b/backend/controllers/FileController.php @@ -0,0 +1,222 @@ +$w){ + return true; + }else if($height >$h) { + return true; + } + return false; + } + + public function actionIndex(){ + die('hello'); + } + + private function resizeImg($w, $h, $imageAlias,$imageAliasSave){ + $img = Image::getImagine()->open(Yii::getAlias($imageAlias)); + + $size = $img->getSize(); + + $width = $size->getWidth(); + $height = $size->getHeight(); + + $e_width = $w/$h; + $e_height = $h/$w; + + $e1_width = $width/$height; + $e1_height = $height/$width; + + + if($this->isBigger($width,$height,$w,$h)){ + if($e_width<$e1_width){ + + $new_width = $width*($e_width/$e1_width); + + $y = 0; + $x = $width/ 2-($new_width/2); + $width = $new_width; + + }else { + + $new_height = $height*($e_height/$e1_height); + $x = 0; + $y = $height/2-($new_height/2); + $height = $new_height; + } + + + } 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(){ + + $request = Yii::$app->request->post(); + + if($request){ + if ($request['old_img']) { + $this->deleteImages($request['old_img']); + } + if(isset($request['action']) && $request['action']=='save'){ + $object = str_replace('-', '\\',$request['model']); + $model = new $object; + $model = $model->findOne($request['id']); + $model->$request['field'] = $request['new_url']; +// print_r($model->validate()); +// print_r($model->getErrors()); +// die(var_dump($model->save())); + $model->save(); + } + } + + } + + + public function actionDownloadPhoto() + { + + $model = new ImageSizerForm(); + + $request = Yii::$app->request->post(); + if ($request) { + + $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 { + return json_encode(['link'=>$imageLink]); + } + + + } + } + + + public function getex($filename) { + return end(explode(".", $filename)); + } + + + public function actionImagesUpload(){ + if($_FILES['upload']) + { + if (($_FILES['upload'] == "none") OR (empty($_FILES['upload']['name'])) ) + { + $message = "Вы не выбрали файл"; + } + else if ($_FILES['upload']["size"] == 0 OR $_FILES['upload']["size"] > 2050000) + { + $message = "Размер файла не соответствует нормам"; + } + else if (($_FILES['upload']["type"] != "image/jpeg") AND ($_FILES['upload']["type"] != "image/jpeg") AND ($_FILES['upload']["type"] != "image/png") AND ($_FILES['upload']['type'] != 'image/gif')) + { + $message = "Допускается загрузка только картинок JPG и PNG."; + } + else if (!is_uploaded_file($_FILES['upload']["tmp_name"])) + { + $message = "Что-то пошло не так. Попытайтесь загрузить файл ещё раз."; + } + else{ + $name =rand(1, 1000).md5($_FILES['upload']['name']).'.'.$this->getex($_FILES['upload']['name']); + move_uploaded_file($_FILES['upload']['tmp_name'], "../../storage/images/".$name); + $full_path = '/storage/images/'.$name; + $message = "Файл ".$_FILES['upload']['name']." загружен"; + $size=@getimagesize('images/'.$name); + + } + $callback = $_REQUEST['CKEditorFuncNum']; + echo ''; + } + } + + +} \ No newline at end of file diff --git a/backend/controllers/SpecializationController.php b/backend/controllers/SpecializationController.php old mode 100644 new mode 100755 index 821220c..821220c --- a/backend/controllers/SpecializationController.php +++ b/backend/controllers/SpecializationController.php diff --git a/backend/controllers/UserInfoTestController.php b/backend/controllers/UserInfoTestController.php old mode 100644 new mode 100755 index 98ac939..98ac939 --- a/backend/controllers/UserInfoTestController.php +++ b/backend/controllers/UserInfoTestController.php diff --git a/backend/controllers/UserTestController.php b/backend/controllers/UserTestController.php old mode 100644 new mode 100755 index b6a9d76..b6a9d76 --- a/backend/controllers/UserTestController.php +++ b/backend/controllers/UserTestController.php diff --git a/backend/views/specialization/_form.php b/backend/views/specialization/_form.php old mode 100644 new mode 100755 index c05f706..a94b978 --- a/backend/views/specialization/_form.php +++ b/backend/views/specialization/_form.php @@ -14,7 +14,15 @@ use yii\helpers\ArrayHelper; field($model, 'specialization_pid')->dropDownList(ArrayHelper::map($model->find()->all(), 'specialization_id', 'specialization_name'), ['prompt' => 'Выберие родителя']) ?> field($model, 'specialization_name')->textInput(['maxlength' => true]) ?> - + $model, + 'field'=>'img', + 'width'=>240, + 'height'=>160, + 'multi'=>false, + 'gallery' =>$model->img, + 'name' => 'Загрузить картинку' + ]); ?>
isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
diff --git a/backend/views/specialization/_search.php b/backend/views/specialization/_search.php old mode 100644 new mode 100755 index b595af3..b595af3 --- a/backend/views/specialization/_search.php +++ b/backend/views/specialization/_search.php diff --git a/backend/views/specialization/create.php b/backend/views/specialization/create.php old mode 100644 new mode 100755 index c37fe8e..c37fe8e --- a/backend/views/specialization/create.php +++ b/backend/views/specialization/create.php diff --git a/backend/views/specialization/index.php b/backend/views/specialization/index.php old mode 100644 new mode 100755 index 82e07bc..82e07bc --- a/backend/views/specialization/index.php +++ b/backend/views/specialization/index.php diff --git a/backend/views/specialization/update.php b/backend/views/specialization/update.php old mode 100644 new mode 100755 index 3186ada..3186ada --- a/backend/views/specialization/update.php +++ b/backend/views/specialization/update.php diff --git a/backend/views/specialization/view.php b/backend/views/specialization/view.php old mode 100644 new mode 100755 index 5f880cd..5f880cd --- a/backend/views/specialization/view.php +++ b/backend/views/specialization/view.php diff --git a/backend/web/js/fieldWidget.js b/backend/web/js/fieldWidget.js old mode 100644 new mode 100755 index b673819..b673819 --- a/backend/web/js/fieldWidget.js +++ b/backend/web/js/fieldWidget.js diff --git a/common/config/.gitignore b/common/config/.gitignore old mode 100644 new mode 100755 index e5d1aeb..e5d1aeb --- a/common/config/.gitignore +++ b/common/config/.gitignore diff --git a/common/config/main.php b/common/config/main.php index 8ccd715..1b7c720 100755 --- a/common/config/main.php +++ b/common/config/main.php @@ -1,6 +1,29 @@ dirname(dirname(__DIR__)) . '/vendor', + 'controllerMap' => [ + 'elfinder' => [ + 'class' => 'mihaildev\elfinder\Controller', + 'access' => ['@'], //глобальный доступ к фаил менеджеру @ - для авторизорованных , ? - для гостей , чтоб открыть всем ['@', '?'] + 'disabledCommands' => ['netmount'], //отключение ненужных команд https://github.com/Studio-42/elFinder/wiki/Client-configuration-options#commands + 'roots' => [ + [ + 'class' => 'mihaildev\elfinder\UserPath', + 'path' => '../../storage/user_{id}', + 'name' => 'My Documents' + ], + ], + 'watermark' => [ + 'source' => __DIR__.'/logo.png', // Path to Water mark image + 'marginRight' => 5, // Margin right pixel + 'marginBottom' => 5, // Margin bottom pixel + 'quality' => 95, // JPEG image save quality + 'transparency' => 70, // Water mark image transparency ( other than PNG ) + 'targetType' => IMG_GIF|IMG_JPG|IMG_PNG|IMG_WBMP, // Target image formats ( bit-field ) + 'targetMinPixel' => 200 // Target image minimum pixel size + ] + ] + ], 'modules' => [ 'permit' => [ 'class' => 'common\components\developeruz\db_rbac\Yii2DbRbac', diff --git a/common/models/Fields.php b/common/models/Fields.php old mode 100644 new mode 100755 index 243ed4b..243ed4b --- a/common/models/Fields.php +++ b/common/models/Fields.php diff --git a/common/models/ImageSizerForm.php b/common/models/ImageSizerForm.php index 278d1e2..3856034 100755 --- a/common/models/ImageSizerForm.php +++ b/common/models/ImageSizerForm.php @@ -1,5 +1,5 @@ $w){ + return true; + }else if($height >$h) { + return true; + } + return false; + } + + public function actionIndex(){ + die('hello'); + } + + private function resizeImg($w, $h, $imageAlias,$imageAliasSave){ + $img = Image::getImagine()->open(Yii::getAlias($imageAlias)); + + $size = $img->getSize(); + + $width = $size->getWidth(); + $height = $size->getHeight(); + + $e_width = $w/$h; + $e_height = $h/$w; + + $e1_width = $width/$height; + $e1_height = $height/$width; + + + if($this->isBigger($width,$height,$w,$h)){ + if($e_width<$e1_width){ + + $new_width = $width*($e_width/$e1_width); + + $y = 0; + $x = $width/ 2-($new_width/2); + $width = $new_width; + + }else { + + $new_height = $height*($e_height/$e1_height); + $x = 0; + $y = $height/2-($new_height/2); + $height = $new_height; + } + + + } 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(){ + + $request = Yii::$app->request->post(); + + if($request){ + if ($request['old_img']) { + $this->deleteImages($request['old_img']); + } + if(isset($request['action']) && $request['action']=='save'){ + $object = str_replace('-', '\\',$request['model']); + $model = new $object; + $model = $model->findOne($request['id']); + $model->$request['field'] = $request['new_url']; +// print_r($model->validate()); +// print_r($model->getErrors()); +// die(var_dump($model->save())); + $model->save(); + } + } + + } + + + public function actionDownloadPhoto() + { + + $model = new ImageSizerForm(); + + $request = Yii::$app->request->post(); + if ($request) { + + $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 { + return json_encode(['link'=>$imageLink]); + } + + + } + } + + + public function getex($filename) { + return end(explode(".", $filename)); + } + + + public function actionImagesUpload(){ + if($_FILES['upload']) + { + if (($_FILES['upload'] == "none") OR (empty($_FILES['upload']['name'])) ) + { + $message = "Вы не выбрали файл"; + } + else if ($_FILES['upload']["size"] == 0 OR $_FILES['upload']["size"] > 2050000) + { + $message = "Размер файла не соответствует нормам"; + } + else if (($_FILES['upload']["type"] != "image/jpeg") AND ($_FILES['upload']["type"] != "image/jpeg") AND ($_FILES['upload']["type"] != "image/png") AND ($_FILES['upload']['type'] != 'image/gif')) + { + $message = "Допускается загрузка только картинок JPG и PNG."; + } + else if (!is_uploaded_file($_FILES['upload']["tmp_name"])) + { + $message = "Что-то пошло не так. Попытайтесь загрузить файл ещё раз."; + } + else{ + $name =rand(1, 1000).md5($_FILES['upload']['name']).'.'.$this->getex($_FILES['upload']['name']); + move_uploaded_file($_FILES['upload']['tmp_name'], "../../storage/images/".$name); + $full_path = '/storage/images/'.$name; + $message = "Файл ".$_FILES['upload']['name']." загружен"; + $size=@getimagesize('images/'.$name); + + } + $callback = $_REQUEST['CKEditorFuncNum']; + echo ''; + } + } + + +} \ No newline at end of file diff --git a/common/widgets/FieldEditor.php b/common/widgets/FieldEditor.php old mode 100644 new mode 100755 index b939584..b939584 --- a/common/widgets/FieldEditor.php +++ b/common/widgets/FieldEditor.php diff --git a/common/widgets/ImageResizer.php b/common/widgets/ImageResizer.php index dc8fa57..8957517 100755 --- a/common/widgets/ImageResizer.php +++ b/common/widgets/ImageResizer.php @@ -1,8 +1,8 @@ render('image_sizer', + [ + 'model'=>$this->model, + 'field' => $this->field, + 'height' => $this->height, + 'width' => $this->width, + 'multi' => $this->multi, + 'name' => $this->name + ]); + + } + + public function getGallery(){ + if($this->gallery){ + $array = explode(",", $this->gallery); + if(count($array) > 1){ + array_pop($array); + } + return $array; + } else { + return array(); + } + + } + +} \ No newline at end of file diff --git a/common/widgets/MultiLangForm.php b/common/widgets/MultiLangForm.php old mode 100644 new mode 100755 index ef284ce..ef284ce --- a/common/widgets/MultiLangForm.php +++ b/common/widgets/MultiLangForm.php diff --git a/common/widgets/views/education_field.php b/common/widgets/views/education_field.php old mode 100644 new mode 100755 index e8eca71..e8eca71 --- a/common/widgets/views/education_field.php +++ b/common/widgets/views/education_field.php diff --git a/common/widgets/views/image_sizer.php b/common/widgets/views/image_sizer.php index 4b9cb0d..a6f08c4 100755 --- a/common/widgets/views/image_sizer.php +++ b/common/widgets/views/image_sizer.php @@ -6,10 +6,8 @@ * Time: 16:20 */ use yii\helpers\Html; -$this->registerJsFile('@web/js/vendor/bower/jquery-file-upload/js/vendor/jquery.ui.widget.js'); -$this->registerJsFile('@web/js/vendor/bower/jquery-file-upload/js/jquery.iframe-transport.js'); -$this->registerJsFile('@web/js/vendor/bower/jquery-file-upload/js/jquery.fileupload.js'); -$this->registerCssFile('@web/js/vendor/bower/jquery-file-upload/css/jquery.fileupload.css'); + +$id = $model::tableName().'_id'; ?>
@@ -18,13 +16,13 @@ $this->registerCssFile('@web/js/vendor/bower/jquery-file-upload/css/jquery.fileu - $field, 'data-url'=>"/admin/site/download-photo" ]);?> + $field, 'data-url'=>"/file/download-photo" ]);?> "{$field}_picture_link"]) ?> - +
$field ? Html::img($model->$field): '' ?>
@@ -59,7 +57,7 @@ $this->registerCssFile('@web/js/vendor/bower/jquery-file-upload/css/jquery.fileu var old_url = $('#_old_img').val(); var new_url = $('#_new_img').val(); var model = ''; - $.post( "/admin/site/delete-image",{new_url:new_url,old_img: old_url,model:model,field:"", id:"id?>",action:'save'}, function() { + $.post( "/admin/site/delete-image",{new_url:new_url,old_img: old_url,model:model,field:"", id:"$id?>",action:'save'}, function() { }); $("#_picture_link").val(new_url); }); @@ -85,7 +83,7 @@ $this->registerCssFile('@web/js/vendor/bower/jquery-file-upload/css/jquery.fileu - $field, 'data-url'=>"/admin/site/download-photo", 'multiple'=> 'multiple' ]);?> + $field, 'data-url'=>"/file/download-photo", 'multiple'=> 'multiple' ]);?> "{$field}_picture_link"]) ?> diff --git a/common/widgets/views/multi-lang-form.php b/common/widgets/views/multi-lang-form.php old mode 100644 new mode 100755 index 4bcf422..4bcf422 --- a/common/widgets/views/multi-lang-form.php +++ b/common/widgets/views/multi-lang-form.php diff --git a/console/migrations/m160125_151635_delete_lang_field.php b/console/migrations/m160125_151635_delete_lang_field.php old mode 100644 new mode 100755 index 0b3a7a2..0b3a7a2 --- a/console/migrations/m160125_151635_delete_lang_field.php +++ b/console/migrations/m160125_151635_delete_lang_field.php diff --git a/console/migrations/m160128_101543_fields.php b/console/migrations/m160128_101543_fields.php old mode 100644 new mode 100755 index cb49e9e..cb49e9e --- a/console/migrations/m160128_101543_fields.php +++ b/console/migrations/m160128_101543_fields.php diff --git a/console/migrations/m160202_084703_specialization.php b/console/migrations/m160202_084703_specialization.php old mode 100644 new mode 100755 index 26e5dad..26e5dad --- a/console/migrations/m160202_084703_specialization.php +++ b/console/migrations/m160202_084703_specialization.php diff --git a/console/migrations/m160203_082111_jobs.php b/console/migrations/m160203_082111_jobs.php new file mode 100644 index 0000000..1f7ba8e --- /dev/null +++ b/console/migrations/m160203_082111_jobs.php @@ -0,0 +1,29 @@ +createTable('{{%job}}', [ + 'job_id' => $this->primaryKey(), + 'name' => $this->string(255)->notNull(), + 'link' => $this->string(255), + 'date_start' => $this->timestamp(), + 'date_end' => $this->timestamp(), + 'position' => $this->string(255), + 'user_id' => $this->integer(), + 'total_count' => $this->integer(), + 'complete_count' => $this->integer(), + ], $tableOptions); + + } + + public function down() + { + $this->dropTable('{{%job}}'); + } +} diff --git a/db-migration/yarik/option_data.backup b/db-migration/yarik/option_data.backup old mode 100644 new mode 100755 index 8e09b52..8e09b52 Binary files a/db-migration/yarik/option_data.backup and b/db-migration/yarik/option_data.backup differ diff --git a/frontend/controllers/ChatController.php b/frontend/controllers/ChatController.php old mode 100644 new mode 100755 index 33d8b46..33d8b46 --- a/frontend/controllers/ChatController.php +++ b/frontend/controllers/ChatController.php diff --git a/frontend/controllers/CompanyController.php b/frontend/controllers/CompanyController.php old mode 100644 new mode 100755 index 1354954..1354954 --- a/frontend/controllers/CompanyController.php +++ b/frontend/controllers/CompanyController.php diff --git a/frontend/controllers/FileController.php b/frontend/controllers/FileController.php old mode 100644 new mode 100755 index 534057c..c7c08b2 --- a/frontend/controllers/FileController.php +++ b/frontend/controllers/FileController.php @@ -6,10 +6,9 @@ * Time: 9:58 */ namespace frontend\controllers; - use Yii; use yii\web\UploadedFile; -use backend\models\ImageSizerForm; +use common\models\ImageSizerForm; use yii\web\Controller; use Imagine\Gd\Imagine; use Imagine\Image\Box; diff --git a/frontend/controllers/OptionLangController.php b/frontend/controllers/OptionLangController.php old mode 100644 new mode 100755 index 1cd5634..1cd5634 --- a/frontend/controllers/OptionLangController.php +++ b/frontend/controllers/OptionLangController.php diff --git a/frontend/controllers/PerformerController.php b/frontend/controllers/PerformerController.php old mode 100644 new mode 100755 index b8418ba..b8418ba --- a/frontend/controllers/PerformerController.php +++ b/frontend/controllers/PerformerController.php diff --git a/frontend/controllers/SearchController.php b/frontend/controllers/SearchController.php old mode 100644 new mode 100755 index 2cb58e7..2cb58e7 --- a/frontend/controllers/SearchController.php +++ b/frontend/controllers/SearchController.php diff --git a/frontend/controllers/TenderController.php b/frontend/controllers/TenderController.php old mode 100644 new mode 100755 index 6936821..6936821 --- a/frontend/controllers/TenderController.php +++ b/frontend/controllers/TenderController.php diff --git a/frontend/views/accounts/_form.php b/frontend/views/accounts/_form.php old mode 100644 new mode 100755 index 2ac8c36..62cecc8 --- a/frontend/views/accounts/_form.php +++ b/frontend/views/accounts/_form.php @@ -1,8 +1,8 @@ @@ -51,6 +51,7 @@ use mihaildev\elfinder\ElFinder; ) ]); ?> + 'education', 'item_id'=> $user->id, diff --git a/frontend/views/accounts/bookmarks.php b/frontend/views/accounts/bookmarks.php old mode 100644 new mode 100755 index 66ce12f..66ce12f --- a/frontend/views/accounts/bookmarks.php +++ b/frontend/views/accounts/bookmarks.php diff --git a/frontend/views/accounts/projects.php b/frontend/views/accounts/projects.php old mode 100644 new mode 100755 index 3f53000..3f53000 --- a/frontend/views/accounts/projects.php +++ b/frontend/views/accounts/projects.php diff --git a/frontend/views/chat/list.php b/frontend/views/chat/list.php old mode 100644 new mode 100755 index 48dabf4..48dabf4 --- a/frontend/views/chat/list.php +++ b/frontend/views/chat/list.php diff --git a/frontend/views/chat/message.php b/frontend/views/chat/message.php old mode 100644 new mode 100755 index 761ab0a..761ab0a --- a/frontend/views/chat/message.php +++ b/frontend/views/chat/message.php diff --git a/frontend/views/company/blog-list.php b/frontend/views/company/blog-list.php old mode 100644 new mode 100755 index 0364ed3..0364ed3 --- a/frontend/views/company/blog-list.php +++ b/frontend/views/company/blog-list.php diff --git a/frontend/views/company/blog-view.php b/frontend/views/company/blog-view.php old mode 100644 new mode 100755 index c74f360..c74f360 --- a/frontend/views/company/blog-view.php +++ b/frontend/views/company/blog-view.php diff --git a/frontend/views/company/common.php b/frontend/views/company/common.php old mode 100644 new mode 100755 index 22ba430..22ba430 --- a/frontend/views/company/common.php +++ b/frontend/views/company/common.php diff --git a/frontend/views/company/gallery.php b/frontend/views/company/gallery.php old mode 100644 new mode 100755 index 3eb3a08..3eb3a08 --- a/frontend/views/company/gallery.php +++ b/frontend/views/company/gallery.php diff --git a/frontend/views/company/portfolio.php b/frontend/views/company/portfolio.php old mode 100644 new mode 100755 index 50bd117..50bd117 --- a/frontend/views/company/portfolio.php +++ b/frontend/views/company/portfolio.php diff --git a/frontend/views/company/review.php b/frontend/views/company/review.php old mode 100644 new mode 100755 index 66ad30a..66ad30a --- a/frontend/views/company/review.php +++ b/frontend/views/company/review.php diff --git a/frontend/views/company/team.php b/frontend/views/company/team.php old mode 100644 new mode 100755 index 9849f72..9849f72 --- a/frontend/views/company/team.php +++ b/frontend/views/company/team.php diff --git a/frontend/views/company/vacancy-list.php b/frontend/views/company/vacancy-list.php old mode 100644 new mode 100755 index fda4cfc..fda4cfc --- a/frontend/views/company/vacancy-list.php +++ b/frontend/views/company/vacancy-list.php diff --git a/frontend/views/company/vacancy-view.php b/frontend/views/company/vacancy-view.php old mode 100644 new mode 100755 index 1bbfa6f..1bbfa6f --- a/frontend/views/company/vacancy-view.php +++ b/frontend/views/company/vacancy-view.php diff --git a/frontend/views/landing/landing-freelance.php b/frontend/views/landing/landing-freelance.php old mode 100644 new mode 100755 index 171391b..171391b --- a/frontend/views/landing/landing-freelance.php +++ b/frontend/views/landing/landing-freelance.php diff --git a/frontend/views/landing/landing-order-project.php b/frontend/views/landing/landing-order-project.php old mode 100644 new mode 100755 index 5d47a3b..5d47a3b --- a/frontend/views/landing/landing-order-project.php +++ b/frontend/views/landing/landing-order-project.php diff --git a/frontend/views/landing/landing-work.php b/frontend/views/landing/landing-work.php old mode 100644 new mode 100755 index ddd5a1f..ddd5a1f --- a/frontend/views/landing/landing-work.php +++ b/frontend/views/landing/landing-work.php diff --git a/frontend/views/layouts/company.php b/frontend/views/layouts/company.php old mode 100644 new mode 100755 index 44d0f62..44d0f62 --- a/frontend/views/layouts/company.php +++ b/frontend/views/layouts/company.php diff --git a/frontend/views/layouts/gallery-company.php b/frontend/views/layouts/gallery-company.php old mode 100644 new mode 100755 index ef56e6e..ef56e6e --- a/frontend/views/layouts/gallery-company.php +++ b/frontend/views/layouts/gallery-company.php diff --git a/frontend/views/layouts/gallery.php b/frontend/views/layouts/gallery.php old mode 100644 new mode 100755 index f789491..f789491 --- a/frontend/views/layouts/gallery.php +++ b/frontend/views/layouts/gallery.php diff --git a/frontend/views/layouts/performer.php b/frontend/views/layouts/performer.php old mode 100644 new mode 100755 index 53f2095..53f2095 --- a/frontend/views/layouts/performer.php +++ b/frontend/views/layouts/performer.php diff --git a/frontend/views/option-lang/_form.php b/frontend/views/option-lang/_form.php old mode 100644 new mode 100755 index 1a1d1da..1a1d1da --- a/frontend/views/option-lang/_form.php +++ b/frontend/views/option-lang/_form.php diff --git a/frontend/views/option-lang/_form_ajax.php b/frontend/views/option-lang/_form_ajax.php old mode 100644 new mode 100755 index 34a3077..34a3077 --- a/frontend/views/option-lang/_form_ajax.php +++ b/frontend/views/option-lang/_form_ajax.php diff --git a/frontend/views/option-lang/_search.php b/frontend/views/option-lang/_search.php old mode 100644 new mode 100755 index 1504f52..1504f52 --- a/frontend/views/option-lang/_search.php +++ b/frontend/views/option-lang/_search.php diff --git a/frontend/views/option-lang/create.php b/frontend/views/option-lang/create.php old mode 100644 new mode 100755 index 1c80e26..1c80e26 --- a/frontend/views/option-lang/create.php +++ b/frontend/views/option-lang/create.php diff --git a/frontend/views/option-lang/index.php b/frontend/views/option-lang/index.php old mode 100644 new mode 100755 index fb3a5fc..fb3a5fc --- a/frontend/views/option-lang/index.php +++ b/frontend/views/option-lang/index.php diff --git a/frontend/views/option-lang/update.php b/frontend/views/option-lang/update.php old mode 100644 new mode 100755 index 22155a5..22155a5 --- a/frontend/views/option-lang/update.php +++ b/frontend/views/option-lang/update.php diff --git a/frontend/views/option-lang/view.php b/frontend/views/option-lang/view.php old mode 100644 new mode 100755 index 3b47fc3..3b47fc3 --- a/frontend/views/option-lang/view.php +++ b/frontend/views/option-lang/view.php diff --git a/frontend/views/performer/blog-list.php b/frontend/views/performer/blog-list.php old mode 100644 new mode 100755 index 0364ed3..0364ed3 --- a/frontend/views/performer/blog-list.php +++ b/frontend/views/performer/blog-list.php diff --git a/frontend/views/performer/blog-view.php b/frontend/views/performer/blog-view.php old mode 100644 new mode 100755 index c74f360..c74f360 --- a/frontend/views/performer/blog-view.php +++ b/frontend/views/performer/blog-view.php diff --git a/frontend/views/performer/common.php b/frontend/views/performer/common.php old mode 100644 new mode 100755 index 4f48c2a..4f48c2a --- a/frontend/views/performer/common.php +++ b/frontend/views/performer/common.php diff --git a/frontend/views/performer/gallery.php b/frontend/views/performer/gallery.php old mode 100644 new mode 100755 index 3eb3a08..3eb3a08 --- a/frontend/views/performer/gallery.php +++ b/frontend/views/performer/gallery.php diff --git a/frontend/views/performer/portfolio.php b/frontend/views/performer/portfolio.php old mode 100644 new mode 100755 index 50bd117..50bd117 --- a/frontend/views/performer/portfolio.php +++ b/frontend/views/performer/portfolio.php diff --git a/frontend/views/performer/review.php b/frontend/views/performer/review.php old mode 100644 new mode 100755 index 66ad30a..66ad30a --- a/frontend/views/performer/review.php +++ b/frontend/views/performer/review.php diff --git a/frontend/views/performer/workplace.php b/frontend/views/performer/workplace.php old mode 100644 new mode 100755 index d9ee5b7..d9ee5b7 --- a/frontend/views/performer/workplace.php +++ b/frontend/views/performer/workplace.php diff --git a/frontend/views/search/company.php b/frontend/views/search/company.php old mode 100644 new mode 100755 index 70f1f14..70f1f14 --- a/frontend/views/search/company.php +++ b/frontend/views/search/company.php diff --git a/frontend/views/search/performer.php b/frontend/views/search/performer.php old mode 100644 new mode 100755 index 94dce01..94dce01 --- a/frontend/views/search/performer.php +++ b/frontend/views/search/performer.php diff --git a/frontend/views/search/project.php b/frontend/views/search/project.php old mode 100644 new mode 100755 index eb58b90..eb58b90 --- a/frontend/views/search/project.php +++ b/frontend/views/search/project.php diff --git a/frontend/views/search/vacancy.php b/frontend/views/search/vacancy.php old mode 100644 new mode 100755 index a41dd6b..a41dd6b --- a/frontend/views/search/vacancy.php +++ b/frontend/views/search/vacancy.php diff --git a/frontend/views/tender/view.php b/frontend/views/tender/view.php old mode 100644 new mode 100755 index b2490db..b2490db --- a/frontend/views/tender/view.php +++ b/frontend/views/tender/view.php diff --git a/frontend/views/views/testuser/_form.php b/frontend/views/views/testuser/_form.php old mode 100644 new mode 100755 index 2fef732..2fef732 --- a/frontend/views/views/testuser/_form.php +++ b/frontend/views/views/testuser/_form.php diff --git a/frontend/views/views/testuser/_search.php b/frontend/views/views/testuser/_search.php old mode 100644 new mode 100755 index f7d9374..f7d9374 --- a/frontend/views/views/testuser/_search.php +++ b/frontend/views/views/testuser/_search.php diff --git a/frontend/views/views/testuser/create.php b/frontend/views/views/testuser/create.php old mode 100644 new mode 100755 index a71baf7..a71baf7 --- a/frontend/views/views/testuser/create.php +++ b/frontend/views/views/testuser/create.php diff --git a/frontend/views/views/testuser/index.php b/frontend/views/views/testuser/index.php old mode 100644 new mode 100755 index 3875454..3875454 --- a/frontend/views/views/testuser/index.php +++ b/frontend/views/views/testuser/index.php diff --git a/frontend/views/views/testuser/update.php b/frontend/views/views/testuser/update.php old mode 100644 new mode 100755 index cad4a75..cad4a75 --- a/frontend/views/views/testuser/update.php +++ b/frontend/views/views/testuser/update.php diff --git a/frontend/views/views/testuser/view.php b/frontend/views/views/testuser/view.php old mode 100644 new mode 100755 index 991b74a..991b74a --- a/frontend/views/views/testuser/view.php +++ b/frontend/views/views/testuser/view.php diff --git a/frontend/views/views/testuserinfo/_form.php b/frontend/views/views/testuserinfo/_form.php old mode 100644 new mode 100755 index b995ecd..b995ecd --- a/frontend/views/views/testuserinfo/_form.php +++ b/frontend/views/views/testuserinfo/_form.php diff --git a/frontend/views/views/testuserinfo/_search.php b/frontend/views/views/testuserinfo/_search.php old mode 100644 new mode 100755 index faa7260..faa7260 --- a/frontend/views/views/testuserinfo/_search.php +++ b/frontend/views/views/testuserinfo/_search.php diff --git a/frontend/views/views/testuserinfo/create.php b/frontend/views/views/testuserinfo/create.php old mode 100644 new mode 100755 index 5213448..5213448 --- a/frontend/views/views/testuserinfo/create.php +++ b/frontend/views/views/testuserinfo/create.php diff --git a/frontend/views/views/testuserinfo/index.php b/frontend/views/views/testuserinfo/index.php old mode 100644 new mode 100755 index 4de5bee..4de5bee --- a/frontend/views/views/testuserinfo/index.php +++ b/frontend/views/views/testuserinfo/index.php diff --git a/frontend/views/views/testuserinfo/update.php b/frontend/views/views/testuserinfo/update.php old mode 100644 new mode 100755 index bb8a173..bb8a173 --- a/frontend/views/views/testuserinfo/update.php +++ b/frontend/views/views/testuserinfo/update.php diff --git a/frontend/views/views/testuserinfo/view.php b/frontend/views/views/testuserinfo/view.php old mode 100644 new mode 100755 index 9a96b19..9a96b19 --- a/frontend/views/views/testuserinfo/view.php +++ b/frontend/views/views/testuserinfo/view.php diff --git a/frontend/web/css/art_box.css b/frontend/web/css/art_box.css old mode 100644 new mode 100755 index 5dcf7f6..5dcf7f6 --- a/frontend/web/css/art_box.css +++ b/frontend/web/css/art_box.css diff --git a/frontend/web/css/style_min.css b/frontend/web/css/style_min.css old mode 100644 new mode 100755 index cf921f4..cf921f4 --- a/frontend/web/css/style_min.css +++ b/frontend/web/css/style_min.css diff --git a/frontend/web/js/_forms.js b/frontend/web/js/_forms.js old mode 100644 new mode 100755 index ad3c75a..ad3c75a --- a/frontend/web/js/_forms.js +++ b/frontend/web/js/_forms.js diff --git a/frontend/web/js/_jquery.rating.js b/frontend/web/js/_jquery.rating.js old mode 100644 new mode 100755 index 3714a32..3714a32 --- a/frontend/web/js/_jquery.rating.js +++ b/frontend/web/js/_jquery.rating.js diff --git a/frontend/web/js/_script.js b/frontend/web/js/_script.js old mode 100644 new mode 100755 index 6036086..6036086 --- a/frontend/web/js/_script.js +++ b/frontend/web/js/_script.js diff --git a/storage/.htaccess b/storage/.htaccess old mode 100644 new mode 100755 index 0a379a4..0a379a4 --- a/storage/.htaccess +++ b/storage/.htaccess diff --git a/storage/images/731f3def4141ee16d28c15219e46e5d2297.jpg b/storage/images/731f3def4141ee16d28c15219e46e5d2297.jpg deleted file mode 100755 index a86b541..0000000 Binary files a/storage/images/731f3def4141ee16d28c15219e46e5d2297.jpg and /dev/null differ -- libgit2 0.21.4