Merge branch 'master' of gitlab.artweb.com.ua:yarik.nechyporuk/artbox-core

# Conflicts: # behaviors/LanguageBehavior.php # components/LanguageRequest.php # components/LanguageUrlManager.php # controllers/SettingsController.php # language_instruction.txt # models/Feedback.php # models/FeedbackSearch.php # models/Language.php # models/Page.php # models/PageLang.php # models/PageSearch.php # models/User.php # widgets/LanguageForm.php # widgets/LanguagePicker.php # widgets/views/language_form_frame.php # widgets/views/view.php

Merge branch 'master' of gitlab.artweb.com.ua:yarik.nechyporuk/artbox-core
# Conflicts: # behaviors/LanguageBehavior.php # components/LanguageRequest.php # components/LanguageUrlManager.php # controllers/SettingsController.php # language_instruction.txt # models/Feedback.php # models/FeedbackSearch.php # models/Language.php # models/Page.php # models/PageLang.php # models/PageSearch.php # models/User.php # widgets/LanguageForm.php # widgets/LanguagePicker.php # widgets/views/language_form_frame.php # widgets/views/view.php
Yarik
1 parent fd14e3ba
Showing 13 changed files with 133 additions and 290 deletions Show diff stats
backend/config/main.php
backend/views/layouts/main.php
backend/views/site/index.php
common/config/.gitignore
common/config/bootstrap.php
common/config/main.php
common/config/params.php
common/config/settings.php
common/config/test.php
common/models/LoginForm.php
common/models/User.php
console/controllers/CreateController.php
init
@@ -14,6 +14,7 @@
         'bootstrap'           => [ 'log' ],
         'controllerMap' => [
             'settings' => 'artweb\artbox\core\controllers\SettingsController',
+            'profile'  => 'artweb\artbox\core\controllers\ProfileController',
         ],
         'modules'             => [
             'imagemanager' => [
@@ -58,7 +59,7 @@
                 'baseUrl'   => '/admin',
             ],
             'user'         => [
-                'identityClass'   => 'common\models\User',
+                'identityClass'   => 'artweb\artbox\core\models\User',
                 'enableAutoLogin' => true,
                 'identityCookie'  => [
                     'name'     => '_identity-backend',
@@ -5,11 +5,13 @@
      * @var \yii\web\View $this
      */
  
+    use artweb\artbox\core\assets\ArtboxCoreAsset;
     use artweb\artbox\core\models\User;
     use yii\helpers\Html;
     use yii\web\View;
  
-    $bundle = yiister\gentelella\assets\Asset::register($this);
+    yiister\gentelella\assets\Asset::register($this);
+    ArtboxCoreAsset::register($this);
     /**
      * @var User $user
      */
@@ -3,7 +3,6 @@
     /* @var $this yii\web\View */
  
     use artweb\artbox\gentelella\widgets\XPanel;
-    use yii\bootstrap\Carousel;
     use yii\bootstrap\Collapse;
  
     $this->title = 'My Yii Application';
@@ -11,31 +10,49 @@
 <?php
     $panel = XPanel::begin(
         [
-            'title'         => 'Test',
-            'toolbarLayout' => '{close}{collapse}',
+            'title' => 'Test',
+        ]
+    );
+    echo Collapse::widget(
+        [
+            'items'        => [
+                // equivalent to the above
+                [
+                    'label'          => '<p>Collapsible Group Item #1</p>',
+                    'content'        => 'Anim pariatur cliche...',
+                    // open its content by default
+                    'contentOptions' => [ 'class' => 'in' ],
+                ],
+                // another group item
+                [
+                    'label'   => 'Collapsible Group Item #1',
+                    'content' => 'Anim pariatur cliche...',
+                ],
+                // if you want to swap out .panel-body with .list-group, you may use the following
+                [
+                    'label'   => 'Collapsible Group Item #1',
+                    'content' => [
+                        'Anim pariatur cliche...',
+                        'Anim pariatur cliche...',
+                    ],
+                    'footer'  => 'Footer'
+                    // the footer label in list-group
+                ],
+                [
+                    'label'   => 'Collapsible Group Item #1',
+                    'content' => [
+                        'Anim pariatur cliche...',
+                        'Anim pariatur cliche...',
+                    ],
+                    'footer'  => 'Footer',
+                    // the footer label in list-group
+                ],
+            ],
+            'options'      => [
+                'class' => 'accordion',
+            ],
+            'encodeLabels' => false,
         ]
     );
-    echo "Velox nuclear vexatum iaceres ducunt ad eleates.";
     $panel::end();
-?>
-<div class="site-index">
-    <div class="x_panel">
-        <div class="x_title">
-            <h2>Test</h2>
-            <ul class="nav navbar-right panel_toolbox">
-                <li>
-                    <a class="collapse-link">
-                        <i class="fa fa-chevron-up"></i>
-                    </a>
-                </li>
-                <li>
-                    <a class="close-link">
-                        <i class="fa fa-close"></i>
-                    </a>
-                </li>
-            </ul>
-            <div class="clearfix"></div>
-        </div>
-        <div class="x_content">Velox nuclear vexatum iaceres ducunt ad eleates.</div>
-    </div>
-</div>
+?>
 \ No newline at end of file
@@ -2,8 +2,8 @@
  
 return [
     1 => [
-        'id' => '1',
-        'name' => 'Admin',
+        'id'          => '1',
+        'name'        => 'Admin321',
         'description' => 'Site administrator',
     ],
 ];
 \ No newline at end of file
 <?php
-namespace common\models;
-
-use Yii;
-use yii\base\Model;
-
-/**
- * Login form
- */
-class LoginForm extends Model
-{
-    public $username;
-    public $password;
-    public $rememberMe = true;
-
-    private $_user;
-
-
+    namespace common\models;
+    
+    use artweb\artbox\core\models\User;
+    use Yii;
+    use yii\base\Model;
+    
     /**
-     * @inheritdoc
+     * Login form
      */
-    public function rules()
+    class LoginForm extends Model
     {
-        return [
-            // username and password are both required
-            [['username', 'password'], 'required'],
-            // rememberMe must be a boolean value
-            ['rememberMe', 'boolean'],
-            // password is validated by validatePassword()
-            ['password', 'validatePassword'],
-        ];
-    }
-
-    /**
-     * Validates the password.
-     * This method serves as the inline validation for password.
-     *
-     * @param string $attribute the attribute currently being validated
-     * @param array $params the additional name-value pairs given in the rule
-     */
-    public function validatePassword($attribute, $params)
-    {
-        if (!$this->hasErrors()) {
-            $user = $this->getUser();
-            if (!$user || !$user->validatePassword($this->password)) {
-                $this->addError($attribute, 'Incorrect username or password.');
+        public $username;
+        public $password;
+        public $rememberMe = true;
+        
+        private $_user;
+        
+        /**
+         * @inheritdoc
+         */
+        public function rules()
+        {
+            return [
+                // username and password are both required
+                [
+                    [
+                        'username',
+                        'password',
+                    ],
+                    'required',
+                ],
+                // rememberMe must be a boolean value
+                [
+                    'rememberMe',
+                    'boolean',
+                ],
+                // password is validated by validatePassword()
+                [
+                    'password',
+                    'validatePassword',
+                ],
+            ];
+        }
+        
+        /**
+         * Validates the password.
+         * This method serves as the inline validation for password.
+         *
+         * @param string $attribute the attribute currently being validated
+         * @param array  $params    the additional name-value pairs given in the rule
+         */
+        public function validatePassword($attribute, $params)
+        {
+            if (!$this->hasErrors()) {
+                $user = $this->getUser();
+                if (!$user || !$user->validatePassword($this->password)) {
+                    $this->addError($attribute, 'Incorrect username or password.');
+                }
             }
         }
-    }
-
-    /**
-     * Logs in a user using the provided username and password.
-     *
-     * @return bool whether the user is logged in successfully
-     */
-    public function login()
-    {
-        if ($this->validate()) {
-            return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600 * 24 * 30 : 0);
-        } else {
-            return false;
+        
+        /**
+         * Logs in a user using the provided username and password.
+         *
+         * @return bool whether the user is logged in successfully
+         */
+        public function login()
+        {
+            if ($this->validate()) {
+                return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600 * 24 * 30 : 0);
+            } else {
+                return false;
+            }
         }
-    }
-
-    /**
-     * Finds user by [[username]]
-     *
-     * @return User|null
-     */
-    protected function getUser()
-    {
-        if ($this->_user === null) {
-            $this->_user = User::findByUsername($this->username);
+        
+        /**
+         * Finds user by [[username]]
+         *
+         * @return User|null
+         */
+        protected function getUser()
+        {
+            if ($this->_user === null) {
+                $this->_user = User::findByUsername($this->username);
+            }
+            
+            return $this->_user;
         }
-
-        return $this->_user;
     }
-}
-<?php
-namespace common\models;
-
-use Yii;
-use yii\base\NotSupportedException;
-use yii\behaviors\TimestampBehavior;
-use yii\db\ActiveRecord;
-use yii\web\IdentityInterface;
-
-/**
- * User model
- *
- * @property integer $id
- * @property string $username
- * @property string $password_hash
- * @property string $password_reset_token
- * @property string $email
- * @property string $auth_key
- * @property integer $status
- * @property integer $created_at
- * @property integer $updated_at
- * @property string $password write-only password
- */
-class User extends ActiveRecord implements IdentityInterface
-{
-    const STATUS_DELETED = 0;
-    const STATUS_ACTIVE = 10;
-
-
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return '{{%user}}';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function behaviors()
-    {
-        return [
-            TimestampBehavior::className(),
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            ['status', 'default', 'value' => self::STATUS_ACTIVE],
-            ['status', 'in', 'range' => [self::STATUS_ACTIVE, self::STATUS_DELETED]],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public static function findIdentity($id)
-    {
-        return static::findOne(['id' => $id, 'status' => self::STATUS_ACTIVE]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public static function findIdentityByAccessToken($token, $type = null)
-    {
-        throw new NotSupportedException('"findIdentityByAccessToken" is not implemented.');
-    }
-
-    /**
-     * Finds user by username
-     *
-     * @param string $username
-     * @return static|null
-     */
-    public static function findByUsername($username)
-    {
-        return static::findOne(['username' => $username, 'status' => self::STATUS_ACTIVE]);
-    }
-
-    /**
-     * Finds user by password reset token
-     *
-     * @param string $token password reset token
-     * @return static|null
-     */
-    public static function findByPasswordResetToken($token)
-    {
-        if (!static::isPasswordResetTokenValid($token)) {
-            return null;
-        }
-
-        return static::findOne([
-            'password_reset_token' => $token,
-            'status' => self::STATUS_ACTIVE,
-        ]);
-    }
-
-    /**
-     * Finds out if password reset token is valid
-     *
-     * @param string $token password reset token
-     * @return bool
-     */
-    public static function isPasswordResetTokenValid($token)
-    {
-        if (empty($token)) {
-            return false;
-        }
-
-        $timestamp = (int) substr($token, strrpos($token, '_') + 1);
-        $expire = Yii::$app->params['user.passwordResetTokenExpire'];
-        return $timestamp + $expire >= time();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getId()
-    {
-        return $this->getPrimaryKey();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getAuthKey()
-    {
-        return $this->auth_key;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function validateAuthKey($authKey)
-    {
-        return $this->getAuthKey() === $authKey;
-    }
-
-    /**
-     * Validates password
-     *
-     * @param string $password password to validate
-     * @return bool if password provided is valid for current user
-     */
-    public function validatePassword($password)
-    {
-        return Yii::$app->security->validatePassword($password, $this->password_hash);
-    }
-
-    /**
-     * Generates password hash from password and sets it to the model
-     *
-     * @param string $password
-     */
-    public function setPassword($password)
-    {
-        $this->password_hash = Yii::$app->security->generatePasswordHash($password);
-    }
-
-    /**
-     * Generates "remember me" authentication key
-     */
-    public function generateAuthKey()
-    {
-        $this->auth_key = Yii::$app->security->generateRandomString();
-    }
-
-    /**
-     * Generates new password reset token
-     */
-    public function generatePasswordResetToken()
-    {
-        $this->password_reset_token = Yii::$app->security->generateRandomString() . '_' . time();
-    }
-
-    /**
-     * Removes password reset token
-     */
-    public function removePasswordResetToken()
-    {
-        $this->password_reset_token = null;
-    }
-}
 <?php
     namespace console\controllers;
-    
-    use common\models\User;
+
+    use artweb\artbox\core\models\User;
     use yii\console\Controller;
     use yii\helpers\Console;