Merge remote-tracking branch 'origin/master'

Yarik
2 parents 9845be03 4668085e
Showing 12 changed files with 392 additions and 119 deletions Show diff stats
backend/web/js/option.js
common/config/main-local.php
common/models/Fields.php
common/widgets/FieldEditor.php
common/widgets/MultiLangForm.php
common/widgets/views/multi-lang-form.php
console/migrations/m160128_101543_fields.php
frontend/assets/AdminAsset.php
frontend/controllers/SiteController.php
frontend/views/accounts/_form.php
frontend/views/accounts/cabinet.php
frontend/web/css/art_box.css
@@ -58,55 +58,55 @@ $(function() {
         }
         return false;
     });
-    $.each($('.nav-tabs.f32'), function(key, value) {
-        if($(value).find('li').length > 1) {
-            $(value).find('li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>');
-        }
-    });
-    $(document).on('click', '.dropdown-menu.f32:not(.old) li a[data-lang]', function() {
-        var lang = $(this).data('lang');
-        var flag = $(this).find('span').first().clone();
-        var el = $(this);
-        var id = $(this).attr('href').substr(1);
-        var path = form[id].handler;
-        var view = form[id].view;
-        var model = form[id].model;
-        $.get(path, { language_id: lang, widget_id: id, ajaxView: view, model: model }, function(data) {
-            $('#'+id+'-tabs li').removeClass('active');
-            $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
-            $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
-            $('#tab-content-'+id).append($(data).find('.ajax-loaded').first());
-            $('body').append($(data).filter('script'));
-            $(el).parent().remove();
-            if(!$('#lang-'+id+' li').length) {
-                $('#'+id+'Lang').addClass('disabled');
-            }
-            if($('#'+id+'-tabs li').length > 1) {
-                $('#'+id+'-tabs li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>')
-            }
-        });
-    });
-    $(document).on('click', '.dropdown-menu.f32.old li a[data-lang]', function(e) {
-        e.preventDefault();
-        var lang = $(this).data('lang');
-        var flag = $(this).find('span').first().clone();
-        var el = $(this);
-        var id = $(this).attr('href').substr(1);
-        $.get(form[id], { language_id: lang, widget_id: id }, function(data) {
-            $('#'+id+'-tabs li').removeClass('active');
-            $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
-            $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
-            $('#tab-content-'+id).append($(data).find('.ajax-loaded').first());
-            $('body').append($(data).filter('script'));
-            $(el).parent().remove();
-            if(!$('#lang-'+id+' li').length) {
-                $('#'+id+'Lang').addClass('disabled');
-            }
-            if($('#'+id+'-tabs li').length > 1) {
-                $('#'+id+'-tabs li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>')
-            }
-        });
-    });
+    //$.each($('.nav-tabs.f32'), function(key, value) {
+    //    if($(value).find('li').length > 1) {
+    //        $(value).find('li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>');
+    //    }
+    //});
+    //$(document).on('click', '.dropdown-menu.f32:not(.old) li a[data-lang]', function() {
+    //    var lang = $(this).data('lang');
+    //    var flag = $(this).find('span').first().clone();
+    //    var el = $(this);
+    //    var id = $(this).attr('href').substr(1);
+    //    var path = form[id].handler;
+    //    var view = form[id].view;
+    //    var model = form[id].model;
+    //    $.get(path, { language_id: lang, widget_id: id, ajaxView: view, model: model }, function(data) {
+    //        $('#'+id+'-tabs li').removeClass('active');
+    //        $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
+    //        $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
+    //        $('#tab-content-'+id).append($(data).find('.ajax-loaded').first());
+    //        $('body').append($(data).filter('script'));
+    //        $(el).parent().remove();
+    //        if(!$('#lang-'+id+' li').length) {
+    //            $('#'+id+'Lang').addClass('disabled');
+    //        }
+    //        if($('#'+id+'-tabs li').length > 1) {
+    //            $('#'+id+'-tabs li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>')
+    //        }
+    //    });
+    //});
+    //$(document).on('click', '.dropdown-menu.f32.old li a[data-lang]', function(e) {
+    //    e.preventDefault();
+    //    var lang = $(this).data('lang');
+    //    var flag = $(this).find('span').first().clone();
+    //    var el = $(this);
+    //    var id = $(this).attr('href').substr(1);
+    //    $.get(form[id], { language_id: lang, widget_id: id }, function(data) {
+    //        $('#'+id+'-tabs li').removeClass('active');
+    //        $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
+    //        $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
+    //        $('#tab-content-'+id).append($(data).find('.ajax-loaded').first());
+    //        $('body').append($(data).filter('script'));
+    //        $(el).parent().remove();
+    //        if(!$('#lang-'+id+' li').length) {
+    //            $('#'+id+'Lang').addClass('disabled');
+    //        }
+    //        if($('#'+id+'-tabs li').length > 1) {
+    //            $('#'+id+'-tabs li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>')
+    //        }
+    //    });
+    //});
     $(document).on('click', '.remove-lang', function() {
         var lang = $(this).parent().data('lang');
         var flag = $(this).parent().find('span.flag').first().clone();
@@ -3,9 +3,9 @@ return [
     'components' => [
         'db' => [
             'class' => 'yii\db\Connection',
-            'dsn' => 'pgsql:host=127.0.0.1;port=5432;dbname=mfp_local',
-            'username' => 'postgres',
-            'password' => '',
+            'dsn' => 'pgsql:host=195.248.225.149;port=5432;dbname=mfp',
+            'username' => 'test33',
+            'password' => 'E4q2N7i9',
             'schemaMap' => [
                 'pgsql'=> [
                     'class'=>'yii\db\pgsql\Schema',
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "{{%fields}}".
+ *
+ * @property integer $id
+ * @property string $table_name
+ * @property integer $table_id
+ * @property string $value
+ * @property string $field_name
+ * @property string $field_type
+ */
+class Fields extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return '{{%fields}}';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['table_name', 'table_id',], 'required'],
+            [['table_id','language'], 'integer'],
+            [['table_name', 'value', 'field_name','field_type'], 'string', 'max' => 255]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'table_name' => 'Model Name',
+            'table_id' => 'Model ID',
+            'value' => 'Value',
+            'field_name' => 'Field Name',
+            'language' => 'Language',
+        ];
+    }
+
+    public static function getData($id, $model, $type){
+       return self::find()->where(['table_id'=>$id, 'table_name'=>$model, 'field_type'=>$type])->all();
+    }
+}
+<?php
+namespace common\widgets;
+use common\models\Fields;
+use yii\base\Widget;
+
+
+class FieldEditor extends Widget
+{
+    public $item_id;
+    public $model;
+    public $template;
+
+    public function init(){
+
+        parent::init();
+
+    }
+
+
+    public function run()
+    {
+        if($this->item_id && $this->model){
+            $widgetData = $this->findModel();
+        } else {
+            $widgetData= [new Fields()];
+        }
+
+
+        return $this->render($this->template.'_field',['model'=>$widgetData]);
+    }
+
+    protected function findModel()
+    {
+        if (($model = Fields::find()->where(['table_id'=>$this->item_id, 'table_name'=>$this->model, 'field_type'=>$this->template])->all()) !== null) {
+
+            return $model;
+
+        } else {
+            return [new Fields()];
+        }
+    }
+}
 \ No newline at end of file
+<?php
+namespace common\widgets;
+use common\models\Language;
+use common\modules\blog\controllers\AjaxController;
+use yii\base\InvalidParamException;
+use yii\base\Widget;
+use yii\bootstrap\ActiveForm;
+
+class MultiLangForm extends Widget
+{
+    public $form;
+
+    public function init()
+    {
+        parent::init();
+
+    }
+
+    public function run()
+    {
+        return $this->render('multi-lang-form',
+            [
+                'form'  => $this->form
+            ]);
+    }
+}
 \ No newline at end of file
+<!---->
+<!--<div class="dropdown pull-right">-->
+<!--    <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">-->
+<!--        --><?//= Yii::t('app', 'Add language') ?>
+<!--        <span class="caret"></span>-->
+<!--    </button>-->
+<!--    <ul class="dropdown-menu f32" >-->
+<!--        <li><a href="#" data-lang="0"><span class="flag ru"></span></a></li>-->
+<!--        <li><a href="#" data-lang="1"><span class="flag ua"></span></a></li>-->
+<!--    </ul>-->
+<!--</div>-->
+<ul class="nav nav-tabs f32"  role="tablist">
+
+    <li  data-lang="0" class="active">
+
+        <a href="#ru_form" role="tab" data-toggle="tab"><span class="flag ru"></span></a>
+
+    </li>
+    <!--    <li  data-lang="1">-->
+    <!---->
+    <!--        <a href="#ua_form" role="tab" data-toggle="tab"><span class="flag ua"></span></a>-->
+    <!--        <span class="glyphicon glyphicon-remove-circle remove-lang glyphicon_right"></span>-->
+    <!--    </li>-->
+</ul>
+<div class="tab-content lang-tab-content">
+    <div class="tab-pane active" id="ru_form">
+
+        <?= $form ?>
+
+    </div>
+
+</div>
 \ No newline at end of file
+<?php
+
+use yii\db\Migration;
+
+class m160128_101543_fields extends Migration
+{
+    public function up()
+    {
+        $tableOptions = null;
+
+        $this->createTable('{{%fields}}', [
+            'id' => $this->primaryKey(),
+            'table_name' => $this->string(255)->notNull(),
+            'table_id' => $this->integer(),
+            'value' => $this->string(255),
+            'field_name' => $this->string(),
+            'field_type' => $this->string(32)->notNull(),
+            'language' => $this->integer()
+        ], $tableOptions);
+
+    }
+
+    public function down()
+    {
+        $this->dropTable('{{%fields}}');
+    }
+}
@@ -19,6 +19,7 @@ class AdminAsset extends AssetBundle
     public $baseUrl = '@web';
     public $css = [
         'css/style.css',
+        'css/art_box.css',
         '/admin/css/flags32.css',
         //'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin',
     ];
 <?php
 namespace frontend\controllers;
+use common\models\UserInfo;
 use Yii;
 use common\models\LoginForm;
 use frontend\models\PasswordResetRequestForm;
@@ -92,71 +93,71 @@ class SiteController extends Controller
             ]);
         }
-//    // creat new model table Social and new model User
-//    $social = new Social();
-//    $user = new User();
-//
-//    $serviceName = Yii::$app->getRequest()->getQueryParam('service');
-//
-//        if (isset($serviceName)) {
-//            /** @var $eauth \nodge\eauth\ServiceBase */
-//            $eauth = Yii::$app->get('eauth')->getIdentity($serviceName);
-//            $eauth->setRedirectUrl(Yii::$app->getUser()->getReturnUrl());
-//            $eauth->setCancelUrl(Yii::$app->getUrlManager()->createAbsoluteUrl('site/login'));
-//
-//            try {
-//                if ($eauth->authenticate()) {
-//                    $identity = User::findByEAuth($eauth);
-//                    Yii::$app->getUser()->login($identity);
-//
-//                    //Save date get social network in database
-//                    if (! $social::find()->where(['social_user_id' => $identity[profile][id], 'social_name' => $identity[profile][service]])->exists()) {
-//                        $name = explode(' ',$identity[profile][name]);
-//                        $user->firstname = $name[0];
-//                        $user->lastname = $name[1];
-//                        $user->id_system_date = date("d.m.y.H:i:s");
-//                        $user->save();
-//                        $social->social_name = $identity[profile][service];
-//                        $social->social_user_id = $identity[profile][id];
-//                        $social->user_id = $user->id;
-//                        $social->validate();
-//                        $social->errors;
-//                        $social->save();
-//                    }
-//
-//                    // special redirect with closing popup window
-//                    $eauth->redirect();
-//                }
-//                else {
-//                    // close popup window and redirect to cancelUrl
-//                    $eauth->cancel();
-//                }
-//            }
-//            catch (\nodge\eauth\ErrorException $e) {
-//                // save error to show it later
-//                Yii::$app->getSession()->setFlash('error', 'EAuthException: '.$e->getMessage());
-//
-//                                // close popup window and redirect to cancelUrl
-//                //              $eauth->cancel();
-//                $eauth->redirect($eauth->getCancelUrl());
-//            }
-//        }
-//
-//
-//
-//
-//        if (!\Yii::$app->user->isGuest) {
-//            return $this->goHome();
-//        }
-//
-//        $model = new LoginForm();
-//        if ($model->load(Yii::$app->request->post()) && $model->login()) {
-//            return $this->goBack();
-//        } else {
-//            return $this->render('login', [
-//                'model' => $model,
-//            ]);
-//        }
+    // creat new model table Social and new model User
+    $social = new Social();
+    $user = new User();
+
+    $serviceName = Yii::$app->getRequest()->getQueryParam('service');
+
+        if (isset($serviceName)) {
+            /** @var $eauth \nodge\eauth\ServiceBase */
+            $eauth = Yii::$app->get('eauth')->getIdentity($serviceName);
+            $eauth->setRedirectUrl(Yii::$app->getUser()->getReturnUrl());
+            $eauth->setCancelUrl(Yii::$app->getUrlManager()->createAbsoluteUrl('site/login'));
+
+            try {
+                if ($eauth->authenticate()) {
+                    $identity = User::findByEAuth($eauth);
+                    Yii::$app->getUser()->login($identity);
+
+                    //Save date get social network in database
+                    if (! $social::find()->where(['social_user_id' => $identity[profile][id], 'social_name' => $identity[profile][service]])->exists()) {
+                        $name = explode(' ',$identity[profile][name]);
+                        $user->firstname = $name[0];
+                        $user->lastname = $name[1];
+                        $user->id_system_date = date("d.m.y.H:i:s");
+                        $user->save();
+                        $social->social_name = $identity[profile][service];
+                        $social->social_user_id = $identity[profile][id];
+                        $social->user_id = $user->id;
+                        $social->validate();
+                        $social->errors;
+                        $social->save();
+                    }
+
+                    // special redirect with closing popup window
+                    $eauth->redirect();
+                }
+                else {
+                    // close popup window and redirect to cancelUrl
+                    $eauth->cancel();
+                }
+            }
+            catch (\nodge\eauth\ErrorException $e) {
+                // save error to show it later
+                Yii::$app->getSession()->setFlash('error', 'EAuthException: '.$e->getMessage());
+
+                                // close popup window and redirect to cancelUrl
+                //              $eauth->cancel();
+                $eauth->redirect($eauth->getCancelUrl());
+            }
+        }
+
+
+
+
+        if (!\Yii::$app->user->isGuest) {
+            return $this->goHome();
+        }
+
+        $model = new LoginForm();
+        if ($model->load(Yii::$app->request->post()) && $model->login()) {
+            return $this->goBack();
+        } else {
+            return $this->render('login', [
+                'model' => $model,
+            ]);
+        }
     }
     /**
@@ -212,6 +213,13 @@ class SiteController extends Controller
         $model = new SignupForm();
         if ($model->load(Yii::$app->request->post())) {
             if ($user = $model->signup()) {
+
+                $user_info  = new UserInfo();
+
+                $user_info->user_id = $user->id;
+
+                $user_info->save();
+
                 if (Yii::$app->getUser()->login($user)) {
                     return $this->goHome();
                 }
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+?>
+
+<?php $form = ActiveForm::begin(); ?>
+
+<?= $form->field($user, 'username')->textInput() ?>
+
+<?= $form->field($user, 'lastname')->textInput() ?>
+
+<?= $form->field($user, 'firstname')->textInput() ?>
+
+<?= $form->field($user, 'email')->textInput() ?>
+
+<?= $form->field($user_info, 'user_id')->textInput() ?>
+
+<?= $form->field($user_info, 'view_count')->textInput() ?>
+
+<?= $form->field($user_info, 'busy')->textInput(['maxlength' => true]) ?>
+
+<?= $form->field($user_info, 'date_visit')->textInput() ?>
+
+<?= $form->field($user_info, 'experience')->textInput() ?>
+
+<?= $form->field($user_info, 'rank')->textInput(['maxlength' => true]) ?>
+
+<?= $form->field($user_info, 'salary')->textInput(['maxlength' => true]) ?>
+
+<?= $form->field($user_info, 'job')->textInput(['maxlength' => true]) ?>
+
+<?= $form->field($user_info, 'location')->textInput(['maxlength' => true]) ?>
+
+<?= $form->field($user_info, 'soft')->textInput() ?>
+
+<?= $form->field($user_info, 'guarantee')->textInput() ?>
+
+<?= $form->field($user_info, 'contract')->textInput() ?>
+
+<?= $form->field($user_info, 'estimate')->textInput() ?>
+
+<?= $form->field($user_info, 'purchase')->textInput() ?>
+
+<?= $form->field($user_info, 'delivery')->textInput() ?>
+
+<?= $form->field($user_info, 'prepayment')->textInput() ?>
+
+<?= $form->field($user_info, 'about')->textarea(['rows' => 6]) ?>
+
+<?= \common\widgets\FieldEditor::widget(['template'=>'', 'item_id'=> $user->id, 'model'=>'User']); ?>
+
+
+<div class="form-group">
+    <?= Html::submitButton('Create', ['class' => 'btn btn-success']) ?>
+</div>
+
+<?php ActiveForm::end(); ?>
 \ No newline at end of file
 <?php
-    use common\models\Option;
+use common\models\Option;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use \common\widgets\MultiLangForm;
     $this->title = 'Мой профиль';
-$this->params['breadcrumbs'][] = $this->title;
+    $this->params['breadcrumbs'][] = $this->title;
 ?>
 <h1><?=  $this->title ?></h1>
+
+
+<?php
+
+$form = $this->render('_form', [
+    'user' => $user,
+    'user_info' => $user_info,
+]);
+
+echo MultiLangForm::widget(['form'=>$form]);
+
+?>
+
+
+.glyphicon_right{
+    top: -55px;
+    left: 50px;
+}
 \ No newline at end of file