Skip to content

Commit

Permalink
change use
Browse files Browse the repository at this point in the history
  • Loading branch information
vanterbit committed Dec 28, 2023
1 parent b6e9596 commit c69697e
Show file tree
Hide file tree
Showing 78 changed files with 275 additions and 275 deletions.
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ The preferred way to install this extension is through [composer](http://getcomp
Either run

```
composer require webvimark/module-user-management
composer require vanterbit/module-user-management
```

or add

```
"webvimark/module-user-management": "^1"
"vanterbit/module-user-management": "^1"
```

to the require section of your `composer.json` file.
Expand All @@ -42,18 +42,18 @@ Configuration

'components'=>[
'user' => [
'class' => 'webvimark\modules\UserManagement\components\UserConfig',
'class' => 'vanterbit\modules\UserManagement\components\UserConfig',

// Comment this if you don't want to record user logins
'on afterLogin' => function($event) {
\webvimark\modules\UserManagement\models\UserVisitLog::newVisitor($event->identity->id);
\vanterbit\modules\UserManagement\models\UserVisitLog::newVisitor($event->identity->id);
}
],
],

'modules'=>[
'user-management' => [
'class' => 'webvimark\modules\UserManagement\UserManagementModule',
'class' => 'vanterbit\modules\UserManagement\UserManagementModule',

// 'enableRegistration' => true,

Expand Down Expand Up @@ -98,8 +98,8 @@ To see full list of options check *UserManagementModule* file

'modules'=>[
'user-management' => [
'class' => 'webvimark\modules\UserManagement\UserManagementModule',
'controllerNamespace'=>'vendor\webvimark\modules\UserManagement\controllers', // To prevent yii help from crashing
'class' => 'vanterbit\modules\UserManagement\UserManagementModule',
'controllerNamespace'=>'vendor\vanterbit\modules\UserManagement\controllers', // To prevent yii help from crashing
],
],

Expand All @@ -109,7 +109,7 @@ To see full list of options check *UserManagementModule* file

```php

./yii migrate --migrationPath=vendor/webvimark/module-user-management/migrations/
./yii migrate --migrationPath=vendor/vanterbit/module-user-management/migrations/

```

Expand All @@ -121,7 +121,7 @@ public function behaviors()
{
return [
'ghost-access'=> [
'class' => 'webvimark\modules\UserManagement\components\GhostAccessControl',
'class' => 'vanterbit\modules\UserManagement\components\GhostAccessControl',
],
];
}
Expand All @@ -134,8 +134,8 @@ Where you can go
```php

<?php
use webvimark\modules\UserManagement\components\GhostMenu;
use webvimark\modules\UserManagement\UserManagementModule;
use vanterbit\modules\UserManagement\components\GhostMenu;
use vanterbit\modules\UserManagement\UserManagementModule;

echo GhostMenu::widget([
'encodeLabels'=>false,
Expand Down Expand Up @@ -233,7 +233,7 @@ Events can be handled via config file like following

'modules'=>[
'user-management' => [
'class' => 'webvimark\modules\UserManagement\UserManagementModule',
'class' => 'vanterbit\modules\UserManagement\UserManagementModule',
'on afterRegistration' => function(UserAuthEvent $event) {
// Here you can do your own stuff like assign roles, send emails and so on
},
Expand All @@ -249,15 +249,15 @@ FAQ

**Question**: Do you have API docs?

**Answer**: Check this one http://opensource.id5.com.br/webvimark/doc/index.html (Credits to [lukBarros](https://github.com/lukBarros))
**Answer**: Check this one http://opensource.id5.com.br/vanterbit/doc/index.html (Credits to [lukBarros](https://github.com/lukBarros))

**Question**: I want users to register and login with they e-mails! Mmmmm... And they should confirm it too!

**Answer**: See configuration properties *$useEmailAsLogin* and *$emailConfirmationRequired*

**Question**: I want to have profile for user with avatar, birthday and stuff. What should I do ?

**Answer**: Profiles are to project-specific, so you'll have to implement them yourself (but you can find example here - https://github.com/webvimark/user-management/wiki/Profile-and-custom-registration). Here is how to do it without modifying this module
**Answer**: Profiles are to project-specific, so you'll have to implement them yourself (but you can find example here - https://github.com/vanterbit/user-management/wiki/Profile-and-custom-registration). Here is how to do it without modifying this module

1) Create table and model for profile, that have user_id (connect with "user" table)

Expand Down
8 changes: 4 additions & 4 deletions UserManagementModule.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace webvimark\modules\UserManagement;
namespace vanterbit\modules\UserManagement;

use Yii;
use yii\helpers\ArrayHelper;
Expand Down Expand Up @@ -68,7 +68,7 @@ class UserManagementModule extends \yii\base\Module
*
* @var string
*/
public $registrationFormClass = 'webvimark\modules\UserManagement\models\forms\RegistrationForm';
public $registrationFormClass = 'vanterbit\modules\UserManagement\models\forms\RegistrationForm';

/**
* After how many seconds confirmation token will be invalid
Expand Down Expand Up @@ -183,7 +183,7 @@ class UserManagementModule extends \yii\base\Module
public $auth_assignment_table = '{{%auth_assignment}}';
public $auth_rule_table = '{{%auth_rule}}';

public $controllerNamespace = 'webvimark\modules\UserManagement\controllers';
public $controllerNamespace = 'vanterbit\modules\UserManagement\controllers';

/**
* @p
Expand Down Expand Up @@ -228,7 +228,7 @@ public static function t($category, $message, $params = [], $language = null)
Yii::$app->i18n->translations['modules/user-management/*'] = [
'class' => 'yii\i18n\PhpMessageSource',
'sourceLanguage' => 'en',
'basePath' => '@vendor/webvimark/module-user-management/messages',
'basePath' => '@vendor/vanterbit/module-user-management/messages',
'fileMap' => [
'modules/user-management/back' => 'back.php',
'modules/user-management/front' => 'front.php',
Expand Down
2 changes: 1 addition & 1 deletion components/AbstractItemEvent.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace webvimark\modules\UserManagement\components;
namespace vanterbit\modules\UserManagement\components;

use yii\base\Event;

Expand Down
12 changes: 6 additions & 6 deletions components/AuthHelper.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace xvetx\modules\UserManagement\components;
namespace vanterbit\modules\UserManagement\components;

use xvetx\modules\UserManagement\models\rbacDB\AbstractItem;
use xvetx\modules\UserManagement\models\rbacDB\Permission;
use xvetx\modules\UserManagement\models\rbacDB\Role;
use xvetx\modules\UserManagement\models\rbacDB\Route;
use vanterbit\modules\UserManagement\models\rbacDB\AbstractItem;
use vanterbit\modules\UserManagement\models\rbacDB\Permission;
use vanterbit\modules\UserManagement\models\rbacDB\Role;
use vanterbit\modules\UserManagement\models\rbacDB\Route;
use Yii;
use yii\base\InvalidParamException;
use yii\helpers\Inflector;
Expand All @@ -23,7 +23,7 @@ class AuthHelper
/**
* Example how to handle layouts from config file
*
* 'on beforeAction'=>['xvetx\modules\UserManagement\components\AuthHelper', 'layoutHandler'],
* 'on beforeAction'=>['vanterbit\modules\UserManagement\components\AuthHelper', 'layoutHandler'],
*
* @param \yii\base\ActionEvent $event
*/
Expand Down
6 changes: 3 additions & 3 deletions components/GhostAccessControl.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace webvimark\modules\UserManagement\components;
namespace vanterbit\modules\UserManagement\components;

use webvimark\modules\UserManagement\models\rbacDB\Route;
use webvimark\modules\UserManagement\models\User;
use vanterbit\modules\UserManagement\models\rbacDB\Route;
use vanterbit\modules\UserManagement\models\User;
use yii\base\Action;
use Yii;
use yii\base\ActionFilter;
Expand Down
6 changes: 3 additions & 3 deletions components/GhostHtml.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
* @var $this yii\web\View
*/

namespace webvimark\modules\UserManagement\components;
namespace vanterbit\modules\UserManagement\components;

use webvimark\modules\UserManagement\models\User;
use vanterbit\modules\UserManagement\models\User;
use yii\helpers\Html;

/**
* Class GhostHtml
*
* Show elements only to those, who can access to them
*
* @package webvimark\modules\UserManagement\components
* @package vanterbit\modules\UserManagement\components
*/
class GhostHtml extends Html
{
Expand Down
6 changes: 3 additions & 3 deletions components/GhostMenu.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace webvimark\modules\UserManagement\components;
namespace vanterbit\modules\UserManagement\components;

use webvimark\modules\UserManagement\models\User;
use vanterbit\modules\UserManagement\models\User;
use yii\widgets\Menu;

/**
Expand All @@ -10,7 +10,7 @@
* Show only those items in navigation menu which user can see
* If item has no "visible" key, than "visible"=>User::canRoute($item['url') will be added
*
* @package webvimark\modules\UserManagement\components
* @package vanterbit\modules\UserManagement\components
*/
class GhostMenu extends Menu
{
Expand Down
6 changes: 3 additions & 3 deletions components/GhostNav.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace webvimark\modules\UserManagement\components;
namespace vanterbit\modules\UserManagement\components;

use webvimark\modules\UserManagement\models\User;
use vanterbit\modules\UserManagement\models\User;
use yii\bootstrap\Nav;

/**
Expand All @@ -10,7 +10,7 @@
* Show only those items in navigation menu which user can see
* If item has no "visible" key, than "visible"=>User::canRoute($item['url') will be added
*
* @package webvimark\modules\UserManagement\components
* @package vanterbit\modules\UserManagement\components
*/
class GhostNav extends Nav
{
Expand Down
10 changes: 5 additions & 5 deletions components/UserAuthEvent.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
namespace webvimark\modules\UserManagement\components;
namespace vanterbit\modules\UserManagement\components;

use webvimark\modules\UserManagement\models\forms\ConfirmEmailForm;
use webvimark\modules\UserManagement\models\forms\PasswordRecoveryForm;
use webvimark\modules\UserManagement\models\forms\RegistrationForm;
use webvimark\modules\UserManagement\models\User;
use vanterbit\modules\UserManagement\models\forms\ConfirmEmailForm;
use vanterbit\modules\UserManagement\models\forms\PasswordRecoveryForm;
use vanterbit\modules\UserManagement\models\forms\RegistrationForm;
use vanterbit\modules\UserManagement\models\User;
use yii\base\Event;

class UserAuthEvent extends Event
Expand Down
6 changes: 3 additions & 3 deletions components/UserConfig.php
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?php

namespace webvimark\modules\UserManagement\components;
namespace vanterbit\modules\UserManagement\components;

use yii\web\User;
use Yii;

/**
* Class UserConfig
* @package webvimark\modules\UserManagement\components
* @package vanterbit\modules\UserManagement\components
*/
class UserConfig extends User
{
/**
* @inheritdoc
*/
public $identityClass = 'webvimark\modules\UserManagement\models\User';
public $identityClass = 'vanterbit\modules\UserManagement\models\User';

/**
* @inheritdoc
Expand Down
4 changes: 2 additions & 2 deletions components/UserIdentity.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace webvimark\modules\UserManagement\components;
namespace vanterbit\modules\UserManagement\components;

use webvimark\modules\UserManagement\models\User;
use vanterbit\modules\UserManagement\models\User;
use yii\base\Security;
use yii\db\ActiveRecord;
use yii\web\IdentityInterface;
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
}
},
"require": {
"webvimark/components": "^1.0.0",
"webvimark/bootstrap-switch": "^1.0.0",
"vanterbit/components": "^1.0.0",
"vanterbit/bootstrap-switch": "^1.0.0",
"ikimea/browser": "1.12.0",
"webvimark/date-range-picker": "^1.0.0",
"webvimark/helpers": "^1.0.0",
"webvimark/grid-bulk-actions": "^1.0.0",
"webvimark/grid-page-size": "^1.0.0"
"vanterbit/date-range-picker": "^1.0.0",
"vanterbit/helpers": "^1.0.0",
"vanterbit/grid-bulk-actions": "^1.0.0",
"vanterbit/grid-page-size": "^1.0.0"
}
}
20 changes: 10 additions & 10 deletions controllers/AuthController.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?php

namespace webvimark\modules\UserManagement\controllers;

use webvimark\components\BaseController;
use webvimark\modules\UserManagement\components\UserAuthEvent;
use webvimark\modules\UserManagement\models\forms\ChangeOwnPasswordForm;
use webvimark\modules\UserManagement\models\forms\ConfirmEmailForm;
use webvimark\modules\UserManagement\models\forms\LoginForm;
use webvimark\modules\UserManagement\models\forms\PasswordRecoveryForm;
use webvimark\modules\UserManagement\models\User;
use webvimark\modules\UserManagement\UserManagementModule;
namespace vanterbit\modules\UserManagement\controllers;

use vanterbit\components\BaseController;
use vanterbit\modules\UserManagement\components\UserAuthEvent;
use vanterbit\modules\UserManagement\models\forms\ChangeOwnPasswordForm;
use vanterbit\modules\UserManagement\models\forms\ConfirmEmailForm;
use vanterbit\modules\UserManagement\models\forms\LoginForm;
use vanterbit\modules\UserManagement\models\forms\PasswordRecoveryForm;
use vanterbit\modules\UserManagement\models\User;
use vanterbit\modules\UserManagement\UserManagementModule;
use Yii;
use yii\web\ForbiddenHttpException;
use yii\web\NotFoundHttpException;
Expand Down
12 changes: 6 additions & 6 deletions controllers/AuthItemGroupController.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace webvimark\modules\UserManagement\controllers;
namespace vanterbit\modules\UserManagement\controllers;

use webvimark\modules\UserManagement\models\rbacDB\AuthItemGroup;
use webvimark\modules\UserManagement\models\rbacDB\search\AuthItemGroupSearch;
use vanterbit\modules\UserManagement\models\rbacDB\AuthItemGroup;
use vanterbit\modules\UserManagement\models\rbacDB\search\AuthItemGroupSearch;
use Yii;
use webvimark\components\AdminDefaultController;
use vanterbit\components\AdminDefaultController;

/**
* AuthItemGroupController implements the CRUD actions for AuthItemGroup model.
Expand All @@ -15,12 +15,12 @@ class AuthItemGroupController extends AdminDefaultController
/**
* @var AuthItemGroup
*/
public $modelClass = 'webvimark\modules\UserManagement\models\rbacDB\AuthItemGroup';
public $modelClass = 'vanterbit\modules\UserManagement\models\rbacDB\AuthItemGroup';

/**
* @var AuthItemGroupSearch
*/
public $modelSearchClass = 'webvimark\modules\UserManagement\models\rbacDB\search\AuthItemGroupSearch';
public $modelSearchClass = 'vanterbit\modules\UserManagement\models\rbacDB\search\AuthItemGroupSearch';

/**
* Define redirect page after update, create, delete, etc
Expand Down

0 comments on commit c69697e

Please sign in to comment.