Merge remote-tracking branch 'origin/master'

Yarik
2 parents 2a4daadd f8eac9c4
Showing 5 changed files with 61 additions and 11 deletions Show diff stats
console/migrations/m161229_140924_add_regexp_column_to_user_table.php
frontend/controllers/CabinetController.php
frontend/views/layouts/cabinet.php
frontend/views/site/index.php
frontend/web/css/style.css
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Handles adding regexp to table `user`.
+ */
+class m161229_140924_add_regexp_column_to_user_table extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function up()
+    {
+        $this->addColumn('user', 'regexp', $this->string(255));
+        $this->addColumn('user', 'name', $this->string(255));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function down()
+    {
+        $this->dropColumn('user', 'regexp');
+        $this->dropColumn('user', 'name');
+    }
+}
@@ -64,11 +64,11 @@
             }
             $table = IntellectualProperty::find()
-                                         ->where(
-                                             [
-                                                 'user_id' => \Yii::$app->user->identity->id,
-                                             ]
-                                         )
+//                                         ->where(
+//                                             [
+//                                                 'user_id' => \Yii::$app->user->identity->id,
+//                                             ]
+//                                         )
                                          ->all();
             return $this->render(
@@ -128,11 +128,11 @@
         public function actionList()
         {
             $table = IntellectualProperty::find()
-                                         ->where(
-                                             [
-                                                 'user_id' => \Yii::$app->user->identity->id,
-                                             ]
-                                         )
+//                                         ->where(
+//                                             [
+//                                                 'user_id' => \Yii::$app->user->identity->id,
+//                                             ]
+//                                         )
                                          ->all();
             return $this->render(
                 'list',
@@ -71,7 +71,7 @@ EOT;
     <a href="#" class="btn_mails"><span>23</span></a>
     <div class="name-wrapp-login">
-      <span class="name_" style="background: url('/images/cabinet/ico/ico-5.png')0 50% no-repeat">Дмитро (фізична особа)</span>
+      <span class="name_" style="background: url('/images/cabinet/ico/ico-5.png')0 50% no-repeat"><?php echo \Yii::$app->user->identity->name?></span>
       <div id="hidden_list_head" class="_off">
         <ul>
           <li><span class="s_">Киев</span></li>
@@ -13,6 +13,7 @@
     $this->title = 'My Yii Application';
 ?>
+
 <div class="section-box-header">
     <div class="container">
         <div class="row">
@@ -27,6 +28,18 @@
                 </ul>
                 <div class="login-wrapp">
                     <?php
+                        if(!\Yii::$app->user->isGuest) {
+                            echo Html::a('Вийти',
+                                         [
+                                             'site/logout'
+                                         ],
+                                         [
+                                             'data-method' => 'post',
+                                             'class' => 'btn-logout',
+                                         ]);
+                        }
+                    ?>
+                    <?php
                     if(\Yii::$app->user->isGuest) {
                         echo Html::a('вхід', '#', [
                             'class' => 'btn_login',
@@ -39,6 +52,7 @@
                         ]);
                     }
                     ?>
+                    
                 </div>
             </div>
         </div>
@@ -46,6 +46,15 @@ ul.main_menu li a:hover {text-decoration: underline;}
 .login-wrapp {
     float: right;
 }
+.btn-logout {
+    float: left;
+    display: block;
+    margin-top: 30px;
+    font-family: Ubuntu;
+    color: #02a1ee;
+    font-weight: 700;
+
+}
 .btn_login {
     margin-top: 23px;
     float: right;