Merge remote-tracking branch 'origin/master'

Yarik
2 parents cdb04594 f1f35982
Showing 3 changed files with 79 additions and 57 deletions Show diff stats
frontend/assets/AppAsset.php
frontend/controllers/SiteController.php
frontend/views/layouts/main.php
@@ -31,7 +31,7 @@ class AppAsset extends AssetBundle
     ];
     public $depends = [
         'yii\web\YiiAsset',
-        'yii\bootstrap\BootstrapAsset',
+        'yii\bootstrap\BootstrapPluginAsset',
     ];
     public $jsOptions = array(
         'position' => \yii\web\View::POS_HEAD
@@ -123,59 +123,7 @@ class SiteController extends Controller
     public function actionLogin()
     {
-    // 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();
         }
@@ -188,6 +136,72 @@ class SiteController extends Controller
                 '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,
+//            ]);
+//        }
     }
     /**
@@ -328,7 +342,7 @@ class SiteController extends Controller
                     }
                 }
             }
-            if(hasErrors) {
+            if($hasErrors) {
                 $data['option_values'] = $option_values;
                 return $this->render('options', ['options' => $data, 'post' => $post]);
             } else {
@@ -48,9 +48,17 @@ AppAsset::register($this);
                     <li><span><img src="/images/ico-question.png" alt=""/></span><a href="#">Помощь</a></li>
                 </ul>
                 <div class="header-cabinet-wr">
-                    <div class="header-cabinet-foto"><img src="/images/ded-ico.png" alt=""/></div>
-                    <div class="header-cabinet-profile">Профиль</div>
-                    <a href="/site/login">Личный кабинет</a>
+                    <?php
+                    if (Yii::$app->user->isGuest): ?>
+                        <div class="header-cabinet-foto"><img src="/images/ded-ico.png" alt=""/></div>
+                        <div class="header-cabinet-profile">Профиль</div>
+                        <?=  Html::a('Личный кабинет',['/site/signup'])  ?>
+                    <?php else : ?>
+                        <div class="header-cabinet-foto"><img src="/images/ded-ico.png" alt=""/></div>
+                        <div class="header-cabinet-profile">Профиль</div>
+                        <?=  Html::a(Yii::$app->user->identity->email,['/cabinet/index'])  ?>
+                    <?php endif; ?>
+
                 </div>
             </div>
         </div>