-
-
-
-
+
+
+
+
+
- translation->name ?>
- module, ucfirst($menu_item->module)) ?>
+
+ translation->name ?>
+
+ module, ucfirst($menu_item->module)) ?>
+
+
+
+
+
+
-
+
['/menu/save-item', 'id' => $menu_item->id],
@@ -51,7 +62,7 @@ $menu_item = $item['item'];
?>
@@ -61,18 +72,20 @@ $menu_item = $item['item'];
field($model, 'target')->dropDownList([
'' => Yii::t('menu', 'Self Window'),
'_blank' => Yii::t('menu', 'Blank Window'),
- ]) ?>
- field($model, 'style')->textInput(['maxlength' => true]) ?>
+ ], [
+ 'class' => 'form-control form-control-sm'
+ ]) ?>
+ field($model, 'style')->textInput(['maxlength' => true, 'class' => 'form-control form-control-sm'],) ?>
- field($model, 'css')->textInput(['maxlength' => true]) ?>
+ field($model, 'css')->textInput(['maxlength' => true, 'class' => 'form-control form-control-sm']) ?>
url_params): ?>
- field($model, 'url')->textInput(['maxlength' => true]) ?>
+ field($model, 'url')->textInput(['maxlength' => true, 'class' => 'form-control form-control-sm']) ?>
-
+
'item-delete-button btn btn-sm btn-danger',
'data-id' => $menu_item->id,
diff --git a/backend/components/menu/widgets/views/_item_tab.php b/backend/components/menu/widgets/views/_item_tab.php
index b880cdf..5cb2933 100644
--- a/backend/components/menu/widgets/views/_item_tab.php
+++ b/backend/components/menu/widgets/views/_item_tab.php
@@ -4,22 +4,25 @@
* Date: 24.08.2018
*/
+use core\forms\menu\MenuItemForm;
+use yii\web\View;
+use yii\widgets\ActiveForm;
+
/**
- * @var $this \yii\web\View
- * @var $form \yii\widgets\ActiveForm
- * @var $model \core\forms\menu\MenuItemForm
+ * @var $this View
+ * @var $form ActiveForm
+ * @var $model MenuItemForm
* @var $language string
*/
$postfix = $language == Yii::$app->params['defaultLanguage'] ? '' : '_' . $language;
?>
-
+
- field($model, 'name' . $postfix)->textInput(['maxlength' => true]) ?>
+ field($model, 'name' . $postfix)->textInput(['maxlength' => true, 'class' => 'form-control form-control-sm']) ?>
- field($model, 'title_attr' . $postfix)->textInput(['maxlength' => true]) ?>
+ field($model, 'title_attr' . $postfix)->textInput(['maxlength' => true, 'class' => 'form-control form-control-sm']) ?>
-
diff --git a/backend/components/menu/widgets/views/menu.php b/backend/components/menu/widgets/views/menu.php
index 6cafbee..0edbd05 100644
--- a/backend/components/menu/widgets/views/menu.php
+++ b/backend/components/menu/widgets/views/menu.php
@@ -4,21 +4,24 @@
* Date: 11.07.2018
*/
-/**
- * @var $this \yii\web\View
- * @var $items array
- * @var $menu \core\entities\menu\Menu
- */
-
use backend\components\menu\assets\MenuAsset;
+use core\entities\menu\Menu;
use core\forms\menu\MenuItemForm;
use yii\helpers\Html;
use yii\helpers\Url;
use yii\web\JsExpression;
+use yii\web\View;
+
+/**
+ * @var $this View
+ * @var $items array
+ * @var $menu Menu
+ */
MenuAsset::register($this);
-function menu_generate($items) {
+function menu_generate($items): string
+{
$html = '';
foreach ($items as $item) {
$menuItemForm = new MenuItemForm($item['item']);
@@ -31,39 +34,11 @@ function menu_generate($items) {
}
$name_empty_error = Yii::t('menu', 'Name must be specified');
-//$item_save_url = Url::to(['menu/save-menu-item-data']);
$item_save_url = ''; // delete this
$item_delete_url = Url::to(['menu/delete-menu-item']);
$confirm_delete_message = Yii::t('buttons', 'Are you sure you want to delete this item?');
$current_url = Url::to(['menu/index', 'id' => $menu->id]);
$js = << $menu->id]);
-
-
'btn btn-success pull-right',
+ 'class' => 'btn btn-success float-right',
'onclick' => new JsExpression('sendTree('.$menu->id.', "'.$url.'", "'.$redirect.'")'),
-]) ?>
\ No newline at end of file
+]) ?>
+
diff --git a/backend/config/main.php b/backend/config/main.php
index e11db52..696e47e 100644
--- a/backend/config/main.php
+++ b/backend/config/main.php
@@ -149,6 +149,48 @@ return [
],
],
],
+ 'assetManager' => [
+ 'bundles' => [
+ 'yii\bootstrap\BootstrapAsset' => [
+ 'sourcePath' => '@core/components/bootstrap4', // do not publish the bundle
+ 'css' => [
+ YII_ENV_DEV ? 'css/bootstrap.css' : 'css/bootstrap.min.css'
+ ],
+ ],
+ 'yii\bootstrap\BootstrapPluginAsset' => [
+ 'sourcePath' => '@core/components/bootstrap4',
+ 'js' => [
+ YII_ENV_DEV ? 'js/bootstrap.bundle.js' : 'js/bootstrap.bundle.min.js'
+ ],
+ 'depends' => [
+ 'yii\web\JqueryAsset',
+ 'yii\bootstrap\BootstrapAsset',
+ ],
+ ],
+ /*'yii\web\JqueryAsset' => [
+ 'sourcePath' => '@cp/assets/libs/jquery321', // do not publish the bundle
+ 'js' => [
+ YII_ENV_DEV ? 'jquery-3.2.1.js' : 'jquery-3.2.1.min.js'
+ ],
+ ],
+ 'yii\bootstrap\BootstrapAsset' => [
+ 'sourcePath' => '@cp/assets/libs/bootstrap4/css', // do not publish the bundle
+ 'css' => [
+ YII_ENV_DEV ? 'bootstrap.css' : 'bootstrap.min.css'
+ ],
+ ],
+ 'yii\bootstrap\BootstrapPluginAsset' => [
+ 'sourcePath' => '@cp/assets/libs/bootstrap4/js', // do not publish the bundle
+ 'js' => [
+ YII_ENV_DEV ? 'bootstrap.js' : 'bootstrap.min.js'
+ ],
+ 'depends' => [
+ 'yii\web\JqueryAsset',
+ 'yii\bootstrap\BootstrapAsset',
+ ],
+ ],*/
+ ],
+ ],
],
'params' => $params,
];
diff --git a/backend/controllers/AuthController.php b/backend/controllers/AuthController.php
index ad69dab..84ca644 100644
--- a/backend/controllers/AuthController.php
+++ b/backend/controllers/AuthController.php
@@ -10,10 +10,11 @@ use yii\filters\VerbFilter;
use core\forms\auth\LoginForm;
use yii\filters\AccessControl;
use DomainException;
+use yii\web\Response;
class AuthController extends Controller
{
- private $auth_service;
+ private AuthService $auth_service;
public function __construct($id, $module, AuthService $service, $config = [])
{
@@ -56,9 +57,9 @@ class AuthController extends Controller
}
/**
- * @return mixed
+ * @return string|Response
*/
- public function actionLogin()
+ public function actionLogin(): string|Response
{
if (!Yii::$app->user->isGuest) {
return $this->goHome();
@@ -85,9 +86,9 @@ class AuthController extends Controller
}
/**
- * @return mixed
+ * @return Response
*/
- public function actionLogout()
+ public function actionLogout(): Response
{
Yii::$app->user->logout();
diff --git a/backend/controllers/MenuController.php b/backend/controllers/MenuController.php
index 2b047c4..5de72ae 100644
--- a/backend/controllers/MenuController.php
+++ b/backend/controllers/MenuController.php
@@ -14,6 +14,7 @@ use core\forms\menu\MenuItemForm;
use core\forms\menu\MenuSelectForm;
use core\services\menu\MenuItemManageService;
use core\services\menu\MenuManageService;
+use yii\db\StaleObjectException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\helpers\Json;
@@ -26,8 +27,8 @@ use Yii;
class MenuController extends Controller
{
- public $menu_service;
- public $menu_item_service;
+ public MenuManageService $menu_service;
+ public MenuItemManageService $menu_item_service;
public function __construct(
string $id,
@@ -68,7 +69,12 @@ class MenuController extends Controller
];
}
- public function actionIndex($id = null)
+ /**
+ * @param null $id
+ * @return Response|string
+ * @throws NotFoundHttpException
+ */
+ public function actionIndex($id = null): Response|string
{
$menus = []; // menu list
$menu_records = Menu::find()->all();
@@ -82,10 +88,12 @@ class MenuController extends Controller
if ($form->load(Yii::$app->request->get()) && $form->validate()) {
return $this->redirect(['menu/index', 'id' => $form->id]);
} elseif ($id) {
- $this->createMenuItem(); // create menu item if MenuItemForm sent
-
$menu = $this->findModel($id);
+ if ($this->createMenuItem()) {
+ return $this->redirect(['/menu/index', 'id' => $id]);
+ }; // create menu item if MenuItemForm sent
+
$creatorWidgets = $this->getCreatorWidgets($menu->id);
return $this->render('menu', [
@@ -102,7 +110,7 @@ class MenuController extends Controller
}
}
- public function actionCreate()
+ public function actionCreate(): Response|string
{
$form = new MenuForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
@@ -121,7 +129,12 @@ class MenuController extends Controller
]);
}
- public function actionUpdate($id)
+ /**
+ * @param $id
+ * @return Response|string
+ * @throws NotFoundHttpException
+ */
+ public function actionUpdate($id): Response|string
{
$menu = $this->findModel($id);
@@ -143,7 +156,7 @@ class MenuController extends Controller
]);
}
- public function actionDelete($id)
+ public function actionDelete($id): Response
{
try {
$this->menu_service->remove($id);
@@ -155,7 +168,12 @@ class MenuController extends Controller
return $this->redirect(['index']);
}
- public function actionSaveItem($id)
+ /**
+ * @param $id
+ * @return Response
+ * @throws NotFoundHttpException
+ */
+ public function actionSaveItem($id): Response
{
$item = $this->findItemModel($id);
$form = new MenuItemForm($item);
@@ -173,7 +191,12 @@ class MenuController extends Controller
return $this->redirect(['index', 'id' => $item->menu_id]);
}
- public function actionDeleteMenuItem()
+ /**
+ * @return array
+ * @throws NotFoundHttpException
+ * @throws StaleObjectException
+ */
+ public function actionDeleteMenuItem(): array
{
Yii::$app->response->format = Response::FORMAT_JSON;
if (Yii::$app->request->isAjax) {
@@ -193,7 +216,7 @@ class MenuController extends Controller
return ['result' => 'error', 'message' => 'Request error'];
}
- public function actionSaveMenuItems()
+ public function actionSaveMenuItems(): array
{
$json = Yii::$app->request->post('json');
Yii::$app->response->format = Response::FORMAT_JSON;
@@ -230,18 +253,25 @@ class MenuController extends Controller
return $widgets;
}
- private function createMenuItem()
+ private function createMenuItem(): bool
{
$form = new MenuItemForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
$this->menu_item_service->create($form);
+ return true;
} catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
}
}
+ return false;
}
+ /**
+ * @param $id
+ * @return Menu
+ * @throws NotFoundHttpException
+ */
protected function findModel($id): Menu
{
if (($model = Menu::findOne($id)) !== null) {
@@ -250,6 +280,11 @@ class MenuController extends Controller
throw new NotFoundHttpException('The requested menu does not exist.');
}
+ /**
+ * @param $id
+ * @return MenuItem
+ * @throws NotFoundHttpException
+ */
protected function findItemModel($id): MenuItem
{
if (($model = MenuItem::findOne($id)) !== null) {
diff --git a/backend/controllers/ModuleController.php b/backend/controllers/ModuleController.php
index 17e2572..ec714ec 100644
--- a/backend/controllers/ModuleController.php
+++ b/backend/controllers/ModuleController.php
@@ -7,12 +7,15 @@
namespace backend\controllers;
use core\entities\ModuleRecord;
-use core\helpers\FileHelper;
use core\services\ModuleService;
+use Yii;
+use yii\base\ErrorException;
+use yii\db\Exception;
use yii\web\Controller;
use yii\filters\VerbFilter;
use yii\filters\AccessControl;
use yii\web\NotFoundHttpException;
+use yii\web\Response;
/**
* Modules Management
@@ -24,12 +27,12 @@ class ModuleController extends Controller
/**
* @var ModuleService Modules management service
*/
- private $_service;
+ private $service;
public function __construct(string $id, $module, ModuleService $service, array $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
public function behaviors(): array
@@ -65,40 +68,57 @@ class ModuleController extends Controller
* List of modules
* @return string
*/
- public function actionList()
+ public function actionList(): string
{
- $modules = \Yii::$app->moduleManager->getModules();
+ $modules = Yii::$app->moduleManager->getModules();
return $this->render('list', [
'modules' => $modules,
]);
}
- public function actionDelete($id)
+ /**
+ * @param $id
+ * @return Response
+ * @throws NotFoundHttpException
+ * @throws ErrorException
+ * @throws Exception
+ */
+ public function actionDelete($id): Response
{
$module = $this->findModel($id);
- $this->_service->delete($module);
+ $this->service->delete($module);
return $this->redirect(['module/list']);
}
- public function actionDisable($id)
+ /**
+ * @param $id
+ * @return Response
+ * @throws NotFoundHttpException
+ */
+ public function actionDisable($id): Response
{
$module = $this->findModel($id);
- $this->_service->disable($module);
+ $this->service->disable($module);
return $this->redirect(['module/list']);
}
- public function actionEnable($id)
+ /**
+ * @param $id
+ * @return Response
+ * @throws NotFoundHttpException
+ */
+ public function actionEnable($id): Response
{
$module = $this->findModel($id);
- $this->_service->enable($module);
+ $this->service->enable($module);
return $this->redirect(['module/list']);
}
- public function actionSearch()
+ public function actionSearch(): string
{
$message = null;
try {
@@ -113,22 +133,22 @@ class ModuleController extends Controller
continue;
}
- $languageFile = str_replace('manifest.php', 'messages/' . \Yii::$app->language . '/' . $manifest['name'] . '.php', $link);
+ $languageFile = str_replace('manifest.php', 'messages/' . Yii::$app->language . '/' . $manifest['name'] . '.php', $link);
try {
$language = file_get_contents($languageFile);
$language = eval(str_replace('render('remote-list', [
@@ -137,6 +157,11 @@ class ModuleController extends Controller
]);
}
+ /**
+ * @param $id
+ * @return ModuleRecord
+ * @throws NotFoundHttpException
+ */
protected function findModel($id): ModuleRecord
{
if (($model = ModuleRecord::findOne($id)) !== null) {
diff --git a/backend/controllers/PermissionController.php b/backend/controllers/PermissionController.php
index 1107e4f..c7dadeb 100644
--- a/backend/controllers/PermissionController.php
+++ b/backend/controllers/PermissionController.php
@@ -9,6 +9,8 @@ namespace backend\controllers;
use backend\forms\rbac\RbacCreatePermissionForm;
use backend\forms\rbac\RbacEditPermissionForm;
use core\services\PermissionManager;
+use DomainException;
+use Exception;
use yii\behaviors\TimestampBehavior;
use yii\data\ArrayDataProvider;
use yii\rbac\Permission;
@@ -16,15 +18,16 @@ use yii\web\Controller;
use yii\filters\VerbFilter;
use Yii;
use yii\filters\AccessControl;
+use yii\web\Response;
class PermissionController extends Controller
{
- private $_permission;
+ private PermissionManager $permission;
public function __construct($id, $module, PermissionManager $permission, $config = [])
{
parent::__construct($id, $module, $config);
- $this->_permission = $permission;
+ $this->permission = $permission;
}
/**
@@ -59,14 +62,14 @@ class PermissionController extends Controller
];
}
- public function actionIndex()
+ public function actionIndex(): string
{
$data = array_map(function (Permission $permission) {
return [
'name' => $permission->name,
'description' => $permission->description,
];
- }, $this->_permission->getPermissions());
+ }, $this->permission->getPermissions());
$dataProvider = new ArrayDataProvider([
'allModels' => $data,
@@ -81,15 +84,15 @@ class PermissionController extends Controller
return $this->render('index', ['dataProvider' => $dataProvider]);
}
- public function actionCreate()
+ public function actionCreate(): Response|string
{
$form = new RbacCreatePermissionForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_permission->create($form->name, $form->description, $form->rule_name, $form->data);
+ $this->permission->create($form->name, $form->description, $form->rule_name, $form->data);
return $this->redirect(['view', 'id' => $form->name]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -100,17 +103,22 @@ class PermissionController extends Controller
]);
}
- public function actionUpdate($id)
+ /**
+ * @param $id
+ * @return Response|string
+ * @throws Exception
+ */
+ public function actionUpdate($id): Response|string
{
$permission = $this->findModel($id);
$form = new RbacEditPermissionForm($permission);
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_permission->update($permission->name, $form->name, $form->description, $form->rule_name, $form->data);
+ $this->permission->update($permission->name, $form->name, $form->description, $form->rule_name, $form->data);
return $this->redirect(['view', 'id' => $form->name]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -121,22 +129,22 @@ class PermissionController extends Controller
]);
}
- public function actionDelete($id)
+ public function actionDelete($id): Response
{
- $this->_permission->delete($id);
+ $this->permission->delete($id);
return $this->redirect(['index']);
}
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'model' => $this->findModel($id),
]);
}
- protected function findModel($id)
+ protected function findModel($id): ?Permission
{
- return $this->_permission->getPermission($id);
+ return $this->permission->getPermission($id);
}
}
diff --git a/backend/controllers/RoleController.php b/backend/controllers/RoleController.php
index 26133d4..c72c408 100644
--- a/backend/controllers/RoleController.php
+++ b/backend/controllers/RoleController.php
@@ -9,25 +9,29 @@ namespace backend\controllers;
use backend\forms\rbac\RbacEditRoleForm;
use backend\forms\rbac\RbacUpdateChildren;
use core\services\PermissionManager;
+use DomainException;
+use Exception;
use yii\behaviors\TimestampBehavior;
use backend\forms\rbac\RbacCreateRoleForm;
use core\services\RoleManager;
use yii\data\ArrayDataProvider;
+use yii\rbac\Role;
use yii\web\Controller;
use yii\filters\VerbFilter;
use yii\filters\AccessControl;
use Yii;
+use yii\web\Response;
class RoleController extends Controller
{
- private $_role;
- private $_permission;
+ private RoleManager $role;
+ private PermissionManager $permission;
public function __construct($id, $module, RoleManager $role, PermissionManager $permission, $config = [])
{
parent::__construct($id, $module, $config);
- $this->_role = $role;
- $this->_permission = $permission;
+ $this->role = $role;
+ $this->permission = $permission;
}
/**
@@ -62,9 +66,9 @@ class RoleController extends Controller
];
}
- public function actionIndex()
+ public function actionIndex(): string
{
- $data = $this->_role->getRolesListArray();
+ $data = $this->role->getRolesListArray();
$dataProvider = new ArrayDataProvider([
'allModels' => $data,
@@ -79,15 +83,19 @@ class RoleController extends Controller
return $this->render('index', ['dataProvider' => $dataProvider]);
}
- public function actionCreate()
+ /**
+ * @return Response|string
+ * @throws Exception
+ */
+ public function actionCreate(): Response|string
{
$form = new RbacCreateRoleForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_role->create($form->name, $form->description, $form->rule_name, $form->data);
+ $this->role->create($form->name, $form->description, $form->rule_name, $form->data);
return $this->redirect(['view', 'id' => $form->name]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -98,17 +106,22 @@ class RoleController extends Controller
]);
}
- public function actionUpdate($id)
+ /**
+ * @param $id
+ * @return string|Response
+ * @throws Exception
+ */
+ public function actionUpdate($id): Response|string
{
$role = $this->findModel($id);
$form = new RbacEditRoleForm($role);
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_role->update($role->name, $form->name, $form->description, $form->rule_name, $form->data);
+ $this->role->update($role->name, $form->name, $form->description, $form->rule_name, $form->data);
return $this->redirect(['view', 'id' => $form->name]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -119,11 +132,11 @@ class RoleController extends Controller
]);
}
- public function actionDelete($id)
+ public function actionDelete($id): Response
{
try {
- $this->_role->delete($id);
- } catch (\DomainException $e) {
+ $this->role->delete($id);
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -131,21 +144,26 @@ class RoleController extends Controller
return $this->redirect(['index']);
}
- public function actionView($id)
+ /**
+ * @param $id
+ * @return string
+ * @throws \yii\base\Exception
+ */
+ public function actionView($id): string
{
- $currentRole = $this->_role->getRole($id);
- $rolesSelectArray = array_diff_assoc($this->_role->getRolesSelectArray(), [$currentRole->name => $currentRole->description]);
+ $currentRole = $this->role->getRole($id);
+ $rolesSelectArray = array_diff_assoc($this->role->getRolesSelectArray(), [$currentRole->name => $currentRole->description]);
$itemsForm = new RbacUpdateChildren();
if ($itemsForm->load(Yii::$app->request->post()) && $itemsForm->validate()) {
- $this->_role->saveChildren($id, $itemsForm->roles, $itemsForm->permissions);
+ $this->role->saveChildren($id, $itemsForm->roles, $itemsForm->permissions);
Yii::$app->session->setFlash('success', Yii::t('user', 'Children roles and permissions for "{role}" is updated.', ['role' => $currentRole->description]));
}
- $rolesSelected = $this->_role->getRolesSelectArrayByRole($id);
+ $rolesSelected = $this->role->getRolesSelectArrayByRole($id);
- $permissionsSelectArray = $this->_permission->getPermissionsSelectArray();
- $permissionsSelected = $this->_permission->getPermissionsSelectArrayByRole($id);
+ $permissionsSelectArray = $this->permission->getPermissionsSelectArray();
+ $permissionsSelected = $this->permission->getPermissionsSelectArrayByRole($id);
$itemsForm->roles = $rolesSelected;
$itemsForm->permissions = $permissionsSelected;
@@ -158,8 +176,12 @@ class RoleController extends Controller
]);
}
- protected function findModel($id)
+ /**
+ * @param $id
+ * @return Role|null
+ */
+ protected function findModel($id): ?Role
{
- return $this->_role->getRole($id);
+ return $this->role->getRole($id);
}
}
diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php
index 8b3d1bb..f0fd7a6 100644
--- a/backend/controllers/SiteController.php
+++ b/backend/controllers/SiteController.php
@@ -5,24 +5,29 @@ namespace backend\controllers;
use core\entities\Search;
use core\forms\SearchForm;
use core\services\user\UserManageService;
+use DomainException;
+use RuntimeException;
use Yii;
+use yii\base\Action;
use yii\data\ActiveDataProvider;
+use yii\web\BadRequestHttpException;
use yii\web\Controller;
use yii\filters\VerbFilter;
use yii\filters\AccessControl;
use core\helpers\UserHelper;
+use yii\web\Response;
/**
* Site controller
*/
class SiteController extends Controller
{
- private $_service;
+ private UserManageService $service;
public function __construct(string $id, $module, UserManageService $service, array $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
/**
@@ -75,12 +80,12 @@ class SiteController extends Controller
*
* @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
return $this->render('index');
}
- public function actionSearch()
+ public function actionSearch(): string
{
$form = new SearchForm();
@@ -102,28 +107,28 @@ class SiteController extends Controller
'provider' => $provider,
'form' => $form
]);
-
- //$page = $this->service->create($form);
- //return $this->redirect(['view', 'id' => $page->id]);
- } catch (\DomainException $e) {
- //Yii::$app->errorHandler->logException($e);
- //Yii::$app->session->setFlash('error', $e->getMessage());
+ } catch (DomainException) {
}
}
return '';
}
- public function actionLanguage($language)
+ public function actionLanguage($language): Response
{
if ($language && in_array($language, array_keys(Yii::$app->params['backendTranslatedLanguages']))) {
- $this->_service->setBackendLanguage($language);
+ $this->service->setBackendLanguage($language);
}
return $this->redirect(Yii::$app->request->referrer);
}
- public function beforeAction($action)
+ /**
+ * @param Action $action
+ * @return bool
+ * @throws BadRequestHttpException
+ */
+ public function beforeAction($action): bool
{
if ($action->id === 'error') {
$this->layout = 'error';
@@ -132,20 +137,20 @@ class SiteController extends Controller
return parent::beforeAction($action);
}
- public function actionGetWidgetsList()
+ public function actionGetWidgetsList(): string
{
return $this->renderAjax('widgets-list');
}
- public function actionAddWidget($itemIdx, $color = '')
+ public function actionAddWidget($itemIdx, $color = ''): string
{
if (!Yii::$app->request->isAjax) {
- throw new \RuntimeException(Yii::t('main', 'The requested page does not exist.'));
+ throw new RuntimeException(Yii::t('main', 'The requested page does not exist.'));
}
$widgets = UserHelper::getSetting('widgetsLayout', []);
$item = Yii::$app->params['dashboard_widgets'][$itemIdx]; //require($itemFile);
- $resizable = isset($item['resizable']) ? $item['resizable'] : 0;
+ $resizable = $item['resizable'] ?? 0;
$newWidget = [
'w' => $item['size']['width'] ?: 0,
'h' => $item['size']['height'] ?: 0,
@@ -168,7 +173,7 @@ class SiteController extends Controller
public function actionRemoveWidget($idx)
{
if (!Yii::$app->request->isAjax) {
- throw new \RuntimeException(Yii::t('main', 'The requested page does not exist.'));
+ throw new RuntimeException(Yii::t('main', 'The requested page does not exist.'));
}
$widgets = UserHelper::getSetting('widgetsLayout', []);
array_splice($widgets, $idx, 1);
@@ -184,7 +189,7 @@ class SiteController extends Controller
}
}
- public function actionGetSelectedWidgetsList()
+ public function actionGetSelectedWidgetsList(): string
{
return $this->renderAjax( 'widgets-selected-list');
}
diff --git a/backend/controllers/SliderController.php b/backend/controllers/SliderController.php
index 9c48d79..95ecd08 100644
--- a/backend/controllers/SliderController.php
+++ b/backend/controllers/SliderController.php
@@ -5,21 +5,23 @@ namespace backend\controllers;
use core\entities\Slider;
use core\forms\SliderForm;
use core\services\SliderService;
+use DomainException;
use Yii;
use yii\data\ActiveDataProvider;
use yii\web\Controller;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
use yii\filters\AccessControl;
+use yii\web\Response;
class SliderController extends Controller
{
- private $_service;
+ private SliderService $service;
public function __construct($id, $module, SliderService $service, $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
/**
@@ -51,10 +53,8 @@ class SliderController extends Controller
];
}
- public function actionIndex()
+ public function actionIndex(): string
{
- //$searchModel = new UserSearch();
- //$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
$query = Slider::find();
$dataProvider = new ActiveDataProvider([
'query' => $query,
@@ -79,7 +79,7 @@ class SliderController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'model' => $this->findModel($id),
@@ -89,18 +89,18 @@ class SliderController extends Controller
/**
* Creates a new User model.
* If creation is successful, the browser will be redirected to the 'view' page.
- * @return mixed
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): Response|string
{
$form = new SliderForm();
$form->scenario = Slider::SCENARIO_CREATE;
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $slider = $this->_service->create($form);
+ $slider = $this->service->create($form);
return $this->redirect(['view', 'id' => $slider->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -114,10 +114,10 @@ class SliderController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$slider = $this->findModel($id);
@@ -125,10 +125,10 @@ class SliderController extends Controller
$form->scenario = Slider::SCENARIO_UPDATE;
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_service->edit($slider->id, $form);
+ $this->service->edit($slider->id, $form);
return $this->redirect(['view', 'id' => $slider->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -143,16 +143,20 @@ class SliderController extends Controller
/**
* @param $id
*
- * @return \yii\web\Response
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete($id): Response
{
- $this->_service->remove($id);
+ $this->service->remove($id);
return $this->redirect(['index']);
}
-
+ /**
+ * @param $id
+ * @return Slider|null
+ * @throws NotFoundHttpException
+ */
protected function findModel($id): ?Slider
{
if (($model = Slider::findOne($id)) !== null) {
diff --git a/backend/controllers/UserController.php b/backend/controllers/UserController.php
index d07a34b..64f1d33 100644
--- a/backend/controllers/UserController.php
+++ b/backend/controllers/UserController.php
@@ -6,13 +6,16 @@ use core\forms\user\ProfileEditForm;
use core\forms\user\UserForm;
use core\services\user\ProfileService;
use core\services\user\UserManageService;
+use DomainException;
use Yii;
use core\entities\user\User;
use backend\forms\UserSearch;
+use yii\base\Exception;
use yii\web\Controller;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
use yii\filters\AccessControl;
+use yii\web\Response;
use yii\web\UploadedFile;
/**
@@ -20,14 +23,14 @@ use yii\web\UploadedFile;
*/
class UserController extends Controller
{
- private $_service;
- private $_profile_service;
+ private UserManageService $service;
+ private ProfileService $profile_service;
public function __construct($id, $module, UserManageService $service, ProfileService $profile_service, $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
- $this->_profile_service = $profile_service;
+ $this->service = $service;
+ $this->profile_service = $profile_service;
}
/**
@@ -66,9 +69,9 @@ class UserController extends Controller
/**
* Lists all User models.
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new UserSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -85,7 +88,7 @@ class UserController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'model' => $this->findModel($id),
@@ -95,17 +98,19 @@ class UserController extends Controller
/**
* Creates a new User model.
* If creation is successful, the browser will be redirected to the 'view' page.
- * @return mixed
+ * @return Response|string
+ * @throws Exception
+ * @throws \yii\db\Exception
*/
- public function actionCreate()
+ public function actionCreate(): Response|string
{
$form = new UserForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $user = $this->_service->create($form);
+ $user = $this->service->create($form);
return $this->redirect(['view', 'id' => $user->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -118,21 +123,22 @@ class UserController extends Controller
/**
* @param $id
- *
- * @return string|\yii\web\Response
+ * @return Response|string
+ * @throws Exception
* @throws NotFoundHttpException
+ * @throws \yii\db\Exception
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$user = $this->findModel($id);
$form = new UserForm($user);
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_service->edit($user->id, $form);
+ $this->service->edit($user->id, $form);
return $this->redirect(['view', 'id' => $user->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -150,16 +156,20 @@ class UserController extends Controller
*
* @param integer $id
*
- * @return mixed
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
- $this->_service->remove($id);
+ $this->service->remove($id);
return $this->redirect(['index']);
}
- public function actionProfile()
+ /**
+ * @return Response|string
+ * @throws NotFoundHttpException|Exception
+ */
+ public function actionProfile(): Response|string
{
$user = $this->findModel(Yii::$app->user->id);
$form = new ProfileEditForm($user);
@@ -167,11 +177,11 @@ class UserController extends Controller
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
$form->user_pic = UploadedFile::getInstance($form, 'user_pic');
- $this->_profile_service->edit(Yii::$app->user->id, $form);
+ $this->profile_service->edit(Yii::$app->user->id, $form);
Yii::$app->session->setFlash('success', Yii::t('user', 'Profile is saved.'));
return $this->redirect(['/user/profile']);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -192,7 +202,7 @@ class UserController extends Controller
* @return User the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id)
+ protected function findModel(int $id): User
{
if (($model = User::findOne($id)) !== null) {
return $model;
diff --git a/backend/controllers/post/CategoryController.php b/backend/controllers/post/CategoryController.php
index 1d2963a..cc31db3 100644
--- a/backend/controllers/post/CategoryController.php
+++ b/backend/controllers/post/CategoryController.php
@@ -5,6 +5,7 @@ namespace backend\controllers\post;
use core\entities\post\PostType;
use core\forms\post\PostCategoryForm;
use core\services\post\PostCategoryManageService;
+use DomainException;
use Yii;
use core\entities\post\PostCategory;
use core\forms\post\search\PostCategorySearch;
@@ -12,10 +13,11 @@ use yii\web\Controller;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
use yii\filters\AccessControl;
+use yii\web\Response;
class CategoryController extends Controller
{
- private $service;
+ private PostCategoryManageService $service;
public function __construct($id, $module, PostCategoryManageService $service, $config = [])
{
@@ -27,7 +29,7 @@ class CategoryController extends Controller
{
return [
'access' => [
- 'class' => AccessControl::className(),
+ 'class' => AccessControl::class,
'rules' => [
[
'allow' => true,
@@ -40,7 +42,7 @@ class CategoryController extends Controller
],
],
'verbs' => [
- 'class' => VerbFilter::className(),
+ 'class' => VerbFilter::class,
'actions' => [
'delete' => ['POST'],
],
@@ -54,7 +56,7 @@ class CategoryController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionIndex($tid)
+ public function actionIndex($tid): string
{
$type = $this->findType($tid);
@@ -74,7 +76,7 @@ class CategoryController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
$category = $this->findModel($id);
$type = $this->findType($category->type_id);
@@ -87,10 +89,10 @@ class CategoryController extends Controller
/**
* @param $tid
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionCreate($tid)
+ public function actionCreate($tid): Response|string
{
$type = $this->findType($tid);
$form = new PostCategoryForm();
@@ -100,7 +102,7 @@ class CategoryController extends Controller
try {
$category = $this->service->create($form);
return $this->redirect(['view', 'id' => $category->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -114,10 +116,10 @@ class CategoryController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$category = $this->findModel($id);
$type = $this->findType($category->type_id);
@@ -126,7 +128,7 @@ class CategoryController extends Controller
try {
$this->service->edit($category->id, $form);
return $this->redirect(['view', 'id' => $category->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -141,16 +143,16 @@ class CategoryController extends Controller
/**
* @param $id
*
- * @return \yii\web\Response
+ * @return Response
* @throws NotFoundHttpException
*/
- public function actionDelete($id)
+ public function actionDelete($id): Response
{
$category = $this->findModel($id);
$type = $this->findType($category->type_id);
try {
$this->service->remove($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -163,7 +165,7 @@ class CategoryController extends Controller
* @return PostCategory the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): PostCategory
+ protected function findModel(int $id): PostCategory
{
if (($model = PostCategory::findOne($id)) !== null) {
return $model;
@@ -171,7 +173,12 @@ class CategoryController extends Controller
throw new NotFoundHttpException('The requested page does not exist.');
}
- protected function findType($id): PostType
+ /**
+ * @param integer $id
+ * @return PostType
+ * @throws NotFoundHttpException
+ */
+ protected function findType(int $id): PostType
{
if (($type = PostType::findOne($id)) !== null) {
return $type;
diff --git a/backend/controllers/post/CommentController.php b/backend/controllers/post/CommentController.php
index e5c861a..a418a9c 100644
--- a/backend/controllers/post/CommentController.php
+++ b/backend/controllers/post/CommentController.php
@@ -5,16 +5,18 @@ namespace backend\controllers\post;
use core\forms\post\search\PostCommentSearch;
use core\forms\post\PostCommentEditForm;
use core\services\post\PostCommentManageService;
+use DomainException;
use Yii;
use core\entities\post\Post;
use yii\web\Controller;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
use yii\filters\AccessControl;
+use yii\web\Response;
class CommentController extends Controller
{
- private $service;
+ private PostCommentManageService $service;
public function __construct($id, $module, PostCommentManageService $service, $config = [])
{
@@ -26,7 +28,7 @@ class CommentController extends Controller
{
return [
'access' => [
- 'class' => AccessControl::className(),
+ 'class' => AccessControl::class,
'rules' => [
[
'allow' => true,
@@ -39,7 +41,7 @@ class CommentController extends Controller
],
],
'verbs' => [
- 'class' => VerbFilter::className(),
+ 'class' => VerbFilter::class,
'actions' => [
'delete' => ['POST'],
],
@@ -48,9 +50,9 @@ class CommentController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new PostCommentSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -65,10 +67,10 @@ class CommentController extends Controller
* @param $post_id
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($post_id, $id)
+ public function actionUpdate($post_id, $id): Response|string
{
$post = $this->findModel($post_id);
$comment = $post->getComment($id);
@@ -78,7 +80,7 @@ class CommentController extends Controller
try {
$this->service->edit($post->id, $comment->id, $form);
return $this->redirect(['view', 'post_id' => $post->id, 'id' => $comment->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -86,7 +88,7 @@ class CommentController extends Controller
return $this->render('update', [
'post' => $post,
'model' => $form,
- 'comment' => $comment,
+ //'comment' => $comment,
]);
}
@@ -97,7 +99,7 @@ class CommentController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($post_id, $id)
+ public function actionView($post_id, $id): string
{
$post = $this->findModel($post_id);
$comment = $post->getComment($id);
@@ -112,33 +114,33 @@ class CommentController extends Controller
* @param $post_id
* @param $id
*
- * @return \yii\web\Response
+ * @return Response
* @throws NotFoundHttpException
*/
- public function actionActivate($post_id, $id)
+ public function actionActivate($post_id, $id): Response
{
$post = $this->findModel($post_id);
try {
$this->service->activate($post->id, $id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->session->setFlash('error', $e->getMessage());
}
return $this->redirect(['view', 'post_id' => $post_id, 'id' => $id]);
}
/**
- * @param $post_id
- * @param $id
+ * @param integer $post_id
+ * @param integer $id
*
- * @return \yii\web\Response
+ * @return Response
* @throws NotFoundHttpException
*/
- public function actionDelete($post_id, $id)
+ public function actionDelete(int $post_id, int $id): Response
{
$post = $this->findModel($post_id);
try {
$this->service->remove($post->id, $id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->session->setFlash('error', $e->getMessage());
}
return $this->redirect(['index']);
@@ -149,7 +151,7 @@ class CommentController extends Controller
* @return Post the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): Post
+ protected function findModel(int $id): Post
{
if (($model = Post::findOne($id)) !== null) {
return $model;
diff --git a/backend/controllers/post/PostController.php b/backend/controllers/post/PostController.php
index 1d79dc4..1ada522 100644
--- a/backend/controllers/post/PostController.php
+++ b/backend/controllers/post/PostController.php
@@ -6,11 +6,11 @@ use core\entities\post\PostTag;
use core\entities\post\PostType;
use core\forms\post\PostForm;
use core\services\post\PostManageService;
+use DomainException;
use Yii;
use core\entities\post\Post;
use core\forms\post\search\PostSearch;
-use yii\helpers\ArrayHelper;
-use yii\log\Logger;
+use yii\base\Exception;
use yii\web\Controller;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
@@ -19,7 +19,7 @@ use yii\web\Response;
class PostController extends Controller
{
- private $service;
+ private PostManageService $service;
public function __construct($id, $module, PostManageService $service, $config = [])
{
@@ -31,7 +31,7 @@ class PostController extends Controller
{
return [
'access' => [
- 'class' => AccessControl::className(),
+ 'class' => AccessControl::class,
'rules' => [
[
'allow' => true,
@@ -44,7 +44,7 @@ class PostController extends Controller
],
],
'verbs' => [
- 'class' => VerbFilter::className(),
+ 'class' => VerbFilter::class,
'actions' => [
'delete' => ['POST'],
'activate' => ['POST'],
@@ -63,7 +63,7 @@ class PostController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionIndex($tid)
+ public function actionIndex($tid): string
{
$type = $this->findType($tid);
@@ -83,7 +83,7 @@ class PostController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
$post = $this->findModel($id);
$type = $this->findType($post->type_id);
@@ -93,13 +93,14 @@ class PostController extends Controller
]);
}
- /**
- * @param $tid
- *
- * @return string|\yii\web\Response
- * @throws NotFoundHttpException
- */
- public function actionCreate($tid)
+ /**
+ * @param $tid
+ * @return Response|string
+ * @throws NotFoundHttpException
+ * @throws Exception
+ * @throws \yii\db\Exception
+ */
+ public function actionCreate($tid): Response|string
{
$type = $this->findType($tid);
$form = new PostForm();
@@ -109,7 +110,7 @@ class PostController extends Controller
try {
$post = $this->service->create($form);
return $this->redirect(['view', 'id' => $post->id, 'tid' => $post->type_id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -120,12 +121,13 @@ class PostController extends Controller
]);
}
- /**
- * @param $id
- *
- * @return string|\yii\web\Response
- * @throws NotFoundHttpException
- */
+ /**
+ * @param $id
+ * @return string|Response
+ * @throws Exception
+ * @throws NotFoundHttpException
+ * @throws \yii\db\Exception
+ */
public function actionUpdate($id)
{
$post = $this->findModel($id);
@@ -136,7 +138,7 @@ class PostController extends Controller
try {
$this->service->edit($post->id, $form);
return $this->redirect(['view', 'id' => $post->id, 'tid' => $post->type_id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -151,16 +153,16 @@ class PostController extends Controller
/**
* @param $id
*
- * @return \yii\web\Response
+ * @return Response
* @throws NotFoundHttpException
*/
- public function actionDelete($id)
+ public function actionDelete($id): Response
{
$post = $this->findModel($id);
$type = $this->findType($post->type_id);
try {
$this->service->remove($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->session->setFlash('error', $e->getMessage());
}
return $this->redirect(['index', 'tid' => $type->id]);
@@ -168,13 +170,13 @@ class PostController extends Controller
/**
* @param integer $id
- * @return mixed
+ * @return Response
*/
- public function actionActivate($id)
+ public function actionActivate(int $id): Response
{
try {
$this->service->activate($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->session->setFlash('error', $e->getMessage());
}
return $this->redirect(['view', 'id' => $id]);
@@ -182,13 +184,13 @@ class PostController extends Controller
/**
* @param integer $id
- * @return mixed
+ * @return Response
*/
- public function actionDraft($id)
+ public function actionDraft(int $id): Response
{
try {
$this->service->draft($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->session->setFlash('error', $e->getMessage());
}
return $this->redirect(['view', 'id' => $id]);
@@ -214,7 +216,7 @@ class PostController extends Controller
* @return Post the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): Post
+ protected function findModel(int $id): Post
{
if (($model = Post::findOne($id)) !== null) {
return $model;
@@ -222,6 +224,11 @@ class PostController extends Controller
throw new NotFoundHttpException('The requested page does not exist.');
}
+ /**
+ * @param $id
+ * @return PostType
+ * @throws NotFoundHttpException
+ */
protected function findType($id): PostType
{
if (($type = PostType::findOne($id)) !== null) {
diff --git a/backend/controllers/post/TagController.php b/backend/controllers/post/TagController.php
index 2c9a5c0..a254a82 100644
--- a/backend/controllers/post/TagController.php
+++ b/backend/controllers/post/TagController.php
@@ -5,6 +5,7 @@ namespace backend\controllers\post;
use core\entities\post\PostType;
use core\forms\post\PostTagSingleForm;
use core\services\post\PostTagManageService;
+use DomainException;
use Yii;
use core\entities\post\PostTag;
use core\forms\post\search\PostTagSearch;
@@ -12,10 +13,11 @@ use yii\web\Controller;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
use yii\filters\AccessControl;
+use yii\web\Response;
class TagController extends Controller
{
- private $service;
+ private PostTagManageService $service;
public function __construct($id, $module, PostTagManageService $service, $config = [])
{
@@ -27,7 +29,7 @@ class TagController extends Controller
{
return [
'access' => [
- 'class' => AccessControl::className(),
+ 'class' => AccessControl::class,
'rules' => [
[
'allow' => true,
@@ -40,7 +42,7 @@ class TagController extends Controller
],
],
'verbs' => [
- 'class' => VerbFilter::className(),
+ 'class' => VerbFilter::class,
'actions' => [
'delete' => ['POST'],
],
@@ -54,7 +56,7 @@ class TagController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionIndex($tid)
+ public function actionIndex($tid): string
{
$type = $this->findType($tid);
@@ -74,7 +76,7 @@ class TagController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
$tag = $this->findModel($id);
$type = $this->findType($tag->type_id);
@@ -87,10 +89,10 @@ class TagController extends Controller
/**
* @param $tid
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionCreate($tid)
+ public function actionCreate($tid): Response|string
{
$type = $this->findType($tid);
$form = new PostTagSingleForm();
@@ -99,7 +101,7 @@ class TagController extends Controller
try {
$tag = $this->service->create($form);
return $this->redirect(['view', 'id' => $tag->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -113,10 +115,10 @@ class TagController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$tag = $this->findModel($id);
$type = $this->findType($tag->type_id);
@@ -125,7 +127,7 @@ class TagController extends Controller
try {
$this->service->edit($tag->id, $form);
return $this->redirect(['view', 'id' => $tag->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -140,16 +142,16 @@ class TagController extends Controller
/**
* @param $id
*
- * @return \yii\web\Response
+ * @return Response
* @throws NotFoundHttpException
*/
- public function actionDelete($id)
+ public function actionDelete($id): Response
{
$tag = $this->findModel($id);
$type = $this->findType($tag->type_id);
try {
$this->service->remove($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -161,7 +163,7 @@ class TagController extends Controller
* @return PostTag the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): PostTag
+ protected function findModel(int $id): PostTag
{
if (($model = PostTag::findOne($id)) !== null) {
return $model;
@@ -169,6 +171,11 @@ class TagController extends Controller
throw new NotFoundHttpException('The requested page does not exist.');
}
+ /**
+ * @param $id
+ * @return PostType
+ * @throws NotFoundHttpException
+ */
protected function findType($id): PostType
{
if (($type = PostType::findOne($id)) !== null) {
diff --git a/backend/controllers/post/TypeController.php b/backend/controllers/post/TypeController.php
index c1b9b90..7cdd5c7 100644
--- a/backend/controllers/post/TypeController.php
+++ b/backend/controllers/post/TypeController.php
@@ -6,11 +6,13 @@ use core\entities\post\PostType;
use core\forms\post\PostTypeForm;
use core\forms\post\search\PostTypeSearch;
use core\services\post\PostTypeService;
+use DomainException;
use yii\web\NotFoundHttpException;
use yii\web\Controller;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use Yii;
+use yii\web\Response;
class TypeController extends Controller
{
@@ -26,7 +28,7 @@ class TypeController extends Controller
{
return [
'access' => [
- 'class' => AccessControl::className(),
+ 'class' => AccessControl::class,
'rules' => [
[
'allow' => true,
@@ -39,7 +41,7 @@ class TypeController extends Controller
],
],
'verbs' => [
- 'class' => VerbFilter::className(),
+ 'class' => VerbFilter::class,
'actions' => [
'delete' => ['POST'],
],
@@ -50,7 +52,7 @@ class TypeController extends Controller
/**
* @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new PostTypeSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -67,7 +69,7 @@ class TypeController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
$type = $this->findModel($id);
return $this->render('view', [
@@ -76,9 +78,9 @@ class TypeController extends Controller
}
/**
- * @return string|\yii\web\Response
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): Response|string
{
$form = new PostTypeForm();
@@ -86,7 +88,7 @@ class TypeController extends Controller
try {
$type = $this->service->create($form);
return $this->redirect(['view', 'id' => $type->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -99,10 +101,10 @@ class TypeController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$type = $this->findModel($id);
@@ -111,20 +113,21 @@ class TypeController extends Controller
try {
$this->service->edit($type->id, $form);
return $this->redirect(['view', 'id' => $type->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
}
return $this->render('update', [
'model' => $form,
+ 'type' => $type,
]);
}
/**
* @param $id
*
- * @return \yii\web\Response
+ * @return Response
* @throws NotFoundHttpException
*/
public function actionDelete($id)
@@ -133,7 +136,7 @@ class TypeController extends Controller
try {
$this->service->remove($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
diff --git a/backend/controllers/settings/ListController.php b/backend/controllers/settings/ListController.php
index c3b2ef3..04c22db 100644
--- a/backend/controllers/settings/ListController.php
+++ b/backend/controllers/settings/ListController.php
@@ -11,22 +11,25 @@ use core\entities\Settings;
use core\forms\FaviconForm;
use core\forms\SettingsForm;
use core\services\SettingsService;
+use DomainException;
+use yii\db\ActiveRecord;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\web\Controller;
use backend\components\ToggleAction;
use Yii;
use yii\web\NotFoundHttpException;
+use yii\web\Response;
use yii\web\UploadedFile;
class ListController extends Controller
{
- private $_service;
+ private SettingsService $service;
public function __construct(string $id, $module, SettingsService $service, array $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
public function behaviors()
@@ -61,12 +64,11 @@ class ListController extends Controller
'toggle' => [
'class' => ToggleAction::class,
'modelClass' => Settings::class,
- //'setFlash' => true,
]
];
}
- public function actionIndex($section = 'site')
+ public function actionIndex($section = 'site'): string
{
$searchModel = new SettingsSearch();
$searchModel->section = $section;
@@ -82,7 +84,13 @@ class ListController extends Controller
);
}
- public function actionView($section, $key)
+ /**
+ * @param $section
+ * @param $key
+ * @return string
+ * @throws NotFoundHttpException
+ */
+ public function actionView($section, $key): string
{
return $this->render(
'view',
@@ -92,15 +100,15 @@ class ListController extends Controller
);
}
- public function actionCreate()
+ public function actionCreate(): Response|string
{
$form = new SettingsForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $settings = $this->_service->create($form);
+ $settings = $this->service->create($form);
return $this->redirect(['view', 'section' => $settings->section, 'key' => $settings->key]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -116,17 +124,23 @@ class ListController extends Controller
);
}
- public function actionUpdate($section, $key)
+ /**
+ * @param $section
+ * @param $key
+ * @return Response|string
+ * @throws NotFoundHttpException
+ */
+ public function actionUpdate($section, $key): Response|string
{
$settings = $this->findModel($section, $key);
$form = new SettingsForm($settings);
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_service->edit($settings->section, $settings->key, $form);
+ $this->service->edit($settings->section, $settings->key, $form);
return $this->redirect(['view', 'section' => $settings->section, 'key' => $settings->key]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -141,14 +155,14 @@ class ListController extends Controller
);
}
- public function actionDelete($section, $key)
+ public function actionDelete($section, $key): Response
{
- $this->_service->remove($section, $key);
+ $this->service->remove($section, $key);
return $this->redirect(['index']);
}
- public function actionFavicon()
+ public function actionFavicon(): Response|string
{
$form = new FaviconForm();
if ($form->load(Yii::$app->request->post())) {
@@ -159,7 +173,7 @@ class ListController extends Controller
}
$form->image->saveAs(Yii::getAlias('@staticRoot') . '/origin/favicon/favicon.png');
- $this->_service->newFavicon();
+ $this->service->newFavicon();
Yii::$app->session->setFlash('success', Yii::t('main', 'Favicon generation complete'));
return $this->redirect(['settings/list/index']);
}
@@ -173,7 +187,13 @@ class ListController extends Controller
);
}
- protected function findModel($section, $key)
+ /**
+ * @param $section
+ * @param $key
+ * @return array|Settings|ActiveRecord|null
+ * @throws NotFoundHttpException
+ */
+ protected function findModel($section, $key): array|Settings|ActiveRecord|null
{
if (($model = Settings::find()->andWhere(['section' => $section])->andWhere(['key' => $key])->one()) !== null) {
return $model;
diff --git a/backend/forms/SettingsSearch.php b/backend/forms/SettingsSearch.php
index c552768..57dbf1b 100644
--- a/backend/forms/SettingsSearch.php
+++ b/backend/forms/SettingsSearch.php
@@ -12,14 +12,14 @@ use yii\data\ActiveDataProvider;
class SettingsSearch extends Settings
{
- public $id;
- public $type;
- public $section;
- public $key;
- public $value;
- public $active;
+ public ?int $id = null;
+ public ?int $type = null;
+ public ?string $section = null;
+ public ?string $key = null;
+ public ?string $value = null;
+ public ?int $active = null;
- public function rules()
+ public function rules(): array
{
return [
[['id'], 'integer'],
@@ -31,7 +31,7 @@ class SettingsSearch extends Settings
/**
* @return array
*/
- public function scenarios()
+ public function scenarios(): array
{
// bypass scenarios() implementation in the parent class
return Model::scenarios();
@@ -42,7 +42,7 @@ class SettingsSearch extends Settings
*
* @return ActiveDataProvider
*/
- public function search($params)
+ public function search($params): ActiveDataProvider
{
$query = Settings::find();
$dataProvider = new ActiveDataProvider(
diff --git a/backend/forms/UserSearch.php b/backend/forms/UserSearch.php
index 23ce1ca..8144934 100644
--- a/backend/forms/UserSearch.php
+++ b/backend/forms/UserSearch.php
@@ -2,6 +2,7 @@
namespace backend\forms;
+use Yii;
use yii\base\Model;
use yii\data\ActiveDataProvider;
use core\entities\user\User;
@@ -9,15 +10,15 @@ use yii\helpers\ArrayHelper;
class UserSearch extends Model
{
- public $id;
- public $date_from;
- public $date_to;
- public $username;
- public $email;
- public $status;
- public $role;
+ public ?int $id = null;
+ public ?string $date_from = null;
+ public ?string $date_to = null;
+ public ?string $username = null;
+ public ?string $email = null;
+ public ?int $status = null;
+ public ?string $role = null;
- public function rules()
+ public function rules(): array
{
return [
[['id', 'status'], 'integer'],
@@ -66,6 +67,6 @@ class UserSearch extends Model
public function rolesList(): array
{
- return ArrayHelper::map(\Yii::$app->authManager->getRoles(), 'name', 'description');
+ return ArrayHelper::map(Yii::$app->authManager->getRoles(), 'name', 'description');
}
}
diff --git a/backend/forms/rbac/RbacCreatePermissionForm.php b/backend/forms/rbac/RbacCreatePermissionForm.php
index 092d50c..5e0627c 100644
--- a/backend/forms/rbac/RbacCreatePermissionForm.php
+++ b/backend/forms/rbac/RbacCreatePermissionForm.php
@@ -11,14 +11,14 @@ use Yii;
class RbacCreatePermissionForm extends Model
{
- public $name;
- public $description;
- public $rule_name;
- public $data;
- public $created_at;
- public $updated_at;
+ public ?string $name = null;
+ public ?string $description = null;
+ public ?string $rule_name = null;
+ public ?string $data = null;
+ public ?int $created_at = null;
+ public ?int $updated_at = null;
- public function rules()
+ public function rules(): array
{
return [
[['name'], 'required'],
diff --git a/backend/forms/rbac/RbacCreateRoleForm.php b/backend/forms/rbac/RbacCreateRoleForm.php
index bd7d8b3..abb6f1c 100644
--- a/backend/forms/rbac/RbacCreateRoleForm.php
+++ b/backend/forms/rbac/RbacCreateRoleForm.php
@@ -11,14 +11,14 @@ use Yii;
class RbacCreateRoleForm extends Model
{
- public $name;
- public $description;
- public $rule_name;
- public $data;
- public $created_at;
- public $updated_at;
+ public ?string $name = null;
+ public ?string $description = null;
+ public ?string $rule_name = null;
+ public ?string $data = null;
+ public ?int $created_at = null;
+ public ?int $updated_at = null;
- public function rules()
+ public function rules(): array
{
return [
[['name'], 'required'],
diff --git a/backend/forms/rbac/RbacEditPermissionForm.php b/backend/forms/rbac/RbacEditPermissionForm.php
index d1b0cb4..0036386 100644
--- a/backend/forms/rbac/RbacEditPermissionForm.php
+++ b/backend/forms/rbac/RbacEditPermissionForm.php
@@ -12,13 +12,12 @@ use Yii;
class RbacEditPermissionForm extends Model
{
- public $name;
- public $description;
- public $rule_name;
- public $data;
- public $created_at;
- public $updated_at;
-
+ public ?string $name = null;
+ public ?string $description = null;
+ public ?string $rule_name = null;
+ public ?string $data = null;
+ public ?int $created_at = null;
+ public ?int $updated_at = null;
public function __construct(Permission $permission, $config = [])
{
@@ -29,7 +28,7 @@ class RbacEditPermissionForm extends Model
parent::__construct($config);
}
- public function rules()
+ public function rules(): array
{
return [
[['name'], 'required'],
diff --git a/backend/forms/rbac/RbacEditRoleForm.php b/backend/forms/rbac/RbacEditRoleForm.php
index c74647d..b0e6209 100644
--- a/backend/forms/rbac/RbacEditRoleForm.php
+++ b/backend/forms/rbac/RbacEditRoleForm.php
@@ -12,13 +12,12 @@ use Yii;
class RbacEditRoleForm extends Model
{
- public $name;
- public $description;
- public $rule_name;
- public $data;
- public $created_at;
- public $updated_at;
-
+ public ?string $name = null;
+ public ?string $description = null;
+ public ?string $rule_name = null;
+ public ?string $data = null;
+ public ?int $created_at = null;
+ public ?int $updated_at = null;
public function __construct(Role $role, $config = [])
{
@@ -29,7 +28,7 @@ class RbacEditRoleForm extends Model
parent::__construct($config);
}
- public function rules()
+ public function rules(): array
{
return [
[['name'], 'required'],
diff --git a/backend/forms/rbac/RbacUpdateChildren.php b/backend/forms/rbac/RbacUpdateChildren.php
index fabe3f6..d9433c6 100644
--- a/backend/forms/rbac/RbacUpdateChildren.php
+++ b/backend/forms/rbac/RbacUpdateChildren.php
@@ -10,10 +10,10 @@ use yii\base\Model;
class RbacUpdateChildren extends Model
{
- public $roles;
- public $permissions;
+ public ?array $roles = null;
+ public ?array $permissions = null;
- public function rules()
+ public function rules(): array
{
return [
[['roles', 'permissions'], 'each', 'rule' => ['string']],
diff --git a/backend/helpers/DashboardHelper.php b/backend/helpers/DashboardHelper.php
index 3f6205c..40f1cab 100644
--- a/backend/helpers/DashboardHelper.php
+++ b/backend/helpers/DashboardHelper.php
@@ -11,7 +11,7 @@ use yii\helpers\Html;
class DashboardHelper
{
- public static function getAllWidgets()
+ public static function getAllWidgets(): array
{
$widgetsCounter = ''; // Counters Widgets
$widgetsInfo = ''; // Information Widgets
@@ -20,15 +20,7 @@ class DashboardHelper
$path = Yii::getAlias('@backend/widgets/dashboard');
$files = scandir($path, 0);
- //foreach ($files as $file) {
foreach (Yii::$app->params['dashboard_widgets'] as $idx => $item) {
- //if (!is_file($path . '/' . $file)) {
- // continue;
- //}
-
- //$itemFile = $path . '/' . $file;
- //$item = require($itemFile);
-
if (isset($item['rule']) && (Yii::$app->user->can($item['rule']) || Yii::$app->user->can('admin'))) {
} elseif (!isset($item['rule'])) {
} else {
@@ -47,11 +39,10 @@ class DashboardHelper
$widgetsInfo .= $line;
}
}
-
return [$widgetsCounter, $widgetsInfo];
}
- public static function getExtColors()
+ public static function getExtColors(): array
{
return [
'gray' => Yii::t('main', 'Gray'),
diff --git a/backend/messages/ru/menu.php b/backend/messages/ru/menu.php
index c355b1b..eb9364a 100644
--- a/backend/messages/ru/menu.php
+++ b/backend/messages/ru/menu.php
@@ -29,4 +29,5 @@ return [
'Title attribute' => 'Аттрибут Title',
'CSS Classes' => 'Классы CSS',
'CSS Style' => 'Стиль CSS',
+ 'Url' => 'Ссылка',
];
\ No newline at end of file
diff --git a/backend/views/auth/login.php b/backend/views/auth/login.php
index 5ef8f5b..6d6d6dd 100644
--- a/backend/views/auth/login.php
+++ b/backend/views/auth/login.php
@@ -1,11 +1,12 @@
title = Yii::t('main', 'Sign in');
@@ -34,7 +35,10 @@ $fieldOptions2 = [
- 'login-form', 'enableClientValidation' => false]); ?>
+ 'login-form',
+ 'enableClientValidation' => false
+ ]); ?>
field($model, 'username', $fieldOptions1)
diff --git a/backend/views/layouts/content-origin.php b/backend/views/layouts/content-origin.php
new file mode 100644
index 0000000..6a2485c
--- /dev/null
+++ b/backend/views/layouts/content-origin.php
@@ -0,0 +1,238 @@
+
+
+
+ blocks['content-header'])) { ?>
+ blocks['content-header'] ?>
+
+
+ title !== null) {
+ echo Html::encode($this->title);
+ } else {
+ echo Inflector::camel2words(
+ Inflector::id2camel($this->context->module->id)
+ );
+ echo ($this->context->module->id !== \Yii::$app->id) ? 'Module' : '';
+ } ?>
+
+
+
+ isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+ ]
+ ) ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/backend/views/layouts/content.php b/backend/views/layouts/content.php
index 54e296b..9a067cf 100644
--- a/backend/views/layouts/content.php
+++ b/backend/views/layouts/content.php
@@ -1,235 +1,64 @@
-
-
- blocks['content-header'])) { ?>
- blocks['content-header'] ?>
-
-
- title !== null) {
- echo \yii\helpers\Html::encode($this->title);
- } else {
- echo \yii\helpers\Inflector::camel2words(
- \yii\helpers\Inflector::id2camel($this->context->module->id)
- );
- echo ($this->context->module->id !== \Yii::$app->id) ? 'Module' : '';
- } ?>
-
-
+use core\components\adminlte3\widgets\Breadcrumbs;
+use core\components\adminlte3\widgets\ToastrNotification;
+use yii\web\View;
+use yii\helpers\Html;
+use yii\helpers\Inflector;
- isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
- ]
- ) ?>
-
+/**
+ * @var $this View
+ * @var $content string
+ */
-
-
-
-
+?>
+
+
+
+
+
+
+
+ blocks['content-header'])) : ?>
+ blocks['content-header'] ?>
+
+
+ title !== null) {
+ echo Html::encode($this->title);
+ } else {
+ echo Inflector::camel2words(
+ Inflector::id2camel($this->context->module->id)
+ );
+ echo ($this->context->module->id !== \Yii::$app->id) ? 'Module' : '';
+ } ?>
+
+
+
+
+
+
+ $this->params['breadcrumbs'] ?? [],
+ ]) ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/backend/views/layouts/error-origin.php b/backend/views/layouts/error-origin.php
new file mode 100644
index 0000000..a7d670e
--- /dev/null
+++ b/backend/views/layouts/error-origin.php
@@ -0,0 +1,33 @@
+
+beginPage() ?>
+
+
+
+
+
+
+ <?= Html::encode($this->title) ?>
+ head() ?>
+
+
+
+beginBody() ?>
+
+
+
+endBody() ?>
+
+
+endPage() ?>
diff --git a/backend/views/layouts/error.php b/backend/views/layouts/error.php
index d737c6c..5b93fcc 100644
--- a/backend/views/layouts/error.php
+++ b/backend/views/layouts/error.php
@@ -1,12 +1,17 @@
beginPage() ?>
diff --git a/backend/views/layouts/header-origin.php b/backend/views/layouts/header-origin.php
new file mode 100644
index 0000000..0780499
--- /dev/null
+++ b/backend/views/layouts/header-origin.php
@@ -0,0 +1,265 @@
+
+
+
+
+ ' . (Yii::$app->params['settings']['site']['short_name'] ?? 'APP') . '' . (isset(Yii::$app->params['settings']['site']['name']) ? Yii::$app->params['settings']['site']['name'] : Yii::$app->name) . '',
+ Yii::$app->homeUrl, ['class' => 'logo']) ?>
+
+
+
diff --git a/backend/views/layouts/header.php b/backend/views/layouts/header.php
index 6010103..0d16fc0 100644
--- a/backend/views/layouts/header.php
+++ b/backend/views/layouts/header.php
@@ -1,264 +1,56 @@
-
-
- ' . (isset(Yii::$app->params['settings']['site']['short_name']) ? Yii::$app->params['settings']['site']['short_name'] : 'APP') . '' . (isset(Yii::$app->params['settings']['site']['name']) ? Yii::$app->params['settings']['site']['name'] : Yii::$app->name) . '',
- Yii::$app->homeUrl, ['class' => 'logo']) ?>
-
-
-
+
diff --git a/backend/views/layouts/left-origin.php b/backend/views/layouts/left-origin.php
new file mode 100644
index 0000000..7475b4f
--- /dev/null
+++ b/backend/views/layouts/left-origin.php
@@ -0,0 +1,211 @@
+
+
+
diff --git a/backend/views/layouts/left.php b/backend/views/layouts/left.php
index bb73075..692a9db 100644
--- a/backend/views/layouts/left.php
+++ b/backend/views/layouts/left.php
@@ -1,210 +1,291 @@
imager;
+$css = << .nav-item > .nav-link.active, .sidebar-light-primary .nav-sidebar.nav-legacy > .nav-item > .nav-link.active {
+ border-color: #9ed6db;
+ }
+CSS;
+$this->registerCss($css);
?>
+
\ No newline at end of file
diff --git a/backend/views/layouts/main-login-origin.php b/backend/views/layouts/main-login-origin.php
new file mode 100644
index 0000000..f853f60
--- /dev/null
+++ b/backend/views/layouts/main-login-origin.php
@@ -0,0 +1,31 @@
+
+beginPage() ?>
+
+
+
+
+
+
+ <?= Html::encode($this->title) ?>
+
+ head() ?>
+
+
+
+beginBody() ?>
+
+
+
+endBody() ?>
+
+
+endPage() ?>
diff --git a/backend/views/layouts/main-login.php b/backend/views/layouts/main-login.php
index f853f60..ae7c4c4 100644
--- a/backend/views/layouts/main-login.php
+++ b/backend/views/layouts/main-login.php
@@ -1,12 +1,27 @@
params['theme'] == \app\forms\SettingsForm::THEME_BLACK) {
+ //AdminLteDarkAsset::register($this);
+//}
+//else {
+ AdminLteLightAsset::register($this);
+//}
+//AdminLteICheckAsset::register($this);
?>
beginPage() ?>
@@ -16,13 +31,17 @@ dmstr\web\AdminLteAsset::register($this);
<?= Html::encode($this->title) ?>
-
head() ?>
-
+
beginBody() ?>
+
+
+ 
+
+
endBody() ?>
diff --git a/backend/views/layouts/main-origin.php b/backend/views/layouts/main-origin.php
new file mode 100644
index 0000000..8731723
--- /dev/null
+++ b/backend/views/layouts/main-origin.php
@@ -0,0 +1,66 @@
+controller->action->id === 'login') {
+ /**
+ * Do not use this code in your template. Remove it.
+ * Instead, use the code $this->layout = '//main-login'; in your controller.
+ */
+ echo $this->render(
+ 'main-login',
+ ['content' => $content]
+ );
+} else {
+ if (class_exists('backend\assets\AppAsset')) {
+ backend\assets\AppAsset::register($this);
+ } else {
+ app\assets\AppAsset::register($this);
+ }
+
+ dmstr\web\AdminLteAsset::register($this);
+ \backend\assets\AdminLteSkinAsset::register($this);
+ $directoryAsset = Yii::$app->assetManager->getPublishedUrl('@vendor/almasaeed2010/adminlte/dist');
+ ?>
+ beginPage() ?>
+
+
+
+
+
+
+ <?= Html::encode($this->title) ?>
+
+ head() ?>
+
+
+ beginBody() ?>
+
+
+ render(
+ 'header.php',
+ ['directoryAsset' => $directoryAsset]
+ ) ?>
+
+ render(
+ 'left.php',
+ ['directoryAsset' => $directoryAsset]
+ )
+ ?>
+
+ render(
+ 'content.php',
+ ['content' => $content, 'directoryAsset' => $directoryAsset]
+ ) ?>
+
+
+
+ endBody() ?>
+
+
+ endPage() ?>
+
diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php
index 8731723..b9771ec 100644
--- a/backend/views/layouts/main.php
+++ b/backend/views/layouts/main.php
@@ -1,30 +1,89 @@
controller->action->id === 'login') {
- /**
- * Do not use this code in your template. Remove it.
- * Instead, use the code $this->layout = '//main-login'; in your controller.
- */
+if (Yii::$app->controller->id == 'auth/auth' && in_array(Yii::$app->controller->action->id, ['login', 'request', 'confirm', 'login-hub', 'login-token', 'reset'])) {
echo $this->render(
'main-login',
['content' => $content]
);
} else {
- if (class_exists('backend\assets\AppAsset')) {
- backend\assets\AppAsset::register($this);
- } else {
- app\assets\AppAsset::register($this);
+
+ AppAsset::register($this);
+ AdminLteAsset::register($this);
+ AdminLteFontsAsset::register($this);
+
+//if (Yii::$app->params['theme'] == \app\forms\SettingsForm::THEME_BLACK) {
+ //AdminLteDarkAsset::register($this);
+//}
+//else {
+ AdminLteLightAsset::register($this);
+//}
+
+ $css = <<assetManager->getPublishedUrl('@vendor/almasaeed2010/adminlte/dist');
+ .breadcrumb {
+ font-size: 12px !important;
+ }
+ .sp-preview {
+ margin-right: 0 !important;
+ }
+ .sp-dd {
+ display: none;
+ }
+CSS;
+ $this->registerCss($css);
?>
beginPage() ?>
@@ -32,35 +91,62 @@ if (Yii::$app->controller->action->id === 'login') {
+
+
<?= Html::encode($this->title) ?>
-
+
+
+
+
+
+
head() ?>
-
+
+
beginBody() ?>
+
+ render('header.php') ?>
+
- render(
- 'header.php',
- ['directoryAsset' => $directoryAsset]
- ) ?>
-
- render(
- 'left.php',
- ['directoryAsset' => $directoryAsset]
- )
- ?>
+
+ render('left.php') ?>
+
render(
'content.php',
- ['content' => $content, 'directoryAsset' => $directoryAsset]
+ ['content' => $content]
) ?>
+
+
+
+
+
+
+
+
+
+
+
+
endBody() ?>
endPage() ?>
+
+
diff --git a/backend/views/menu/_form.php b/backend/views/menu/_form.php
index f14f6f7..62bfc57 100644
--- a/backend/views/menu/_form.php
+++ b/backend/views/menu/_form.php
@@ -1,10 +1,13 @@
@@ -12,8 +15,8 @@ use yii\widgets\ActiveForm;
-
-
+
+
-
-
-
- 'btn btn-success']) ?>
+
diff --git a/backend/views/menu/_form_tab.php b/backend/views/menu/_form_tab.php
index 1bef429..76a1002 100644
--- a/backend/views/menu/_form_tab.php
+++ b/backend/views/menu/_form_tab.php
@@ -4,14 +4,19 @@
* Date: 24.08.2018
*/
+use core\forms\menu\MenuForm;
+use yii\web\View;
+use yii\widgets\ActiveForm;
+
/**
- * @var $this \yii\web\View
- * @var $form \yii\widgets\ActiveForm
- * @var $model \core\forms\menu\MenuForm
+ * @var $this View
+ * @var $form ActiveForm
+ * @var $model MenuForm
* @var $language string
*/
$postfix = $language == Yii::$app->params['defaultLanguage'] ? '' : '_' . $language;
?>
+
field($model, 'name' . $postfix)->textInput(['maxlength' => true]) ?>
diff --git a/backend/views/menu/create.php b/backend/views/menu/create.php
index 831553d..2014f42 100644
--- a/backend/views/menu/create.php
+++ b/backend/views/menu/create.php
@@ -1,7 +1,9 @@
title = Yii::t('menu', 'Create Menu');
$this->params['breadcrumbs'][] = ['label' => Yii::t('menu', 'Menu'), 'url' => ['index']];
diff --git a/backend/views/menu/menu.php b/backend/views/menu/menu.php
index 1d1e3dd..49caedd 100644
--- a/backend/views/menu/menu.php
+++ b/backend/views/menu/menu.php
@@ -4,14 +4,18 @@
* Date: 10.07.2018
*/
+use backend\components\menu\widgets\MenuEditorWidget;
+use core\entities\menu\Menu;
+use core\forms\menu\MenuSelectForm;
use kartik\form\ActiveForm;
use yii\helpers\Html;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $model \core\forms\menu\MenuSelectForm
- * @var $menus \core\entities\menu\Menu[]
- * @var $menu \core\entities\menu\Menu
+ * @var $this View
+ * @var $model MenuSelectForm
+ * @var $menus Menu[]
+ * @var $menu Menu
* @var $creator array
*/
@@ -41,11 +45,11 @@ $this->registerJs($js, $this::POS_HEAD);
?>
-
-
-
+
+
+
-
+
false,
@@ -54,6 +58,7 @@ $this->registerJs($js, $this::POS_HEAD);
]); ?>
field($model, 'id')->dropDownList($menus, [
+ 'class' => 'form-control mb-1',
//'prompt' => Yii::t('menu', 'Select menu...'),
'value' => $menu->id,
'onchange' => 'this.form.submit()',
@@ -63,15 +68,15 @@ $this->registerJs($js, $this::POS_HEAD);
'btn btn-success',
+ 'class' => 'btn btn-success d-block d-md-inline-block mb-1',
]) ?>
$menu->id], [
- 'class' => 'btn btn-primary',
+ 'class' => 'btn btn-primary d-block d-md-inline-block mb-1',
]) ?>
$menu->id], [
- 'class' => 'btn btn-danger',
+ 'class' => 'btn btn-danger d-block d-md-inline-block mb-1',
'data' => [
'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
'method' => 'post',
@@ -85,24 +90,25 @@ $this->registerJs($js, $this::POS_HEAD);
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
+
-
+
@@ -116,11 +122,11 @@ $this->registerJs($js, $this::POS_HEAD);
-
-
-
+
+
+
- $menu->id
]) ?>
@@ -129,35 +135,37 @@ $this->registerJs($js, $this::POS_HEAD);
-
-
-
+
+
+
" . $menu->id . ']) ?>';
?>
-
+
+
'form-control',
+ 'class' => 'form-control form-control-sm',
'id' => 'code_template',
]) ?>
-
+
" . $menu->id . ']) ?]';
?>
-
+
+
'form-control',
+ 'class' => 'form-control form-control-sm',
'id' => 'code_editor',
]) ?>
-
+
diff --git a/backend/views/menu/select_menu.php b/backend/views/menu/select_menu.php
index fa06de6..35b68f3 100644
--- a/backend/views/menu/select_menu.php
+++ b/backend/views/menu/select_menu.php
@@ -4,14 +4,16 @@
* Date: 10.07.2018
*/
+use core\entities\menu\Menu;
+use core\forms\menu\MenuSelectForm;
use kartik\form\ActiveForm;
-use yii\helpers\ArrayHelper;
use yii\helpers\Html;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $model \core\forms\menu\MenuSelectForm
- * @var $menus \core\entities\menu\Menu[]
+ * @var $this View
+ * @var $model MenuSelectForm
+ * @var $menus Menu[]
*/
$this->title = Yii::t('menu', 'Menu');
diff --git a/backend/views/menu/update.php b/backend/views/menu/update.php
index 7bc7489..207bbb1 100644
--- a/backend/views/menu/update.php
+++ b/backend/views/menu/update.php
@@ -1,8 +1,11 @@
title = Yii::t('menu', 'Update Menu: {name}', ['name' => isset($menu->translation) ? $menu->translation->name : Yii::t('menu', 'Not set')]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('menu', 'Menu'), 'url' => ['index']];
diff --git a/backend/views/module/list.php b/backend/views/module/list.php
index 3ac40c3..fcf4722 100644
--- a/backend/views/module/list.php
+++ b/backend/views/module/list.php
@@ -4,13 +4,15 @@
* Date: 17.08.2018
*/
+use core\entities\ModuleRecord;
use yii\helpers\Html;
use core\helpers\ModuleHelper;
use kartik\dialog\Dialog;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $modules \core\entities\ModuleRecord[]
+ * @var $this View
+ * @var $modules ModuleRecord[]
*/
$this->title = Yii::t('main', 'Modules');
@@ -47,15 +49,15 @@ $this->registerJs($js, $this::POS_READY);
-
-
+
+
-
+
-
+
isSystem()) : ?>
isEnabled()) : ?>
$module->id], [
diff --git a/backend/views/module/remote-list.php b/backend/views/module/remote-list.php
index e757a1c..443835e 100644
--- a/backend/views/module/remote-list.php
+++ b/backend/views/module/remote-list.php
@@ -6,9 +6,10 @@
use yii\helpers\Html;
use kartik\dialog\Dialog;
+use yii\web\View;
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $modules array
* @var $message string
*/
diff --git a/backend/views/permission/create.php b/backend/views/permission/create.php
index bf80bc4..02c2a0b 100644
--- a/backend/views/permission/create.php
+++ b/backend/views/permission/create.php
@@ -1,8 +1,9 @@
params['breadcrumbs'][] = $this->title;
-
-
+
+
field($model, 'name')->textInput(['maxLength' => true]) ?>
field($model, 'description')->textarea() ?>
field($model, 'rule_name')->textInput(['maxLength' => true]) ?>
field($model, 'data')->textarea() ?>
-
-
-
- 'btn btn-primary']) ?>
+
+ 'btn btn-success']) ?>
+
diff --git a/backend/views/permission/index.php b/backend/views/permission/index.php
index db46bd0..a86ebd1 100644
--- a/backend/views/permission/index.php
+++ b/backend/views/permission/index.php
@@ -11,13 +11,11 @@ $this->title = Yii::t('user', 'Permissions');
$this->params['breadcrumbs'][] = $this->title;
?>
-
-
- 'btn btn-success']) ?>
-
-
-
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'columns' => [
diff --git a/backend/views/permission/update.php b/backend/views/permission/update.php
index 17ef66f..131daa1 100644
--- a/backend/views/permission/update.php
+++ b/backend/views/permission/update.php
@@ -1,11 +1,12 @@
title = Yii::t('user', 'Update Permission: {permission}', ['permission' => $model->name]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Permissions'), 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->name]];
@@ -15,17 +16,16 @@ $this->params['breadcrumbs'][] = Yii::t('user', 'Editing');
-
-
+
+
field($model, 'name')->textInput(['maxLength' => true]) ?>
field($model, 'description')->textarea() ?>
field($model, 'rule_name')->textInput(['maxLength' => true]) ?>
field($model, 'data')->textarea() ?>
-
-
-
- 'btn btn-primary']) ?>
+
+ 'btn btn-success']) ?>
+
diff --git a/backend/views/permission/view.php b/backend/views/permission/view.php
index 8d58aa8..7352bed 100644
--- a/backend/views/permission/view.php
+++ b/backend/views/permission/view.php
@@ -1,11 +1,11 @@
title = $model->name;
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Permissions'), 'url' => ['index']];
@@ -14,10 +14,10 @@ $this->params['breadcrumbs'][] = $this->title;
- 'btn btn-default']) ?>
- $model->name], ['class' => 'btn btn-primary']) ?>
+ 'btn btn-outline-primary btn-sm']) ?>
+ $model->name], ['class' => 'btn btn-primary btn-sm']) ?>
$model->name], [
- 'class' => 'btn btn-danger',
+ 'class' => 'btn btn-danger btn-sm',
'data' => [
'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
'method' => 'post',
@@ -25,8 +25,8 @@ $this->params['breadcrumbs'][] = $this->title;
]) ?>
-
-
+
+
$model,
'attributes' => [
diff --git a/backend/views/post/articles/_form.php b/backend/views/post/articles/_form.php
index 740b8aa..bc603b7 100644
--- a/backend/views/post/articles/_form.php
+++ b/backend/views/post/articles/_form.php
@@ -1,19 +1,25 @@
_post)) {
- $tagsJson = \yii\helpers\Json::encode( \yii\helpers\Json::encode( \yii\helpers\ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
+ $tagsJson = Json::encode( Json::encode( ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
$js = <<
- 'btn btn-success']) ?>
-
-
-
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'columns' => [
@@ -38,5 +36,4 @@ $this->params['breadcrumbs'][] = $this->title;
]); ?>
-
diff --git a/backend/views/role/update.php b/backend/views/role/update.php
index 591b45a..399cd44 100644
--- a/backend/views/role/update.php
+++ b/backend/views/role/update.php
@@ -1,11 +1,12 @@
title = Yii::t('user', 'Update Role: {role}', ['role' => $model->name]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Roles'), 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->name]];
@@ -15,19 +16,18 @@ $this->params['breadcrumbs'][] = Yii::t('buttons', 'Editing');
-
-
+
+
field($model, 'name')->textInput(['maxLength' => true]) ?>
field($model, 'description')->textarea() ?>
field($model, 'rule_name')->textInput(['maxLength' => true]) ?>
field($model, 'data')->textarea() ?>
-
-
-
- 'btn btn-primary']) ?>
+
+ 'btn btn-success']) ?>
+
-
\ No newline at end of file
+
diff --git a/backend/views/role/view.php b/backend/views/role/view.php
index 163847b..fe3ee63 100644
--- a/backend/views/role/view.php
+++ b/backend/views/role/view.php
@@ -1,17 +1,20 @@
title = $model->name;
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Roles'), 'url' => ['index']];
@@ -20,10 +23,10 @@ $this->params['breadcrumbs'][] = $this->title;
- 'btn btn-default']) ?>
- $model->name], ['class' => 'btn btn-primary']) ?>
+ 'btn btn-outline-primary btn-sm']) ?>
+ $model->name], ['class' => 'btn btn-primary btn-sm']) ?>
$model->name], [
- 'class' => 'btn btn-danger',
+ 'class' => 'btn btn-danger btn-sm',
'data' => [
'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
'method' => 'post',
@@ -31,8 +34,8 @@ $this->params['breadcrumbs'][] = $this->title;
]) ?>
-
-
+
+
$model,
'attributes' => [
@@ -56,48 +59,51 @@ $this->params['breadcrumbs'][] = $this->title;
name !== 'admin') : ?>
-
-
+
+
+
+
- field($itemsForm, 'roles')->widget(
- Select2::class,
- [
- 'name' => 'childrenRoles',
- 'data' => $roles,
- 'size' => Select2::SMALL,
- 'options' => [
- 'placeholder' => Yii::t('user', 'Select role...'),
- 'multiple' => true,
- ],
- 'pluginOptions' => [
- 'allowClear' => true
- ],
- ]
- )->label(false);
- ?>
+ field($itemsForm, 'roles')->widget(
+ Select2::class,
+ [
+ 'name' => 'childrenRoles',
+ 'data' => $roles,
+ 'size' => Select2::SMALL,
+ 'options' => [
+ 'placeholder' => Yii::t('user', 'Select role...'),
+ 'multiple' => true,
+ ],
+ 'pluginOptions' => [
+ 'allowClear' => true
+ ],
+ ]
+ )->label(false);
+ ?>
-
+
- field($itemsForm, 'permissions')->widget(
- Select2::class,
- [
- 'name' => 'childrenPermissions',
- 'data' => $permissions,
- 'size' => Select2::SMALL,
- 'options' => [
- 'placeholder' => Yii::t('user', 'Select permission...'),
- 'multiple' => true
- ],
- 'pluginOptions' => [
- 'allowClear' => true
- ],
- ]
- )->label(false);
- ?>
-
-
- 'btn btn-primary']) ?>
+ field($itemsForm, 'permissions')->widget(
+ Select2::class,
+ [
+ 'name' => 'childrenPermissions',
+ 'data' => $permissions,
+ 'size' => Select2::SMALL,
+ 'options' => [
+ 'placeholder' => Yii::t('user', 'Select permission...'),
+ 'multiple' => true
+ ],
+ 'pluginOptions' => [
+ 'allowClear' => true
+ ],
+ ]
+ )->label(false);
+ ?>
+
+
diff --git a/backend/views/settings/list/_form.php b/backend/views/settings/list/_form.php
index b59c53e..807c295 100644
--- a/backend/views/settings/list/_form.php
+++ b/backend/views/settings/list/_form.php
@@ -1,5 +1,6 @@
registerJs($js2);
?>
diff --git a/backend/views/settings/list/_form_tab.php b/backend/views/settings/list/_form_tab.php
index 65b760d..1d2afe6 100644
--- a/backend/views/settings/list/_form_tab.php
+++ b/backend/views/settings/list/_form_tab.php
@@ -4,10 +4,14 @@
* Date: 24.08.2018
*/
+use core\forms\SettingsForm;
+use yii\web\View;
+use yii\widgets\ActiveForm;
+
/**
- * @var $this \yii\web\View
- * @var $form \yii\widgets\ActiveForm
- * @var $model \core\forms\SettingsForm
+ * @var $this View
+ * @var $form ActiveForm
+ * @var $model SettingsForm
* @var $language string
*/
diff --git a/backend/views/settings/list/_view_tab.php b/backend/views/settings/list/_view_tab.php
index 7538762..d9cf882 100644
--- a/backend/views/settings/list/_view_tab.php
+++ b/backend/views/settings/list/_view_tab.php
@@ -4,11 +4,12 @@
* Date: 25.08.2018
*/
+use yii\web\View;
use yii\widgets\DetailView;
use core\entities\Settings;
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $setting Settings
* @var $language string
*/
diff --git a/backend/views/settings/list/index.php b/backend/views/settings/list/index.php
index a46cfda..ba56c00 100644
--- a/backend/views/settings/list/index.php
+++ b/backend/views/settings/list/index.php
@@ -1,5 +1,6 @@
params['breadcrumbs'][] = $this->title;
[
'label' => Yii::t('main', 'Value'),
'value' => function (Settings $setting) {
- return isset($setting->translation->value) ? $setting->translation->value : '- ';
+ return $setting->translation->value ?? '- ';
},
'format' => 'ntext',
],
diff --git a/backend/views/settings/list/view.php b/backend/views/settings/list/view.php
index 9d8586e..a7a3b92 100644
--- a/backend/views/settings/list/view.php
+++ b/backend/views/settings/list/view.php
@@ -1,11 +1,13 @@
title = $model->section . '.' . $model->key;
@@ -75,7 +77,7 @@ $this->registerCss($css);
?>
diff --git a/backend/views/site/index.php b/backend/views/site/index.php
index 1d54530..a1ef5e8 100644
--- a/backend/views/site/index.php
+++ b/backend/views/site/index.php
@@ -1,5 +1,6 @@
registerJs($formatJs, $this::POS_HEAD);
'handle' => '.moveHandle',
],
]);
- $widgets = \core\helpers\UserHelper::getSetting('widgetsLayout', []);
+ $widgets = UserHelper::getSetting('widgetsLayout', []);
foreach ($widgets as $widget) {
$widgetData = [
'class'=>'grid-stack-item',
diff --git a/backend/views/site/login.php b/backend/views/site/login.php
index bbe2136..046b227 100644
--- a/backend/views/site/login.php
+++ b/backend/views/site/login.php
@@ -1,10 +1,12 @@
title = 'Sign In';
diff --git a/backend/views/site/search.php b/backend/views/site/search.php
index 33151f2..ef8dda1 100644
--- a/backend/views/site/search.php
+++ b/backend/views/site/search.php
@@ -1,13 +1,14 @@
title = $title . ' > ' . Html::encode($form->query);
diff --git a/backend/views/site/widgets-list.php b/backend/views/site/widgets-list.php
index 1b80ee7..001d9b8 100644
--- a/backend/views/site/widgets-list.php
+++ b/backend/views/site/widgets-list.php
@@ -2,9 +2,10 @@
use yii\helpers\Html;
use backend\helpers\DashboardHelper;
+use yii\web\View;
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $wl array
*/
diff --git a/backend/views/site/widgets-selected-list.php b/backend/views/site/widgets-selected-list.php
index 0eb8ce0..d076059 100644
--- a/backend/views/site/widgets-selected-list.php
+++ b/backend/views/site/widgets-selected-list.php
@@ -4,7 +4,9 @@
* @var $this \yii\web\View
*/
-$widgets = \core\helpers\UserHelper::getSetting('widgetsLayout', []);
+use core\helpers\UserHelper;
+
+$widgets = UserHelper::getSetting('widgetsLayout', []);
$i = 0;
?>
diff --git a/backend/views/slider/_form.php b/backend/views/slider/_form.php
index e546964..9822eb7 100644
--- a/backend/views/slider/_form.php
+++ b/backend/views/slider/_form.php
@@ -1,19 +1,20 @@
-
-
+
+
field($model, 'title')->textarea(['maxLength' => true, 'rows' => 2]) ?>
field($model, 'tagline')->textarea(['maxLength' => true, 'rows' => 2]) ?>
@@ -26,16 +27,15 @@ use yii\helpers\Html;
- field($model, 'image')->widget(\kartik\widgets\FileInput::classname(), [
+ field($model, 'image')->widget(FileInput::class, [
'pluginOptions' => [
'showUpload' => false,
],
])->label(Yii::t('slider', 'Background Image')) ?>
-
-
-
- 'btn btn-primary']) ?>
+
diff --git a/backend/views/slider/create.php b/backend/views/slider/create.php
index c79f614..1eef431 100644
--- a/backend/views/slider/create.php
+++ b/backend/views/slider/create.php
@@ -1,7 +1,9 @@
title = Yii::t('slider', 'Create Slide');
$this->params['breadcrumbs'][] = ['label' => Yii::t('slider', 'Slider'), 'url' => ['index']];
diff --git a/backend/views/slider/index.php b/backend/views/slider/index.php
index 7010b6c..3ddfa56 100644
--- a/backend/views/slider/index.php
+++ b/backend/views/slider/index.php
@@ -13,12 +13,11 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-
- 'btn btn-success']) ?>
-
-
-
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'columns' => [
diff --git a/backend/views/slider/update.php b/backend/views/slider/update.php
index 63bd7da..42f185b 100644
--- a/backend/views/slider/update.php
+++ b/backend/views/slider/update.php
@@ -1,9 +1,11 @@
title = Yii::t('slider', 'Update Slide');
$this->params['breadcrumbs'][] = ['label' => Yii::t('slider', 'Slider'), 'url' => ['index']];
diff --git a/backend/views/slider/view.php b/backend/views/slider/view.php
index 8a6a8ae..c7cf71c 100644
--- a/backend/views/slider/view.php
+++ b/backend/views/slider/view.php
@@ -1,12 +1,11 @@
title = $model->title;
$this->params['breadcrumbs'][] = ['label' => Yii::t('slider', 'Slider'), 'url' => ['index']];
@@ -15,10 +14,10 @@ $this->params['breadcrumbs'][] = $this->title;
- 'btn btn-default']) ?>
- $model->id], ['class' => 'btn btn-primary']) ?>
+ 'btn btn-outline-primary btn-sm']) ?>
+ $model->id], ['class' => 'btn btn-primary btn-sm']) ?>
$model->id], [
- 'class' => 'btn btn-danger',
+ 'class' => 'btn btn-danger btn-sm',
'data' => [
'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
'method' => 'post',
@@ -29,8 +28,8 @@ $this->params['breadcrumbs'][] = $this->title;
-
-
+
+
image): ?>
getThumbFileUrl('image', 'thumb')) ?>
@@ -40,8 +39,8 @@ $this->params['breadcrumbs'][] = $this->title;
-
-
+
+
$model,
'attributes' => [
@@ -55,7 +54,4 @@ $this->params['breadcrumbs'][] = $this->title;
-
-
-
diff --git a/backend/views/user/_form.php b/backend/views/user/_form.php
index 81d5b3d..4d2e66b 100644
--- a/backend/views/user/_form.php
+++ b/backend/views/user/_form.php
@@ -1,32 +1,28 @@
-
-
-
+
+
field($model, 'username')->textInput(['maxLength' => true]) ?>
field($model, 'email')->textInput(['maxLength' => true]) ?>
field($model, 'password')->passwordInput(['maxLength' => true]) ?>
field($model, 'role')->dropDownList($model->rolesList()) ?>
+
-
-
- 'btn btn-primary']) ?>
-
-
-
-
diff --git a/backend/views/user/create.php b/backend/views/user/create.php
index f5c71dd..f4cd17e 100644
--- a/backend/views/user/create.php
+++ b/backend/views/user/create.php
@@ -1,7 +1,8 @@
title = Yii::t('user', 'Create User');
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']];
diff --git a/backend/views/user/index.php b/backend/views/user/index.php
index 443d2e8..a43cbc6 100644
--- a/backend/views/user/index.php
+++ b/backend/views/user/index.php
@@ -16,13 +16,11 @@ $this->title = Yii::t('user', 'Users');
$this->params['breadcrumbs'][] = $this->title;
?>
-
-
- 'btn btn-success']) ?>
-
-
-
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'filterModel' => $searchModel,
diff --git a/backend/views/user/profile.php b/backend/views/user/profile.php
index 44eed73..418da43 100644
--- a/backend/views/user/profile.php
+++ b/backend/views/user/profile.php
@@ -1,12 +1,15 @@
title = Yii::t('user', 'Profile: {username}', ['username' => $user->username]);
$this->params['breadcrumbs'][] = ['label' => $user->username, 'url' => ['view', 'id' => $user->id]];
$this->params['breadcrumbs'][] = Yii::t('user', 'Profile');
@@ -16,14 +19,14 @@ $this->params['breadcrumbs'][] = Yii::t('user', 'Profile');
-
-
-
+
+
+
 ?>?<?= rand(10, 5000) ?>)
- field($model, 'user_pic')->widget(\kartik\widgets\FileInput::class, [
+ field($model, 'user_pic')->widget(FileInput::class, [
'options' => [
'accept' => 'image/*'
],
@@ -31,15 +34,15 @@ $this->params['breadcrumbs'][] = Yii::t('user', 'Profile');
'showPreview' => false,
'showCaption' => true,
'showRemove' => true,
- 'showUpload' => false
+ 'showUpload' => false,
],
]); ?>
-
-
-
+
+
+
field($model, 'username')->textInput(['maxLength' => true]) ?>
field($model, 'email')->textInput(['maxLength' => true]) ?>
field($model, 'password')->passwordInput(['maxLength' => true]) ?>
diff --git a/backend/views/user/update.php b/backend/views/user/update.php
index b9f865f..db9fb27 100644
--- a/backend/views/user/update.php
+++ b/backend/views/user/update.php
@@ -1,10 +1,13 @@
title = Yii::t('user', 'Update User: {user}', ['user' => $user->username]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $user->username, 'url' => ['view', 'id' => $user->id]];
diff --git a/backend/views/user/view.php b/backend/views/user/view.php
index 32ddfd8..6dfe8c6 100644
--- a/backend/views/user/view.php
+++ b/backend/views/user/view.php
@@ -1,12 +1,13 @@
title = $model->username;
$this->params['breadcrumbs'][] = ['label' => 'Users', 'url' => ['index']];
@@ -15,10 +16,10 @@ $this->params['breadcrumbs'][] = $this->title;
- 'btn btn-default']) ?>
- $model->id], ['class' => 'btn btn-primary']) ?>
+ 'btn btn-outline-primary btn-sm']) ?>
+ $model->id], ['class' => 'btn btn-primary btn-sm']) ?>
$model->id], [
- 'class' => 'btn btn-danger',
+ 'class' => 'btn btn-danger btn-sm',
'data' => [
'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
'method' => 'post',
@@ -26,8 +27,8 @@ $this->params['breadcrumbs'][] = $this->title;
]) ?>
-
-
+
+
$model,
'attributes' => [
diff --git a/backend/web/css/site-origin.css b/backend/web/css/site-origin.css
new file mode 100644
index 0000000..5e03acc
--- /dev/null
+++ b/backend/web/css/site-origin.css
@@ -0,0 +1,138 @@
+html,
+body {
+ height: 100%;
+}
+
+.wrap {
+ min-height: 100%;
+ height: auto;
+ margin: 0 auto -60px;
+ padding: 0 0 60px;
+}
+
+.wrap > .container {
+ padding: 70px 15px 20px;
+}
+
+.footer {
+ height: 60px;
+ background-color: #f5f5f5;
+ border-top: 1px solid #ddd;
+ padding-top: 20px;
+}
+
+.jumbotron {
+ text-align: center;
+ background-color: transparent;
+}
+
+.jumbotron .btn {
+ font-size: 21px;
+ padding: 14px 24px;
+}
+
+.not-set {
+ color: #c55;
+ font-style: italic;
+}
+
+/* add sorting icons to gridview sort links */
+a.asc:after, a.desc:after {
+ position: relative;
+ top: 1px;
+ display: inline-block;
+ font-family: 'Glyphicons Halflings';
+ font-style: normal;
+ font-weight: normal;
+ line-height: 1;
+ padding-left: 5px;
+}
+
+a.asc:after {
+ content: /*"\e113"*/ "\e151";
+}
+
+a.desc:after {
+ content: /*"\e114"*/ "\e152";
+}
+
+.sort-numerical a.asc:after {
+ content: "\e153";
+}
+
+.sort-numerical a.desc:after {
+ content: "\e154";
+}
+
+.sort-ordinal a.asc:after {
+ content: "\e155";
+}
+
+.sort-ordinal a.desc:after {
+ content: "\e156";
+}
+
+.grid-view td {
+ white-space: nowrap;
+}
+
+.grid-view .filters input,
+.grid-view .filters select {
+ min-width: 50px;
+}
+
+.hint-block {
+ display: block;
+ margin-top: 5px;
+ color: #999;
+}
+
+.error-summary {
+ color: #a94442;
+ background: #fdf7f7;
+ border-left: 3px solid #eed3d7;
+ padding: 10px 20px;
+ margin: 0 0 15px 0;
+}
+
+/* align the logout "link" (button in form) of the navbar */
+.nav li > form > button.logout {
+ padding: 15px;
+ border: none;
+}
+
+@media(max-width:767px) {
+ .nav li > form > button.logout {
+ display:block;
+ text-align: left;
+ width: 100%;
+ padding: 10px 15px;
+ }
+}
+
+.nav > li > form > button.logout:focus,
+.nav > li > form > button.logout:hover {
+ text-decoration: none;
+}
+
+.nav > li > form > button.logout:focus {
+ outline: none;
+}
+
+div.required label.control-label:after {
+ content: " *";
+ color: red;
+}
+
+.modal-content {
+ background-color: transparent !important;
+}
+
+.modal-content .modal-body, .modal-content .modal-footer {
+ background-color: white;
+}
+
+.bootstrap-dialog .modal-footer {
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+}
\ No newline at end of file
diff --git a/backend/web/css/site.css b/backend/web/css/site.css
index 5e03acc..f908ba0 100644
--- a/backend/web/css/site.css
+++ b/backend/web/css/site.css
@@ -1,6 +1,7 @@
html,
body {
height: 100%;
+ background-color: #ffffff !important;
}
.wrap {
@@ -36,24 +37,29 @@ body {
font-style: italic;
}
+a {
+ text-decoration: none;
+}
+
/* add sorting icons to gridview sort links */
a.asc:after, a.desc:after {
position: relative;
top: 1px;
display: inline-block;
- font-family: 'Glyphicons Halflings';
+ /*font-family: 'Glyphicons Halflings';*/
+ font-family: "Font Awesome 5 Free";
font-style: normal;
- font-weight: normal;
+ /*font-weight: normal;*/
line-height: 1;
padding-left: 5px;
}
a.asc:after {
- content: /*"\e113"*/ "\e151";
+ content: /*"\e113" "\e151";*/ "\f884";
}
a.desc:after {
- content: /*"\e114"*/ "\e152";
+ content: /*"\e114"* "\e152"*/ "\f160";
}
.sort-numerical a.asc:after {
@@ -72,15 +78,10 @@ a.desc:after {
content: "\e156";
}
-.grid-view td {
+.grid-view th {
white-space: nowrap;
}
-.grid-view .filters input,
-.grid-view .filters select {
- min-width: 50px;
-}
-
.hint-block {
display: block;
margin-top: 5px;
@@ -119,20 +120,341 @@ a.desc:after {
outline: none;
}
+.company-logo {
+ width: 100%;
+ text-align: center;
+}
+
+.sidebar-collapse .company-logo {
+ display: none;
+}
+
+.modal-content {
+ background: transparent;
+}
+
+.modal-content .modal-body, .modal-content .modal-footer {
+ background: #ffffff;
+}
+
div.required label.control-label:after {
content: " *";
color: red;
}
-.modal-content {
- background-color: transparent !important;
+.thumbnail .file-icon .fa {
+ font-size: 36px;
}
-.modal-content .modal-body, .modal-content .modal-footer {
- background-color: white;
+.sub-stop-led
+{
+ font-size: 11px;
+ color: #ae121d;
+}
+
+.grid-view .glyphicon {
+ display: inline-block;
+ padding: 5px;
+ background-color: #ffffff;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+}
+
+/* CARDS */
+.business-card {
+ background: #ddd;
+ /*padding: 10px;*/
+ border-radius: 4px;
+ margin-bottom: 10px;
+ position: relative;
+ overflow: hidden;
+}
+
+.business-card .media-left {
+ background-color: #999;
+ padding: 10px;
+}
+
+.business-card .media-body {
+ padding: 10px;
+}
+
+.business-card .profile-img {
+ height: 80px;
+ background: white;
+}
+.business-card .job {
+ color: #555;
+ font-size: 16px;
+}
+.business-card .name {
+ font-size: 20px;
+}
+
+.business-card .buttons {
+ position: absolute;
+ right: 10px;
+ bottom: 10px;
+ display: none;
+ font-size: 12px;
+}
+
+.business-card:hover .buttons {
+ display: block;
+}
+
+.business-card .buttons a {
+ color: #777;
+}
+
+.business-card-empty {
+ border: solid 3px #ccc;
+ padding: 10px;
+ border-radius: 4px;
+ margin-bottom: 10px;
+ position: relative;
+ overflow: hidden;
+ text-align: center;
+ color: #ccc;
+ font-size: 16px;
+ cursor: pointer;
+}
+.business-card-empty i {
+ font-size: 30px;
+}
+.business-card-empty:hover {
+ color: #484f58;
+}
+
+/* CONTACT CARD */
+.contact-card .job {
+ color: #999;
+ font-size: 16px;
+}
+.contact-card .name {
+ font-size: 20px;
+ color: #333;
+}
+
+.contact-card .cc_image {
+ width:180px;
+ height: 220px;
+ margin: 0 auto;
+ background-position: center;
+ background-size: cover;
+ background-repeat: no-repeat;
+}
+
+.modal .panel-body {
+ color: #ccc !important;
+}
+
+.modal #sub_data {
+ color: #555 !important;
+}
+
+.info-box-number {
+ font-size: 26px !important;
+}
+
+/* CALENDAR */
+.calendar-left-sidebar .list-group .btn {
+ border: 0;
+ background-color: transparent;
+ margin-top: -10px;
+ margin-right: -15px;
}
-.bootstrap-dialog .modal-footer {
- border-bottom-left-radius: 4px;
- border-bottom-right-radius: 4px;
+.calendar-left-sidebar .list-group .btn:hover {
+ border: 0;
+ background-color: transparent;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
+.business-card-avatar{
+ width: 80px;
+ height: 80px;
+ background-size: cover;
+ display: block;
+ border-radius: 50%;
+}
+
+/*.custom-checkbox { position: absolute; opacity: 0; z-index: -1; }
+/.custom-checkbox+span { font: 14px sans-serif; color: #3b3b3b; }
+.custom-checkbox+span:before { font: 16pt FontAwesome; content: '\00f096'; display: inline-block; width: 16pt; padding: 2px 0 0 3px; margin-right: 0.5em; }
+.custom-checkbox:checked+span:before { content: '\00f046'; color: limegreen }
+.custom-checkbox:focus+span:before { outline: 1px dotted #aaa; }
+.custom-checkbox:disabled+span { color: #999; }
+.custom-checkbox:not(:disabled)+span:hover:before { text-shadow: 0 1px 2px #77F; }*/
+
+.deadline-card-date-success { background-color: #2c9f32 }
+.deadline-card-date-danger { background-color:#cc3532 }
+.deadline-card-date-primary { background-color:#339ccc }
+
+.card-header-color {
+ background-color: #7BA7AB !important;
+ color: #ffffff;
+}
+.card-title-info {
+ color: rgba(255,255,255,0.5) !important;
+}
+
+.card, .card-header, .btn, .btn-lg, .form-control {
+ border-radius: 0 !important;
+}
+.card-header {
+ border-bottom: solid 3px #628589 !important;
+}
+
+.custom-control-input.is-valid ~ .custom-control-label::before {
+ color: #cccccc !important;
+ background-color: #cccccc !important;
+ border-color: #cccccc !important;
+}
+.was-validated .custom-control-input:valid:checked ~ .custom-control-label::before, .custom-control-input.is-valid:checked ~ .custom-control-label::before {
+ color: #7BA7AB !important;
+ background-color: #7BA7AB !important;
+ border-color: #7BA7AB !important;
+}
+.custom-control-input ~ .custom-control-label::before {
+ border-radius: 0 !important;
+ border-color: #7BA7AB !important;
+}
+.custom-checkbox .custom-control-input:checked ~ .custom-control-label::before {
+ background-color: #7BA7AB !important;
+ border-color: #7BA7AB;
+}
+.custom-checkbox .custom-control-input:checked:focus ~ .custom-control-label::before {
+ box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(123, 167, 171, 0.25)
+}
+.custom-checkbox .custom-control-input:focus ~ .custom-control-label::before {
+ box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 0, 0, 0.25)
+}
+.custom-checkbox .custom-control-input:active ~ .custom-control-label::before {
+ background-color: #9bd2d8;
+}
+.was-validated .custom-control-input:valid ~ .custom-control-label,
+.custom-control-input.is-valid ~ .custom-control-label,
+.custom-control-input.is-valid:checked ~ .custom-control-label::before {
+ color: inherit !important;
+}
+.was-validated .form-control:valid, .form-control.is-valid {
+ border-color: #cccccc !important;
+}
+.form-control:focus {
+ border-color: rgba(123, 167, 171, 0.44) !important;
+}
+
+.btn-success{color:#fff !important; background-color: #7bab83 !important; border-color:#7bab83 !important;border-bottom: solid 3px #658962 !important;}
+.btn-success:hover{color:#fff;background-color: #658962 !important;border-color:#658962 !important;}
+.btn-success:focus,.btn-success.focus{box-shadow:0 0 0 .2rem rgba(98, 137, 99, 0.5)
+}
+.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#7bab83;border-color:#658962}
+.btn-success:not(:disabled):not(.disabled):active,.btn-success:not(:disabled):not(.disabled).active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#7bab83;border-color:#000}
+.btn-success:not(:disabled):not(.disabled):active:focus,.btn-success:not(:disabled):not(.disabled).active:focus,.show>.btn-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(98, 137, 101, 0.5)
+}
+
+.btn-outline-success{color:#7bab83;background-color:transparent;background-image:none;border-color:#7bab83}.btn-outline-success:hover{color:#222;background-color: #009a1f;border-color:#7bab83}
+.btn-outline-success:focus,.btn-outline-success.focus{box-shadow:0 0 0 .2rem #658962}
+.btn-outline-success.disabled,.btn-outline-success:disabled{color:#7bab83;background-color:transparent}
+.btn-outline-success:not(:disabled):not(.disabled):active,.btn-outline-success:not(:disabled):not(.disabled).active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color: #8cc28f;border-color:#7bab83}
+.btn-outline-success:not(:disabled):not(.disabled):active:focus,.btn-outline-success:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem #658962}
+
+
+.btn-primary{color:#fff !important; background-color:#7BA7AB !important; border-color:#7BA7AB !important;border-bottom: solid 3px #628589 !important;}
+.btn-primary:hover{color:#fff;background-color:#628589 !important;border-color:#628589 !important;}
+.btn-primary:focus,.btn-primary.focus{box-shadow:0 0 0 .2rem rgba(98,133,137,0.5)}
+.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#7BA7AB;border-color:#628589}
+.btn-primary:not(:disabled):not(.disabled):active,.btn-primary:not(:disabled):not(.disabled).active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#7BA7AB;border-color:#000}
+.btn-primary:not(:disabled):not(.disabled):active:focus,.btn-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(98,133,137,0.5)}
+
+.btn-outline-primary{color:#7BA7AB !important;background-color:transparent !important;background-image:none !important;border-color:#7BA7AB !important; border-bottom: solid 3px #628589 !important;}.btn-outline-primary:hover{color:#FFFFFF !important;background-color:#628589 !important;border-color:#628589 !important; !important}
+.btn-outline-primary:focus,.btn-outline-primary.focus{box-shadow:0 0 0 .2rem #628589 !important;}
+.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#7BA7AB !important;background-color:transparent !important;}
+.btn-outline-primary:not(:disabled):not(.disabled):active,.btn-outline-primary:not(:disabled):not(.disabled).active,.show>.btn-outline-primary.dropdown-toggle{color:#fff !important;background-color: #8cbdc2 !important;border-color:#7BA7AB !important;}
+.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem #628589 !important;}
+
+
+.btn-danger{color:#fff !important; background-color: #dc565f !important; border-color:#dc565f !important;border-bottom: solid 3px #C82333 !important;}
+.btn-danger:hover{color:#fff;background-color:#C82333 !important;border-color:#C82333 !important;}
+.btn-danger:focus,.btn-primary.focus{box-shadow:0 0 0 .2rem rgba(200,35,51,0.5)}
+.btn-danger.disabled,.btn-primary:disabled{color:#fff;background-color:#dc565f;border-color:#C82333}
+.btn-danger:not(:disabled):not(.disabled):active,.btn-primary:not(:disabled):not(.disabled).active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#dc565f;border-color:#000}
+.btn-danger:not(:disabled):not(.disabled):active:focus,.btn-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(200,35,51,0.5)}
+
+.btn-outline-danger{color:#dc565f;background-color:transparent;background-image:none;border-color:#dc565f}.btn-outline-primary:hover{color:#222;background-color: #9a231e;border-color:#dc565f}
+.btn-outline-danger:focus,.btn-outline-primary.focus{box-shadow:0 0 0 .2rem #C82333}
+.btn-outline-danger.disabled,.btn-outline-primary:disabled{color:#dc565f;background-color:transparent}
+.btn-outline-danger:not(:disabled):not(.disabled):active,.btn-outline-primary:not(:disabled):not(.disabled).active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color: #dfa5a1;border-color:#dc565f}
+.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem #C82333}
+
+.btn-info{color:#fff !important; background-color:#17A2B8 !important; border-color:#17A2B8 !important;border-bottom: solid 3px #138496 !important;}
+.btn-info:hover{color:#fff;background-color:#138496 !important;border-color:#138496 !important;}
+.btn-info:focus,.btn-primary.focus{box-shadow:0 0 0 .2rem rgba(98,133,137,0.5)}
+.btn-info.disabled,.btn-primary:disabled{color:#fff;background-color:#17A2B8;border-color:#138496}
+.btn-info:not(:disabled):not(.disabled):active,.btn-primary:not(:disabled):not(.disabled).active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#17A2B8;border-color:#000}
+.btn-info:not(:disabled):not(.disabled):active:focus,.btn-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(98,133,137,0.5)}
+
+.btn-outline-info{color:#17A2B8;background-color:transparent;background-image:none;border-color:#17A2B8}.btn-outline-primary:hover{color:#222;background-color:#009a9a;border-color:#17A2B8}
+.btn-outline-info:focus,.btn-outline-primary.focus{box-shadow:0 0 0 .2rem #138496}
+.btn-outline-info.disabled,.btn-outline-primary:disabled{color:#17A2B8;background-color:transparent}
+.btn-outline-info:not(:disabled):not(.disabled):active,.btn-outline-primary:not(:disabled):not(.disabled).active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color: #8cbdc2;border-color:#17A2B8}
+.btn-outline-info:not(:disabled):not(.disabled):active:focus,.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem #138496}
+
+.nav-link {
+ color: #1e7785;
+}
+
+.nav-link:hover {
+ color: #06333b;
+}
+
+.nav-pills .nav-link.active,
+.nav-pills .show > .nav-link {
+ background-color: #7BA7AB !important;
+}
+
+.auth-icon {
+ display: inline-block !important;
+ margin: 0 10px;
+}
+
+.invalid-feedback {
+ font-size: 0.7em !important;
+ color: #F15B42 !important;
+}
+
+.was-validated .form-control:invalid,
+.form-control.is-invalid {
+ border-color: #cccccc !important;
+}
+
+.card-primary.card-outline {
+ border-top: 3px solid #7BA7AB !important;
+}
+
+.summary {
+ float: right;
+ font-size: 0.8em;
+ opacity: 0.5;
+}
+
+table {
+ font-size: 0.9em;
+}
+
+.card-header-info {
+ border-bottom-color: #17A2B8 !important;
+}
+
+.custom-control-input:checked ~ .custom-control-label::before {
+ background-color: #17A2B8 !important;
+}
+
+.help-block {
+ color: red;
+ font-size: 0.8em;
}
\ No newline at end of file
diff --git a/backend/web/css/skin.css b/backend/web/css/skin-origin.css
similarity index 100%
rename from backend/web/css/skin.css
rename to backend/web/css/skin-origin.css
diff --git a/backend/web/css/ui.jqgrid-bootstrap.css b/backend/web/css/ui.jqgrid-bootstrap.css
new file mode 100644
index 0000000..5166b23
--- /dev/null
+++ b/backend/web/css/ui.jqgrid-bootstrap.css
@@ -0,0 +1,1002 @@
+/*Grid*/
+.ui-jqgrid {
+ position: relative;
+ border: 1px solid #ddd; /*default*/
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+}
+.ui-jqgrid .ui-jqgrid-view {
+ position: relative;
+ left:0;
+ top: 0;
+ padding: 0;
+}
+.ui-jqgrid .ui-common-table {}
+
+/* Caption*/
+.ui-jqgrid .ui-jqgrid-titlebar {
+ font-weight: normal;
+ min-height:37px;
+ padding: 4px 8px;
+ position: relative;
+ margin-right: 2px;
+ border-bottom: 1px solid #ddd; /*default*/
+
+}
+.ui-jqgrid .ui-jqgrid-caption {
+ text-align: left;
+}
+.ui-jqgrid .ui-jqgrid-title {
+ padding-top: 5px;
+ vertical-align: middle;
+ position: absolute;
+}
+
+.ui-jqgrid .ui-jqgrid-titlebar-close {
+ color: inherit;
+ position: absolute;
+ top: 50%;
+ margin: -10px 7px 0 0;
+ padding: 1px;
+ cursor:pointer;
+}
+.ui-jqgrid .ui-jqgrid-titlebar-close span {
+ display: block;
+ margin: 1px;
+}
+.ui-jqgrid .ui-jqgrid-titlebar-close:hover { }
+
+/* Header*/
+.ui-jqgrid .ui-jqgrid-hdiv {
+ position: relative;
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
+}
+.ui-jqgrid .ui-jqgrid-hbox {
+ float: left;
+ padding-right: 20px;
+}
+.ui-jqgrid .ui-jqgrid-htable {
+ margin-bottom: 0;
+ table-layout: fixed;
+ border-top:none;
+}
+.ui-jqgrid .ui-jqgrid-htable thead th {
+ overflow : hidden;
+ border-bottom : none;
+ padding-right: 2px;
+}
+.ui-jqgrid .ui-jqgrid-htable thead th div {
+ overflow: hidden;
+ position:relative;
+}
+.ui-th-column, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column {
+ overflow: hidden;
+ white-space: nowrap;
+}
+.ui-th-column-header,
+.ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header {
+ overflow: hidden;
+ white-space: nowrap;
+}
+.ui-th-ltr, .ui-jqgrid .ui-jqgrid-htable th.ui-th-ltr {}
+.ui-th-rtl, .ui-jqgrid .ui-jqgrid-htable th.ui-th-rtl {text-align: center; }
+.ui-first-th-ltr { }
+.ui-first-th-rtl { }
+.ui-jqgrid tr.jqg-first-row-header th {
+ height:auto;
+ border-top:none;
+ padding-bottom: 0;
+ padding-top: 0;
+ border-bottom: none;
+ padding-right: 2px;
+ text-align: center;
+}
+.ui-jqgrid tr.jqg-second-row-header th,
+.ui-jqgrid tr.jqg-third--row-header th
+{
+ border-top:none;
+ text-align: center;
+}
+
+.ui-jqgrid .ui-th-div-ie {
+ white-space: nowrap;
+ height:17px;
+}
+.ui-jqgrid .ui-jqgrid-resize {
+ height:20px !important;
+ position: relative;
+ cursor :e-resize;
+ display: inline;
+ overflow: hidden;
+}
+.ui-jqgrid .ui-grid-ico-sort {
+ margin-left:5px;
+ overflow:hidden;
+ position:absolute;
+ right: auto;
+ font-size:12px;
+}
+.ui-jqgrid .ui-icon-asc {
+ margin-top:-3px;
+}
+.ui-jqgrid .ui-icon-desc {
+ margin-top:4px;
+}
+.ui-jqgrid .ui-i-asc {
+ margin-top:0;
+}
+.ui-jqgrid .ui-i-desc {
+ margin-top:0;
+ margin-right:13px;
+}
+.ui-jqgrid .ui-single-sort-asc {
+ margin-top:0;
+}
+.ui-jqgrid .ui-single-sort-desc {}
+.ui-jqgrid .ui-jqgrid-sortable {
+ cursor:pointer;
+}
+.ui-jqgrid tr.ui-search-toolbar th { }
+.ui-jqgrid .ui-search-table td.ui-search-clear { }
+.ui-jqgrid tr.ui-search-toolbar td > input { }
+.ui-jqgrid tr.ui-search-toolbar select {}
+
+.ui-jqgrid .ui-th-column > .ui-th-div {
+ padding-left: 14px;
+}
+.ui-jqgrid .ui-icon-left .ui-grid-ico-sort {
+ margin-left: -14px;
+}
+
+
+/* Body */
+.ui-jqgrid .table-bordered,
+.ui-jqgrid .table-bordered td,
+.ui-jqgrid .table-bordered th.ui-th-ltr
+{
+ border-left:0px none !important;
+}
+.ui-jqgrid .table-bordered th.ui-th-rtl
+{
+ border-right:0px none !important;
+}
+.ui-jqgrid .table-bordered tr.ui-row-rtl td
+{
+ border-right:0px none !important;
+ border-left: 1px solid #ddd !important;
+}
+div.tablediv > .table-bordered {
+ border-left : 1px solid #ddd !important;
+}
+.ui-jqgrid .ui-jqgrid-bdiv table.table-bordered td {
+ border-top: 0px none;
+}
+.ui-jqgrid .ui-jqgrid-bdiv {
+ position: relative;
+ margin: 0;
+ padding:0;
+ overflow: auto;
+ text-align:left;
+}
+.ui-jqgrid .ui-jqgrid-btable {
+ table-layout: fixed;
+ border-left:none ;
+ border-top:none;
+ margin-bottom: 0px
+}
+.ui-jqgrid tr.jqgrow {
+ outline-style: none;
+}
+.ui-jqgrid tr.jqgroup {
+ outline-style: none;
+}
+.ui-jqgrid .ui-jqgrid-btable tbody tr.jqgrow td {
+ overflow: hidden;
+ white-space: pre;
+ padding-right: 2px;
+}
+.ui-jqgrid tr.jqgfirstrow td {
+ height:auto;
+ border-top:none;
+ padding-bottom: 0;
+ padding-top: 0;
+ border-bottom: none;
+ padding-right: 2px;
+}
+.ui-jqgrid tr.jqgroup td {
+ white-space: nowrap;
+}
+.ui-jqgrid tr.jqfoot td {
+ white-space: nowrap;
+}
+.ui-jqgrid tr.ui-row-ltr td {}
+.ui-jqgrid tr.ui-row-rtl td {}
+.ui-jqgrid td.jqgrid-rownum { }
+.ui-jqgrid .ui-jqgrid-resize-mark {
+ width:2px;
+ left:0;
+ background-color:#777;
+ cursor: e-resize;
+ cursor: col-resize;
+ position:absolute;
+ top:0;
+ height:100px;
+ overflow:hidden;
+ display:none;
+ border:0 none;
+ z-index: 99999;
+
+}
+/* Footer */
+.ui-jqgrid .ui-jqgrid-sdiv {
+ position: relative;
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
+ border-left: 0 none !important;
+ border-top : 0 none !important;
+ border-right : 0 none !important;
+}
+.ui-jqgrid .ui-jqgrid-ftable {
+ table-layout:fixed;
+ margin-bottom:0;
+}
+
+.ui-jqgrid tr.footrow td {
+ font-weight: bold;
+ overflow: hidden;
+ white-space:nowrap;
+ padding-right: 2px;
+ border-bottom: 0px none;
+}
+.ui-jqgrid tr.footrow-ltr td {
+ text-align:left;
+}
+.ui-jqgrid tr.footrow-rtl td {
+ text-align:right;
+}
+
+/* Pager*/
+.ui-jqgrid .ui-jqgrid-pager,
+.ui-jqgrid .ui-jqgrid-toppager
+{
+ border-left-width: 0px;
+ border-top: 1px solid #ddd;
+ /*padding : 4px 0px;*/
+ position: relative;
+ /*height: auto; */
+ white-space: nowrap;
+ overflow: hidden;
+}
+.ui-jqgrid .ui-jqgrid-toppager {
+ border-top-width :0;
+ border-bottom : 1px solid #ddd;
+}
+.ui-jqgrid .ui-jqgrid-toppager .ui-pager-control,
+.ui-jqgrid .ui-jqgrid-pager .ui-pager-control {
+ position: relative;
+ border-left: 0;
+ border-bottom: 0;
+ border-top: 0;
+ /*height: 30px;*/
+}
+.ui-jqgrid .ui-pg-table {
+ position: relative;
+ padding: 1px 0;
+ width:auto;
+ margin: 0;
+}
+.ui-jqgrid .ui-pg-table td {
+ font-weight:normal;
+ vertical-align:middle;
+ /*padding:0px 6px;*/
+}
+.ui-jqgrid .ui-pager-control .ui-pager-table td {
+ border-top : 0px none !important;
+ min-height : 20px !important;
+}
+.ui-jqgrid .ui-pg-button {
+ height:auto;
+}
+.ui-jqgrid .ui-paging-pager td {
+ padding : 0 5px;
+}
+.ui-jqgrid .ui-pg-button span {
+ display: block;
+ margin: 0px 2px;
+ float:left;
+}
+.ui-jqgrid .ui-pg-button:hover { }
+.ui-jqgrid .ui-disabled:hover {}
+.ui-jqgrid .ui-pg-input,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-input {
+ display: inline-block;
+ height:auto;
+ width: auto;
+ font-size:.9em;
+ margin:0;
+ line-height: inherit;
+ border: none;
+ padding: 0px 3px
+}
+.ui-jqgrid .ui-pg-selbox,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-selbox {
+ font-size:.9em;
+ line-height:inherit;
+ display:block;
+ height:22px;
+ margin: 0;
+ padding: 3px 0px 3px 3px;
+ border:none;
+}
+.ui-jqgrid .ui-separator {
+ height: 18px;
+ border : none;
+ border-left: 2px solid #ccc ; /*default*/
+
+}
+.ui-separator-li {
+ height: 2px;
+ border : none;
+ border-top: 2px solid #ccc ; /*default*/
+ margin: 0; padding: 0; width:100%
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-pg-div,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-div
+{
+ float:left;
+ position:relative;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-pg-button,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-button
+{
+ cursor:pointer;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-pg-div span,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-div span
+{
+ float:left;
+}
+.ui-jqgrid td input,
+.ui-jqgrid td select,
+.ui-jqgrid td textarea {
+ margin: 0;
+}
+.ui-jqgrid td textarea {
+ width:auto;
+ height:auto;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-pager-table,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pager-table
+{
+ width:100%;
+ table-layout:fixed;
+ height:100%;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-paging-info,
+.ui-jqgrid .ui-jqgrid-toppager .ui-paging-info
+{
+ font-weight: normal;
+ height:auto;
+ margin-top:3px;
+ margin-right:4px;
+ display: inline;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-paging-pager,
+.ui-jqgrid .ui-jqgrid-toppager .ui-paging-pager
+{
+ table-layout:auto;
+ height:100%;
+}
+.ui-jqgrid .ui-jqgrid-pager .navtable,
+.ui-jqgrid .ui-jqgrid-toppager .navtable
+{
+ float:left;
+ table-layout:auto;
+ height:100%;
+}
+.ui-jqgrid .ui-jqgrid-pager .navtable td,
+.ui-jqgrid .ui-jqgrid-toppager .navtable td
+{
+ padding : 0 5px;
+}
+
+/*Subgrid*/
+
+.ui-jqgrid .ui-jqgrid-btable .ui-sgcollapsed span {
+ display: block;
+}
+.ui-jqgrid .ui-subgrid {
+ margin:0;
+ padding:0;
+ width:100%;
+}
+.ui-jqgrid .ui-subgrid table {
+ table-layout: fixed;
+}
+.ui-jqgrid .ui-subgrid tr.ui-subtblcell td {}
+.ui-jqgrid .ui-subgrid td.subgrid-data {
+ border-top: 0 none !important;
+}
+.ui-jqgrid .ui-subgrid td.subgrid-cell {
+ vertical-align: middle
+}
+.ui-jqgrid a.ui-sghref {
+ text-decoration: none;
+ color : #010101; /*default*/
+}
+.ui-jqgrid .ui-th-subgrid {height:20px;}
+.tablediv > .row { margin: 0 0}
+/* loading */
+.ui-jqgrid .loading,
+.loading_pivot {
+ position: absolute;
+ top: 45%;
+ left: 45%;
+ width: auto;
+ z-index:101;
+ padding: 6px;
+ margin: 5px;
+ text-align: center;
+ display: none;
+ border: 1px solid #ddd; /*default*/
+ font-size: 14px;
+ background-color: #d9edf7;
+}
+.ui-jqgrid .jqgrid-overlay {
+ display:none;
+}
+/* IE * html .jqgrid-overlay {width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');} */
+* .jqgrid-overlay iframe {
+ position:absolute;
+ top:0;
+ left:0;
+ z-index:-1;
+}
+/* IE width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');}*/
+/* end loading div */
+
+/* Toolbar */
+.ui-jqgrid .ui-userdata {
+ padding: 4px 0px;
+ overflow: hidden;
+ min-height: 32px;
+}
+.ui-jqgrid .ui-userdata-top {
+ border-left-width: 0px; /*default*/
+ border-bottom: 1px solid #ddd;
+}
+.ui-jqgrid .ui-userdata-bottom {
+ border-left-width: 0px; /*default*/
+ border-top: 1px solid #ddd;
+}
+/*Modal Window */
+.ui-jqdialog { }
+.ui-jqdialog {
+ display: none;
+ width: 500px;
+ position: absolute;
+ /*padding: 5px; */
+ overflow:visible;
+}
+.ui-jqdialog .ui-jqdialog-titlebar {
+ padding: .1em .1em;
+ min-height: 35px;
+}
+.ui-jqdialog .ui-jqdialog-title {
+ margin: .3em 0 .2em;
+ font-weight: bold;
+ padding-left :6px;
+ padding-right:6px;
+}
+.ui-jqdialog .ui-jqdialog-titlebar-close {
+ position: absolute;
+ top: 0%;
+ margin: 3px 5px 0 0;
+ padding: 8px;
+ cursor:pointer;
+}
+
+.ui-jqdialog .ui-jqdialog-titlebar-close span { }
+.ui-jqdialog .ui-jqdialog-titlebar-close:hover,
+.ui-jqdialog .ui-jqdialog-titlebar-close:focus {
+ padding: 8px;
+}
+.ui-jqdialog-content, .ui-jqdialog .ui-jqdialog-content {
+ border: 0;
+ padding: .3em .2em;
+ background: none;
+ height:auto;
+}
+.ui-jqdialog .ui-jqconfirm {
+ padding: .4em 1em;
+ border-width:3px;
+ position:absolute;
+ bottom:10px;
+ right:10px;
+ overflow:visible;
+ display:none;
+ height:120px;
+ width:220px;
+ text-align:center;
+ background-color: #fff;
+ border-radius: 4px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+}
+.ui-jqdialog>.ui-resizable-se { }
+.ui-jqgrid>.ui-resizable-se { }
+.jqgrid-overlay-modal {
+ display : none;
+}
+/* end Modal window*/
+/* Form edit */
+.ui-jqdialog-content .FormGrid {
+ margin: 0 8px 0 8px;
+ overflow:auto;
+ position:relative;
+}
+.ui-jqdialog-content .EditTable {
+ width: 100%;
+ margin-bottom:0;
+}
+.ui-jqdialog-content .DelTable {
+ width: 100%;
+ margin-bottom:0;
+}
+.EditTable td input,
+.EditTable td select,
+.EditTable td textarea {
+ width: 98%;
+ display: inline-block;
+}
+.EditTable td textarea {
+ width:auto;
+ height:auto;
+}
+.EditTable .FormData td {
+ height:37px !important;
+}
+.ui-jqdialog-content td.EditButton {
+ text-align: right;
+ padding: 5px 5px 5px 0;
+}
+.ui-jqdialog-content td.navButton {
+ text-align: center;
+ border-left: 0 none;
+ border-top: 0 none;
+ border-right: 0 none;
+ padding-bottom:5px;
+ padding-top:5px;
+}
+.ui-jqdialog-content input.FormElement {
+ padding: .5em .3em;
+ margin-bottom: 5px
+}
+.ui-jqdialog-content select.FormElement {
+ padding:.3em;
+ margin-bottom: 3px;
+}
+.ui-jqdialog-content .data-line {
+ padding-top:.1em;
+ border: 0 none;
+}
+
+.ui-jqdialog-content .CaptionTD {
+ vertical-align: middle;
+ border: 0 none;
+ padding: 2px;
+ white-space: nowrap;
+}
+.ui-jqdialog-content .DataTD {
+ padding: 2px;
+ border: 0 none;
+ vertical-align: top;
+}
+.ui-jqdialog-content .form-view-data {
+ white-space:pre
+}
+.fm-button { }
+.fm-button-icon-left {
+ margin-left: 4px;
+ margin-right: 4px;
+}
+.fm-button-icon-right {
+ margin-left: 4px;
+ margin-right: 4px;
+}
+.fm-button-icon-left { }
+.fm-button-icon-right { }
+#nData, #pData {
+ margin-left: 4px;
+ margin-right: 4px;
+}
+#sData span, #cData span {
+ margin-left: 5px;
+}
+/* End Eorm edit */
+/*.ui-jqgrid .edit-cell {}*/
+.ui-jqgrid .selected-row,
+div.ui-jqgrid .selected-row td {
+ font-style : normal;
+}
+/* inline edit actions button*/
+.ui-inline-del, .ui-inline-cancel {
+ margin-left: 14px;
+}
+.ui-jqgrid .inline-edit-cell {}
+/* Tree Grid */
+.ui-jqgrid .tree-wrap {
+ float: left;
+ position: relative;
+ height: 18px;
+ white-space: nowrap;
+ overflow: hidden;
+}
+.ui-jqgrid .tree-minus {
+ position: absolute;
+ height: 18px;
+ width: 18px;
+ overflow: hidden;
+}
+.ui-jqgrid .tree-plus {
+ position: absolute;
+ height: 18px;
+ width: 18px;
+ overflow: hidden;
+}
+.ui-jqgrid .tree-leaf {
+ position: absolute;
+ height: 18px;
+ width: 18px;
+ overflow: hidden;
+}
+.ui-jqgrid .treeclick {
+ cursor: pointer;
+}
+/* moda dialog */
+* iframe.jqm {
+ position:absolute;
+ top:0;
+ left:0;
+ z-index:-1;
+}
+/* width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');}*/
+.ui-jqgrid-dnd tr td {
+ border-right-width: 1px;
+ border-right-color: inherit;
+ border-right-style: solid;
+ height:20px
+}
+/* RTL Support */
+.ui-jqgrid .ui-jqgrid-caption-rtl {
+ text-align: right;
+}
+.ui-jqgrid .ui-jqgrid-hbox-rtl {
+ float: right;
+ /*padding-left: 20px;*/
+}
+.ui-jqgrid .ui-jqgrid-resize-ltr {
+ float: right;
+ margin: -2px -2px -2px 0;
+ height:100%;
+}
+.ui-jqgrid .ui-jqgrid-resize-rtl {
+ float: left;
+ margin: -2px -2px -2px -0px;
+}
+.ui-jqgrid .ui-sort-rtl {
+
+}
+.ui-jqgrid .tree-wrap-ltr {
+ float: left;
+}
+.ui-jqgrid .tree-wrap-rtl {
+ float: right;
+}
+.ui-jqgrid .ui-ellipsis {
+ -moz-text-overflow:ellipsis;
+ text-overflow:ellipsis;
+}
+/* Toolbar Search Menu. Nav menu */
+.ui-search-menu,
+.ui-nav-menu {
+ position: absolute;
+ padding: 2px 5px;
+ z-index:99999;
+}
+.ui-search-menu.ui-menu .ui-menu-item,
+.ui-nav-menu.ui-menu .ui-menu-item
+{
+ list-style-image: none;
+ padding-right: 0;
+ padding-left: 0;
+}
+.ui-search-menu.ui-menu .ui-menu-item a,
+.ui-nav-menu.ui-menu .ui-menu-item a
+{
+ display: block;
+}
+.ui-search-menu.ui-menu .ui-menu-item a.g-menu-item:hover,
+.ui-nav-menu.ui-menu .ui-menu-item a.g-menu-item:hover
+{
+ margin: -1px;
+ font-weight: normal;
+}
+.ui-jqgrid .ui-search-table {
+ padding: 0;
+ border: 0 none;
+ height:20px;
+ width:100%;
+}
+.ui-jqgrid .ui-search-table .ui-search-oper {
+ width:20px;
+}
+a.g-menu-item, a.soptclass, a.clearsearchclass {
+ cursor: pointer;
+}
+.ui-jqgrid .ui-jqgrid-view input,
+.ui-jqgrid .ui-jqgrid-view select,
+.ui-jqgrid .ui-jqgrid-view textarea,
+.ui-jqgrid .ui-jqgrid-view button {
+ /*font-size: 11px*/
+}
+.ui-jqgrid .ui-scroll-popup {
+ width: 100px;
+}
+.ui-search-table select,
+.ui-search-table input
+{
+ padding: 4px 3px;
+}
+
+.ui-disabled {
+ opacity: .35;
+ filter:Alpha(Opacity=35); /* support: IE8 */
+ background-image: none;
+}
+.ui-overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0,0,0,0.5);
+ opacity: .3;
+ filter: Alpha(Opacity=30); /* support: IE8 */
+}
+
+.ui-jqgrid-pager .ui-pg-table .ui-pg-button:hover,
+.ui-jqgrid-toppager .ui-pg-table .ui-pg-button:hover
+{
+ background-color: #ddd;
+}
+.ui-jqgrid-corner {
+ border-radius: 5px
+}
+.ui-resizable-handle {
+ /*position: absolute;*/
+ display: block;
+ left :97%;
+}
+.ui-jqdialog .ui-resizable-se {
+ width: 12px;
+ height: 12px;
+ right: -5px;
+ bottom: -5px;
+ background-position: 16px 16px;
+}
+.ui-resizable-se {
+ cursor: se-resize;
+ width: 12px;
+ height: 12px;
+ right: 1px;
+ bottom: 1px;
+}
+.ui-top-corner {
+ border-top-left-radius: 5px;
+ border-top-right-radius: 5px;
+}
+.ui-bottom-corner {
+ border-bottom-left-radius: 5px;
+ border-bottom-right-radius: 5px;
+}
+
+.ui-search-table {
+ margin-bottom: 0;
+}
+.ui-search-table .columns, .ui-search-table .operators {
+ padding-right: 5px;
+}
+.opsel {
+ float :left;
+ width : 100px;
+ margin-right : 5px;
+}
+.add-group, .add-rule, .delete-group {
+ width: 14%;
+ margin-right : 5px;
+}
+.delete-rule {
+ width : 15px;
+}
+ul.ui-search-menu, ul.ui-nav-menu {
+ list-style-type: none;
+}
+ul.ui-search-menu li a,
+ul.ui-nav-menu li a,
+.soptclass,
+.clearsearchclass {
+ text-decoration: none;
+ color : #010101;
+}
+ul.ui-search-menu li a:hover, ul.ui-nav-menu li a:hover, a.soptclass:hover, a.clearsearchclass:hover {
+ background-color: #ddd;
+ padding: 1px 1px;
+ text-decoration: none;
+}
+ul.ui-search-menu li, ul.ui-nav-menu li {
+ padding : 5px 5px;
+}
+.ui-menu-item hr {
+ margin-bottom: 0px;
+ margin-top:0px;
+}
+
+.searchFilter .ui-search-table td,
+.searchFilter .ui-search-table th
+{
+ border-top: 0px none !important;
+}
+
+.searchFilter .queryresult {
+ margin-bottom: 5px;
+}
+.searchFilter .queryresult tr td{
+ border-top: 0px none;
+}
+.ui-search-label {
+ padding-left: 5px;
+}
+
+.frozen-div, .frozen-bdiv {
+ background-color: #fff;
+}
+/*
+.ui-jqgrid .ui-jqgrid-caption,
+.ui-jqgrid .ui-jqgrid-pager,
+.ui-jqgrid .ui-jqgrid-toppager,
+.ui-jqgrid .ui-jqgrid-htable thead th,
+.ui-jqgrid .ui-userdata-top,
+.ui-jqgrid .ui-userdata-bottom,
+.ui-jqgrid .ui-jqgrid-hdiv,
+.ui-jqdialog .ui-jqdialog-titlebar
+{
+ background-image: none, linear-gradient(to bottom, #fff 0px, #e0e0e0 100%);
+ background-repeat: repeat-x;
+ border-color: #ccc;
+ text-shadow: 0 1px 0 #fff;
+}
+*/
+/* Column menu */
+.ui-jqgrid .ui-jqgrid-htable .colmenu {
+ position:absolute;
+ right:1px;
+ height:100%;
+ color : black;
+}
+.ui-jqgrid .ui-jqgrid-htable .colmenu-rtl {
+ right: auto;
+ left : 1px;
+}
+.ui-jqgrid .ui-jqgrid-htable .colmenuspan {
+ display:inline-block;
+}
+
+.ui-jqgrid .ui-jqgrid-htable .ui-th-div {
+ height:17px;
+ margin-top:5px;
+}
+.column-menu, .ui-search-menu {
+ padding: 10px 15px;
+}
+.column-menu .divider {
+ background-color: #e5e5e5;
+ height: 1px;
+ padding:0 0;
+ margin: 5px 0;
+ overflow: hidden;
+}
+.ui-menu-item .ui-common-table .menu_icon {
+ padding-right: 8px;
+ padding-left: 8px;
+}
+td.menu_text {
+ width: auto;
+ padding-left: 1px;
+ white-space: nowrap;
+}
+#search_menu .ui-menu-item div {
+ padding: 3px 0;
+ white-space: nowrap;
+}
+
+#search_menu .search_buttons {
+ display:inline-block;
+ width:50%;
+ padding: 3px 3px;
+}
+.search_buttons .btn-default:hover {
+ padding-bottom: 6px;
+ padding-top: 6px;
+}
+.search_buttons #bs_reset {
+ margin-right: 3px;
+}
+.search_buttons #bs_search {
+ margin-left: 3px;
+}
+/*menubar*/
+.ui-jqgrid .ui-jqgrid-menubar {
+ margin: 5px 5px;
+ width:16px;
+ height:16px;
+}
+.ui-jqgrid a.ui-jqgrid-menubar {
+ text-decoration: none;
+ color : #010101; /*default*/
+}
+.ui-jqgrid .ui-jqgrid-menubar:hover {
+ margin: 5px 5px;
+ background-color: #ddd;
+ text-decoration: none;
+}
+.ui-jqgrid .menubar-rtl {
+ float : right;
+}
+
+.ui-jqgrid .menubar-ltr {
+ float : left;
+}
+/*printing*/
+
+.jqgridprint {
+ width : 100%;
+ font-size: 13px;
+}
+
+.jqgridprint th,
+.jqgridprint td {
+ padding: 4px 4px 4px 4px ;
+ text-align: center ;
+}
+.jqgridprint th {
+ border-bottom: 2px solid #333333 ;
+}
+.jqgridprint td {
+ border-bottom: 1px dotted #999999 ;
+}
+
+.jqgridprint tfoot td {
+ border-bottom-width: 0px ;
+ border-top: 2px solid #333333 ;
+ padding-top: 20px ;
+}
+.ui-jqgrid .jqgrid-caption-menu
+{
+ left:0;
+ top:30px;
+ position:absolute;
+ display:none;
+ font-size: inherit;
+ width : auto;
+}
+.ui-jqgrid .jqgrid-column-menu
+{
+ font-size:inherit;
+ width:auto;
+ position :absolute;
+}
diff --git a/backend/widgets/NotificationCountWidget.php b/backend/widgets/NotificationCountWidget.php
index 6712f7e..aa38e62 100644
--- a/backend/widgets/NotificationCountWidget.php
+++ b/backend/widgets/NotificationCountWidget.php
@@ -6,7 +6,7 @@
namespace backend\widgets;
-
+use Yii;
use yii\base\Widget;
class NotificationCountWidget extends Widget
@@ -15,14 +15,14 @@ class NotificationCountWidget extends Widget
{
$count = 0;
- if (isset(\Yii::$app->params['notifications'])) {
- foreach ( \Yii::$app->params['notifications'] as $notification ) {
+ if (isset(Yii::$app->params['notifications'])) {
+ foreach ( Yii::$app->params['notifications'] as $notification ) {
$count += $notification['count'];
}
}
return $this->render('notification-count', [
- 'notifications' => isset(\Yii::$app->params['notifications']) ? \Yii::$app->params['notifications'] : [],
+ 'notifications' => Yii::$app->params['notifications'] ?? [],
'count' => $count,
]);
}
diff --git a/backend/widgets/grid/CheckBoxColumn.php b/backend/widgets/grid/CheckBoxColumn.php
index cac779e..df8816c 100644
--- a/backend/widgets/grid/CheckBoxColumn.php
+++ b/backend/widgets/grid/CheckBoxColumn.php
@@ -6,7 +6,6 @@
namespace backend\widgets\grid;
-
class CheckBoxColumn extends \yii\grid\CheckboxColumn
{
public $headerOptions = ['class' => 'text-center', 'style' => 'width: 3em'];
diff --git a/common/config/main.php b/common/config/main.php
index d69dfc0..6e72884 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -1,4 +1,9 @@
[
'@bower' => '@vendor/bower-asset',
@@ -29,12 +34,12 @@ return [
'queue' => [
//'class' => 'yii\queue\redis\Queue',
//'as log' => 'yii\queue\LogBehavior',
- 'class' => \yii\queue\file\Queue::class,
+ 'class' => Queue::class,
//'path' => '@runtime/queue',
'path' => '@common/runtime/queue',
],
'avatar' => [
- 'class' => \zertex\avatar_generator\AvatarGenerator::class,
+ 'class' => AvatarGenerator::class,
'images_folder' => '@staticRoot/images/avatars',
'images_url' => '@static/images/avatars',
'size_width' => 300, // default: 300
@@ -45,7 +50,7 @@ return [
'text_over_image' => false,
],
'moduleManager' => [
- 'class' => \core\components\modules\ModuleManager::class,
+ 'class' => ModuleManager::class,
],
],
];
diff --git a/common/modules/banners/BannersModule.php b/common/modules/banners/BannersModule.php
index f495a2e..c8f1334 100644
--- a/common/modules/banners/BannersModule.php
+++ b/common/modules/banners/BannersModule.php
@@ -3,12 +3,15 @@
namespace common\modules\banners;
use core\components\modules\ModuleInterface;
+use Yii;
+use yii\base\Module;
use yii\helpers\ArrayHelper;
+use yii\web\Application;
/**
* blog module definition class
*/
-class BannersModule extends \yii\base\Module implements ModuleInterface
+class BannersModule extends Module implements ModuleInterface
{
/**
* @inheritdoc
@@ -25,7 +28,7 @@ class BannersModule extends \yii\base\Module implements ModuleInterface
// custom initialization code goes here
}
- public function bootstrap($app)
+ public function bootstrap(Application $app)
{
// add migration path
$app->controllerMap['migrate']['migrationPath'][] = '@common/modules/banners/migrations';
@@ -51,25 +54,25 @@ class BannersModule extends \yii\base\Module implements ModuleInterface
]);
// add menu items
- if (basename(\Yii::$app->getBasePath()) === 'backend') {
+ if (basename(Yii::$app->getBasePath()) === 'backend') {
$app->params['adminMenu'][] = [
- 'label' => \Yii::t('banners', 'Banners'),
- 'icon' => 'flag',
+ 'label' => Yii::t('banners', 'Banners'),
+ 'icon' => 'fas fa-flag',
'items' => [
[
- 'label' => \Yii::t('banners', 'Banners'),
- 'icon' => 'caret-right',
+ 'label' => Yii::t('banners', 'Banners'),
+ 'icon' => 'fas fa-caret-right',
'url' => ['/banners/manage/banner/index'],
//'active' => \Yii::$app->controller->getUniqueId() == 'banners/manage/banner'
],
[
- 'label' => \Yii::t('banners', 'Places'),
- 'icon' => 'caret-right',
+ 'label' => Yii::t('banners', 'Places'),
+ 'icon' => 'fas fa-caret-right',
'url' => ['/banners/manage/place/index'],
//'active' => \Yii::$app->controller->getUniqueId() == 'banners/manage/place'
],
],
- 'visible' => $app->user->can('admin') || \Yii::$app->user->can('BannersManagement'),
+ 'visible' => $app->user->can('admin') || Yii::$app->user->can('BannersManagement'),
];
}
}
diff --git a/common/modules/banners/controllers/BannerController.php b/common/modules/banners/controllers/BannerController.php
index 4107068..97fe149 100644
--- a/common/modules/banners/controllers/BannerController.php
+++ b/common/modules/banners/controllers/BannerController.php
@@ -9,36 +9,48 @@ namespace common\modules\banners\controllers;
use common\modules\banners\entities\Banner;
use common\modules\banners\services\BannerManageService;
use frontend\components\FrontendController;
+use Yii;
use yii\web\NotFoundHttpException;
class BannerController extends FrontendController
{
- private $_service;
+ private BannerManageService $service;
public function __construct(string $id, $module, BannerManageService $service, array $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
+ /**
+ * @throws NotFoundHttpException
+ */
public function actionView()
{
$id = filter_input(INPUT_POST, 'id', FILTER_VALIDATE_INT);
- if (\Yii::$app->request->isAjax && $id) {
+ if (Yii::$app->request->isAjax && $id) {
$banner = $this->findModel($id);
- $this->_service->addView($banner);
+ $this->service->addView($banner);
}
}
+ /**
+ * @throws NotFoundHttpException
+ */
public function actionClick()
{
$id = filter_input(INPUT_POST, 'id', FILTER_VALIDATE_INT);
- if (\Yii::$app->request->isAjax && $id) {
+ if (Yii::$app->request->isAjax && $id) {
$banner = $this->findModel($id);
- $this->_service->addClick($banner);
+ $this->service->addClick($banner);
}
}
+ /**
+ * @param $id
+ * @return Banner
+ * @throws NotFoundHttpException
+ */
protected function findModel($id): Banner
{
if (($model = Banner::findOne($id)) !== null) {
diff --git a/common/modules/banners/controllers/manage/BannerController.php b/common/modules/banners/controllers/manage/BannerController.php
index ce0cec6..118281e 100644
--- a/common/modules/banners/controllers/manage/BannerController.php
+++ b/common/modules/banners/controllers/manage/BannerController.php
@@ -6,20 +6,22 @@ use common\modules\banners\entities\Banner;
use common\modules\banners\forms\BannerForm;
use common\modules\banners\forms\search\BannerSearch;
use common\modules\banners\services\BannerManageService;
+use DomainException;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\web\Controller;
use Yii;
+use yii\web\Response;
class BannerController extends Controller
{
- private $_service;
+ private BannerManageService $service;
public function __construct($id, $module, BannerManageService $service, $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
public function behaviors(): array
@@ -48,9 +50,9 @@ class BannerController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new BannerSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -67,7 +69,7 @@ class BannerController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'banner' => $this->findModel($id),
@@ -75,18 +77,18 @@ class BannerController extends Controller
}
/**
- * @return mixed
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): string|Response
{
$form = new BannerForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $form = $this->_service->create($form);
+ $form = $this->service->create($form);
return $this->redirect(['view', 'id' => $form->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -102,10 +104,10 @@ class BannerController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$banner = $this->findModel($id);
$form = new BannerForm($banner);
@@ -113,10 +115,10 @@ class BannerController extends Controller
$form->end_at = date('d.m.Y H:i:s', $form->end_at);
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_service->edit($banner->id, $form);
+ $this->service->edit($banner->id, $form);
return $this->redirect(['view', 'id' => $banner->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -129,15 +131,14 @@ class BannerController extends Controller
}
/**
- * @param integer $id
- *
- * @return mixed
+ * @param int $id
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
- $this->_service->remove($id);
- } catch (\DomainException $e) {
+ $this->service->remove($id);
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -151,7 +152,7 @@ class BannerController extends Controller
* @return Banner the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): Banner
+ protected function findModel(int $id): Banner
{
if (($model = Banner::findOne($id)) !== null) {
return $model;
diff --git a/common/modules/banners/controllers/manage/PlaceController.php b/common/modules/banners/controllers/manage/PlaceController.php
index f8f8b06..7b29de8 100644
--- a/common/modules/banners/controllers/manage/PlaceController.php
+++ b/common/modules/banners/controllers/manage/PlaceController.php
@@ -6,20 +6,22 @@ use common\modules\banners\entities\BannerPlace;
use common\modules\banners\forms\BannerPlaceForm;
use common\modules\banners\forms\search\PlaceSearch;
use common\modules\banners\services\BannerPlaceManageService;
+use DomainException;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\web\Controller;
use Yii;
+use yii\web\Response;
class PlaceController extends Controller
{
- private $_service;
+ private BannerPlaceManageService $service;
public function __construct($id, $module, BannerPlaceManageService $service, $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
public function behaviors(): array
@@ -48,9 +50,9 @@ class PlaceController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new PlaceSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -67,7 +69,7 @@ class PlaceController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'place' => $this->findModel($id),
@@ -75,17 +77,17 @@ class PlaceController extends Controller
}
/**
- * @return mixed
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): string|Response
{
$form = new BannerPlaceForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $form = $this->_service->create($form);
+ $form = $this->service->create($form);
return $this->redirect(['view', 'id' => $form->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -101,20 +103,20 @@ class PlaceController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$place = $this->findModel($id);
$form = new BannerPlaceForm($place);
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_service->edit($place->id, $form);
+ $this->service->edit($place->id, $form);
return $this->redirect(['view', 'id' => $place->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -129,13 +131,13 @@ class PlaceController extends Controller
/**
* @param integer $id
*
- * @return mixed
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
- $this->_service->remove($id);
- } catch (\DomainException $e) {
+ $this->service->remove($id);
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -149,7 +151,7 @@ class PlaceController extends Controller
* @return BannerPlace the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): BannerPlace
+ protected function findModel(int $id): BannerPlace
{
if (($model = BannerPlace::findOne($id)) !== null) {
return $model;
diff --git a/common/modules/banners/entities/Banner.php b/common/modules/banners/entities/Banner.php
index 39a0572..d09ece8 100644
--- a/common/modules/banners/entities/Banner.php
+++ b/common/modules/banners/entities/Banner.php
@@ -3,7 +3,9 @@
namespace common\modules\banners\entities;
use common\modules\banners\entities\queries\BannerQuery;
+use DomainException;
use yii\behaviors\TimestampBehavior;
+use yii\db\ActiveQuery;
use yii\db\ActiveRecord;
use yii\web\UploadedFile;
use Yii;
@@ -99,7 +101,7 @@ class Banner extends ActiveRecord
/**
* @inheritdoc
*/
- public static function tableName()
+ public static function tableName(): string
{
return 'banners';
}
@@ -107,7 +109,7 @@ class Banner extends ActiveRecord
/**
* @inheritdoc
*/
- public function attributeLabels()
+ public function attributeLabels(): array
{
return [
'id' => Yii::t('banners', 'ID'),
@@ -131,7 +133,7 @@ class Banner extends ActiveRecord
public function activate(): void
{
if ($this->isActive()) {
- throw new \DomainException('Banner is already active.');
+ throw new DomainException('Banner is already active.');
}
$this->active = self::STATUS_ACTIVE;
}
@@ -139,7 +141,7 @@ class Banner extends ActiveRecord
public function draft(): void
{
if ($this->isDraft()) {
- throw new \DomainException('Banner is already draft.');
+ throw new DomainException('Banner is already draft.');
}
$this->active = self::STATUS_DRAFT;
}
@@ -155,7 +157,7 @@ class Banner extends ActiveRecord
return $this->active == self::STATUS_DRAFT;
}
- public function getPlace()
+ public function getPlace(): ActiveQuery
{
return $this->hasOne(BannerPlace::class, ['id' => 'place_id']);
}
diff --git a/common/modules/banners/entities/BannerPlace.php b/common/modules/banners/entities/BannerPlace.php
index 1879de5..b2baeaa 100644
--- a/common/modules/banners/entities/BannerPlace.php
+++ b/common/modules/banners/entities/BannerPlace.php
@@ -3,6 +3,8 @@
namespace common\modules\banners\entities;
use common\modules\banners\entities\queries\BannerPlaceQuery;
+use DomainException;
+use yii\db\ActiveQuery;
use yii\db\ActiveRecord;
use Yii;
@@ -46,7 +48,7 @@ class BannerPlace extends ActiveRecord
/**
* @inheritdoc
*/
- public static function tableName()
+ public static function tableName(): string
{
return 'banners_places';
}
@@ -68,7 +70,7 @@ class BannerPlace extends ActiveRecord
public function activate(): void
{
if ($this->isActive()) {
- throw new \DomainException('Place is already active.');
+ throw new DomainException('Place is already active.');
}
$this->active = self::STATUS_ACTIVE;
}
@@ -76,7 +78,7 @@ class BannerPlace extends ActiveRecord
public function draft(): void
{
if ($this->isDraft()) {
- throw new \DomainException('Place is already draft.');
+ throw new DomainException('Place is already draft.');
}
$this->active = self::STATUS_DRAFT;
}
@@ -91,12 +93,12 @@ class BannerPlace extends ActiveRecord
return $this->active == self::STATUS_DRAFT;
}
- public function getBanners()
+ public function getBanners(): ActiveQuery
{
return $this->hasMany(Banner::class, ['place_id' => 'id']);
}
- public function getActiveBanners()
+ public function getActiveBanners(): ActiveQuery
{
return $this->hasMany(Banner::class, ['place_id' => 'id'])->andWhere(['active' => Banner::STATUS_ACTIVE]);
}
diff --git a/common/modules/banners/forms/BannerForm.php b/common/modules/banners/forms/BannerForm.php
index 5b2a1d6..3bc1c6c 100644
--- a/common/modules/banners/forms/BannerForm.php
+++ b/common/modules/banners/forms/BannerForm.php
@@ -9,22 +9,19 @@ use yii\web\UploadedFile;
class BannerForm extends Model
{
- public $title;
+ public ?string $title = null;
- /**
- * @var UploadedFile
- */
- public $image;
- public $url;
- public $target;
- public $active;
- public $start_at;
- public $end_at;
- public $include_urls;
- public $exclude_urls;
- public $place_id;
+ public string|null|UploadedFile $image = null;
+ public ?string $url = null;
+ public ?string $target = null;
+ public ?int $active = null;
+ public ?int $start_at = null;
+ public ?int $end_at = null;
+ public ?string $include_urls = null;
+ public ?string $exclude_urls = null;
+ public ?int $place_id = null;
- public $_banner;
+ public Banner $banner;
public function __construct(Banner $banner = null, $config = [])
{
@@ -39,7 +36,7 @@ class BannerForm extends Model
$this->include_urls = $banner->include_urls;
$this->exclude_urls = $banner->exclude_urls;
$this->place_id = $banner->place_id;
- $this->_banner = $banner;
+ $this->banner = $banner;
}
parent::__construct($config);
}
@@ -53,13 +50,10 @@ class BannerForm extends Model
[['include_urls', 'exclude_urls'], 'string'],
[['image'], 'file', 'extensions' => 'png, jpg, gif'],
[['start_at', 'end_at'], 'safe'],
- /*[['start_at', 'end_at'], 'date',
- 'format' => 'php:d.m.Y H:i'
- ],*/
];
}
- public function attributeLabels()
+ public function attributeLabels(): array
{
return [
'id' => Yii::t('banners', 'ID'),
@@ -80,7 +74,7 @@ class BannerForm extends Model
];
}
- public function beforeValidate()
+ public function beforeValidate(): bool
{
if (parent::beforeValidate()) {
$this->image = UploadedFile::getInstance($this, 'image');
@@ -92,13 +86,4 @@ class BannerForm extends Model
return false;
}
-
- /*public function afterValidate() {
- if (parent::afterValidate()) {
- $this->start_at = strtotime($this->start_at);
- $this->end_at = strtotime($this->end_at);
- return true;
- }
- return false;
- }*/
}
diff --git a/common/modules/banners/forms/BannerPlaceForm.php b/common/modules/banners/forms/BannerPlaceForm.php
index cd334bd..73e9a50 100644
--- a/common/modules/banners/forms/BannerPlaceForm.php
+++ b/common/modules/banners/forms/BannerPlaceForm.php
@@ -8,12 +8,12 @@ use Yii;
class BannerPlaceForm extends Model
{
- public $title;
- public $width;
- public $height;
- public $active;
+ public ?string $title = null;
+ public ?int $width = null;
+ public ?int $height = null;
+ public ?int $active = null;
- public $_place;
+ public BannerPlace $place;
public function __construct(BannerPlace $place = null, $config = [])
{
@@ -22,7 +22,7 @@ class BannerPlaceForm extends Model
$this->width = $place->width;
$this->height = $place->height;
$this->active = $place->active;
- $this->_place = $place;
+ $this->place = $place;
}
parent::__construct($config);
}
diff --git a/common/modules/banners/forms/search/BannerSearch.php b/common/modules/banners/forms/search/BannerSearch.php
index 7308f90..defb6a5 100644
--- a/common/modules/banners/forms/search/BannerSearch.php
+++ b/common/modules/banners/forms/search/BannerSearch.php
@@ -8,11 +8,11 @@ use yii\data\ActiveDataProvider;
class BannerSearch extends Model
{
- public $id;
- public $title;
- public $active;
- public $place_id;
- public $target;
+ public ?int $id = null;
+ public ?string $title = null;
+ public ?int $active = null;
+ public ?int $place_id = null;
+ public ?string $target = null;
public function rules(): array
{
diff --git a/common/modules/banners/forms/search/PlaceSearch.php b/common/modules/banners/forms/search/PlaceSearch.php
index 79347fe..ed825aa 100644
--- a/common/modules/banners/forms/search/PlaceSearch.php
+++ b/common/modules/banners/forms/search/PlaceSearch.php
@@ -8,11 +8,11 @@ use yii\data\ActiveDataProvider;
class PlaceSearch extends Model
{
- public $id;
- public $title;
- public $width;
- public $height;
- public $active;
+ public ?int $id = null;
+ public ?string $title = null;
+ public ?int $width = null;
+ public ?int $height = null;
+ public ?int $active = null;
public function rules(): array
{
diff --git a/common/modules/banners/helpers/BannerHelper.php b/common/modules/banners/helpers/BannerHelper.php
index e25e5e5..ce2c241 100644
--- a/common/modules/banners/helpers/BannerHelper.php
+++ b/common/modules/banners/helpers/BannerHelper.php
@@ -7,6 +7,7 @@
namespace common\modules\banners\helpers;
use common\modules\banners\entities\Banner;
+use Exception;
use yii\helpers\ArrayHelper;
use yii\helpers\Html;
use Yii;
@@ -21,6 +22,11 @@ class BannerHelper
];
}
+ /**
+ * @param $target
+ * @return string
+ * @throws Exception
+ */
public static function targetName($target): string
{
return ArrayHelper::getValue(self::targetList(), $target);
@@ -34,23 +40,28 @@ class BannerHelper
];
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusName($status): string
{
return ArrayHelper::getValue(self::statusList(), $status);
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusLabel($status): string
{
- switch ($status) {
- case Banner::STATUS_DRAFT:
- $class = 'label label-default';
- break;
- case Banner::STATUS_ACTIVE:
- $class = 'label label-success';
- break;
- default:
- $class = 'label label-default';
- }
+ $class = match ($status) {
+ Banner::STATUS_DRAFT => 'label label-default',
+ Banner::STATUS_ACTIVE => 'label label-success',
+ default => 'label label-default',
+ };
return Html::tag('span', ArrayHelper::getValue(self::statusList(), $status), [
'class' => $class,
diff --git a/common/modules/banners/repositories/BannerPlaceRepository.php b/common/modules/banners/repositories/BannerPlaceRepository.php
index 630ed9a..e5024fb 100644
--- a/common/modules/banners/repositories/BannerPlaceRepository.php
+++ b/common/modules/banners/repositories/BannerPlaceRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\banners\repositories;
use common\modules\banners\entities\BannerPlace;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class BannerPlaceRepository
{
@@ -18,14 +20,18 @@ class BannerPlaceRepository
public function save(BannerPlace $place): void
{
if (!$place->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param BannerPlace $place
+ * @throws StaleObjectException
+ */
public function remove(BannerPlace $place): void
{
if (!$place->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
}
diff --git a/common/modules/banners/repositories/BannerRepository.php b/common/modules/banners/repositories/BannerRepository.php
index 61bf2c4..f25bc1c 100644
--- a/common/modules/banners/repositories/BannerRepository.php
+++ b/common/modules/banners/repositories/BannerRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\banners\repositories;
use common\modules\banners\entities\Banner;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class BannerRepository
{
@@ -18,14 +20,18 @@ class BannerRepository
public function save(Banner $banner): void
{
if (!$banner->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param Banner $banner
+ * @throws StaleObjectException
+ */
public function remove(Banner $banner): void
{
if (!$banner->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
}
diff --git a/common/modules/banners/services/BannerManageService.php b/common/modules/banners/services/BannerManageService.php
index 3413fc6..2b874bc 100644
--- a/common/modules/banners/services/BannerManageService.php
+++ b/common/modules/banners/services/BannerManageService.php
@@ -5,22 +5,30 @@ namespace common\modules\banners\services;
use common\modules\banners\entities\Banner;
use common\modules\banners\forms\BannerForm;
use common\modules\banners\repositories\BannerRepository;
+use Yii;
+use yii\base\Exception;
use yii\base\Security;
+use yii\db\StaleObjectException;
class BannerManageService
{
- private $_repository;
+ private BannerRepository $repository;
public function __construct(BannerRepository $repository)
{
- $this->_repository = $repository;
+ $this->repository = $repository;
}
+ /**
+ * @param BannerForm $form
+ * @return Banner
+ * @throws Exception
+ */
public function create(BannerForm $form): Banner
{
if ($form->image) {
$filename = $form->image->baseName . '_' . (new Security())->generateRandomString(5) . '.' . $form->image->extension;
- $path = \Yii::getAlias(Banner::FILE_ORIGINAL_PATH);
+ $path = Yii::getAlias(Banner::FILE_ORIGINAL_PATH);
if (!file_exists($path)) {
mkdir($path, 0777, true);
}
@@ -40,18 +48,23 @@ class BannerManageService
$form->active,
$form->place_id
);
- $this->_repository->save($banner);
+ $this->repository->save($banner);
return $banner;
}
+ /**
+ * @param $id
+ * @param BannerForm $form
+ * @throws Exception
+ */
public function edit($id, BannerForm $form): void
{
- $banner = $this->_repository->get($id);
+ $banner = $this->repository->get($id);
if ($form->image) {
$filename = $form->image->baseName . '_' . (new Security())->generateRandomString(5) . '.' . $form->image->extension;
- $path = \Yii::getAlias(Banner::FILE_ORIGINAL_PATH);
+ $path = Yii::getAlias(Banner::FILE_ORIGINAL_PATH);
$form->image->saveAs($path . '/' . $filename);
$form->image = $filename;
} else {
@@ -70,24 +83,28 @@ class BannerManageService
$form->active,
$form->place_id
);
- $this->_repository->save($banner);
+ $this->repository->save($banner);
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
- $banner = $this->_repository->get($id);
- $this->_repository->remove($banner);
+ $banner = $this->repository->get($id);
+ $this->repository->remove($banner);
}
public function addView(Banner $banner)
{
$banner->views++;
- $this->_repository->save($banner);
+ $this->repository->save($banner);
}
public function addClick(Banner $banner)
{
$banner->clicks++;
- $this->_repository->save($banner);
+ $this->repository->save($banner);
}
}
diff --git a/common/modules/banners/services/BannerPlaceManageService.php b/common/modules/banners/services/BannerPlaceManageService.php
index b362e9b..71bbc1e 100644
--- a/common/modules/banners/services/BannerPlaceManageService.php
+++ b/common/modules/banners/services/BannerPlaceManageService.php
@@ -5,14 +5,15 @@ namespace common\modules\banners\services;
use common\modules\banners\entities\BannerPlace;
use common\modules\banners\forms\BannerPlaceForm;
use common\modules\banners\repositories\BannerPlaceRepository;
+use yii\db\StaleObjectException;
class BannerPlaceManageService
{
- private $_repository;
+ private BannerPlaceRepository $repository;
public function __construct(BannerPlaceRepository $repository)
{
- $this->_repository = $repository;
+ $this->repository = $repository;
}
public function create(BannerPlaceForm $form): BannerPlace
@@ -23,26 +24,30 @@ class BannerPlaceManageService
$form->height,
$form->active
);
- $this->_repository->save($place);
+ $this->repository->save($place);
return $place;
}
public function edit($id, BannerPlaceForm $form): void
{
- $place = $this->_repository->get($id);
+ $place = $this->repository->get($id);
$place->edit(
$form->title,
$form->width,
$form->height,
$form->active
);
- $this->_repository->save($place);
+ $this->repository->save($place);
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
- $place = $this->_repository->get($id);
- $this->_repository->remove($place);
+ $place = $this->repository->get($id);
+ $this->repository->remove($place);
}
}
diff --git a/common/modules/banners/views/manage/banner/_form.php b/common/modules/banners/views/manage/banner/_form.php
index b8fa27c..cf9e385 100644
--- a/common/modules/banners/views/manage/banner/_form.php
+++ b/common/modules/banners/views/manage/banner/_form.php
@@ -1,5 +1,6 @@
title = Yii::t('banners', 'Create Banner');
$this->params['breadcrumbs'][] = ['label' => Yii::t('banners', 'Banners'), 'url' => ['index']];
diff --git a/common/modules/banners/views/manage/banner/index.php b/common/modules/banners/views/manage/banner/index.php
index caa1d10..c1b237e 100644
--- a/common/modules/banners/views/manage/banner/index.php
+++ b/common/modules/banners/views/manage/banner/index.php
@@ -1,6 +1,7 @@
title = Yii::t('banners', 'Banners');
diff --git a/common/modules/banners/views/manage/banner/update.php b/common/modules/banners/views/manage/banner/update.php
index cdf268e..abd44ef 100644
--- a/common/modules/banners/views/manage/banner/update.php
+++ b/common/modules/banners/views/manage/banner/update.php
@@ -1,8 +1,11 @@
title = Yii::t('banners', 'Update Banner: {name}', ['name' => $banner->title]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('banners', 'Banners'), 'url' => ['index']];
diff --git a/common/modules/banners/views/manage/place/_form.php b/common/modules/banners/views/manage/place/_form.php
index 9b962e3..059ba75 100644
--- a/common/modules/banners/views/manage/place/_form.php
+++ b/common/modules/banners/views/manage/place/_form.php
@@ -32,8 +32,8 @@ $this->registerJs($js2);
-
-
+
+
field($model, 'title')->textInput(['maxlength' => true]) ?>
@@ -47,19 +47,20 @@ $this->registerJs($js2);
+
-
- 'btn btn-success']) ?>
-
+
-
-
-
+
+
+
field($model, 'active')->radioList(BannerHelper::statusList()) ?>
diff --git a/common/modules/banners/views/manage/place/index.php b/common/modules/banners/views/manage/place/index.php
index 97624fd..b2f184b 100644
--- a/common/modules/banners/views/manage/place/index.php
+++ b/common/modules/banners/views/manage/place/index.php
@@ -1,26 +1,25 @@
title = Yii::t('banners', 'Places');
$this->params['breadcrumbs'][] = $this->title;
?>
-
-
- 'btn btn-success']) ?>
-
-
-
-
+
+
+ 'btn btn-sm btn-success']) ?>
+
+
$dataProvider,
'filterModel' => $searchModel,
diff --git a/common/modules/banners/widgets/BannerWidget.php b/common/modules/banners/widgets/BannerWidget.php
index ee9b593..00794f8 100644
--- a/common/modules/banners/widgets/BannerWidget.php
+++ b/common/modules/banners/widgets/BannerWidget.php
@@ -12,9 +12,9 @@ use yii\base\Widget;
class BannerWidget extends Widget
{
- public $id;
+ public int $id;
- public function run()
+ public function run(): string
{
$place = BannerPlace::findOne($this->id);
if (!$place) {
@@ -24,7 +24,6 @@ class BannerWidget extends Widget
$banners = Banner::find()
->active()
->showTime()
- //->excludeFree()
->andWhere(['place_id' => $place->id])
->all();
diff --git a/common/modules/banners/widgets/views/banner.php b/common/modules/banners/widgets/views/banner.php
index 76c1eb5..9070d22 100644
--- a/common/modules/banners/widgets/views/banner.php
+++ b/common/modules/banners/widgets/views/banner.php
@@ -4,12 +4,14 @@
* Date: 22.08.2018
*/
+use common\modules\banners\entities\Banner;
use yii\helpers\Html;
use yii\helpers\Url;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $banner \common\modules\banners\entities\Banner;
+ * @var $this View
+ * @var $banner Banner;
*/
$banner_id = 'banner_' . $banner->id;
diff --git a/common/modules/forms/FormsModule.php b/common/modules/forms/FormsModule.php
index 8ae6b91..7e96bde 100644
--- a/common/modules/forms/FormsModule.php
+++ b/common/modules/forms/FormsModule.php
@@ -5,7 +5,9 @@ namespace common\modules\forms;
use common\modules\forms\entities\FormMessage;
use common\modules\forms\urls\FormsUrlRule;
use core\components\modules\ModuleInterface;
+use Yii;
use yii\helpers\ArrayHelper;
+use yii\web\Application;
/**
* blog module definition class
@@ -27,7 +29,7 @@ class FormsModule extends \yii\base\Module implements ModuleInterface
// custom initialization code goes here
}
- public function bootstrap($app)
+ public function bootstrap(Application $app)
{
// add migration path
$app->controllerMap['migrate']['migrationPath'][] = '@common/modules/forms/migrations';
@@ -52,26 +54,26 @@ class FormsModule extends \yii\base\Module implements ModuleInterface
// add menu items
if (basename($app->getBasePath()) === 'backend') {
$app->params['adminMenu'][] = [
- 'label' => \Yii::t('forms', 'Forms'),
- 'icon' => 'address-card-o',
+ 'label' => Yii::t('forms', 'Forms'),
+ 'icon' => 'far fa-address-card',
'items' => [
[
- 'label' => \Yii::t('forms', 'Forms'),
- 'icon' => 'caret-right',
+ 'label' => Yii::t('forms', 'Forms'),
+ 'icon' => 'fas fa-caret-right',
'url' => ['/forms/manage/form/index']
],
[
- 'label' => \Yii::t('forms', 'Messages'),
- 'icon' => 'caret-right',
- 'url' => ['/forms/manage/form-message/index']
+ 'label' => Yii::t('forms', 'Messages'),
+ 'icon' => 'fas fa-caret-right',
+ 'url' => ['/forms/manage/form-message/index'],
],
],
- 'visible' => \Yii::$app->user->can('admin') || \Yii::$app->user->can('FormsManagement'),
+ 'visible' => Yii::$app->user->can('admin') || Yii::$app->user->can('FormsManagement'),
];
}
// prepare notifications
- $new_messages_count = \Yii::$app->moduleManager->isTableExist('{{%forms}}') ? FormMessage::find()->unread()->count() : 0;
+ $new_messages_count = Yii::$app->moduleManager->isTableExist('{{%forms}}') ? FormMessage::find()->unread()->count() : 0;
if ($new_messages_count > 0) {
$app->params['notifications'][] = [
'icon' => 'address-card-o',
diff --git a/common/modules/forms/controllers/FormController.php b/common/modules/forms/controllers/FormController.php
index d5b0228..b9c841e 100644
--- a/common/modules/forms/controllers/FormController.php
+++ b/common/modules/forms/controllers/FormController.php
@@ -9,17 +9,19 @@ namespace common\modules\forms\controllers;
use common\modules\forms\entities\Form;
use common\modules\forms\services\FormMessageManageService;
use frontend\components\FrontendController;
+use RuntimeException;
use yii\base\Model;
use yii\helpers\Html;
use yii\helpers\Json;
use yii\mail\MailerInterface;
use yii\web\NotFoundHttpException;
use Yii;
+use yii\web\Response;
class FormController extends FrontendController
{
- public $mailer;
- public $message_service;
+ public MailerInterface $mailer;
+ public FormMessageManageService $message_service;
public function __construct(
string $id,
@@ -33,7 +35,12 @@ class FormController extends FrontendController
$this->message_service = $message_service;
}
- public function actionSend($id)
+ /**
+ * @param $id
+ * @return Response|string
+ * @throws NotFoundHttpException
+ */
+ public function actionSend($id): Response|string
{
$form = $this->findModel($id);
@@ -50,8 +57,6 @@ class FormController extends FrontendController
if ($form->complete_page_id) {
return $this->redirect(['/pages/page/view', 'id' => $form->complete_page_id]);
}
-
- //return $form->complete_text;
return $this->render('view', ['text' => $form->complete_text]);
}
@@ -78,7 +83,7 @@ class FormController extends FrontendController
->setSubject($form->subject)
->send();
if (!$sent) {
- throw new \RuntimeException('Sending error.');
+ throw new RuntimeException('Sending error.');
}
}
@@ -99,7 +104,7 @@ class FormController extends FrontendController
$item['name'] = str_replace('-', '_', $item['name']);
$items[] = [
- 'key' => isset($item['label']) ? $item['label'] : '',
+ 'key' => $item['label'] ?? '',
'value' => is_array($dynaForm->{$item['name']}) ? implode(', ', array_map(function ($el) {
return Html::encode($el);
}, $dynaForm->{$item['name']})) : Html::encode($dynaForm->{$item['name']}),
@@ -109,18 +114,11 @@ class FormController extends FrontendController
return $items;
}
- /*private function prepareMessage($json_string, $dynaForm): string
- {
- $message = '';
- $json = Json::decode($json_string, true);
- foreach ($json as $item) {
- if ($item['type'] == 'button') {continue;}
- $item['name'] = str_replace('-', '_', $item['name']);
- $message.=$item['label'] . ': ' . Html::encode($dynaForm->{$item['name']}) . "\n";
- }
- return $message;
- }*/
-
+ /**
+ * @param $id
+ * @return Form
+ * @throws NotFoundHttpException
+ */
protected function findModel($id): Form
{
if (($model = Form::findOne($id)) !== null) {
diff --git a/common/modules/forms/controllers/manage/FormController.php b/common/modules/forms/controllers/manage/FormController.php
index a6c78db..cd12b82 100644
--- a/common/modules/forms/controllers/manage/FormController.php
+++ b/common/modules/forms/controllers/manage/FormController.php
@@ -7,6 +7,7 @@ use common\modules\forms\forms\FormSearch;
use common\modules\forms\entities\Form;
use common\modules\pages\entities\Page;
use common\modules\forms\forms\FormForm;
+use DomainException;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
@@ -16,12 +17,12 @@ use Yii;
class FormController extends Controller
{
- private $_service;
+ private FormManageService $service;
public function __construct($id, $module, FormManageService $service, $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
public function behaviors(): array
@@ -50,9 +51,9 @@ class FormController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new FormSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -69,7 +70,7 @@ class FormController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'form' => $this->findModel($id),
@@ -77,17 +78,17 @@ class FormController extends Controller
}
/**
- * @return mixed
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): string|Response
{
$form = new FormForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $form = $this->_service->create($form);
+ $form = $this->service->create($form);
return $this->redirect(['view', 'id' => $form->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -101,20 +102,20 @@ class FormController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$form_model = $this->findModel($id);
$form = new FormForm($form_model);
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_service->edit($form_model->id, $form);
+ $this->service->edit($form_model->id, $form);
return $this->redirect(['view', 'id' => $form_model->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -129,13 +130,13 @@ class FormController extends Controller
/**
* @param integer $id
*
- * @return mixed
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
- $this->_service->remove($id);
- } catch (\DomainException $e) {
+ $this->service->remove($id);
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -143,10 +144,9 @@ class FormController extends Controller
return $this->redirect(['index']);
}
-
public function actionPageSearch($q = null, $id = null)
{
- \Yii::$app->response->format = Response::FORMAT_JSON;
+ Yii::$app->response->format = Response::FORMAT_JSON;
$out = ['results' => ['id' => '', 'text' => '']];
if (!is_null($q)) {
$data = [];
@@ -167,19 +167,6 @@ class FormController extends Controller
$tag_name = Page::findOne($id)->translation->title;
$out['results'] = ['id' => $tag_name, 'text' => $tag_name];
} else {
- /*$data = [];
- $pages = Page::find()
- ->with('translation')
- ->leftJoin('{{%pages_lng}}', '`pages_lng`.`page_id` = `pages`.`id`')
- ->limit(20)
- ->all();
- foreach ($pages as $page) {
- $data[] = [
- 'id' => $page->id,
- 'text' => isset($page->translation) ? $page->translation->title : null,
- ];
- }*/
-
$data = [];
$pages = Page::find()->typePublic()->orderBy(['id' => SORT_DESC])->limit(20)->all();
foreach ($pages as $page) {
@@ -200,7 +187,7 @@ class FormController extends Controller
* @return Form the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): Form
+ protected function findModel(int $id): Form
{
if (($model = Form::findOne($id)) !== null) {
return $model;
diff --git a/common/modules/forms/controllers/manage/FormMessageController.php b/common/modules/forms/controllers/manage/FormMessageController.php
index 3b06a8f..bab4f4d 100644
--- a/common/modules/forms/controllers/manage/FormMessageController.php
+++ b/common/modules/forms/controllers/manage/FormMessageController.php
@@ -5,6 +5,7 @@ namespace common\modules\forms\controllers\manage;
use common\modules\forms\entities\FormMessage;
use common\modules\forms\forms\FormMessageSearch;
use common\modules\forms\services\FormMessageManageService;
+use DomainException;
use yii\helpers\Json;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
@@ -15,7 +16,7 @@ use yii\web\Response;
class FormMessageController extends Controller
{
- private $service;
+ private FormMessageManageService $service;
public function __construct($id, $module, FormMessageManageService $service, $config = [])
{
@@ -49,9 +50,9 @@ class FormMessageController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new FormMessageSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -68,7 +69,7 @@ class FormMessageController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
$this->service->setRead($id);
return $this->render('view', [
@@ -78,13 +79,13 @@ class FormMessageController extends Controller
/**
* @param integer $id
- * @return mixed
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
$this->service->remove($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -94,7 +95,7 @@ class FormMessageController extends Controller
public function actionDeleteSelected()
{
$post = Yii::$app->request->post();
- $ids = isset($post['ids']) ? $post['ids'] : null;
+ $ids = $post['ids'] ?? null;
Yii::$app->response->format = Response::FORMAT_JSON;
if (!$ids) {
return [
@@ -107,7 +108,7 @@ class FormMessageController extends Controller
{
try {
$this->service->remove($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
return [
@@ -121,10 +122,10 @@ class FormMessageController extends Controller
];
}
- public function actionReadSelected()
+ public function actionReadSelected(): array
{
$post = Yii::$app->request->post();
- $ids = isset($post['ids']) ? $post['ids'] : null;
+ $ids = $post['ids'] ?? null;
Yii::$app->response->format = Response::FORMAT_JSON;
if (!$ids) {
return [
@@ -137,7 +138,7 @@ class FormMessageController extends Controller
{
try {
$this->service->setRead($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
return [
@@ -150,10 +151,10 @@ class FormMessageController extends Controller
];
}
- public function actionUnreadSelected()
+ public function actionUnreadSelected(): array
{
$post = Yii::$app->request->post();
- $ids = isset($post['ids']) ? $post['ids'] : null;
+ $ids = $post['ids'] ?? null;
Yii::$app->response->format = Response::FORMAT_JSON;
if (!$ids) {
return [
@@ -166,7 +167,7 @@ class FormMessageController extends Controller
{
try {
$this->service->setUnread($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
return [
diff --git a/common/modules/forms/entities/Form.php b/common/modules/forms/entities/Form.php
index 3eefb7e..7835afd 100644
--- a/common/modules/forms/entities/Form.php
+++ b/common/modules/forms/entities/Form.php
@@ -4,6 +4,7 @@ namespace common\modules\forms\entities;
use common\modules\forms\entities\queries\FormQuery;
use yii\behaviors\TimestampBehavior;
+use yii\db\ActiveQuery;
use yii\db\ActiveRecord;
use Yii;
@@ -95,7 +96,8 @@ class Form extends ActiveRecord
];
}
- public function attributeLabels() {
+ public function attributeLabels(): array
+ {
return [
'name' => Yii::t('forms', 'Name'),
'data' => Yii::t('forms', 'Form'),
@@ -110,7 +112,7 @@ class Form extends ActiveRecord
];
}
- public function getMessages()
+ public function getMessages(): ActiveQuery
{
return $this->hasMany(FormMessage::class, ['form_id' => 'id']);
}
@@ -119,4 +121,4 @@ class Form extends ActiveRecord
{
return new FormQuery(static::class);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/entities/FormMessage.php b/common/modules/forms/entities/FormMessage.php
index 2983cb4..c151df0 100644
--- a/common/modules/forms/entities/FormMessage.php
+++ b/common/modules/forms/entities/FormMessage.php
@@ -4,6 +4,7 @@ namespace common\modules\forms\entities;
use common\modules\forms\entities\queries\FormMessageQuery;
use yii\behaviors\TimestampBehavior;
+use yii\db\ActiveQuery;
use yii\db\ActiveRecord;
use Yii;
@@ -62,14 +63,15 @@ class FormMessage extends ActiveRecord
];
}
- public function attributeLabels() {
+ public function attributeLabels(): array
+ {
return [
'form_id' => Yii::t('forms', 'Form'),
'data' => Yii::t('forms', 'Form Data'),
];
}
- public function getForm()
+ public function getForm(): ActiveQuery
{
return $this->hasOne(Form::class, ['id' => 'form_id']);
}
@@ -78,4 +80,4 @@ class FormMessage extends ActiveRecord
{
return new FormMessageQuery(static::class);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/forms/FormForm.php b/common/modules/forms/forms/FormForm.php
index b16eb90..d9fdf35 100644
--- a/common/modules/forms/forms/FormForm.php
+++ b/common/modules/forms/forms/FormForm.php
@@ -9,18 +9,18 @@ use yii\helpers\Json;
class FormForm extends Model
{
- public $name;
- public $data;
- public $subject;
- public $from;
- public $reply;
- public $return;
- public $complete_text;
- public $complete_page_id;
- public $status;
- public $captcha;
+ public ?string $name = null;
+ public ?string $data = null;
+ public ?string $subject = null;
+ public ?string $from = null;
+ public ?string $reply = null;
+ public ?string $return = null;
+ public ?string $complete_text = null;
+ public ?int $complete_page_id = null;
+ public ?int $status = null;
+ public ?int $captcha = null;
- public $_form;
+ public Form $form;
public function __construct(Form $form = null, $config = [])
{
@@ -36,7 +36,7 @@ class FormForm extends Model
$this->status = $form->status;
$this->captcha = $form->captcha;
- $this->_form = $form;
+ $this->form = $form;
}
else {
$this->data = Json::encode([]);
@@ -56,7 +56,8 @@ class FormForm extends Model
];
}
- public function attributeLabels() {
+ public function attributeLabels(): array
+ {
return [
'name' => Yii::t('forms', 'Name'),
'data' => Yii::t('forms', 'Form'),
@@ -70,4 +71,4 @@ class FormForm extends Model
'captcha' => Yii::t('forms', 'Use Captcha'),
];
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/forms/FormMessageSearch.php b/common/modules/forms/forms/FormMessageSearch.php
index 6e965a2..4ea3764 100644
--- a/common/modules/forms/forms/FormMessageSearch.php
+++ b/common/modules/forms/forms/FormMessageSearch.php
@@ -8,8 +8,8 @@ use yii\data\ActiveDataProvider;
class FormMessageSearch extends Model
{
- public $id;
- public $form_id;
+ public ?int $id = null;
+ public ?int $form_id = null;
public function rules(): array
{
diff --git a/common/modules/forms/forms/FormSearch.php b/common/modules/forms/forms/FormSearch.php
index 863c33f..ffd3a39 100644
--- a/common/modules/forms/forms/FormSearch.php
+++ b/common/modules/forms/forms/FormSearch.php
@@ -8,10 +8,10 @@ use common\modules\forms\entities\Form;
class FormSearch extends Model
{
- public $id;
- public $name;
- public $slug;
- public $subject;
+ public ?int $id = null;
+ public ?string $name = null;
+ public ?string $slug = null;
+ public ?string $subject = null;
public function rules(): array
{
diff --git a/common/modules/forms/helpers/FormHelper.php b/common/modules/forms/helpers/FormHelper.php
index 0a62cd2..d4315ae 100644
--- a/common/modules/forms/helpers/FormHelper.php
+++ b/common/modules/forms/helpers/FormHelper.php
@@ -6,8 +6,8 @@
namespace common\modules\forms\helpers;
-
use common\modules\forms\entities\Form;
+use Exception;
use Yii;
use yii\helpers\ArrayHelper;
use yii\helpers\Html;
@@ -21,26 +21,31 @@ class FormHelper {
];
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusName($status): string
{
return ArrayHelper::getValue(self::statusList(), $status);
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusLabel($status): string
{
- switch ($status) {
- case Form::STATUS_DRAFT:
- $class = 'label label-default';
- break;
- case Form::STATUS_ACTIVE:
- $class = 'label label-success';
- break;
- default:
- $class = 'label label-default';
- }
+ $class = match ($status) {
+ Form::STATUS_DRAFT => 'label label-default',
+ Form::STATUS_ACTIVE => 'label label-success',
+ default => 'label label-default',
+ };
return Html::tag('span', ArrayHelper::getValue(self::statusList(), $status), [
'class' => $class,
]);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/mail/form-html.php b/common/modules/forms/mail/form-html.php
index 50b867a..e33b8e2 100644
--- a/common/modules/forms/mail/form-html.php
+++ b/common/modules/forms/mail/form-html.php
@@ -4,8 +4,10 @@
* Date: 01.08.2018
*/
+use yii\web\View;
+
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $items array
*/
?>
diff --git a/common/modules/forms/mail/form-text.php b/common/modules/forms/mail/form-text.php
index 4ec8c6c..89848f3 100644
--- a/common/modules/forms/mail/form-text.php
+++ b/common/modules/forms/mail/form-text.php
@@ -4,8 +4,10 @@
* Date: 01.08.2018
*/
+use yii\web\View;
+
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $items array
*/
?>
diff --git a/common/modules/forms/repositories/FormMessageRepository.php b/common/modules/forms/repositories/FormMessageRepository.php
index 32499d5..6f12e91 100644
--- a/common/modules/forms/repositories/FormMessageRepository.php
+++ b/common/modules/forms/repositories/FormMessageRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\forms\repositories;
use common\modules\forms\entities\FormMessage;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class FormMessageRepository
{
@@ -18,14 +20,18 @@ class FormMessageRepository
public function save(FormMessage $message): void
{
if (!$message->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param FormMessage $message
+ * @throws StaleObjectException
+ */
public function remove(FormMessage $message): void
{
if (!$message->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/repositories/FormRepository.php b/common/modules/forms/repositories/FormRepository.php
index 41b8cce..a468642 100644
--- a/common/modules/forms/repositories/FormRepository.php
+++ b/common/modules/forms/repositories/FormRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\forms\repositories;
use common\modules\forms\entities\Form;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class FormRepository
{
@@ -18,14 +20,18 @@ class FormRepository
public function save(Form $form): void
{
if (!$form->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param Form $form
+ * @throws StaleObjectException
+ */
public function remove(Form $form): void
{
if (!$form->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/services/FormManageService.php b/common/modules/forms/services/FormManageService.php
index 431ab6a..735bc54 100644
--- a/common/modules/forms/services/FormManageService.php
+++ b/common/modules/forms/services/FormManageService.php
@@ -6,18 +6,19 @@ use common\modules\forms\entities\Form;
use common\modules\forms\forms\FormForm;
use common\modules\forms\repositories\FormRepository;
use common\modules\forms\widgets\FormGenerator;
+use yii\db\StaleObjectException;
use yii\helpers\Json;
class FormManageService
{
- private $repository;
+ private FormRepository $repository;
public function __construct(FormRepository $repository)
{
$this->repository = $repository;
}
- public function clearJsonLabels($json)
+ public function clearJsonLabels($json): string
{
$new_data = [];
$data = Json::decode($json, true);
@@ -70,6 +71,10 @@ class FormManageService
FormGenerator::generateFormView($id, Json::decode($form->data, true));
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
$form = $this->repository->get($id);
diff --git a/common/modules/forms/services/FormMessageManageService.php b/common/modules/forms/services/FormMessageManageService.php
index 719d066..7902eb4 100644
--- a/common/modules/forms/services/FormMessageManageService.php
+++ b/common/modules/forms/services/FormMessageManageService.php
@@ -4,10 +4,11 @@ namespace common\modules\forms\services;
use common\modules\forms\entities\FormMessage;
use common\modules\forms\repositories\FormMessageRepository;
+use yii\db\StaleObjectException;
class FormMessageManageService
{
- private $repository;
+ private FormMessageRepository $repository;
public function __construct(FormMessageRepository $repository)
{
@@ -48,6 +49,10 @@ class FormMessageManageService
$this->repository->save($message);
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
$message = $this->repository->get($id);
diff --git a/common/modules/forms/urls/FormsUrlRule.php b/common/modules/forms/urls/FormsUrlRule.php
index 8286a9c..37ade5c 100644
--- a/common/modules/forms/urls/FormsUrlRule.php
+++ b/common/modules/forms/urls/FormsUrlRule.php
@@ -10,22 +10,22 @@ use yii;
class FormsUrlRule extends BaseObject implements UrlRuleInterface
{
- public $prefix = 'forms/form/send';
+ public string $prefix = 'forms/form/send';
- private $_repository;
+ private FormRepository $repository;
public function __construct(FormRepository $repository, array $config = [])
{
parent::__construct($config);
- $this->_repository = $repository;
+ $this->repository = $repository;
}
- public function parseRequest($manager, $request)
+ public function parseRequest($manager, $request): bool|array
{
$uri = ltrim(LanguageHelper::processLangInUrl($request->pathInfo), '/');
if ($uri == $this->prefix) {
$id = Yii::$app->request->get('id');
- $form = $this->_repository->get($id);
+ $form = $this->repository->get($id);
if ($form) {
return [$uri, ['id' => $id]];
@@ -34,7 +34,7 @@ class FormsUrlRule extends BaseObject implements UrlRuleInterface
return false;
}
- public function createUrl($manager, $route, $params)
+ public function createUrl($manager, $route, $params): bool
{
return false;
}
diff --git a/common/modules/forms/views/form/view.php b/common/modules/forms/views/form/view.php
index 909c761..d464d63 100644
--- a/common/modules/forms/views/form/view.php
+++ b/common/modules/forms/views/form/view.php
@@ -4,11 +4,12 @@
* Date: 01.08.2018
*/
+use yii\web\View;
+
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $text string
*/
-
?>
diff --git a/common/modules/forms/views/manage/form-message/index.php b/common/modules/forms/views/manage/form-message/index.php
index 7c76bd7..ef087af 100644
--- a/common/modules/forms/views/manage/form-message/index.php
+++ b/common/modules/forms/views/manage/form-message/index.php
@@ -1,6 +1,7 @@
title = Yii::t('forms', 'Messages');
@@ -100,14 +102,14 @@ $this->registerJs($js2, $this::POS_HEAD);
diff --git a/common/modules/forms/views/manage/form-message/view.php b/common/modules/forms/views/manage/form-message/view.php
index b0c8066..632e684 100644
--- a/common/modules/forms/views/manage/form-message/view.php
+++ b/common/modules/forms/views/manage/form-message/view.php
@@ -1,7 +1,6 @@
registerJs($js2);
-
-
-
+
+
+
- [
[
'label' => Yii::t('forms', 'Common'),
diff --git a/common/modules/forms/views/manage/form/_form/_form-builder.php b/common/modules/forms/views/manage/form/_form/_form-builder.php
index ae9b7a7..2bc3f7c 100644
--- a/common/modules/forms/views/manage/form/_form/_form-builder.php
+++ b/common/modules/forms/views/manage/form/_form/_form-builder.php
@@ -4,13 +4,16 @@
* Date: 29.07.2018
*/
+use backend\components\form_builder\assets\FormBuilderAsset;
+use common\modules\forms\forms\FormForm;
use \yii\helpers\Json;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $model \common\modules\forms\forms\FormForm
+ * @var $this View
+ * @var $model FormForm
*/
-$bundle = \backend\components\form_builder\assets\FormBuilderAsset::register($this);
+$bundle = FormBuilderAsset::register($this);
$lng = str_replace('_', '-', Yii::$app->language);
$lng_file = $bundle->baseUrl . '/js/languages/';
diff --git a/common/modules/forms/views/manage/form/_form/_form-items.php b/common/modules/forms/views/manage/form/_form/_form-items.php
index 717ad54..fcf061d 100644
--- a/common/modules/forms/views/manage/form/_form/_form-items.php
+++ b/common/modules/forms/views/manage/form/_form/_form-items.php
@@ -4,14 +4,18 @@
* Date: 29.07.2018
*/
+use common\modules\forms\forms\FormForm;
+use kartik\widgets\Select2;
+use yii\web\View;
+use yii\widgets\ActiveForm;
use zertex\ckeditor\CKEditor;
use yii\web\JsExpression;
use yii\helpers\Url;
/**
- * @var $this \yii\web\View
- * @var $form \yii\widgets\ActiveForm
- * @var $model \common\modules\forms\forms\FormForm
+ * @var $this View
+ * @var $form ActiveForm
+ * @var $model FormForm
*/
$fetchUrl = Url::to( [ '/forms/manage/form/page-search' ] );
@@ -38,7 +42,7 @@ $fetchUrl = Url::to( [ '/forms/manage/form/page-search' ] );
field($model, 'complete_text')->widget(CKEditor::class) ?>
- field($model, 'complete_page_id')->widget(\kartik\widgets\Select2::class, [
+ field($model, 'complete_page_id')->widget(Select2::class, [
'options' => [
'placeholder' => Yii::t('forms', 'Select page...'),
'id' => 'page_select',
diff --git a/common/modules/forms/views/manage/form/create.php b/common/modules/forms/views/manage/form/create.php
index 0ca88bc..61e64f9 100644
--- a/common/modules/forms/views/manage/form/create.php
+++ b/common/modules/forms/views/manage/form/create.php
@@ -1,7 +1,9 @@
title = Yii::t('forms', 'Create Form');
$this->params['breadcrumbs'][] = ['label' => Yii::t('forms', 'Forms'), 'url' => ['index']];
diff --git a/common/modules/forms/views/manage/form/index.php b/common/modules/forms/views/manage/form/index.php
index 0ee4f37..8502c7d 100644
--- a/common/modules/forms/views/manage/form/index.php
+++ b/common/modules/forms/views/manage/form/index.php
@@ -1,12 +1,13 @@
title = Yii::t('forms', 'Forms');
diff --git a/common/modules/forms/views/manage/form/update.php b/common/modules/forms/views/manage/form/update.php
index 510e057..27e10c2 100644
--- a/common/modules/forms/views/manage/form/update.php
+++ b/common/modules/forms/views/manage/form/update.php
@@ -1,8 +1,11 @@
title = Yii::t('forms', 'Update Form: {name}', ['name' => $form_model->name]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('pages', 'Pages'), 'url' => ['index']];
diff --git a/common/modules/forms/widgets/FormClassField.php b/common/modules/forms/widgets/FormClassField.php
index 596dd06..ea1516e 100644
--- a/common/modules/forms/widgets/FormClassField.php
+++ b/common/modules/forms/widgets/FormClassField.php
@@ -6,7 +6,6 @@
namespace common\modules\forms\widgets;
-
class FormClassField
{
public function text(array $settings): string
@@ -44,4 +43,4 @@ class FormClassField
}
return "['{$settings['name']}', 'string'],";
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/widgets/FormGenerator.php b/common/modules/forms/widgets/FormGenerator.php
index 967b194..1bd1849 100644
--- a/common/modules/forms/widgets/FormGenerator.php
+++ b/common/modules/forms/widgets/FormGenerator.php
@@ -6,8 +6,7 @@
namespace common\modules\forms\widgets;
-
-use yii\web\View;
+use Yii;
class FormGenerator
{
@@ -17,44 +16,24 @@ class FormGenerator
$fields = [];
$fieldRender = new FormViewField();
- //print_r($json); die;
-
foreach ($json as $item) {
if ( isset( $item['name'] ) ) {
$item['name'] = str_replace( '-', '_', $item['name'] );
}
- switch ($item['type']) {
- case 'text':
- $fields[] = $fieldRender->text($item);
- break;
- case 'header':
- $fields[] = $fieldRender->header($item);
- break;
- case 'paragraph':
- $fields[] = $fieldRender->paragraph($item);
- break;
- case 'hidden':
- $fields[] = $fieldRender->hidden($item);
- break;
- case 'radio-group':
- $fields[] = $fieldRender->radioGroup($item);
- break;
- case 'checkbox-group':
- $fields[] = $fieldRender->checkboxGroup($item);
- break;
- case 'select':
- $fields[] = $fieldRender->select($item);
- break;
- case 'button':
- $fields[] = $fieldRender->button($item);
- break;
- case 'textarea':
- $fields[] = $fieldRender->textArea($item);
- break;
- }
+ $fields[] = match ($item['type']) {
+ 'text' => $fieldRender->text($item),
+ 'header' => $fieldRender->header($item),
+ 'paragraph' => $fieldRender->paragraph($item),
+ 'hidden' => $fieldRender->hidden($item),
+ 'radio-group' => $fieldRender->radioGroup($item),
+ 'checkbox-group' => $fieldRender->checkboxGroup($item),
+ 'select' => $fieldRender->select($item),
+ 'button' => $fieldRender->button($item),
+ 'textarea' => $fieldRender->textArea($item),
+ };
}
$fields = implode("\n", $fields);
- $tpl = file_get_contents(\Yii::getAlias('@common/modules/forms/widgets/templates/DynaView.tpl'));
+ $tpl = file_get_contents(Yii::getAlias('@common/modules/forms/widgets/templates/DynaView.tpl'));
$tpl = preg_replace([
'/\{\$fields\}/'
@@ -62,7 +41,7 @@ class FormGenerator
$fields
], $tpl);
- file_put_contents(\Yii::getAlias('@common/modules/forms/runtime/' . $viewName . '.php'), $tpl);
+ file_put_contents(Yii::getAlias('@common/modules/forms/runtime/' . $viewName . '.php'), $tpl);
}
@@ -127,7 +106,7 @@ class FormGenerator
$options = [];
//$options[] = $selected ? "'value' => [{$selected}]" : "";
$options = implode(',', array_filter($options));
- $description = isset($item['description']) ? $item['description'] : '';
+ $description = $item['description'] ?? '';
$fields[] = "field(\$model, '{$item['name']}')
->radioList([
{$values}
@@ -153,7 +132,7 @@ class FormGenerator
$options = [];
//$options[] = $selected ? "'value' => [{$selected}]" : "";
$options = implode(',', array_filter($options));
- $description = isset($item['description']) ? $item['description'] : '';
+ $description = $item['description'] ?? '';
$fields[] = "field(\$model, '{$item['name']}')
->checkboxList([
{$values}
@@ -177,7 +156,7 @@ class FormGenerator
$options[] = isset($item['placeholder']) ? "'prompt' => '{$item['placeholder']}'" : "";
$options[] = isset($item['multiple']) && $item['multiple'] == true ? "'multiple' => 'multiple'" : "";
$options = implode(',', array_filter($options));
- $description = isset($item['description']) ? $item['description'] : '';
+ $description = $item['description'] ?? '';
$fields[] = "field(\$model, '{$item['name']}')->dropDownList([{$values}], [{$options}])->hint('{$description}') ?>";
}
@@ -212,7 +191,7 @@ use yii\\helpers\\Html;
VIEW;
- file_put_contents(\Yii::getAlias('@common/modules/forms/runtime/' . $viewName . '.php'), $view);
+ file_put_contents(Yii::getAlias('@common/modules/forms/runtime/' . $viewName . '.php'), $view);
}
public static function generateFormClass2($id, $json)
@@ -298,7 +277,7 @@ class {$className} extends Model
}
CLASS;
- file_put_contents(\Yii::getAlias('@common/modules/forms/runtime/' . $className . '.php'), $classData);
+ file_put_contents(Yii::getAlias('@common/modules/forms/runtime/' . $className . '.php'), $classData);
}
public static function generateFormClass($id, $json)
@@ -384,6 +363,6 @@ class {$className} extends Model
}
CLASS;
- file_put_contents(\Yii::getAlias('@common/modules/forms/runtime/' . $className . '.php'), $classData);
+ file_put_contents(Yii::getAlias('@common/modules/forms/runtime/' . $className . '.php'), $classData);
}
}
diff --git a/common/modules/forms/widgets/FormViewField.php b/common/modules/forms/widgets/FormViewField.php
index aa5f6d0..92cadf8 100644
--- a/common/modules/forms/widgets/FormViewField.php
+++ b/common/modules/forms/widgets/FormViewField.php
@@ -6,7 +6,6 @@
namespace common\modules\forms\widgets;
-
class FormViewField
{
public function text(array $settings): string
@@ -35,14 +34,12 @@ class FormViewField
public function header(array $settings): string
{
- $field = "<{$settings['subtype']}>{$settings['label']}";
- return $field;
+ return "<{$settings['subtype']}>{$settings['label']}";
}
public function paragraph(array $settings): string
{
- $field = "<{$settings['subtype']}>{$settings['label']}";
- return $field;
+ return "<{$settings['subtype']}>{$settings['label']}";
}
public function hidden(array $settings): string
@@ -50,8 +47,7 @@ class FormViewField
$options = [];
$options[] = isset($item['value']) ? "'value' => '{$settings['value']}'" : "";
$options = implode(',', array_filter($options));
- $field = "field(\$model, '{$settings['name']}')->hiddenInput([{$options}])->label(false) ?>";
- return $field;
+ return "field(\$model, '{$settings['name']}')->hiddenInput([{$options}])->label(false) ?>";
}
public function radioGroup(array $settings): string
@@ -73,12 +69,11 @@ class FormViewField
$options = [];
$options = implode(',', array_filter($options));
- $description = isset($settings['description']) ? $settings['description'] : '';
- $field = "field(\$model, '{$settings['name']}')
+ $description = $settings['description'] ?? '';
+ return "field(\$model, '{$settings['name']}')
->radioList([
{$values}
], [{$options}])->hint('{$description}'); ?>";
- return $field;
}
public function checkboxGroup(array $settings): string
@@ -100,12 +95,11 @@ class FormViewField
$options = [];
$options = implode(',', array_filter($options));
- $description = isset($settings['description']) ? $settings['description'] : '';
- $field = "field(\$model, '{$settings['name']}')
+ $description = $settings['description'] ?? '';
+ return "field(\$model, '{$settings['name']}')
->checkboxList([
{$values}
], [{$options}])->hint('{$description}'); ?>";
- return $field;
}
public function select(array $settings): string
@@ -126,25 +120,21 @@ class FormViewField
$options[] = isset($settings['placeholder']) ? "'prompt' => '{$settings['placeholder']}'" : "";
$options[] = isset($settings['multiple']) && $settings['multiple'] == true ? "'multiple' => 'multiple'" : "";
$options = implode(',', array_filter($options));
- $description = isset($settings['description']) ? $settings['description'] : '';
- $field = "field(\$model, '{$settings['name']}')->dropDownList([{$values}], [{$options}])->hint('{$description}') ?>";
- return $field;
+ $description = $settings['description'] ?? '';
+ return "field(\$model, '{$settings['name']}')->dropDownList([{$values}], [{$options}])->hint('{$description}') ?>";
}
public function button(array $settings): string
{
- $style = isset($settings['style']) ? $settings['style'] : 'default';
+ $style = $settings['style'] ?? 'default';
if ($settings['subtype'] == 'submit') {
- $field = " 'btn btn-{$style}']) ?>";
- return $field;
+ return " 'btn btn-{$style}']) ?>";
}
elseif ($settings['subtype'] == 'button') {
- $field = " 'btn btn-{$style}']) ?>";
- return $field;
+ return " 'btn btn-{$style}']) ?>";
}
elseif ($settings['subtype'] == 'reset') {
- $field = " 'btn btn-{$style}']) ?>";
- return $field;
+ return " 'btn btn-{$style}']) ?>";
}
return '';
}
diff --git a/common/modules/forms/widgets/FormWidget.php b/common/modules/forms/widgets/FormWidget.php
index 71d0d61..40b4631 100644
--- a/common/modules/forms/widgets/FormWidget.php
+++ b/common/modules/forms/widgets/FormWidget.php
@@ -11,9 +11,10 @@ use yii\base\Widget;
class FormWidget extends Widget
{
- public $id;
+ public int $id;
- public function run() {
+ public function run(): string
+ {
$form = Form::findOne($this->id);
if (!$form) {
return 'Form is not found';
@@ -24,4 +25,4 @@ class FormWidget extends Widget
return $this->renderFile(\Yii::getAlias('@common/modules/forms/runtime/' . 'DynaView' . $this->id . '.php'), ['model' => $dynaForm, 'form_entity' => $form]);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/languages/LanguagesModule.php b/common/modules/languages/LanguagesModule.php
index 528115e..1339a6c 100644
--- a/common/modules/languages/LanguagesModule.php
+++ b/common/modules/languages/LanguagesModule.php
@@ -4,6 +4,7 @@ namespace common\modules\languages;
use core\components\modules\ModuleInterface;
use yii\helpers\ArrayHelper;
+use yii\web\Application;
/**
@@ -26,7 +27,7 @@ class LanguagesModule extends \yii\base\Module implements ModuleInterface
// custom initialization code goes here
}
- public function bootstrap($app)
+ public function bootstrap(Application $app)
{
// add migration path
$app->controllerMap['migrate']['migrationPath'][] = '@common/modules/languages/migrations';
@@ -47,7 +48,7 @@ class LanguagesModule extends \yii\base\Module implements ModuleInterface
if (basename($app->getBasePath()) === 'backend') {
$app->params['adminMenu'][] = [
'label' => \Yii::t( 'languages', 'Site Languages' ),
- 'icon' => 'language',
+ 'icon' => 'fas fa-globe-americas',
'url' => [ '/languages/manage/language/index' ],
'visible' => \Yii::$app->user->can( 'admin' ) || \Yii::$app->user->can( 'LanguagesManagement' )
];
diff --git a/common/modules/languages/controllers/manage/LanguageController.php b/common/modules/languages/controllers/manage/LanguageController.php
index d79f872..13ad30b 100644
--- a/common/modules/languages/controllers/manage/LanguageController.php
+++ b/common/modules/languages/controllers/manage/LanguageController.php
@@ -6,15 +6,17 @@ use common\modules\languages\entities\Language;
use common\modules\languages\forms\LanguageForm;
use common\modules\languages\forms\search\LanguageSearch;
use common\modules\languages\services\LanguageManageService;
+use DomainException;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\web\Controller;
use Yii;
+use yii\web\Response;
class LanguageController extends Controller
{
- private $service;
+ private LanguageManageService $service;
public function __construct($id, $module, LanguageManageService $service, $config = [])
{
@@ -49,9 +51,9 @@ class LanguageController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new LanguageSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -68,7 +70,7 @@ class LanguageController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'language' => $this->findModel($id),
@@ -76,9 +78,9 @@ class LanguageController extends Controller
}
/**
- * @return mixed
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): string|Response
{
$form = new LanguageForm();
@@ -86,7 +88,7 @@ class LanguageController extends Controller
try {
$form = $this->service->create($form);
return $this->redirect(['view', 'id' => $form->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -102,10 +104,10 @@ class LanguageController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$language = $this->findModel($id);
$form = new LanguageForm($language);
@@ -114,7 +116,7 @@ class LanguageController extends Controller
try {
$this->service->edit($language->id, $form);
return $this->redirect(['view', 'id' => $language->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -128,20 +130,25 @@ class LanguageController extends Controller
/**
* @param integer $id
- * @return mixed
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
$this->service->remove($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
return $this->redirect(['index']);
}
- public function actionSetDefault($id)
+ /**
+ * @param $id
+ * @return Response
+ * @throws NotFoundHttpException
+ */
+ public function actionSetDefault($id): Response
{
$language = $this->findModel($id);
if ($language) {
@@ -156,7 +163,7 @@ class LanguageController extends Controller
* @return Language the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): Language
+ protected function findModel(int $id): Language
{
if (($model = Language::findOne($id)) !== null) {
return $model;
diff --git a/common/modules/languages/entities/Language.php b/common/modules/languages/entities/Language.php
index 2cfa865..429b748 100644
--- a/common/modules/languages/entities/Language.php
+++ b/common/modules/languages/entities/Language.php
@@ -3,10 +3,10 @@
namespace common\modules\languages\entities;
use common\modules\languages\entities\queries\LanguageQuery;
+use DomainException;
use yii\db\ActiveRecord;
use Yii;
-
/**
* This is the model class for table "languages".
*
@@ -44,7 +44,7 @@ class Language extends ActiveRecord
/**
* @inheritdoc
*/
- public static function tableName()
+ public static function tableName(): string
{
return 'languages';
}
@@ -66,7 +66,7 @@ class Language extends ActiveRecord
public function activate(): void
{
if ($this->isActive()) {
- throw new \DomainException('Language is already active.');
+ throw new DomainException('Language is already active.');
}
$this->status = self::STATUS_ACTIVE;
}
@@ -74,7 +74,7 @@ class Language extends ActiveRecord
public function draft(): void
{
if ($this->isDraft()) {
- throw new \DomainException('Language is already draft.');
+ throw new DomainException('Language is already draft.');
}
$this->status = self::STATUS_DRAFT;
}
diff --git a/common/modules/languages/entities/queries/LanguageQuery.php b/common/modules/languages/entities/queries/LanguageQuery.php
index a1d591a..2e46947 100644
--- a/common/modules/languages/entities/queries/LanguageQuery.php
+++ b/common/modules/languages/entities/queries/LanguageQuery.php
@@ -19,4 +19,4 @@ class LanguageQuery extends ActiveQuery
{
return $this->andWhere(['default' => Language::DEFAULT_TRUE]);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/languages/forms/LanguageForm.php b/common/modules/languages/forms/LanguageForm.php
index 16ec797..a5e2b35 100644
--- a/common/modules/languages/forms/LanguageForm.php
+++ b/common/modules/languages/forms/LanguageForm.php
@@ -8,11 +8,11 @@ use Yii;
class LanguageForm extends Model
{
- public $name;
- public $title;
- public $status;
+ public ?string $name = null;
+ public ?string $title = null;
+ public ?int $status = null;
- public $_language;
+ public Language $language;
public function __construct(Language $language = null, $config = [])
{
@@ -21,7 +21,7 @@ class LanguageForm extends Model
$this->title = $language->title;
$this->status = $language->status;
- $this->_language = $language;
+ $this->language = $language;
}
parent::__construct($config);
}
@@ -36,7 +36,8 @@ class LanguageForm extends Model
];
}
- public function attributeLabels() {
+ public function attributeLabels(): array
+ {
return [
'id' => Yii::t('languages', 'ID'),
'name' => Yii::t('languages', 'Name'),
diff --git a/common/modules/languages/forms/search/LanguageSearch.php b/common/modules/languages/forms/search/LanguageSearch.php
index 6148fac..3079403 100644
--- a/common/modules/languages/forms/search/LanguageSearch.php
+++ b/common/modules/languages/forms/search/LanguageSearch.php
@@ -8,10 +8,10 @@ use yii\data\ActiveDataProvider;
class LanguageSearch extends Model
{
- public $id;
- public $name;
- public $title;
- public $status;
+ public ?int $id = null;
+ public ?string $name = null;
+ public ?string $title = null;
+ public ?int $status = null;
public function rules(): array
{
diff --git a/common/modules/languages/helpers/LanguageHelper.php b/common/modules/languages/helpers/LanguageHelper.php
index 7c45ab1..ac08b61 100644
--- a/common/modules/languages/helpers/LanguageHelper.php
+++ b/common/modules/languages/helpers/LanguageHelper.php
@@ -7,6 +7,7 @@
namespace common\modules\languages\helpers;
use common\modules\languages\entities\Language;
+use Exception;
use yii\helpers\ArrayHelper;
use yii\helpers\Html;
use Yii;
@@ -15,16 +16,11 @@ class LanguageHelper
{
public static function defaultLabel($default): string
{
- switch ($default) {
- case Language::DEFAULT_FALSE:
- $class = 'text-gray';
- break;
- case Language::DEFAULT_TRUE:
- $class = 'text-yellow';
- break;
- default:
- $class = 'text-gray';
- }
+ $class = match ($default) {
+ Language::DEFAULT_FALSE => 'text-gray',
+ Language::DEFAULT_TRUE => 'text-yellow',
+ default => 'text-gray',
+ };
return '';
}
@@ -37,27 +33,31 @@ class LanguageHelper
];
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusName($status): string
{
return ArrayHelper::getValue(self::statusList(), $status);
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusLabel($status): string
{
- switch ($status) {
- case Language::STATUS_DRAFT:
- $class = 'label label-default';
- break;
- case Language::STATUS_ACTIVE:
- $class = 'label label-success';
- break;
- default:
- $class = 'label label-default';
- }
+ $class = match ($status) {
+ Language::STATUS_DRAFT => 'label label-default',
+ Language::STATUS_ACTIVE => 'label label-success',
+ default => 'label label-default',
+ };
return Html::tag('span', ArrayHelper::getValue(self::statusList(), $status), [
'class' => $class,
]);
}
}
-
diff --git a/common/modules/languages/repositories/LanguageRepository.php b/common/modules/languages/repositories/LanguageRepository.php
index 31ccf70..10e905a 100644
--- a/common/modules/languages/repositories/LanguageRepository.php
+++ b/common/modules/languages/repositories/LanguageRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\languages\repositories;
use common\modules\languages\entities\Language;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class LanguageRepository
{
@@ -18,14 +20,18 @@ class LanguageRepository
public function save(Language $language): void
{
if (!$language->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param Language $language
+ * @throws StaleObjectException
+ */
public function remove(Language $language): void
{
if (!$language->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
@@ -33,4 +39,4 @@ class LanguageRepository
{
Language::updateAll(['default' => 0]);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/languages/services/LanguageManageService.php b/common/modules/languages/services/LanguageManageService.php
index eceb37c..a3878a9 100644
--- a/common/modules/languages/services/LanguageManageService.php
+++ b/common/modules/languages/services/LanguageManageService.php
@@ -4,12 +4,12 @@ namespace common\modules\languages\services;
use common\modules\languages\entities\Language;
use common\modules\languages\forms\LanguageForm;
-use common\modules\languages\helpers\LanguageHelper;
use common\modules\languages\repositories\LanguageRepository;
+use yii\db\StaleObjectException;
class LanguageManageService
{
- private $repository;
+ private LanguageRepository $repository;
public function __construct(LanguageRepository $repository)
{
@@ -39,6 +39,10 @@ class LanguageManageService
$this->repository->save($language);
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
$language = $this->repository->get($id);
diff --git a/common/modules/languages/views/manage/language/_form.php b/common/modules/languages/views/manage/language/_form.php
index 1a5abac..01fa908 100644
--- a/common/modules/languages/views/manage/language/_form.php
+++ b/common/modules/languages/views/manage/language/_form.php
@@ -1,11 +1,12 @@
registerJs($js2);
-
-
+
+
@@ -54,9 +55,9 @@ $this->registerJs($js2);
-
-
-
+
+
+
_language->default) && $model->_language->default): ?>
diff --git a/common/modules/languages/views/manage/language/create.php b/common/modules/languages/views/manage/language/create.php
index 9cbf985..00dc16d 100644
--- a/common/modules/languages/views/manage/language/create.php
+++ b/common/modules/languages/views/manage/language/create.php
@@ -1,7 +1,9 @@
title = Yii::t('languages', 'Create Language');
$this->params['breadcrumbs'][] = ['label' => Yii::t('languages', 'Languages'), 'url' => ['index']];
diff --git a/common/modules/languages/views/manage/language/index.php b/common/modules/languages/views/manage/language/index.php
index d2622b0..df7daf6 100644
--- a/common/modules/languages/views/manage/language/index.php
+++ b/common/modules/languages/views/manage/language/index.php
@@ -1,5 +1,6 @@
title = Yii::t('languages', 'Languages');
@@ -15,12 +16,11 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-
- 'btn btn-success']) ?>
-
-
-
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'filterModel' => $searchModel,
@@ -60,8 +60,8 @@ $this->params['breadcrumbs'][] = $this->title;
[
'class' => ActionColumn::class,
'visibleButtons' => [
- 'delete' => function ($model, $key, $index) {
- return $model->default === 1 ? false : true;
+ 'delete' => function ($model) {
+ return !($model->default === 1);
}
],
'options' => ['style' => 'width: 100px;'],
diff --git a/common/modules/languages/views/manage/language/update.php b/common/modules/languages/views/manage/language/update.php
index 5484695..4e7a3ff 100644
--- a/common/modules/languages/views/manage/language/update.php
+++ b/common/modules/languages/views/manage/language/update.php
@@ -1,8 +1,11 @@
title = Yii::t('languages', 'Update Language: {name}', ['name' => $language->title]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('languages', 'Languages'), 'url' => ['index']];
diff --git a/common/modules/languages/views/manage/language/view.php b/common/modules/languages/views/manage/language/view.php
index 238f0f5..020258d 100644
--- a/common/modules/languages/views/manage/language/view.php
+++ b/common/modules/languages/views/manage/language/view.php
@@ -14,23 +14,22 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-
- 'btn btn-default']) ?>
- $language->id], ['class' => 'btn btn-primary']) ?>
- $language->id], [
- 'class' => 'btn btn-danger',
- 'data' => [
- 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
- 'method' => 'post',
- ],
- ]) ?>
-
-
-
-
+
+
+ 'btn btn-outline-primary btn-sm']) ?>
+ $language->id], ['class' => 'btn btn-primary btn-sm']) ?>
+ $language->id], [
+ 'class' => 'btn btn-danger btn-sm',
+ 'data' => [
+ 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
+ 'method' => 'post',
+ ],
+ ]) ?>
+
+
$language,
'attributes' => [
diff --git a/common/modules/links/LinksModule.php b/common/modules/links/LinksModule.php
index 7a1a98c..588d7fd 100644
--- a/common/modules/links/LinksModule.php
+++ b/common/modules/links/LinksModule.php
@@ -4,13 +4,15 @@ namespace common\modules\links;
use common\modules\links\widgets\MenuItemCreatorWidget;
use core\components\modules\ModuleInterface;
+use Yii;
+use yii\base\Module;
use yii\helpers\ArrayHelper;
-
+use yii\web\Application;
/**
* blog module definition class
*/
-class LinksModule extends \yii\base\Module implements ModuleInterface
+class LinksModule extends Module implements ModuleInterface
{
/**
* @inheritdoc
@@ -27,7 +29,7 @@ class LinksModule extends \yii\base\Module implements ModuleInterface
// custom initialization code goes here
}
- public function bootstrap($app)
+ public function bootstrap(Application $app)
{
// add languages
$app->getI18n()->translations = ArrayHelper::merge($app->getI18n()->translations, [
@@ -47,7 +49,7 @@ class LinksModule extends \yii\base\Module implements ModuleInterface
$widgets = [];
$widgets[] = [
'id' => 'links',
- 'title' => \Yii::t('links', 'Links'),
+ 'title' => Yii::t('links', 'Links'),
'content' => MenuItemCreatorWidget::widget([
'menu_id' => $menu_id,
]),
diff --git a/common/modules/links/widgets/MenuItemCreatorWidget.php b/common/modules/links/widgets/MenuItemCreatorWidget.php
index 1e28e43..f1fe938 100644
--- a/common/modules/links/widgets/MenuItemCreatorWidget.php
+++ b/common/modules/links/widgets/MenuItemCreatorWidget.php
@@ -11,10 +11,10 @@ use yii\base\Widget;
class MenuItemCreatorWidget extends Widget
{
- public $menu_id;
+ public int $menu_id;
- public function run()
- {
+ public function run(): string
+ {
$form = new MenuItemForm();
$form->module = 'links';
$form->menu_id = $this->menu_id;
diff --git a/common/modules/links/widgets/views/menu-item/creator.php b/common/modules/links/widgets/views/menu-item/creator.php
index 6b5ecc8..14bc7be 100644
--- a/common/modules/links/widgets/views/menu-item/creator.php
+++ b/common/modules/links/widgets/views/menu-item/creator.php
@@ -1,37 +1,42 @@
+
+
+
- translation->name ?>
- module, ucfirst($menu_item->module)) ?>
+
+ translation->name ?>
+
+ module, ucfirst($menu_item->module)) ?>
+
+
+
+
+
+
-
+
-
['/menu/save-item', 'id' => $menu_item->id],
@@ -51,7 +62,7 @@ $menu_item = $item['item'];
?>
@@ -61,18 +72,20 @@ $menu_item = $item['item'];
field($model, 'target')->dropDownList([
'' => Yii::t('menu', 'Self Window'),
'_blank' => Yii::t('menu', 'Blank Window'),
- ]) ?>
- field($model, 'style')->textInput(['maxlength' => true]) ?>
+ ], [
+ 'class' => 'form-control form-control-sm'
+ ]) ?>
+ field($model, 'style')->textInput(['maxlength' => true, 'class' => 'form-control form-control-sm'],) ?>
- field($model, 'css')->textInput(['maxlength' => true]) ?>
+ field($model, 'css')->textInput(['maxlength' => true, 'class' => 'form-control form-control-sm']) ?>
url_params): ?>
- field($model, 'url')->textInput(['maxlength' => true]) ?>
+ field($model, 'url')->textInput(['maxlength' => true, 'class' => 'form-control form-control-sm']) ?>
+
'item-delete-button btn btn-sm btn-danger',
'data-id' => $menu_item->id,
diff --git a/backend/components/menu/widgets/views/_item_tab.php b/backend/components/menu/widgets/views/_item_tab.php
index b880cdf..5cb2933 100644
--- a/backend/components/menu/widgets/views/_item_tab.php
+++ b/backend/components/menu/widgets/views/_item_tab.php
@@ -4,22 +4,25 @@
* Date: 24.08.2018
*/
+use core\forms\menu\MenuItemForm;
+use yii\web\View;
+use yii\widgets\ActiveForm;
+
/**
- * @var $this \yii\web\View
- * @var $form \yii\widgets\ActiveForm
- * @var $model \core\forms\menu\MenuItemForm
+ * @var $this View
+ * @var $form ActiveForm
+ * @var $model MenuItemForm
* @var $language string
*/
$postfix = $language == Yii::$app->params['defaultLanguage'] ? '' : '_' . $language;
?>
-
'btn btn-success pull-right', + 'class' => 'btn btn-success float-right', 'onclick' => new JsExpression('sendTree('.$menu->id.', "'.$url.'", "'.$redirect.'")'), -]) ?> \ No newline at end of file +]) ?> + diff --git a/backend/config/main.php b/backend/config/main.php index e11db52..696e47e 100644 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -149,6 +149,48 @@ return [ ], ], ], + 'assetManager' => [ + 'bundles' => [ + 'yii\bootstrap\BootstrapAsset' => [ + 'sourcePath' => '@core/components/bootstrap4', // do not publish the bundle + 'css' => [ + YII_ENV_DEV ? 'css/bootstrap.css' : 'css/bootstrap.min.css' + ], + ], + 'yii\bootstrap\BootstrapPluginAsset' => [ + 'sourcePath' => '@core/components/bootstrap4', + 'js' => [ + YII_ENV_DEV ? 'js/bootstrap.bundle.js' : 'js/bootstrap.bundle.min.js' + ], + 'depends' => [ + 'yii\web\JqueryAsset', + 'yii\bootstrap\BootstrapAsset', + ], + ], + /*'yii\web\JqueryAsset' => [ + 'sourcePath' => '@cp/assets/libs/jquery321', // do not publish the bundle + 'js' => [ + YII_ENV_DEV ? 'jquery-3.2.1.js' : 'jquery-3.2.1.min.js' + ], + ], + 'yii\bootstrap\BootstrapAsset' => [ + 'sourcePath' => '@cp/assets/libs/bootstrap4/css', // do not publish the bundle + 'css' => [ + YII_ENV_DEV ? 'bootstrap.css' : 'bootstrap.min.css' + ], + ], + 'yii\bootstrap\BootstrapPluginAsset' => [ + 'sourcePath' => '@cp/assets/libs/bootstrap4/js', // do not publish the bundle + 'js' => [ + YII_ENV_DEV ? 'bootstrap.js' : 'bootstrap.min.js' + ], + 'depends' => [ + 'yii\web\JqueryAsset', + 'yii\bootstrap\BootstrapAsset', + ], + ],*/ + ], + ], ], 'params' => $params, ]; diff --git a/backend/controllers/AuthController.php b/backend/controllers/AuthController.php index ad69dab..84ca644 100644 --- a/backend/controllers/AuthController.php +++ b/backend/controllers/AuthController.php @@ -10,10 +10,11 @@ use yii\filters\VerbFilter; use core\forms\auth\LoginForm; use yii\filters\AccessControl; use DomainException; +use yii\web\Response; class AuthController extends Controller { - private $auth_service; + private AuthService $auth_service; public function __construct($id, $module, AuthService $service, $config = []) { @@ -56,9 +57,9 @@ class AuthController extends Controller } /** - * @return mixed + * @return string|Response */ - public function actionLogin() + public function actionLogin(): string|Response { if (!Yii::$app->user->isGuest) { return $this->goHome(); @@ -85,9 +86,9 @@ class AuthController extends Controller } /** - * @return mixed + * @return Response */ - public function actionLogout() + public function actionLogout(): Response { Yii::$app->user->logout(); diff --git a/backend/controllers/MenuController.php b/backend/controllers/MenuController.php index 2b047c4..5de72ae 100644 --- a/backend/controllers/MenuController.php +++ b/backend/controllers/MenuController.php @@ -14,6 +14,7 @@ use core\forms\menu\MenuItemForm; use core\forms\menu\MenuSelectForm; use core\services\menu\MenuItemManageService; use core\services\menu\MenuManageService; +use yii\db\StaleObjectException; use yii\filters\AccessControl; use yii\filters\VerbFilter; use yii\helpers\Json; @@ -26,8 +27,8 @@ use Yii; class MenuController extends Controller { - public $menu_service; - public $menu_item_service; + public MenuManageService $menu_service; + public MenuItemManageService $menu_item_service; public function __construct( string $id, @@ -68,7 +69,12 @@ class MenuController extends Controller ]; } - public function actionIndex($id = null) + /** + * @param null $id + * @return Response|string + * @throws NotFoundHttpException + */ + public function actionIndex($id = null): Response|string { $menus = []; // menu list $menu_records = Menu::find()->all(); @@ -82,10 +88,12 @@ class MenuController extends Controller if ($form->load(Yii::$app->request->get()) && $form->validate()) { return $this->redirect(['menu/index', 'id' => $form->id]); } elseif ($id) { - $this->createMenuItem(); // create menu item if MenuItemForm sent - $menu = $this->findModel($id); + if ($this->createMenuItem()) { + return $this->redirect(['/menu/index', 'id' => $id]); + }; // create menu item if MenuItemForm sent + $creatorWidgets = $this->getCreatorWidgets($menu->id); return $this->render('menu', [ @@ -102,7 +110,7 @@ class MenuController extends Controller } } - public function actionCreate() + public function actionCreate(): Response|string { $form = new MenuForm(); if ($form->load(Yii::$app->request->post()) && $form->validate()) { @@ -121,7 +129,12 @@ class MenuController extends Controller ]); } - public function actionUpdate($id) + /** + * @param $id + * @return Response|string + * @throws NotFoundHttpException + */ + public function actionUpdate($id): Response|string { $menu = $this->findModel($id); @@ -143,7 +156,7 @@ class MenuController extends Controller ]); } - public function actionDelete($id) + public function actionDelete($id): Response { try { $this->menu_service->remove($id); @@ -155,7 +168,12 @@ class MenuController extends Controller return $this->redirect(['index']); } - public function actionSaveItem($id) + /** + * @param $id + * @return Response + * @throws NotFoundHttpException + */ + public function actionSaveItem($id): Response { $item = $this->findItemModel($id); $form = new MenuItemForm($item); @@ -173,7 +191,12 @@ class MenuController extends Controller return $this->redirect(['index', 'id' => $item->menu_id]); } - public function actionDeleteMenuItem() + /** + * @return array + * @throws NotFoundHttpException + * @throws StaleObjectException + */ + public function actionDeleteMenuItem(): array { Yii::$app->response->format = Response::FORMAT_JSON; if (Yii::$app->request->isAjax) { @@ -193,7 +216,7 @@ class MenuController extends Controller return ['result' => 'error', 'message' => 'Request error']; } - public function actionSaveMenuItems() + public function actionSaveMenuItems(): array { $json = Yii::$app->request->post('json'); Yii::$app->response->format = Response::FORMAT_JSON; @@ -230,18 +253,25 @@ class MenuController extends Controller return $widgets; } - private function createMenuItem() + private function createMenuItem(): bool { $form = new MenuItemForm(); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { $this->menu_item_service->create($form); + return true; } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); } } + return false; } + /** + * @param $id + * @return Menu + * @throws NotFoundHttpException + */ protected function findModel($id): Menu { if (($model = Menu::findOne($id)) !== null) { @@ -250,6 +280,11 @@ class MenuController extends Controller throw new NotFoundHttpException('The requested menu does not exist.'); } + /** + * @param $id + * @return MenuItem + * @throws NotFoundHttpException + */ protected function findItemModel($id): MenuItem { if (($model = MenuItem::findOne($id)) !== null) { diff --git a/backend/controllers/ModuleController.php b/backend/controllers/ModuleController.php index 17e2572..ec714ec 100644 --- a/backend/controllers/ModuleController.php +++ b/backend/controllers/ModuleController.php @@ -7,12 +7,15 @@ namespace backend\controllers; use core\entities\ModuleRecord; -use core\helpers\FileHelper; use core\services\ModuleService; +use Yii; +use yii\base\ErrorException; +use yii\db\Exception; use yii\web\Controller; use yii\filters\VerbFilter; use yii\filters\AccessControl; use yii\web\NotFoundHttpException; +use yii\web\Response; /** * Modules Management @@ -24,12 +27,12 @@ class ModuleController extends Controller /** * @var ModuleService Modules management service */ - private $_service; + private $service; public function __construct(string $id, $module, ModuleService $service, array $config = []) { parent::__construct($id, $module, $config); - $this->_service = $service; + $this->service = $service; } public function behaviors(): array @@ -65,40 +68,57 @@ class ModuleController extends Controller * List of modules * @return string */ - public function actionList() + public function actionList(): string { - $modules = \Yii::$app->moduleManager->getModules(); + $modules = Yii::$app->moduleManager->getModules(); return $this->render('list', [ 'modules' => $modules, ]); } - public function actionDelete($id) + /** + * @param $id + * @return Response + * @throws NotFoundHttpException + * @throws ErrorException + * @throws Exception + */ + public function actionDelete($id): Response { $module = $this->findModel($id); - $this->_service->delete($module); + $this->service->delete($module); return $this->redirect(['module/list']); } - public function actionDisable($id) + /** + * @param $id + * @return Response + * @throws NotFoundHttpException + */ + public function actionDisable($id): Response { $module = $this->findModel($id); - $this->_service->disable($module); + $this->service->disable($module); return $this->redirect(['module/list']); } - public function actionEnable($id) + /** + * @param $id + * @return Response + * @throws NotFoundHttpException + */ + public function actionEnable($id): Response { $module = $this->findModel($id); - $this->_service->enable($module); + $this->service->enable($module); return $this->redirect(['module/list']); } - public function actionSearch() + public function actionSearch(): string { $message = null; try { @@ -113,22 +133,22 @@ class ModuleController extends Controller continue; } - $languageFile = str_replace('manifest.php', 'messages/' . \Yii::$app->language . '/' . $manifest['name'] . '.php', $link); + $languageFile = str_replace('manifest.php', 'messages/' . Yii::$app->language . '/' . $manifest['name'] . '.php', $link); try { $language = file_get_contents($languageFile); $language = eval(str_replace('render('remote-list', [ @@ -137,6 +157,11 @@ class ModuleController extends Controller ]); } + /** + * @param $id + * @return ModuleRecord + * @throws NotFoundHttpException + */ protected function findModel($id): ModuleRecord { if (($model = ModuleRecord::findOne($id)) !== null) { diff --git a/backend/controllers/PermissionController.php b/backend/controllers/PermissionController.php index 1107e4f..c7dadeb 100644 --- a/backend/controllers/PermissionController.php +++ b/backend/controllers/PermissionController.php @@ -9,6 +9,8 @@ namespace backend\controllers; use backend\forms\rbac\RbacCreatePermissionForm; use backend\forms\rbac\RbacEditPermissionForm; use core\services\PermissionManager; +use DomainException; +use Exception; use yii\behaviors\TimestampBehavior; use yii\data\ArrayDataProvider; use yii\rbac\Permission; @@ -16,15 +18,16 @@ use yii\web\Controller; use yii\filters\VerbFilter; use Yii; use yii\filters\AccessControl; +use yii\web\Response; class PermissionController extends Controller { - private $_permission; + private PermissionManager $permission; public function __construct($id, $module, PermissionManager $permission, $config = []) { parent::__construct($id, $module, $config); - $this->_permission = $permission; + $this->permission = $permission; } /** @@ -59,14 +62,14 @@ class PermissionController extends Controller ]; } - public function actionIndex() + public function actionIndex(): string { $data = array_map(function (Permission $permission) { return [ 'name' => $permission->name, 'description' => $permission->description, ]; - }, $this->_permission->getPermissions()); + }, $this->permission->getPermissions()); $dataProvider = new ArrayDataProvider([ 'allModels' => $data, @@ -81,15 +84,15 @@ class PermissionController extends Controller return $this->render('index', ['dataProvider' => $dataProvider]); } - public function actionCreate() + public function actionCreate(): Response|string { $form = new RbacCreatePermissionForm(); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_permission->create($form->name, $form->description, $form->rule_name, $form->data); + $this->permission->create($form->name, $form->description, $form->rule_name, $form->data); return $this->redirect(['view', 'id' => $form->name]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -100,17 +103,22 @@ class PermissionController extends Controller ]); } - public function actionUpdate($id) + /** + * @param $id + * @return Response|string + * @throws Exception + */ + public function actionUpdate($id): Response|string { $permission = $this->findModel($id); $form = new RbacEditPermissionForm($permission); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_permission->update($permission->name, $form->name, $form->description, $form->rule_name, $form->data); + $this->permission->update($permission->name, $form->name, $form->description, $form->rule_name, $form->data); return $this->redirect(['view', 'id' => $form->name]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -121,22 +129,22 @@ class PermissionController extends Controller ]); } - public function actionDelete($id) + public function actionDelete($id): Response { - $this->_permission->delete($id); + $this->permission->delete($id); return $this->redirect(['index']); } - public function actionView($id) + public function actionView($id): string { return $this->render('view', [ 'model' => $this->findModel($id), ]); } - protected function findModel($id) + protected function findModel($id): ?Permission { - return $this->_permission->getPermission($id); + return $this->permission->getPermission($id); } } diff --git a/backend/controllers/RoleController.php b/backend/controllers/RoleController.php index 26133d4..c72c408 100644 --- a/backend/controllers/RoleController.php +++ b/backend/controllers/RoleController.php @@ -9,25 +9,29 @@ namespace backend\controllers; use backend\forms\rbac\RbacEditRoleForm; use backend\forms\rbac\RbacUpdateChildren; use core\services\PermissionManager; +use DomainException; +use Exception; use yii\behaviors\TimestampBehavior; use backend\forms\rbac\RbacCreateRoleForm; use core\services\RoleManager; use yii\data\ArrayDataProvider; +use yii\rbac\Role; use yii\web\Controller; use yii\filters\VerbFilter; use yii\filters\AccessControl; use Yii; +use yii\web\Response; class RoleController extends Controller { - private $_role; - private $_permission; + private RoleManager $role; + private PermissionManager $permission; public function __construct($id, $module, RoleManager $role, PermissionManager $permission, $config = []) { parent::__construct($id, $module, $config); - $this->_role = $role; - $this->_permission = $permission; + $this->role = $role; + $this->permission = $permission; } /** @@ -62,9 +66,9 @@ class RoleController extends Controller ]; } - public function actionIndex() + public function actionIndex(): string { - $data = $this->_role->getRolesListArray(); + $data = $this->role->getRolesListArray(); $dataProvider = new ArrayDataProvider([ 'allModels' => $data, @@ -79,15 +83,19 @@ class RoleController extends Controller return $this->render('index', ['dataProvider' => $dataProvider]); } - public function actionCreate() + /** + * @return Response|string + * @throws Exception + */ + public function actionCreate(): Response|string { $form = new RbacCreateRoleForm(); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_role->create($form->name, $form->description, $form->rule_name, $form->data); + $this->role->create($form->name, $form->description, $form->rule_name, $form->data); return $this->redirect(['view', 'id' => $form->name]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -98,17 +106,22 @@ class RoleController extends Controller ]); } - public function actionUpdate($id) + /** + * @param $id + * @return string|Response + * @throws Exception + */ + public function actionUpdate($id): Response|string { $role = $this->findModel($id); $form = new RbacEditRoleForm($role); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_role->update($role->name, $form->name, $form->description, $form->rule_name, $form->data); + $this->role->update($role->name, $form->name, $form->description, $form->rule_name, $form->data); return $this->redirect(['view', 'id' => $form->name]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -119,11 +132,11 @@ class RoleController extends Controller ]); } - public function actionDelete($id) + public function actionDelete($id): Response { try { - $this->_role->delete($id); - } catch (\DomainException $e) { + $this->role->delete($id); + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -131,21 +144,26 @@ class RoleController extends Controller return $this->redirect(['index']); } - public function actionView($id) + /** + * @param $id + * @return string + * @throws \yii\base\Exception + */ + public function actionView($id): string { - $currentRole = $this->_role->getRole($id); - $rolesSelectArray = array_diff_assoc($this->_role->getRolesSelectArray(), [$currentRole->name => $currentRole->description]); + $currentRole = $this->role->getRole($id); + $rolesSelectArray = array_diff_assoc($this->role->getRolesSelectArray(), [$currentRole->name => $currentRole->description]); $itemsForm = new RbacUpdateChildren(); if ($itemsForm->load(Yii::$app->request->post()) && $itemsForm->validate()) { - $this->_role->saveChildren($id, $itemsForm->roles, $itemsForm->permissions); + $this->role->saveChildren($id, $itemsForm->roles, $itemsForm->permissions); Yii::$app->session->setFlash('success', Yii::t('user', 'Children roles and permissions for "{role}" is updated.', ['role' => $currentRole->description])); } - $rolesSelected = $this->_role->getRolesSelectArrayByRole($id); + $rolesSelected = $this->role->getRolesSelectArrayByRole($id); - $permissionsSelectArray = $this->_permission->getPermissionsSelectArray(); - $permissionsSelected = $this->_permission->getPermissionsSelectArrayByRole($id); + $permissionsSelectArray = $this->permission->getPermissionsSelectArray(); + $permissionsSelected = $this->permission->getPermissionsSelectArrayByRole($id); $itemsForm->roles = $rolesSelected; $itemsForm->permissions = $permissionsSelected; @@ -158,8 +176,12 @@ class RoleController extends Controller ]); } - protected function findModel($id) + /** + * @param $id + * @return Role|null + */ + protected function findModel($id): ?Role { - return $this->_role->getRole($id); + return $this->role->getRole($id); } } diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php index 8b3d1bb..f0fd7a6 100644 --- a/backend/controllers/SiteController.php +++ b/backend/controllers/SiteController.php @@ -5,24 +5,29 @@ namespace backend\controllers; use core\entities\Search; use core\forms\SearchForm; use core\services\user\UserManageService; +use DomainException; +use RuntimeException; use Yii; +use yii\base\Action; use yii\data\ActiveDataProvider; +use yii\web\BadRequestHttpException; use yii\web\Controller; use yii\filters\VerbFilter; use yii\filters\AccessControl; use core\helpers\UserHelper; +use yii\web\Response; /** * Site controller */ class SiteController extends Controller { - private $_service; + private UserManageService $service; public function __construct(string $id, $module, UserManageService $service, array $config = []) { parent::__construct($id, $module, $config); - $this->_service = $service; + $this->service = $service; } /** @@ -75,12 +80,12 @@ class SiteController extends Controller * * @return string */ - public function actionIndex() + public function actionIndex(): string { return $this->render('index'); } - public function actionSearch() + public function actionSearch(): string { $form = new SearchForm(); @@ -102,28 +107,28 @@ class SiteController extends Controller 'provider' => $provider, 'form' => $form ]); - - //$page = $this->service->create($form); - //return $this->redirect(['view', 'id' => $page->id]); - } catch (\DomainException $e) { - //Yii::$app->errorHandler->logException($e); - //Yii::$app->session->setFlash('error', $e->getMessage()); + } catch (DomainException) { } } return ''; } - public function actionLanguage($language) + public function actionLanguage($language): Response { if ($language && in_array($language, array_keys(Yii::$app->params['backendTranslatedLanguages']))) { - $this->_service->setBackendLanguage($language); + $this->service->setBackendLanguage($language); } return $this->redirect(Yii::$app->request->referrer); } - public function beforeAction($action) + /** + * @param Action $action + * @return bool + * @throws BadRequestHttpException + */ + public function beforeAction($action): bool { if ($action->id === 'error') { $this->layout = 'error'; @@ -132,20 +137,20 @@ class SiteController extends Controller return parent::beforeAction($action); } - public function actionGetWidgetsList() + public function actionGetWidgetsList(): string { return $this->renderAjax('widgets-list'); } - public function actionAddWidget($itemIdx, $color = '') + public function actionAddWidget($itemIdx, $color = ''): string { if (!Yii::$app->request->isAjax) { - throw new \RuntimeException(Yii::t('main', 'The requested page does not exist.')); + throw new RuntimeException(Yii::t('main', 'The requested page does not exist.')); } $widgets = UserHelper::getSetting('widgetsLayout', []); $item = Yii::$app->params['dashboard_widgets'][$itemIdx]; //require($itemFile); - $resizable = isset($item['resizable']) ? $item['resizable'] : 0; + $resizable = $item['resizable'] ?? 0; $newWidget = [ 'w' => $item['size']['width'] ?: 0, 'h' => $item['size']['height'] ?: 0, @@ -168,7 +173,7 @@ class SiteController extends Controller public function actionRemoveWidget($idx) { if (!Yii::$app->request->isAjax) { - throw new \RuntimeException(Yii::t('main', 'The requested page does not exist.')); + throw new RuntimeException(Yii::t('main', 'The requested page does not exist.')); } $widgets = UserHelper::getSetting('widgetsLayout', []); array_splice($widgets, $idx, 1); @@ -184,7 +189,7 @@ class SiteController extends Controller } } - public function actionGetSelectedWidgetsList() + public function actionGetSelectedWidgetsList(): string { return $this->renderAjax( 'widgets-selected-list'); } diff --git a/backend/controllers/SliderController.php b/backend/controllers/SliderController.php index 9c48d79..95ecd08 100644 --- a/backend/controllers/SliderController.php +++ b/backend/controllers/SliderController.php @@ -5,21 +5,23 @@ namespace backend\controllers; use core\entities\Slider; use core\forms\SliderForm; use core\services\SliderService; +use DomainException; use Yii; use yii\data\ActiveDataProvider; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use yii\filters\AccessControl; +use yii\web\Response; class SliderController extends Controller { - private $_service; + private SliderService $service; public function __construct($id, $module, SliderService $service, $config = []) { parent::__construct($id, $module, $config); - $this->_service = $service; + $this->service = $service; } /** @@ -51,10 +53,8 @@ class SliderController extends Controller ]; } - public function actionIndex() + public function actionIndex(): string { - //$searchModel = new UserSearch(); - //$dataProvider = $searchModel->search(Yii::$app->request->queryParams); $query = Slider::find(); $dataProvider = new ActiveDataProvider([ 'query' => $query, @@ -79,7 +79,7 @@ class SliderController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($id) + public function actionView($id): string { return $this->render('view', [ 'model' => $this->findModel($id), @@ -89,18 +89,18 @@ class SliderController extends Controller /** * Creates a new User model. * If creation is successful, the browser will be redirected to the 'view' page. - * @return mixed + * @return string|Response */ - public function actionCreate() + public function actionCreate(): Response|string { $form = new SliderForm(); $form->scenario = Slider::SCENARIO_CREATE; if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $slider = $this->_service->create($form); + $slider = $this->service->create($form); return $this->redirect(['view', 'id' => $slider->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -114,10 +114,10 @@ class SliderController extends Controller /** * @param $id * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionUpdate($id) + public function actionUpdate($id): Response|string { $slider = $this->findModel($id); @@ -125,10 +125,10 @@ class SliderController extends Controller $form->scenario = Slider::SCENARIO_UPDATE; if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_service->edit($slider->id, $form); + $this->service->edit($slider->id, $form); return $this->redirect(['view', 'id' => $slider->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -143,16 +143,20 @@ class SliderController extends Controller /** * @param $id * - * @return \yii\web\Response + * @return Response */ - public function actionDelete($id) + public function actionDelete($id): Response { - $this->_service->remove($id); + $this->service->remove($id); return $this->redirect(['index']); } - + /** + * @param $id + * @return Slider|null + * @throws NotFoundHttpException + */ protected function findModel($id): ?Slider { if (($model = Slider::findOne($id)) !== null) { diff --git a/backend/controllers/UserController.php b/backend/controllers/UserController.php index d07a34b..64f1d33 100644 --- a/backend/controllers/UserController.php +++ b/backend/controllers/UserController.php @@ -6,13 +6,16 @@ use core\forms\user\ProfileEditForm; use core\forms\user\UserForm; use core\services\user\ProfileService; use core\services\user\UserManageService; +use DomainException; use Yii; use core\entities\user\User; use backend\forms\UserSearch; +use yii\base\Exception; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use yii\filters\AccessControl; +use yii\web\Response; use yii\web\UploadedFile; /** @@ -20,14 +23,14 @@ use yii\web\UploadedFile; */ class UserController extends Controller { - private $_service; - private $_profile_service; + private UserManageService $service; + private ProfileService $profile_service; public function __construct($id, $module, UserManageService $service, ProfileService $profile_service, $config = []) { parent::__construct($id, $module, $config); - $this->_service = $service; - $this->_profile_service = $profile_service; + $this->service = $service; + $this->profile_service = $profile_service; } /** @@ -66,9 +69,9 @@ class UserController extends Controller /** * Lists all User models. - * @return mixed + * @return string */ - public function actionIndex() + public function actionIndex(): string { $searchModel = new UserSearch(); $dataProvider = $searchModel->search(Yii::$app->request->queryParams); @@ -85,7 +88,7 @@ class UserController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($id) + public function actionView($id): string { return $this->render('view', [ 'model' => $this->findModel($id), @@ -95,17 +98,19 @@ class UserController extends Controller /** * Creates a new User model. * If creation is successful, the browser will be redirected to the 'view' page. - * @return mixed + * @return Response|string + * @throws Exception + * @throws \yii\db\Exception */ - public function actionCreate() + public function actionCreate(): Response|string { $form = new UserForm(); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $user = $this->_service->create($form); + $user = $this->service->create($form); return $this->redirect(['view', 'id' => $user->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -118,21 +123,22 @@ class UserController extends Controller /** * @param $id - * - * @return string|\yii\web\Response + * @return Response|string + * @throws Exception * @throws NotFoundHttpException + * @throws \yii\db\Exception */ - public function actionUpdate($id) + public function actionUpdate($id): Response|string { $user = $this->findModel($id); $form = new UserForm($user); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_service->edit($user->id, $form); + $this->service->edit($user->id, $form); return $this->redirect(['view', 'id' => $user->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -150,16 +156,20 @@ class UserController extends Controller * * @param integer $id * - * @return mixed + * @return Response */ - public function actionDelete($id) + public function actionDelete(int $id): Response { - $this->_service->remove($id); + $this->service->remove($id); return $this->redirect(['index']); } - public function actionProfile() + /** + * @return Response|string + * @throws NotFoundHttpException|Exception + */ + public function actionProfile(): Response|string { $user = $this->findModel(Yii::$app->user->id); $form = new ProfileEditForm($user); @@ -167,11 +177,11 @@ class UserController extends Controller if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { $form->user_pic = UploadedFile::getInstance($form, 'user_pic'); - $this->_profile_service->edit(Yii::$app->user->id, $form); + $this->profile_service->edit(Yii::$app->user->id, $form); Yii::$app->session->setFlash('success', Yii::t('user', 'Profile is saved.')); return $this->redirect(['/user/profile']); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -192,7 +202,7 @@ class UserController extends Controller * @return User the loaded model * @throws NotFoundHttpException if the model cannot be found */ - protected function findModel($id) + protected function findModel(int $id): User { if (($model = User::findOne($id)) !== null) { return $model; diff --git a/backend/controllers/post/CategoryController.php b/backend/controllers/post/CategoryController.php index 1d2963a..cc31db3 100644 --- a/backend/controllers/post/CategoryController.php +++ b/backend/controllers/post/CategoryController.php @@ -5,6 +5,7 @@ namespace backend\controllers\post; use core\entities\post\PostType; use core\forms\post\PostCategoryForm; use core\services\post\PostCategoryManageService; +use DomainException; use Yii; use core\entities\post\PostCategory; use core\forms\post\search\PostCategorySearch; @@ -12,10 +13,11 @@ use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use yii\filters\AccessControl; +use yii\web\Response; class CategoryController extends Controller { - private $service; + private PostCategoryManageService $service; public function __construct($id, $module, PostCategoryManageService $service, $config = []) { @@ -27,7 +29,7 @@ class CategoryController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, @@ -40,7 +42,7 @@ class CategoryController extends Controller ], ], 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'delete' => ['POST'], ], @@ -54,7 +56,7 @@ class CategoryController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionIndex($tid) + public function actionIndex($tid): string { $type = $this->findType($tid); @@ -74,7 +76,7 @@ class CategoryController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($id) + public function actionView($id): string { $category = $this->findModel($id); $type = $this->findType($category->type_id); @@ -87,10 +89,10 @@ class CategoryController extends Controller /** * @param $tid * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionCreate($tid) + public function actionCreate($tid): Response|string { $type = $this->findType($tid); $form = new PostCategoryForm(); @@ -100,7 +102,7 @@ class CategoryController extends Controller try { $category = $this->service->create($form); return $this->redirect(['view', 'id' => $category->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -114,10 +116,10 @@ class CategoryController extends Controller /** * @param $id * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionUpdate($id) + public function actionUpdate($id): Response|string { $category = $this->findModel($id); $type = $this->findType($category->type_id); @@ -126,7 +128,7 @@ class CategoryController extends Controller try { $this->service->edit($category->id, $form); return $this->redirect(['view', 'id' => $category->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -141,16 +143,16 @@ class CategoryController extends Controller /** * @param $id * - * @return \yii\web\Response + * @return Response * @throws NotFoundHttpException */ - public function actionDelete($id) + public function actionDelete($id): Response { $category = $this->findModel($id); $type = $this->findType($category->type_id); try { $this->service->remove($id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -163,7 +165,7 @@ class CategoryController extends Controller * @return PostCategory the loaded model * @throws NotFoundHttpException if the model cannot be found */ - protected function findModel($id): PostCategory + protected function findModel(int $id): PostCategory { if (($model = PostCategory::findOne($id)) !== null) { return $model; @@ -171,7 +173,12 @@ class CategoryController extends Controller throw new NotFoundHttpException('The requested page does not exist.'); } - protected function findType($id): PostType + /** + * @param integer $id + * @return PostType + * @throws NotFoundHttpException + */ + protected function findType(int $id): PostType { if (($type = PostType::findOne($id)) !== null) { return $type; diff --git a/backend/controllers/post/CommentController.php b/backend/controllers/post/CommentController.php index e5c861a..a418a9c 100644 --- a/backend/controllers/post/CommentController.php +++ b/backend/controllers/post/CommentController.php @@ -5,16 +5,18 @@ namespace backend\controllers\post; use core\forms\post\search\PostCommentSearch; use core\forms\post\PostCommentEditForm; use core\services\post\PostCommentManageService; +use DomainException; use Yii; use core\entities\post\Post; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use yii\filters\AccessControl; +use yii\web\Response; class CommentController extends Controller { - private $service; + private PostCommentManageService $service; public function __construct($id, $module, PostCommentManageService $service, $config = []) { @@ -26,7 +28,7 @@ class CommentController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, @@ -39,7 +41,7 @@ class CommentController extends Controller ], ], 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'delete' => ['POST'], ], @@ -48,9 +50,9 @@ class CommentController extends Controller } /** - * @return mixed + * @return string */ - public function actionIndex() + public function actionIndex(): string { $searchModel = new PostCommentSearch(); $dataProvider = $searchModel->search(Yii::$app->request->queryParams); @@ -65,10 +67,10 @@ class CommentController extends Controller * @param $post_id * @param $id * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionUpdate($post_id, $id) + public function actionUpdate($post_id, $id): Response|string { $post = $this->findModel($post_id); $comment = $post->getComment($id); @@ -78,7 +80,7 @@ class CommentController extends Controller try { $this->service->edit($post->id, $comment->id, $form); return $this->redirect(['view', 'post_id' => $post->id, 'id' => $comment->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -86,7 +88,7 @@ class CommentController extends Controller return $this->render('update', [ 'post' => $post, 'model' => $form, - 'comment' => $comment, + //'comment' => $comment, ]); } @@ -97,7 +99,7 @@ class CommentController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($post_id, $id) + public function actionView($post_id, $id): string { $post = $this->findModel($post_id); $comment = $post->getComment($id); @@ -112,33 +114,33 @@ class CommentController extends Controller * @param $post_id * @param $id * - * @return \yii\web\Response + * @return Response * @throws NotFoundHttpException */ - public function actionActivate($post_id, $id) + public function actionActivate($post_id, $id): Response { $post = $this->findModel($post_id); try { $this->service->activate($post->id, $id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->session->setFlash('error', $e->getMessage()); } return $this->redirect(['view', 'post_id' => $post_id, 'id' => $id]); } /** - * @param $post_id - * @param $id + * @param integer $post_id + * @param integer $id * - * @return \yii\web\Response + * @return Response * @throws NotFoundHttpException */ - public function actionDelete($post_id, $id) + public function actionDelete(int $post_id, int $id): Response { $post = $this->findModel($post_id); try { $this->service->remove($post->id, $id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->session->setFlash('error', $e->getMessage()); } return $this->redirect(['index']); @@ -149,7 +151,7 @@ class CommentController extends Controller * @return Post the loaded model * @throws NotFoundHttpException if the model cannot be found */ - protected function findModel($id): Post + protected function findModel(int $id): Post { if (($model = Post::findOne($id)) !== null) { return $model; diff --git a/backend/controllers/post/PostController.php b/backend/controllers/post/PostController.php index 1d79dc4..1ada522 100644 --- a/backend/controllers/post/PostController.php +++ b/backend/controllers/post/PostController.php @@ -6,11 +6,11 @@ use core\entities\post\PostTag; use core\entities\post\PostType; use core\forms\post\PostForm; use core\services\post\PostManageService; +use DomainException; use Yii; use core\entities\post\Post; use core\forms\post\search\PostSearch; -use yii\helpers\ArrayHelper; -use yii\log\Logger; +use yii\base\Exception; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; @@ -19,7 +19,7 @@ use yii\web\Response; class PostController extends Controller { - private $service; + private PostManageService $service; public function __construct($id, $module, PostManageService $service, $config = []) { @@ -31,7 +31,7 @@ class PostController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, @@ -44,7 +44,7 @@ class PostController extends Controller ], ], 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'delete' => ['POST'], 'activate' => ['POST'], @@ -63,7 +63,7 @@ class PostController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionIndex($tid) + public function actionIndex($tid): string { $type = $this->findType($tid); @@ -83,7 +83,7 @@ class PostController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($id) + public function actionView($id): string { $post = $this->findModel($id); $type = $this->findType($post->type_id); @@ -93,13 +93,14 @@ class PostController extends Controller ]); } - /** - * @param $tid - * - * @return string|\yii\web\Response - * @throws NotFoundHttpException - */ - public function actionCreate($tid) + /** + * @param $tid + * @return Response|string + * @throws NotFoundHttpException + * @throws Exception + * @throws \yii\db\Exception + */ + public function actionCreate($tid): Response|string { $type = $this->findType($tid); $form = new PostForm(); @@ -109,7 +110,7 @@ class PostController extends Controller try { $post = $this->service->create($form); return $this->redirect(['view', 'id' => $post->id, 'tid' => $post->type_id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -120,12 +121,13 @@ class PostController extends Controller ]); } - /** - * @param $id - * - * @return string|\yii\web\Response - * @throws NotFoundHttpException - */ + /** + * @param $id + * @return string|Response + * @throws Exception + * @throws NotFoundHttpException + * @throws \yii\db\Exception + */ public function actionUpdate($id) { $post = $this->findModel($id); @@ -136,7 +138,7 @@ class PostController extends Controller try { $this->service->edit($post->id, $form); return $this->redirect(['view', 'id' => $post->id, 'tid' => $post->type_id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -151,16 +153,16 @@ class PostController extends Controller /** * @param $id * - * @return \yii\web\Response + * @return Response * @throws NotFoundHttpException */ - public function actionDelete($id) + public function actionDelete($id): Response { $post = $this->findModel($id); $type = $this->findType($post->type_id); try { $this->service->remove($id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->session->setFlash('error', $e->getMessage()); } return $this->redirect(['index', 'tid' => $type->id]); @@ -168,13 +170,13 @@ class PostController extends Controller /** * @param integer $id - * @return mixed + * @return Response */ - public function actionActivate($id) + public function actionActivate(int $id): Response { try { $this->service->activate($id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->session->setFlash('error', $e->getMessage()); } return $this->redirect(['view', 'id' => $id]); @@ -182,13 +184,13 @@ class PostController extends Controller /** * @param integer $id - * @return mixed + * @return Response */ - public function actionDraft($id) + public function actionDraft(int $id): Response { try { $this->service->draft($id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->session->setFlash('error', $e->getMessage()); } return $this->redirect(['view', 'id' => $id]); @@ -214,7 +216,7 @@ class PostController extends Controller * @return Post the loaded model * @throws NotFoundHttpException if the model cannot be found */ - protected function findModel($id): Post + protected function findModel(int $id): Post { if (($model = Post::findOne($id)) !== null) { return $model; @@ -222,6 +224,11 @@ class PostController extends Controller throw new NotFoundHttpException('The requested page does not exist.'); } + /** + * @param $id + * @return PostType + * @throws NotFoundHttpException + */ protected function findType($id): PostType { if (($type = PostType::findOne($id)) !== null) { diff --git a/backend/controllers/post/TagController.php b/backend/controllers/post/TagController.php index 2c9a5c0..a254a82 100644 --- a/backend/controllers/post/TagController.php +++ b/backend/controllers/post/TagController.php @@ -5,6 +5,7 @@ namespace backend\controllers\post; use core\entities\post\PostType; use core\forms\post\PostTagSingleForm; use core\services\post\PostTagManageService; +use DomainException; use Yii; use core\entities\post\PostTag; use core\forms\post\search\PostTagSearch; @@ -12,10 +13,11 @@ use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use yii\filters\AccessControl; +use yii\web\Response; class TagController extends Controller { - private $service; + private PostTagManageService $service; public function __construct($id, $module, PostTagManageService $service, $config = []) { @@ -27,7 +29,7 @@ class TagController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, @@ -40,7 +42,7 @@ class TagController extends Controller ], ], 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'delete' => ['POST'], ], @@ -54,7 +56,7 @@ class TagController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionIndex($tid) + public function actionIndex($tid): string { $type = $this->findType($tid); @@ -74,7 +76,7 @@ class TagController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($id) + public function actionView($id): string { $tag = $this->findModel($id); $type = $this->findType($tag->type_id); @@ -87,10 +89,10 @@ class TagController extends Controller /** * @param $tid * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionCreate($tid) + public function actionCreate($tid): Response|string { $type = $this->findType($tid); $form = new PostTagSingleForm(); @@ -99,7 +101,7 @@ class TagController extends Controller try { $tag = $this->service->create($form); return $this->redirect(['view', 'id' => $tag->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -113,10 +115,10 @@ class TagController extends Controller /** * @param $id * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionUpdate($id) + public function actionUpdate($id): Response|string { $tag = $this->findModel($id); $type = $this->findType($tag->type_id); @@ -125,7 +127,7 @@ class TagController extends Controller try { $this->service->edit($tag->id, $form); return $this->redirect(['view', 'id' => $tag->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -140,16 +142,16 @@ class TagController extends Controller /** * @param $id * - * @return \yii\web\Response + * @return Response * @throws NotFoundHttpException */ - public function actionDelete($id) + public function actionDelete($id): Response { $tag = $this->findModel($id); $type = $this->findType($tag->type_id); try { $this->service->remove($id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -161,7 +163,7 @@ class TagController extends Controller * @return PostTag the loaded model * @throws NotFoundHttpException if the model cannot be found */ - protected function findModel($id): PostTag + protected function findModel(int $id): PostTag { if (($model = PostTag::findOne($id)) !== null) { return $model; @@ -169,6 +171,11 @@ class TagController extends Controller throw new NotFoundHttpException('The requested page does not exist.'); } + /** + * @param $id + * @return PostType + * @throws NotFoundHttpException + */ protected function findType($id): PostType { if (($type = PostType::findOne($id)) !== null) { diff --git a/backend/controllers/post/TypeController.php b/backend/controllers/post/TypeController.php index c1b9b90..7cdd5c7 100644 --- a/backend/controllers/post/TypeController.php +++ b/backend/controllers/post/TypeController.php @@ -6,11 +6,13 @@ use core\entities\post\PostType; use core\forms\post\PostTypeForm; use core\forms\post\search\PostTypeSearch; use core\services\post\PostTypeService; +use DomainException; use yii\web\NotFoundHttpException; use yii\web\Controller; use yii\filters\AccessControl; use yii\filters\VerbFilter; use Yii; +use yii\web\Response; class TypeController extends Controller { @@ -26,7 +28,7 @@ class TypeController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, @@ -39,7 +41,7 @@ class TypeController extends Controller ], ], 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'delete' => ['POST'], ], @@ -50,7 +52,7 @@ class TypeController extends Controller /** * @return string */ - public function actionIndex() + public function actionIndex(): string { $searchModel = new PostTypeSearch(); $dataProvider = $searchModel->search(Yii::$app->request->queryParams); @@ -67,7 +69,7 @@ class TypeController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($id) + public function actionView($id): string { $type = $this->findModel($id); return $this->render('view', [ @@ -76,9 +78,9 @@ class TypeController extends Controller } /** - * @return string|\yii\web\Response + * @return string|Response */ - public function actionCreate() + public function actionCreate(): Response|string { $form = new PostTypeForm(); @@ -86,7 +88,7 @@ class TypeController extends Controller try { $type = $this->service->create($form); return $this->redirect(['view', 'id' => $type->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -99,10 +101,10 @@ class TypeController extends Controller /** * @param $id * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionUpdate($id) + public function actionUpdate($id): Response|string { $type = $this->findModel($id); @@ -111,20 +113,21 @@ class TypeController extends Controller try { $this->service->edit($type->id, $form); return $this->redirect(['view', 'id' => $type->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } } return $this->render('update', [ 'model' => $form, + 'type' => $type, ]); } /** * @param $id * - * @return \yii\web\Response + * @return Response * @throws NotFoundHttpException */ public function actionDelete($id) @@ -133,7 +136,7 @@ class TypeController extends Controller try { $this->service->remove($id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } diff --git a/backend/controllers/settings/ListController.php b/backend/controllers/settings/ListController.php index c3b2ef3..04c22db 100644 --- a/backend/controllers/settings/ListController.php +++ b/backend/controllers/settings/ListController.php @@ -11,22 +11,25 @@ use core\entities\Settings; use core\forms\FaviconForm; use core\forms\SettingsForm; use core\services\SettingsService; +use DomainException; +use yii\db\ActiveRecord; use yii\filters\AccessControl; use yii\filters\VerbFilter; use yii\web\Controller; use backend\components\ToggleAction; use Yii; use yii\web\NotFoundHttpException; +use yii\web\Response; use yii\web\UploadedFile; class ListController extends Controller { - private $_service; + private SettingsService $service; public function __construct(string $id, $module, SettingsService $service, array $config = []) { parent::__construct($id, $module, $config); - $this->_service = $service; + $this->service = $service; } public function behaviors() @@ -61,12 +64,11 @@ class ListController extends Controller 'toggle' => [ 'class' => ToggleAction::class, 'modelClass' => Settings::class, - //'setFlash' => true, ] ]; } - public function actionIndex($section = 'site') + public function actionIndex($section = 'site'): string { $searchModel = new SettingsSearch(); $searchModel->section = $section; @@ -82,7 +84,13 @@ class ListController extends Controller ); } - public function actionView($section, $key) + /** + * @param $section + * @param $key + * @return string + * @throws NotFoundHttpException + */ + public function actionView($section, $key): string { return $this->render( 'view', @@ -92,15 +100,15 @@ class ListController extends Controller ); } - public function actionCreate() + public function actionCreate(): Response|string { $form = new SettingsForm(); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $settings = $this->_service->create($form); + $settings = $this->service->create($form); return $this->redirect(['view', 'section' => $settings->section, 'key' => $settings->key]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -116,17 +124,23 @@ class ListController extends Controller ); } - public function actionUpdate($section, $key) + /** + * @param $section + * @param $key + * @return Response|string + * @throws NotFoundHttpException + */ + public function actionUpdate($section, $key): Response|string { $settings = $this->findModel($section, $key); $form = new SettingsForm($settings); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_service->edit($settings->section, $settings->key, $form); + $this->service->edit($settings->section, $settings->key, $form); return $this->redirect(['view', 'section' => $settings->section, 'key' => $settings->key]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -141,14 +155,14 @@ class ListController extends Controller ); } - public function actionDelete($section, $key) + public function actionDelete($section, $key): Response { - $this->_service->remove($section, $key); + $this->service->remove($section, $key); return $this->redirect(['index']); } - public function actionFavicon() + public function actionFavicon(): Response|string { $form = new FaviconForm(); if ($form->load(Yii::$app->request->post())) { @@ -159,7 +173,7 @@ class ListController extends Controller } $form->image->saveAs(Yii::getAlias('@staticRoot') . '/origin/favicon/favicon.png'); - $this->_service->newFavicon(); + $this->service->newFavicon(); Yii::$app->session->setFlash('success', Yii::t('main', 'Favicon generation complete')); return $this->redirect(['settings/list/index']); } @@ -173,7 +187,13 @@ class ListController extends Controller ); } - protected function findModel($section, $key) + /** + * @param $section + * @param $key + * @return array|Settings|ActiveRecord|null + * @throws NotFoundHttpException + */ + protected function findModel($section, $key): array|Settings|ActiveRecord|null { if (($model = Settings::find()->andWhere(['section' => $section])->andWhere(['key' => $key])->one()) !== null) { return $model; diff --git a/backend/forms/SettingsSearch.php b/backend/forms/SettingsSearch.php index c552768..57dbf1b 100644 --- a/backend/forms/SettingsSearch.php +++ b/backend/forms/SettingsSearch.php @@ -12,14 +12,14 @@ use yii\data\ActiveDataProvider; class SettingsSearch extends Settings { - public $id; - public $type; - public $section; - public $key; - public $value; - public $active; + public ?int $id = null; + public ?int $type = null; + public ?string $section = null; + public ?string $key = null; + public ?string $value = null; + public ?int $active = null; - public function rules() + public function rules(): array { return [ [['id'], 'integer'], @@ -31,7 +31,7 @@ class SettingsSearch extends Settings /** * @return array */ - public function scenarios() + public function scenarios(): array { // bypass scenarios() implementation in the parent class return Model::scenarios(); @@ -42,7 +42,7 @@ class SettingsSearch extends Settings * * @return ActiveDataProvider */ - public function search($params) + public function search($params): ActiveDataProvider { $query = Settings::find(); $dataProvider = new ActiveDataProvider( diff --git a/backend/forms/UserSearch.php b/backend/forms/UserSearch.php index 23ce1ca..8144934 100644 --- a/backend/forms/UserSearch.php +++ b/backend/forms/UserSearch.php @@ -2,6 +2,7 @@ namespace backend\forms; +use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; use core\entities\user\User; @@ -9,15 +10,15 @@ use yii\helpers\ArrayHelper; class UserSearch extends Model { - public $id; - public $date_from; - public $date_to; - public $username; - public $email; - public $status; - public $role; + public ?int $id = null; + public ?string $date_from = null; + public ?string $date_to = null; + public ?string $username = null; + public ?string $email = null; + public ?int $status = null; + public ?string $role = null; - public function rules() + public function rules(): array { return [ [['id', 'status'], 'integer'], @@ -66,6 +67,6 @@ class UserSearch extends Model public function rolesList(): array { - return ArrayHelper::map(\Yii::$app->authManager->getRoles(), 'name', 'description'); + return ArrayHelper::map(Yii::$app->authManager->getRoles(), 'name', 'description'); } } diff --git a/backend/forms/rbac/RbacCreatePermissionForm.php b/backend/forms/rbac/RbacCreatePermissionForm.php index 092d50c..5e0627c 100644 --- a/backend/forms/rbac/RbacCreatePermissionForm.php +++ b/backend/forms/rbac/RbacCreatePermissionForm.php @@ -11,14 +11,14 @@ use Yii; class RbacCreatePermissionForm extends Model { - public $name; - public $description; - public $rule_name; - public $data; - public $created_at; - public $updated_at; + public ?string $name = null; + public ?string $description = null; + public ?string $rule_name = null; + public ?string $data = null; + public ?int $created_at = null; + public ?int $updated_at = null; - public function rules() + public function rules(): array { return [ [['name'], 'required'], diff --git a/backend/forms/rbac/RbacCreateRoleForm.php b/backend/forms/rbac/RbacCreateRoleForm.php index bd7d8b3..abb6f1c 100644 --- a/backend/forms/rbac/RbacCreateRoleForm.php +++ b/backend/forms/rbac/RbacCreateRoleForm.php @@ -11,14 +11,14 @@ use Yii; class RbacCreateRoleForm extends Model { - public $name; - public $description; - public $rule_name; - public $data; - public $created_at; - public $updated_at; + public ?string $name = null; + public ?string $description = null; + public ?string $rule_name = null; + public ?string $data = null; + public ?int $created_at = null; + public ?int $updated_at = null; - public function rules() + public function rules(): array { return [ [['name'], 'required'], diff --git a/backend/forms/rbac/RbacEditPermissionForm.php b/backend/forms/rbac/RbacEditPermissionForm.php index d1b0cb4..0036386 100644 --- a/backend/forms/rbac/RbacEditPermissionForm.php +++ b/backend/forms/rbac/RbacEditPermissionForm.php @@ -12,13 +12,12 @@ use Yii; class RbacEditPermissionForm extends Model { - public $name; - public $description; - public $rule_name; - public $data; - public $created_at; - public $updated_at; - + public ?string $name = null; + public ?string $description = null; + public ?string $rule_name = null; + public ?string $data = null; + public ?int $created_at = null; + public ?int $updated_at = null; public function __construct(Permission $permission, $config = []) { @@ -29,7 +28,7 @@ class RbacEditPermissionForm extends Model parent::__construct($config); } - public function rules() + public function rules(): array { return [ [['name'], 'required'], diff --git a/backend/forms/rbac/RbacEditRoleForm.php b/backend/forms/rbac/RbacEditRoleForm.php index c74647d..b0e6209 100644 --- a/backend/forms/rbac/RbacEditRoleForm.php +++ b/backend/forms/rbac/RbacEditRoleForm.php @@ -12,13 +12,12 @@ use Yii; class RbacEditRoleForm extends Model { - public $name; - public $description; - public $rule_name; - public $data; - public $created_at; - public $updated_at; - + public ?string $name = null; + public ?string $description = null; + public ?string $rule_name = null; + public ?string $data = null; + public ?int $created_at = null; + public ?int $updated_at = null; public function __construct(Role $role, $config = []) { @@ -29,7 +28,7 @@ class RbacEditRoleForm extends Model parent::__construct($config); } - public function rules() + public function rules(): array { return [ [['name'], 'required'], diff --git a/backend/forms/rbac/RbacUpdateChildren.php b/backend/forms/rbac/RbacUpdateChildren.php index fabe3f6..d9433c6 100644 --- a/backend/forms/rbac/RbacUpdateChildren.php +++ b/backend/forms/rbac/RbacUpdateChildren.php @@ -10,10 +10,10 @@ use yii\base\Model; class RbacUpdateChildren extends Model { - public $roles; - public $permissions; + public ?array $roles = null; + public ?array $permissions = null; - public function rules() + public function rules(): array { return [ [['roles', 'permissions'], 'each', 'rule' => ['string']], diff --git a/backend/helpers/DashboardHelper.php b/backend/helpers/DashboardHelper.php index 3f6205c..40f1cab 100644 --- a/backend/helpers/DashboardHelper.php +++ b/backend/helpers/DashboardHelper.php @@ -11,7 +11,7 @@ use yii\helpers\Html; class DashboardHelper { - public static function getAllWidgets() + public static function getAllWidgets(): array { $widgetsCounter = ''; // Counters Widgets $widgetsInfo = ''; // Information Widgets @@ -20,15 +20,7 @@ class DashboardHelper $path = Yii::getAlias('@backend/widgets/dashboard'); $files = scandir($path, 0); - //foreach ($files as $file) { foreach (Yii::$app->params['dashboard_widgets'] as $idx => $item) { - //if (!is_file($path . '/' . $file)) { - // continue; - //} - - //$itemFile = $path . '/' . $file; - //$item = require($itemFile); - if (isset($item['rule']) && (Yii::$app->user->can($item['rule']) || Yii::$app->user->can('admin'))) { } elseif (!isset($item['rule'])) { } else { @@ -47,11 +39,10 @@ class DashboardHelper $widgetsInfo .= $line; } } - return [$widgetsCounter, $widgetsInfo]; } - public static function getExtColors() + public static function getExtColors(): array { return [ 'gray' => Yii::t('main', 'Gray'), diff --git a/backend/messages/ru/menu.php b/backend/messages/ru/menu.php index c355b1b..eb9364a 100644 --- a/backend/messages/ru/menu.php +++ b/backend/messages/ru/menu.php @@ -29,4 +29,5 @@ return [ 'Title attribute' => 'Аттрибут Title', 'CSS Classes' => 'Классы CSS', 'CSS Style' => 'Стиль CSS', + 'Url' => 'Ссылка', ]; \ No newline at end of file diff --git a/backend/views/auth/login.php b/backend/views/auth/login.php index 5ef8f5b..6d6d6dd 100644 --- a/backend/views/auth/login.php +++ b/backend/views/auth/login.php @@ -1,11 +1,12 @@ title = Yii::t('main', 'Sign in'); @@ -34,7 +35,10 @@ $fieldOptions2 = [ - 'login-form', 'enableClientValidation' => false]); ?> + 'login-form', + 'enableClientValidation' => false + ]); ?> field($model, 'username', $fieldOptions1) diff --git a/backend/views/layouts/content-origin.php b/backend/views/layouts/content-origin.php new file mode 100644 index 0000000..6a2485c --- /dev/null +++ b/backend/views/layouts/content-origin.php @@ -0,0 +1,238 @@ + +
+
-
diff --git a/backend/components/menu/widgets/views/menu.php b/backend/components/menu/widgets/views/menu.php
index 6cafbee..0edbd05 100644
--- a/backend/components/menu/widgets/views/menu.php
+++ b/backend/components/menu/widgets/views/menu.php
@@ -4,21 +4,24 @@
* Date: 11.07.2018
*/
-/**
- * @var $this \yii\web\View
- * @var $items array
- * @var $menu \core\entities\menu\Menu
- */
-
use backend\components\menu\assets\MenuAsset;
+use core\entities\menu\Menu;
use core\forms\menu\MenuItemForm;
use yii\helpers\Html;
use yii\helpers\Url;
use yii\web\JsExpression;
+use yii\web\View;
+
+/**
+ * @var $this View
+ * @var $items array
+ * @var $menu Menu
+ */
MenuAsset::register($this);
-function menu_generate($items) {
+function menu_generate($items): string
+{
$html = '
-
-
- field($model, 'name' . $postfix)->textInput(['maxlength' => true]) ?>
+ field($model, 'name' . $postfix)->textInput(['maxlength' => true, 'class' => 'form-control form-control-sm']) ?>
- field($model, 'title_attr' . $postfix)->textInput(['maxlength' => true]) ?>
+ field($model, 'title_attr' . $postfix)->textInput(['maxlength' => true, 'class' => 'form-control form-control-sm']) ?>
- ';
foreach ($items as $item) {
$menuItemForm = new MenuItemForm($item['item']);
@@ -31,39 +34,11 @@ function menu_generate($items) {
}
$name_empty_error = Yii::t('menu', 'Name must be specified');
-//$item_save_url = Url::to(['menu/save-menu-item-data']);
$item_save_url = ''; // delete this
$item_delete_url = Url::to(['menu/delete-menu-item']);
$confirm_delete_message = Yii::t('buttons', 'Are you sure you want to delete this item?');
$current_url = Url::to(['menu/index', 'id' => $menu->id]);
$js = <<
'btn btn-success pull-right', + 'class' => 'btn btn-success float-right', 'onclick' => new JsExpression('sendTree('.$menu->id.', "'.$url.'", "'.$redirect.'")'), -]) ?> \ No newline at end of file +]) ?> + diff --git a/backend/config/main.php b/backend/config/main.php index e11db52..696e47e 100644 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -149,6 +149,48 @@ return [ ], ], ], + 'assetManager' => [ + 'bundles' => [ + 'yii\bootstrap\BootstrapAsset' => [ + 'sourcePath' => '@core/components/bootstrap4', // do not publish the bundle + 'css' => [ + YII_ENV_DEV ? 'css/bootstrap.css' : 'css/bootstrap.min.css' + ], + ], + 'yii\bootstrap\BootstrapPluginAsset' => [ + 'sourcePath' => '@core/components/bootstrap4', + 'js' => [ + YII_ENV_DEV ? 'js/bootstrap.bundle.js' : 'js/bootstrap.bundle.min.js' + ], + 'depends' => [ + 'yii\web\JqueryAsset', + 'yii\bootstrap\BootstrapAsset', + ], + ], + /*'yii\web\JqueryAsset' => [ + 'sourcePath' => '@cp/assets/libs/jquery321', // do not publish the bundle + 'js' => [ + YII_ENV_DEV ? 'jquery-3.2.1.js' : 'jquery-3.2.1.min.js' + ], + ], + 'yii\bootstrap\BootstrapAsset' => [ + 'sourcePath' => '@cp/assets/libs/bootstrap4/css', // do not publish the bundle + 'css' => [ + YII_ENV_DEV ? 'bootstrap.css' : 'bootstrap.min.css' + ], + ], + 'yii\bootstrap\BootstrapPluginAsset' => [ + 'sourcePath' => '@cp/assets/libs/bootstrap4/js', // do not publish the bundle + 'js' => [ + YII_ENV_DEV ? 'bootstrap.js' : 'bootstrap.min.js' + ], + 'depends' => [ + 'yii\web\JqueryAsset', + 'yii\bootstrap\BootstrapAsset', + ], + ],*/ + ], + ], ], 'params' => $params, ]; diff --git a/backend/controllers/AuthController.php b/backend/controllers/AuthController.php index ad69dab..84ca644 100644 --- a/backend/controllers/AuthController.php +++ b/backend/controllers/AuthController.php @@ -10,10 +10,11 @@ use yii\filters\VerbFilter; use core\forms\auth\LoginForm; use yii\filters\AccessControl; use DomainException; +use yii\web\Response; class AuthController extends Controller { - private $auth_service; + private AuthService $auth_service; public function __construct($id, $module, AuthService $service, $config = []) { @@ -56,9 +57,9 @@ class AuthController extends Controller } /** - * @return mixed + * @return string|Response */ - public function actionLogin() + public function actionLogin(): string|Response { if (!Yii::$app->user->isGuest) { return $this->goHome(); @@ -85,9 +86,9 @@ class AuthController extends Controller } /** - * @return mixed + * @return Response */ - public function actionLogout() + public function actionLogout(): Response { Yii::$app->user->logout(); diff --git a/backend/controllers/MenuController.php b/backend/controllers/MenuController.php index 2b047c4..5de72ae 100644 --- a/backend/controllers/MenuController.php +++ b/backend/controllers/MenuController.php @@ -14,6 +14,7 @@ use core\forms\menu\MenuItemForm; use core\forms\menu\MenuSelectForm; use core\services\menu\MenuItemManageService; use core\services\menu\MenuManageService; +use yii\db\StaleObjectException; use yii\filters\AccessControl; use yii\filters\VerbFilter; use yii\helpers\Json; @@ -26,8 +27,8 @@ use Yii; class MenuController extends Controller { - public $menu_service; - public $menu_item_service; + public MenuManageService $menu_service; + public MenuItemManageService $menu_item_service; public function __construct( string $id, @@ -68,7 +69,12 @@ class MenuController extends Controller ]; } - public function actionIndex($id = null) + /** + * @param null $id + * @return Response|string + * @throws NotFoundHttpException + */ + public function actionIndex($id = null): Response|string { $menus = []; // menu list $menu_records = Menu::find()->all(); @@ -82,10 +88,12 @@ class MenuController extends Controller if ($form->load(Yii::$app->request->get()) && $form->validate()) { return $this->redirect(['menu/index', 'id' => $form->id]); } elseif ($id) { - $this->createMenuItem(); // create menu item if MenuItemForm sent - $menu = $this->findModel($id); + if ($this->createMenuItem()) { + return $this->redirect(['/menu/index', 'id' => $id]); + }; // create menu item if MenuItemForm sent + $creatorWidgets = $this->getCreatorWidgets($menu->id); return $this->render('menu', [ @@ -102,7 +110,7 @@ class MenuController extends Controller } } - public function actionCreate() + public function actionCreate(): Response|string { $form = new MenuForm(); if ($form->load(Yii::$app->request->post()) && $form->validate()) { @@ -121,7 +129,12 @@ class MenuController extends Controller ]); } - public function actionUpdate($id) + /** + * @param $id + * @return Response|string + * @throws NotFoundHttpException + */ + public function actionUpdate($id): Response|string { $menu = $this->findModel($id); @@ -143,7 +156,7 @@ class MenuController extends Controller ]); } - public function actionDelete($id) + public function actionDelete($id): Response { try { $this->menu_service->remove($id); @@ -155,7 +168,12 @@ class MenuController extends Controller return $this->redirect(['index']); } - public function actionSaveItem($id) + /** + * @param $id + * @return Response + * @throws NotFoundHttpException + */ + public function actionSaveItem($id): Response { $item = $this->findItemModel($id); $form = new MenuItemForm($item); @@ -173,7 +191,12 @@ class MenuController extends Controller return $this->redirect(['index', 'id' => $item->menu_id]); } - public function actionDeleteMenuItem() + /** + * @return array + * @throws NotFoundHttpException + * @throws StaleObjectException + */ + public function actionDeleteMenuItem(): array { Yii::$app->response->format = Response::FORMAT_JSON; if (Yii::$app->request->isAjax) { @@ -193,7 +216,7 @@ class MenuController extends Controller return ['result' => 'error', 'message' => 'Request error']; } - public function actionSaveMenuItems() + public function actionSaveMenuItems(): array { $json = Yii::$app->request->post('json'); Yii::$app->response->format = Response::FORMAT_JSON; @@ -230,18 +253,25 @@ class MenuController extends Controller return $widgets; } - private function createMenuItem() + private function createMenuItem(): bool { $form = new MenuItemForm(); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { $this->menu_item_service->create($form); + return true; } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); } } + return false; } + /** + * @param $id + * @return Menu + * @throws NotFoundHttpException + */ protected function findModel($id): Menu { if (($model = Menu::findOne($id)) !== null) { @@ -250,6 +280,11 @@ class MenuController extends Controller throw new NotFoundHttpException('The requested menu does not exist.'); } + /** + * @param $id + * @return MenuItem + * @throws NotFoundHttpException + */ protected function findItemModel($id): MenuItem { if (($model = MenuItem::findOne($id)) !== null) { diff --git a/backend/controllers/ModuleController.php b/backend/controllers/ModuleController.php index 17e2572..ec714ec 100644 --- a/backend/controllers/ModuleController.php +++ b/backend/controllers/ModuleController.php @@ -7,12 +7,15 @@ namespace backend\controllers; use core\entities\ModuleRecord; -use core\helpers\FileHelper; use core\services\ModuleService; +use Yii; +use yii\base\ErrorException; +use yii\db\Exception; use yii\web\Controller; use yii\filters\VerbFilter; use yii\filters\AccessControl; use yii\web\NotFoundHttpException; +use yii\web\Response; /** * Modules Management @@ -24,12 +27,12 @@ class ModuleController extends Controller /** * @var ModuleService Modules management service */ - private $_service; + private $service; public function __construct(string $id, $module, ModuleService $service, array $config = []) { parent::__construct($id, $module, $config); - $this->_service = $service; + $this->service = $service; } public function behaviors(): array @@ -65,40 +68,57 @@ class ModuleController extends Controller * List of modules * @return string */ - public function actionList() + public function actionList(): string { - $modules = \Yii::$app->moduleManager->getModules(); + $modules = Yii::$app->moduleManager->getModules(); return $this->render('list', [ 'modules' => $modules, ]); } - public function actionDelete($id) + /** + * @param $id + * @return Response + * @throws NotFoundHttpException + * @throws ErrorException + * @throws Exception + */ + public function actionDelete($id): Response { $module = $this->findModel($id); - $this->_service->delete($module); + $this->service->delete($module); return $this->redirect(['module/list']); } - public function actionDisable($id) + /** + * @param $id + * @return Response + * @throws NotFoundHttpException + */ + public function actionDisable($id): Response { $module = $this->findModel($id); - $this->_service->disable($module); + $this->service->disable($module); return $this->redirect(['module/list']); } - public function actionEnable($id) + /** + * @param $id + * @return Response + * @throws NotFoundHttpException + */ + public function actionEnable($id): Response { $module = $this->findModel($id); - $this->_service->enable($module); + $this->service->enable($module); return $this->redirect(['module/list']); } - public function actionSearch() + public function actionSearch(): string { $message = null; try { @@ -113,22 +133,22 @@ class ModuleController extends Controller continue; } - $languageFile = str_replace('manifest.php', 'messages/' . \Yii::$app->language . '/' . $manifest['name'] . '.php', $link); + $languageFile = str_replace('manifest.php', 'messages/' . Yii::$app->language . '/' . $manifest['name'] . '.php', $link); try { $language = file_get_contents($languageFile); $language = eval(str_replace('render('remote-list', [ @@ -137,6 +157,11 @@ class ModuleController extends Controller ]); } + /** + * @param $id + * @return ModuleRecord + * @throws NotFoundHttpException + */ protected function findModel($id): ModuleRecord { if (($model = ModuleRecord::findOne($id)) !== null) { diff --git a/backend/controllers/PermissionController.php b/backend/controllers/PermissionController.php index 1107e4f..c7dadeb 100644 --- a/backend/controllers/PermissionController.php +++ b/backend/controllers/PermissionController.php @@ -9,6 +9,8 @@ namespace backend\controllers; use backend\forms\rbac\RbacCreatePermissionForm; use backend\forms\rbac\RbacEditPermissionForm; use core\services\PermissionManager; +use DomainException; +use Exception; use yii\behaviors\TimestampBehavior; use yii\data\ArrayDataProvider; use yii\rbac\Permission; @@ -16,15 +18,16 @@ use yii\web\Controller; use yii\filters\VerbFilter; use Yii; use yii\filters\AccessControl; +use yii\web\Response; class PermissionController extends Controller { - private $_permission; + private PermissionManager $permission; public function __construct($id, $module, PermissionManager $permission, $config = []) { parent::__construct($id, $module, $config); - $this->_permission = $permission; + $this->permission = $permission; } /** @@ -59,14 +62,14 @@ class PermissionController extends Controller ]; } - public function actionIndex() + public function actionIndex(): string { $data = array_map(function (Permission $permission) { return [ 'name' => $permission->name, 'description' => $permission->description, ]; - }, $this->_permission->getPermissions()); + }, $this->permission->getPermissions()); $dataProvider = new ArrayDataProvider([ 'allModels' => $data, @@ -81,15 +84,15 @@ class PermissionController extends Controller return $this->render('index', ['dataProvider' => $dataProvider]); } - public function actionCreate() + public function actionCreate(): Response|string { $form = new RbacCreatePermissionForm(); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_permission->create($form->name, $form->description, $form->rule_name, $form->data); + $this->permission->create($form->name, $form->description, $form->rule_name, $form->data); return $this->redirect(['view', 'id' => $form->name]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -100,17 +103,22 @@ class PermissionController extends Controller ]); } - public function actionUpdate($id) + /** + * @param $id + * @return Response|string + * @throws Exception + */ + public function actionUpdate($id): Response|string { $permission = $this->findModel($id); $form = new RbacEditPermissionForm($permission); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_permission->update($permission->name, $form->name, $form->description, $form->rule_name, $form->data); + $this->permission->update($permission->name, $form->name, $form->description, $form->rule_name, $form->data); return $this->redirect(['view', 'id' => $form->name]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -121,22 +129,22 @@ class PermissionController extends Controller ]); } - public function actionDelete($id) + public function actionDelete($id): Response { - $this->_permission->delete($id); + $this->permission->delete($id); return $this->redirect(['index']); } - public function actionView($id) + public function actionView($id): string { return $this->render('view', [ 'model' => $this->findModel($id), ]); } - protected function findModel($id) + protected function findModel($id): ?Permission { - return $this->_permission->getPermission($id); + return $this->permission->getPermission($id); } } diff --git a/backend/controllers/RoleController.php b/backend/controllers/RoleController.php index 26133d4..c72c408 100644 --- a/backend/controllers/RoleController.php +++ b/backend/controllers/RoleController.php @@ -9,25 +9,29 @@ namespace backend\controllers; use backend\forms\rbac\RbacEditRoleForm; use backend\forms\rbac\RbacUpdateChildren; use core\services\PermissionManager; +use DomainException; +use Exception; use yii\behaviors\TimestampBehavior; use backend\forms\rbac\RbacCreateRoleForm; use core\services\RoleManager; use yii\data\ArrayDataProvider; +use yii\rbac\Role; use yii\web\Controller; use yii\filters\VerbFilter; use yii\filters\AccessControl; use Yii; +use yii\web\Response; class RoleController extends Controller { - private $_role; - private $_permission; + private RoleManager $role; + private PermissionManager $permission; public function __construct($id, $module, RoleManager $role, PermissionManager $permission, $config = []) { parent::__construct($id, $module, $config); - $this->_role = $role; - $this->_permission = $permission; + $this->role = $role; + $this->permission = $permission; } /** @@ -62,9 +66,9 @@ class RoleController extends Controller ]; } - public function actionIndex() + public function actionIndex(): string { - $data = $this->_role->getRolesListArray(); + $data = $this->role->getRolesListArray(); $dataProvider = new ArrayDataProvider([ 'allModels' => $data, @@ -79,15 +83,19 @@ class RoleController extends Controller return $this->render('index', ['dataProvider' => $dataProvider]); } - public function actionCreate() + /** + * @return Response|string + * @throws Exception + */ + public function actionCreate(): Response|string { $form = new RbacCreateRoleForm(); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_role->create($form->name, $form->description, $form->rule_name, $form->data); + $this->role->create($form->name, $form->description, $form->rule_name, $form->data); return $this->redirect(['view', 'id' => $form->name]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -98,17 +106,22 @@ class RoleController extends Controller ]); } - public function actionUpdate($id) + /** + * @param $id + * @return string|Response + * @throws Exception + */ + public function actionUpdate($id): Response|string { $role = $this->findModel($id); $form = new RbacEditRoleForm($role); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_role->update($role->name, $form->name, $form->description, $form->rule_name, $form->data); + $this->role->update($role->name, $form->name, $form->description, $form->rule_name, $form->data); return $this->redirect(['view', 'id' => $form->name]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -119,11 +132,11 @@ class RoleController extends Controller ]); } - public function actionDelete($id) + public function actionDelete($id): Response { try { - $this->_role->delete($id); - } catch (\DomainException $e) { + $this->role->delete($id); + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -131,21 +144,26 @@ class RoleController extends Controller return $this->redirect(['index']); } - public function actionView($id) + /** + * @param $id + * @return string + * @throws \yii\base\Exception + */ + public function actionView($id): string { - $currentRole = $this->_role->getRole($id); - $rolesSelectArray = array_diff_assoc($this->_role->getRolesSelectArray(), [$currentRole->name => $currentRole->description]); + $currentRole = $this->role->getRole($id); + $rolesSelectArray = array_diff_assoc($this->role->getRolesSelectArray(), [$currentRole->name => $currentRole->description]); $itemsForm = new RbacUpdateChildren(); if ($itemsForm->load(Yii::$app->request->post()) && $itemsForm->validate()) { - $this->_role->saveChildren($id, $itemsForm->roles, $itemsForm->permissions); + $this->role->saveChildren($id, $itemsForm->roles, $itemsForm->permissions); Yii::$app->session->setFlash('success', Yii::t('user', 'Children roles and permissions for "{role}" is updated.', ['role' => $currentRole->description])); } - $rolesSelected = $this->_role->getRolesSelectArrayByRole($id); + $rolesSelected = $this->role->getRolesSelectArrayByRole($id); - $permissionsSelectArray = $this->_permission->getPermissionsSelectArray(); - $permissionsSelected = $this->_permission->getPermissionsSelectArrayByRole($id); + $permissionsSelectArray = $this->permission->getPermissionsSelectArray(); + $permissionsSelected = $this->permission->getPermissionsSelectArrayByRole($id); $itemsForm->roles = $rolesSelected; $itemsForm->permissions = $permissionsSelected; @@ -158,8 +176,12 @@ class RoleController extends Controller ]); } - protected function findModel($id) + /** + * @param $id + * @return Role|null + */ + protected function findModel($id): ?Role { - return $this->_role->getRole($id); + return $this->role->getRole($id); } } diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php index 8b3d1bb..f0fd7a6 100644 --- a/backend/controllers/SiteController.php +++ b/backend/controllers/SiteController.php @@ -5,24 +5,29 @@ namespace backend\controllers; use core\entities\Search; use core\forms\SearchForm; use core\services\user\UserManageService; +use DomainException; +use RuntimeException; use Yii; +use yii\base\Action; use yii\data\ActiveDataProvider; +use yii\web\BadRequestHttpException; use yii\web\Controller; use yii\filters\VerbFilter; use yii\filters\AccessControl; use core\helpers\UserHelper; +use yii\web\Response; /** * Site controller */ class SiteController extends Controller { - private $_service; + private UserManageService $service; public function __construct(string $id, $module, UserManageService $service, array $config = []) { parent::__construct($id, $module, $config); - $this->_service = $service; + $this->service = $service; } /** @@ -75,12 +80,12 @@ class SiteController extends Controller * * @return string */ - public function actionIndex() + public function actionIndex(): string { return $this->render('index'); } - public function actionSearch() + public function actionSearch(): string { $form = new SearchForm(); @@ -102,28 +107,28 @@ class SiteController extends Controller 'provider' => $provider, 'form' => $form ]); - - //$page = $this->service->create($form); - //return $this->redirect(['view', 'id' => $page->id]); - } catch (\DomainException $e) { - //Yii::$app->errorHandler->logException($e); - //Yii::$app->session->setFlash('error', $e->getMessage()); + } catch (DomainException) { } } return ''; } - public function actionLanguage($language) + public function actionLanguage($language): Response { if ($language && in_array($language, array_keys(Yii::$app->params['backendTranslatedLanguages']))) { - $this->_service->setBackendLanguage($language); + $this->service->setBackendLanguage($language); } return $this->redirect(Yii::$app->request->referrer); } - public function beforeAction($action) + /** + * @param Action $action + * @return bool + * @throws BadRequestHttpException + */ + public function beforeAction($action): bool { if ($action->id === 'error') { $this->layout = 'error'; @@ -132,20 +137,20 @@ class SiteController extends Controller return parent::beforeAction($action); } - public function actionGetWidgetsList() + public function actionGetWidgetsList(): string { return $this->renderAjax('widgets-list'); } - public function actionAddWidget($itemIdx, $color = '') + public function actionAddWidget($itemIdx, $color = ''): string { if (!Yii::$app->request->isAjax) { - throw new \RuntimeException(Yii::t('main', 'The requested page does not exist.')); + throw new RuntimeException(Yii::t('main', 'The requested page does not exist.')); } $widgets = UserHelper::getSetting('widgetsLayout', []); $item = Yii::$app->params['dashboard_widgets'][$itemIdx]; //require($itemFile); - $resizable = isset($item['resizable']) ? $item['resizable'] : 0; + $resizable = $item['resizable'] ?? 0; $newWidget = [ 'w' => $item['size']['width'] ?: 0, 'h' => $item['size']['height'] ?: 0, @@ -168,7 +173,7 @@ class SiteController extends Controller public function actionRemoveWidget($idx) { if (!Yii::$app->request->isAjax) { - throw new \RuntimeException(Yii::t('main', 'The requested page does not exist.')); + throw new RuntimeException(Yii::t('main', 'The requested page does not exist.')); } $widgets = UserHelper::getSetting('widgetsLayout', []); array_splice($widgets, $idx, 1); @@ -184,7 +189,7 @@ class SiteController extends Controller } } - public function actionGetSelectedWidgetsList() + public function actionGetSelectedWidgetsList(): string { return $this->renderAjax( 'widgets-selected-list'); } diff --git a/backend/controllers/SliderController.php b/backend/controllers/SliderController.php index 9c48d79..95ecd08 100644 --- a/backend/controllers/SliderController.php +++ b/backend/controllers/SliderController.php @@ -5,21 +5,23 @@ namespace backend\controllers; use core\entities\Slider; use core\forms\SliderForm; use core\services\SliderService; +use DomainException; use Yii; use yii\data\ActiveDataProvider; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use yii\filters\AccessControl; +use yii\web\Response; class SliderController extends Controller { - private $_service; + private SliderService $service; public function __construct($id, $module, SliderService $service, $config = []) { parent::__construct($id, $module, $config); - $this->_service = $service; + $this->service = $service; } /** @@ -51,10 +53,8 @@ class SliderController extends Controller ]; } - public function actionIndex() + public function actionIndex(): string { - //$searchModel = new UserSearch(); - //$dataProvider = $searchModel->search(Yii::$app->request->queryParams); $query = Slider::find(); $dataProvider = new ActiveDataProvider([ 'query' => $query, @@ -79,7 +79,7 @@ class SliderController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($id) + public function actionView($id): string { return $this->render('view', [ 'model' => $this->findModel($id), @@ -89,18 +89,18 @@ class SliderController extends Controller /** * Creates a new User model. * If creation is successful, the browser will be redirected to the 'view' page. - * @return mixed + * @return string|Response */ - public function actionCreate() + public function actionCreate(): Response|string { $form = new SliderForm(); $form->scenario = Slider::SCENARIO_CREATE; if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $slider = $this->_service->create($form); + $slider = $this->service->create($form); return $this->redirect(['view', 'id' => $slider->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -114,10 +114,10 @@ class SliderController extends Controller /** * @param $id * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionUpdate($id) + public function actionUpdate($id): Response|string { $slider = $this->findModel($id); @@ -125,10 +125,10 @@ class SliderController extends Controller $form->scenario = Slider::SCENARIO_UPDATE; if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_service->edit($slider->id, $form); + $this->service->edit($slider->id, $form); return $this->redirect(['view', 'id' => $slider->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -143,16 +143,20 @@ class SliderController extends Controller /** * @param $id * - * @return \yii\web\Response + * @return Response */ - public function actionDelete($id) + public function actionDelete($id): Response { - $this->_service->remove($id); + $this->service->remove($id); return $this->redirect(['index']); } - + /** + * @param $id + * @return Slider|null + * @throws NotFoundHttpException + */ protected function findModel($id): ?Slider { if (($model = Slider::findOne($id)) !== null) { diff --git a/backend/controllers/UserController.php b/backend/controllers/UserController.php index d07a34b..64f1d33 100644 --- a/backend/controllers/UserController.php +++ b/backend/controllers/UserController.php @@ -6,13 +6,16 @@ use core\forms\user\ProfileEditForm; use core\forms\user\UserForm; use core\services\user\ProfileService; use core\services\user\UserManageService; +use DomainException; use Yii; use core\entities\user\User; use backend\forms\UserSearch; +use yii\base\Exception; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use yii\filters\AccessControl; +use yii\web\Response; use yii\web\UploadedFile; /** @@ -20,14 +23,14 @@ use yii\web\UploadedFile; */ class UserController extends Controller { - private $_service; - private $_profile_service; + private UserManageService $service; + private ProfileService $profile_service; public function __construct($id, $module, UserManageService $service, ProfileService $profile_service, $config = []) { parent::__construct($id, $module, $config); - $this->_service = $service; - $this->_profile_service = $profile_service; + $this->service = $service; + $this->profile_service = $profile_service; } /** @@ -66,9 +69,9 @@ class UserController extends Controller /** * Lists all User models. - * @return mixed + * @return string */ - public function actionIndex() + public function actionIndex(): string { $searchModel = new UserSearch(); $dataProvider = $searchModel->search(Yii::$app->request->queryParams); @@ -85,7 +88,7 @@ class UserController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($id) + public function actionView($id): string { return $this->render('view', [ 'model' => $this->findModel($id), @@ -95,17 +98,19 @@ class UserController extends Controller /** * Creates a new User model. * If creation is successful, the browser will be redirected to the 'view' page. - * @return mixed + * @return Response|string + * @throws Exception + * @throws \yii\db\Exception */ - public function actionCreate() + public function actionCreate(): Response|string { $form = new UserForm(); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $user = $this->_service->create($form); + $user = $this->service->create($form); return $this->redirect(['view', 'id' => $user->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -118,21 +123,22 @@ class UserController extends Controller /** * @param $id - * - * @return string|\yii\web\Response + * @return Response|string + * @throws Exception * @throws NotFoundHttpException + * @throws \yii\db\Exception */ - public function actionUpdate($id) + public function actionUpdate($id): Response|string { $user = $this->findModel($id); $form = new UserForm($user); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_service->edit($user->id, $form); + $this->service->edit($user->id, $form); return $this->redirect(['view', 'id' => $user->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -150,16 +156,20 @@ class UserController extends Controller * * @param integer $id * - * @return mixed + * @return Response */ - public function actionDelete($id) + public function actionDelete(int $id): Response { - $this->_service->remove($id); + $this->service->remove($id); return $this->redirect(['index']); } - public function actionProfile() + /** + * @return Response|string + * @throws NotFoundHttpException|Exception + */ + public function actionProfile(): Response|string { $user = $this->findModel(Yii::$app->user->id); $form = new ProfileEditForm($user); @@ -167,11 +177,11 @@ class UserController extends Controller if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { $form->user_pic = UploadedFile::getInstance($form, 'user_pic'); - $this->_profile_service->edit(Yii::$app->user->id, $form); + $this->profile_service->edit(Yii::$app->user->id, $form); Yii::$app->session->setFlash('success', Yii::t('user', 'Profile is saved.')); return $this->redirect(['/user/profile']); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -192,7 +202,7 @@ class UserController extends Controller * @return User the loaded model * @throws NotFoundHttpException if the model cannot be found */ - protected function findModel($id) + protected function findModel(int $id): User { if (($model = User::findOne($id)) !== null) { return $model; diff --git a/backend/controllers/post/CategoryController.php b/backend/controllers/post/CategoryController.php index 1d2963a..cc31db3 100644 --- a/backend/controllers/post/CategoryController.php +++ b/backend/controllers/post/CategoryController.php @@ -5,6 +5,7 @@ namespace backend\controllers\post; use core\entities\post\PostType; use core\forms\post\PostCategoryForm; use core\services\post\PostCategoryManageService; +use DomainException; use Yii; use core\entities\post\PostCategory; use core\forms\post\search\PostCategorySearch; @@ -12,10 +13,11 @@ use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use yii\filters\AccessControl; +use yii\web\Response; class CategoryController extends Controller { - private $service; + private PostCategoryManageService $service; public function __construct($id, $module, PostCategoryManageService $service, $config = []) { @@ -27,7 +29,7 @@ class CategoryController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, @@ -40,7 +42,7 @@ class CategoryController extends Controller ], ], 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'delete' => ['POST'], ], @@ -54,7 +56,7 @@ class CategoryController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionIndex($tid) + public function actionIndex($tid): string { $type = $this->findType($tid); @@ -74,7 +76,7 @@ class CategoryController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($id) + public function actionView($id): string { $category = $this->findModel($id); $type = $this->findType($category->type_id); @@ -87,10 +89,10 @@ class CategoryController extends Controller /** * @param $tid * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionCreate($tid) + public function actionCreate($tid): Response|string { $type = $this->findType($tid); $form = new PostCategoryForm(); @@ -100,7 +102,7 @@ class CategoryController extends Controller try { $category = $this->service->create($form); return $this->redirect(['view', 'id' => $category->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -114,10 +116,10 @@ class CategoryController extends Controller /** * @param $id * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionUpdate($id) + public function actionUpdate($id): Response|string { $category = $this->findModel($id); $type = $this->findType($category->type_id); @@ -126,7 +128,7 @@ class CategoryController extends Controller try { $this->service->edit($category->id, $form); return $this->redirect(['view', 'id' => $category->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -141,16 +143,16 @@ class CategoryController extends Controller /** * @param $id * - * @return \yii\web\Response + * @return Response * @throws NotFoundHttpException */ - public function actionDelete($id) + public function actionDelete($id): Response { $category = $this->findModel($id); $type = $this->findType($category->type_id); try { $this->service->remove($id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -163,7 +165,7 @@ class CategoryController extends Controller * @return PostCategory the loaded model * @throws NotFoundHttpException if the model cannot be found */ - protected function findModel($id): PostCategory + protected function findModel(int $id): PostCategory { if (($model = PostCategory::findOne($id)) !== null) { return $model; @@ -171,7 +173,12 @@ class CategoryController extends Controller throw new NotFoundHttpException('The requested page does not exist.'); } - protected function findType($id): PostType + /** + * @param integer $id + * @return PostType + * @throws NotFoundHttpException + */ + protected function findType(int $id): PostType { if (($type = PostType::findOne($id)) !== null) { return $type; diff --git a/backend/controllers/post/CommentController.php b/backend/controllers/post/CommentController.php index e5c861a..a418a9c 100644 --- a/backend/controllers/post/CommentController.php +++ b/backend/controllers/post/CommentController.php @@ -5,16 +5,18 @@ namespace backend\controllers\post; use core\forms\post\search\PostCommentSearch; use core\forms\post\PostCommentEditForm; use core\services\post\PostCommentManageService; +use DomainException; use Yii; use core\entities\post\Post; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use yii\filters\AccessControl; +use yii\web\Response; class CommentController extends Controller { - private $service; + private PostCommentManageService $service; public function __construct($id, $module, PostCommentManageService $service, $config = []) { @@ -26,7 +28,7 @@ class CommentController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, @@ -39,7 +41,7 @@ class CommentController extends Controller ], ], 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'delete' => ['POST'], ], @@ -48,9 +50,9 @@ class CommentController extends Controller } /** - * @return mixed + * @return string */ - public function actionIndex() + public function actionIndex(): string { $searchModel = new PostCommentSearch(); $dataProvider = $searchModel->search(Yii::$app->request->queryParams); @@ -65,10 +67,10 @@ class CommentController extends Controller * @param $post_id * @param $id * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionUpdate($post_id, $id) + public function actionUpdate($post_id, $id): Response|string { $post = $this->findModel($post_id); $comment = $post->getComment($id); @@ -78,7 +80,7 @@ class CommentController extends Controller try { $this->service->edit($post->id, $comment->id, $form); return $this->redirect(['view', 'post_id' => $post->id, 'id' => $comment->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -86,7 +88,7 @@ class CommentController extends Controller return $this->render('update', [ 'post' => $post, 'model' => $form, - 'comment' => $comment, + //'comment' => $comment, ]); } @@ -97,7 +99,7 @@ class CommentController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($post_id, $id) + public function actionView($post_id, $id): string { $post = $this->findModel($post_id); $comment = $post->getComment($id); @@ -112,33 +114,33 @@ class CommentController extends Controller * @param $post_id * @param $id * - * @return \yii\web\Response + * @return Response * @throws NotFoundHttpException */ - public function actionActivate($post_id, $id) + public function actionActivate($post_id, $id): Response { $post = $this->findModel($post_id); try { $this->service->activate($post->id, $id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->session->setFlash('error', $e->getMessage()); } return $this->redirect(['view', 'post_id' => $post_id, 'id' => $id]); } /** - * @param $post_id - * @param $id + * @param integer $post_id + * @param integer $id * - * @return \yii\web\Response + * @return Response * @throws NotFoundHttpException */ - public function actionDelete($post_id, $id) + public function actionDelete(int $post_id, int $id): Response { $post = $this->findModel($post_id); try { $this->service->remove($post->id, $id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->session->setFlash('error', $e->getMessage()); } return $this->redirect(['index']); @@ -149,7 +151,7 @@ class CommentController extends Controller * @return Post the loaded model * @throws NotFoundHttpException if the model cannot be found */ - protected function findModel($id): Post + protected function findModel(int $id): Post { if (($model = Post::findOne($id)) !== null) { return $model; diff --git a/backend/controllers/post/PostController.php b/backend/controllers/post/PostController.php index 1d79dc4..1ada522 100644 --- a/backend/controllers/post/PostController.php +++ b/backend/controllers/post/PostController.php @@ -6,11 +6,11 @@ use core\entities\post\PostTag; use core\entities\post\PostType; use core\forms\post\PostForm; use core\services\post\PostManageService; +use DomainException; use Yii; use core\entities\post\Post; use core\forms\post\search\PostSearch; -use yii\helpers\ArrayHelper; -use yii\log\Logger; +use yii\base\Exception; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; @@ -19,7 +19,7 @@ use yii\web\Response; class PostController extends Controller { - private $service; + private PostManageService $service; public function __construct($id, $module, PostManageService $service, $config = []) { @@ -31,7 +31,7 @@ class PostController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, @@ -44,7 +44,7 @@ class PostController extends Controller ], ], 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'delete' => ['POST'], 'activate' => ['POST'], @@ -63,7 +63,7 @@ class PostController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionIndex($tid) + public function actionIndex($tid): string { $type = $this->findType($tid); @@ -83,7 +83,7 @@ class PostController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($id) + public function actionView($id): string { $post = $this->findModel($id); $type = $this->findType($post->type_id); @@ -93,13 +93,14 @@ class PostController extends Controller ]); } - /** - * @param $tid - * - * @return string|\yii\web\Response - * @throws NotFoundHttpException - */ - public function actionCreate($tid) + /** + * @param $tid + * @return Response|string + * @throws NotFoundHttpException + * @throws Exception + * @throws \yii\db\Exception + */ + public function actionCreate($tid): Response|string { $type = $this->findType($tid); $form = new PostForm(); @@ -109,7 +110,7 @@ class PostController extends Controller try { $post = $this->service->create($form); return $this->redirect(['view', 'id' => $post->id, 'tid' => $post->type_id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -120,12 +121,13 @@ class PostController extends Controller ]); } - /** - * @param $id - * - * @return string|\yii\web\Response - * @throws NotFoundHttpException - */ + /** + * @param $id + * @return string|Response + * @throws Exception + * @throws NotFoundHttpException + * @throws \yii\db\Exception + */ public function actionUpdate($id) { $post = $this->findModel($id); @@ -136,7 +138,7 @@ class PostController extends Controller try { $this->service->edit($post->id, $form); return $this->redirect(['view', 'id' => $post->id, 'tid' => $post->type_id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -151,16 +153,16 @@ class PostController extends Controller /** * @param $id * - * @return \yii\web\Response + * @return Response * @throws NotFoundHttpException */ - public function actionDelete($id) + public function actionDelete($id): Response { $post = $this->findModel($id); $type = $this->findType($post->type_id); try { $this->service->remove($id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->session->setFlash('error', $e->getMessage()); } return $this->redirect(['index', 'tid' => $type->id]); @@ -168,13 +170,13 @@ class PostController extends Controller /** * @param integer $id - * @return mixed + * @return Response */ - public function actionActivate($id) + public function actionActivate(int $id): Response { try { $this->service->activate($id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->session->setFlash('error', $e->getMessage()); } return $this->redirect(['view', 'id' => $id]); @@ -182,13 +184,13 @@ class PostController extends Controller /** * @param integer $id - * @return mixed + * @return Response */ - public function actionDraft($id) + public function actionDraft(int $id): Response { try { $this->service->draft($id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->session->setFlash('error', $e->getMessage()); } return $this->redirect(['view', 'id' => $id]); @@ -214,7 +216,7 @@ class PostController extends Controller * @return Post the loaded model * @throws NotFoundHttpException if the model cannot be found */ - protected function findModel($id): Post + protected function findModel(int $id): Post { if (($model = Post::findOne($id)) !== null) { return $model; @@ -222,6 +224,11 @@ class PostController extends Controller throw new NotFoundHttpException('The requested page does not exist.'); } + /** + * @param $id + * @return PostType + * @throws NotFoundHttpException + */ protected function findType($id): PostType { if (($type = PostType::findOne($id)) !== null) { diff --git a/backend/controllers/post/TagController.php b/backend/controllers/post/TagController.php index 2c9a5c0..a254a82 100644 --- a/backend/controllers/post/TagController.php +++ b/backend/controllers/post/TagController.php @@ -5,6 +5,7 @@ namespace backend\controllers\post; use core\entities\post\PostType; use core\forms\post\PostTagSingleForm; use core\services\post\PostTagManageService; +use DomainException; use Yii; use core\entities\post\PostTag; use core\forms\post\search\PostTagSearch; @@ -12,10 +13,11 @@ use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use yii\filters\AccessControl; +use yii\web\Response; class TagController extends Controller { - private $service; + private PostTagManageService $service; public function __construct($id, $module, PostTagManageService $service, $config = []) { @@ -27,7 +29,7 @@ class TagController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, @@ -40,7 +42,7 @@ class TagController extends Controller ], ], 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'delete' => ['POST'], ], @@ -54,7 +56,7 @@ class TagController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionIndex($tid) + public function actionIndex($tid): string { $type = $this->findType($tid); @@ -74,7 +76,7 @@ class TagController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($id) + public function actionView($id): string { $tag = $this->findModel($id); $type = $this->findType($tag->type_id); @@ -87,10 +89,10 @@ class TagController extends Controller /** * @param $tid * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionCreate($tid) + public function actionCreate($tid): Response|string { $type = $this->findType($tid); $form = new PostTagSingleForm(); @@ -99,7 +101,7 @@ class TagController extends Controller try { $tag = $this->service->create($form); return $this->redirect(['view', 'id' => $tag->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -113,10 +115,10 @@ class TagController extends Controller /** * @param $id * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionUpdate($id) + public function actionUpdate($id): Response|string { $tag = $this->findModel($id); $type = $this->findType($tag->type_id); @@ -125,7 +127,7 @@ class TagController extends Controller try { $this->service->edit($tag->id, $form); return $this->redirect(['view', 'id' => $tag->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -140,16 +142,16 @@ class TagController extends Controller /** * @param $id * - * @return \yii\web\Response + * @return Response * @throws NotFoundHttpException */ - public function actionDelete($id) + public function actionDelete($id): Response { $tag = $this->findModel($id); $type = $this->findType($tag->type_id); try { $this->service->remove($id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -161,7 +163,7 @@ class TagController extends Controller * @return PostTag the loaded model * @throws NotFoundHttpException if the model cannot be found */ - protected function findModel($id): PostTag + protected function findModel(int $id): PostTag { if (($model = PostTag::findOne($id)) !== null) { return $model; @@ -169,6 +171,11 @@ class TagController extends Controller throw new NotFoundHttpException('The requested page does not exist.'); } + /** + * @param $id + * @return PostType + * @throws NotFoundHttpException + */ protected function findType($id): PostType { if (($type = PostType::findOne($id)) !== null) { diff --git a/backend/controllers/post/TypeController.php b/backend/controllers/post/TypeController.php index c1b9b90..7cdd5c7 100644 --- a/backend/controllers/post/TypeController.php +++ b/backend/controllers/post/TypeController.php @@ -6,11 +6,13 @@ use core\entities\post\PostType; use core\forms\post\PostTypeForm; use core\forms\post\search\PostTypeSearch; use core\services\post\PostTypeService; +use DomainException; use yii\web\NotFoundHttpException; use yii\web\Controller; use yii\filters\AccessControl; use yii\filters\VerbFilter; use Yii; +use yii\web\Response; class TypeController extends Controller { @@ -26,7 +28,7 @@ class TypeController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, @@ -39,7 +41,7 @@ class TypeController extends Controller ], ], 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'delete' => ['POST'], ], @@ -50,7 +52,7 @@ class TypeController extends Controller /** * @return string */ - public function actionIndex() + public function actionIndex(): string { $searchModel = new PostTypeSearch(); $dataProvider = $searchModel->search(Yii::$app->request->queryParams); @@ -67,7 +69,7 @@ class TypeController extends Controller * @return string * @throws NotFoundHttpException */ - public function actionView($id) + public function actionView($id): string { $type = $this->findModel($id); return $this->render('view', [ @@ -76,9 +78,9 @@ class TypeController extends Controller } /** - * @return string|\yii\web\Response + * @return string|Response */ - public function actionCreate() + public function actionCreate(): Response|string { $form = new PostTypeForm(); @@ -86,7 +88,7 @@ class TypeController extends Controller try { $type = $this->service->create($form); return $this->redirect(['view', 'id' => $type->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -99,10 +101,10 @@ class TypeController extends Controller /** * @param $id * - * @return string|\yii\web\Response + * @return string|Response * @throws NotFoundHttpException */ - public function actionUpdate($id) + public function actionUpdate($id): Response|string { $type = $this->findModel($id); @@ -111,20 +113,21 @@ class TypeController extends Controller try { $this->service->edit($type->id, $form); return $this->redirect(['view', 'id' => $type->id]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } } return $this->render('update', [ 'model' => $form, + 'type' => $type, ]); } /** * @param $id * - * @return \yii\web\Response + * @return Response * @throws NotFoundHttpException */ public function actionDelete($id) @@ -133,7 +136,7 @@ class TypeController extends Controller try { $this->service->remove($id); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } diff --git a/backend/controllers/settings/ListController.php b/backend/controllers/settings/ListController.php index c3b2ef3..04c22db 100644 --- a/backend/controllers/settings/ListController.php +++ b/backend/controllers/settings/ListController.php @@ -11,22 +11,25 @@ use core\entities\Settings; use core\forms\FaviconForm; use core\forms\SettingsForm; use core\services\SettingsService; +use DomainException; +use yii\db\ActiveRecord; use yii\filters\AccessControl; use yii\filters\VerbFilter; use yii\web\Controller; use backend\components\ToggleAction; use Yii; use yii\web\NotFoundHttpException; +use yii\web\Response; use yii\web\UploadedFile; class ListController extends Controller { - private $_service; + private SettingsService $service; public function __construct(string $id, $module, SettingsService $service, array $config = []) { parent::__construct($id, $module, $config); - $this->_service = $service; + $this->service = $service; } public function behaviors() @@ -61,12 +64,11 @@ class ListController extends Controller 'toggle' => [ 'class' => ToggleAction::class, 'modelClass' => Settings::class, - //'setFlash' => true, ] ]; } - public function actionIndex($section = 'site') + public function actionIndex($section = 'site'): string { $searchModel = new SettingsSearch(); $searchModel->section = $section; @@ -82,7 +84,13 @@ class ListController extends Controller ); } - public function actionView($section, $key) + /** + * @param $section + * @param $key + * @return string + * @throws NotFoundHttpException + */ + public function actionView($section, $key): string { return $this->render( 'view', @@ -92,15 +100,15 @@ class ListController extends Controller ); } - public function actionCreate() + public function actionCreate(): Response|string { $form = new SettingsForm(); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $settings = $this->_service->create($form); + $settings = $this->service->create($form); return $this->redirect(['view', 'section' => $settings->section, 'key' => $settings->key]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -116,17 +124,23 @@ class ListController extends Controller ); } - public function actionUpdate($section, $key) + /** + * @param $section + * @param $key + * @return Response|string + * @throws NotFoundHttpException + */ + public function actionUpdate($section, $key): Response|string { $settings = $this->findModel($section, $key); $form = new SettingsForm($settings); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->_service->edit($settings->section, $settings->key, $form); + $this->service->edit($settings->section, $settings->key, $form); return $this->redirect(['view', 'section' => $settings->section, 'key' => $settings->key]); - } catch (\DomainException $e) { + } catch (DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } @@ -141,14 +155,14 @@ class ListController extends Controller ); } - public function actionDelete($section, $key) + public function actionDelete($section, $key): Response { - $this->_service->remove($section, $key); + $this->service->remove($section, $key); return $this->redirect(['index']); } - public function actionFavicon() + public function actionFavicon(): Response|string { $form = new FaviconForm(); if ($form->load(Yii::$app->request->post())) { @@ -159,7 +173,7 @@ class ListController extends Controller } $form->image->saveAs(Yii::getAlias('@staticRoot') . '/origin/favicon/favicon.png'); - $this->_service->newFavicon(); + $this->service->newFavicon(); Yii::$app->session->setFlash('success', Yii::t('main', 'Favicon generation complete')); return $this->redirect(['settings/list/index']); } @@ -173,7 +187,13 @@ class ListController extends Controller ); } - protected function findModel($section, $key) + /** + * @param $section + * @param $key + * @return array|Settings|ActiveRecord|null + * @throws NotFoundHttpException + */ + protected function findModel($section, $key): array|Settings|ActiveRecord|null { if (($model = Settings::find()->andWhere(['section' => $section])->andWhere(['key' => $key])->one()) !== null) { return $model; diff --git a/backend/forms/SettingsSearch.php b/backend/forms/SettingsSearch.php index c552768..57dbf1b 100644 --- a/backend/forms/SettingsSearch.php +++ b/backend/forms/SettingsSearch.php @@ -12,14 +12,14 @@ use yii\data\ActiveDataProvider; class SettingsSearch extends Settings { - public $id; - public $type; - public $section; - public $key; - public $value; - public $active; + public ?int $id = null; + public ?int $type = null; + public ?string $section = null; + public ?string $key = null; + public ?string $value = null; + public ?int $active = null; - public function rules() + public function rules(): array { return [ [['id'], 'integer'], @@ -31,7 +31,7 @@ class SettingsSearch extends Settings /** * @return array */ - public function scenarios() + public function scenarios(): array { // bypass scenarios() implementation in the parent class return Model::scenarios(); @@ -42,7 +42,7 @@ class SettingsSearch extends Settings * * @return ActiveDataProvider */ - public function search($params) + public function search($params): ActiveDataProvider { $query = Settings::find(); $dataProvider = new ActiveDataProvider( diff --git a/backend/forms/UserSearch.php b/backend/forms/UserSearch.php index 23ce1ca..8144934 100644 --- a/backend/forms/UserSearch.php +++ b/backend/forms/UserSearch.php @@ -2,6 +2,7 @@ namespace backend\forms; +use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; use core\entities\user\User; @@ -9,15 +10,15 @@ use yii\helpers\ArrayHelper; class UserSearch extends Model { - public $id; - public $date_from; - public $date_to; - public $username; - public $email; - public $status; - public $role; + public ?int $id = null; + public ?string $date_from = null; + public ?string $date_to = null; + public ?string $username = null; + public ?string $email = null; + public ?int $status = null; + public ?string $role = null; - public function rules() + public function rules(): array { return [ [['id', 'status'], 'integer'], @@ -66,6 +67,6 @@ class UserSearch extends Model public function rolesList(): array { - return ArrayHelper::map(\Yii::$app->authManager->getRoles(), 'name', 'description'); + return ArrayHelper::map(Yii::$app->authManager->getRoles(), 'name', 'description'); } } diff --git a/backend/forms/rbac/RbacCreatePermissionForm.php b/backend/forms/rbac/RbacCreatePermissionForm.php index 092d50c..5e0627c 100644 --- a/backend/forms/rbac/RbacCreatePermissionForm.php +++ b/backend/forms/rbac/RbacCreatePermissionForm.php @@ -11,14 +11,14 @@ use Yii; class RbacCreatePermissionForm extends Model { - public $name; - public $description; - public $rule_name; - public $data; - public $created_at; - public $updated_at; + public ?string $name = null; + public ?string $description = null; + public ?string $rule_name = null; + public ?string $data = null; + public ?int $created_at = null; + public ?int $updated_at = null; - public function rules() + public function rules(): array { return [ [['name'], 'required'], diff --git a/backend/forms/rbac/RbacCreateRoleForm.php b/backend/forms/rbac/RbacCreateRoleForm.php index bd7d8b3..abb6f1c 100644 --- a/backend/forms/rbac/RbacCreateRoleForm.php +++ b/backend/forms/rbac/RbacCreateRoleForm.php @@ -11,14 +11,14 @@ use Yii; class RbacCreateRoleForm extends Model { - public $name; - public $description; - public $rule_name; - public $data; - public $created_at; - public $updated_at; + public ?string $name = null; + public ?string $description = null; + public ?string $rule_name = null; + public ?string $data = null; + public ?int $created_at = null; + public ?int $updated_at = null; - public function rules() + public function rules(): array { return [ [['name'], 'required'], diff --git a/backend/forms/rbac/RbacEditPermissionForm.php b/backend/forms/rbac/RbacEditPermissionForm.php index d1b0cb4..0036386 100644 --- a/backend/forms/rbac/RbacEditPermissionForm.php +++ b/backend/forms/rbac/RbacEditPermissionForm.php @@ -12,13 +12,12 @@ use Yii; class RbacEditPermissionForm extends Model { - public $name; - public $description; - public $rule_name; - public $data; - public $created_at; - public $updated_at; - + public ?string $name = null; + public ?string $description = null; + public ?string $rule_name = null; + public ?string $data = null; + public ?int $created_at = null; + public ?int $updated_at = null; public function __construct(Permission $permission, $config = []) { @@ -29,7 +28,7 @@ class RbacEditPermissionForm extends Model parent::__construct($config); } - public function rules() + public function rules(): array { return [ [['name'], 'required'], diff --git a/backend/forms/rbac/RbacEditRoleForm.php b/backend/forms/rbac/RbacEditRoleForm.php index c74647d..b0e6209 100644 --- a/backend/forms/rbac/RbacEditRoleForm.php +++ b/backend/forms/rbac/RbacEditRoleForm.php @@ -12,13 +12,12 @@ use Yii; class RbacEditRoleForm extends Model { - public $name; - public $description; - public $rule_name; - public $data; - public $created_at; - public $updated_at; - + public ?string $name = null; + public ?string $description = null; + public ?string $rule_name = null; + public ?string $data = null; + public ?int $created_at = null; + public ?int $updated_at = null; public function __construct(Role $role, $config = []) { @@ -29,7 +28,7 @@ class RbacEditRoleForm extends Model parent::__construct($config); } - public function rules() + public function rules(): array { return [ [['name'], 'required'], diff --git a/backend/forms/rbac/RbacUpdateChildren.php b/backend/forms/rbac/RbacUpdateChildren.php index fabe3f6..d9433c6 100644 --- a/backend/forms/rbac/RbacUpdateChildren.php +++ b/backend/forms/rbac/RbacUpdateChildren.php @@ -10,10 +10,10 @@ use yii\base\Model; class RbacUpdateChildren extends Model { - public $roles; - public $permissions; + public ?array $roles = null; + public ?array $permissions = null; - public function rules() + public function rules(): array { return [ [['roles', 'permissions'], 'each', 'rule' => ['string']], diff --git a/backend/helpers/DashboardHelper.php b/backend/helpers/DashboardHelper.php index 3f6205c..40f1cab 100644 --- a/backend/helpers/DashboardHelper.php +++ b/backend/helpers/DashboardHelper.php @@ -11,7 +11,7 @@ use yii\helpers\Html; class DashboardHelper { - public static function getAllWidgets() + public static function getAllWidgets(): array { $widgetsCounter = ''; // Counters Widgets $widgetsInfo = ''; // Information Widgets @@ -20,15 +20,7 @@ class DashboardHelper $path = Yii::getAlias('@backend/widgets/dashboard'); $files = scandir($path, 0); - //foreach ($files as $file) { foreach (Yii::$app->params['dashboard_widgets'] as $idx => $item) { - //if (!is_file($path . '/' . $file)) { - // continue; - //} - - //$itemFile = $path . '/' . $file; - //$item = require($itemFile); - if (isset($item['rule']) && (Yii::$app->user->can($item['rule']) || Yii::$app->user->can('admin'))) { } elseif (!isset($item['rule'])) { } else { @@ -47,11 +39,10 @@ class DashboardHelper $widgetsInfo .= $line; } } - return [$widgetsCounter, $widgetsInfo]; } - public static function getExtColors() + public static function getExtColors(): array { return [ 'gray' => Yii::t('main', 'Gray'), diff --git a/backend/messages/ru/menu.php b/backend/messages/ru/menu.php index c355b1b..eb9364a 100644 --- a/backend/messages/ru/menu.php +++ b/backend/messages/ru/menu.php @@ -29,4 +29,5 @@ return [ 'Title attribute' => 'Аттрибут Title', 'CSS Classes' => 'Классы CSS', 'CSS Style' => 'Стиль CSS', + 'Url' => 'Ссылка', ]; \ No newline at end of file diff --git a/backend/views/auth/login.php b/backend/views/auth/login.php index 5ef8f5b..6d6d6dd 100644 --- a/backend/views/auth/login.php +++ b/backend/views/auth/login.php @@ -1,11 +1,12 @@ title = Yii::t('main', 'Sign in'); @@ -34,7 +35,10 @@ $fieldOptions2 = [ - 'login-form', 'enableClientValidation' => false]); ?> + 'login-form', + 'enableClientValidation' => false + ]); ?> field($model, 'username', $fieldOptions1) diff --git a/backend/views/layouts/content-origin.php b/backend/views/layouts/content-origin.php new file mode 100644 index 0000000..6a2485c --- /dev/null +++ b/backend/views/layouts/content-origin.php @@ -0,0 +1,238 @@ + +
+
+ blocks['content-header'])) { ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/backend/views/layouts/content.php b/backend/views/layouts/content.php
index 54e296b..9a067cf 100644
--- a/backend/views/layouts/content.php
+++ b/backend/views/layouts/content.php
@@ -1,235 +1,64 @@
-blocks['content-header'] ?>
+ ++ title !== null) { + echo Html::encode($this->title); + } else { + echo Inflector::camel2words( + Inflector::id2camel($this->context->module->id) + ); + echo ($this->context->module->id !== \Yii::$app->id) ? 'Module' : ''; + } ?> +
+ + + isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [], + ] + ) ?> +
-
- blocks['content-header'])) { ?>
-
+/**
+ * @var $this View
+ * @var $content string
+ */
-
-
-
-
+?>
+<?= Html::encode($this->title) ?>
+ head() ?>
+
+
+
+beginBody() ?>
+
+
+
+endBody() ?>
+
+
+endPage() ?>
diff --git a/backend/views/layouts/error.php b/backend/views/layouts/error.php
index d737c6c..5b93fcc 100644
--- a/backend/views/layouts/error.php
+++ b/backend/views/layouts/error.php
@@ -1,12 +1,17 @@
beginPage() ?>
diff --git a/backend/views/layouts/header-origin.php b/backend/views/layouts/header-origin.php
new file mode 100644
index 0000000..0780499
--- /dev/null
+++ b/backend/views/layouts/header-origin.php
@@ -0,0 +1,265 @@
+
+
+
+
+ ' . (Yii::$app->params['settings']['site']['short_name'] ?? 'APP') . '' . (isset(Yii::$app->params['settings']['site']['name']) ? Yii::$app->params['settings']['site']['name'] : Yii::$app->name) . '',
+ Yii::$app->homeUrl, ['class' => 'logo']) ?>
+
+
+
diff --git a/backend/views/layouts/header.php b/backend/views/layouts/header.php
index 6010103..0d16fc0 100644
--- a/backend/views/layouts/header.php
+++ b/backend/views/layouts/header.php
@@ -1,264 +1,56 @@
-
-
- ' . (isset(Yii::$app->params['settings']['site']['short_name']) ? Yii::$app->params['settings']['site']['short_name'] : 'APP') . '' . (isset(Yii::$app->params['settings']['site']['name']) ? Yii::$app->params['settings']['site']['name'] : Yii::$app->name) . '',
- Yii::$app->homeUrl, ['class' => 'logo']) ?>
-
-
-
+
diff --git a/backend/views/layouts/left-origin.php b/backend/views/layouts/left-origin.php
new file mode 100644
index 0000000..7475b4f
--- /dev/null
+++ b/backend/views/layouts/left-origin.php
@@ -0,0 +1,211 @@
+
+
+
diff --git a/backend/views/layouts/left.php b/backend/views/layouts/left.php
index bb73075..692a9db 100644
--- a/backend/views/layouts/left.php
+++ b/backend/views/layouts/left.php
@@ -1,210 +1,291 @@
imager;
+$css = << .nav-item > .nav-link.active, .sidebar-light-primary .nav-sidebar.nav-legacy > .nav-item > .nav-link.active {
+ border-color: #9ed6db;
+ }
+CSS;
+$this->registerCss($css);
?>
+
\ No newline at end of file
diff --git a/backend/views/layouts/main-login-origin.php b/backend/views/layouts/main-login-origin.php
new file mode 100644
index 0000000..f853f60
--- /dev/null
+++ b/backend/views/layouts/main-login-origin.php
@@ -0,0 +1,31 @@
+
+beginPage() ?>
+
+
+
+
+
+
+ <?= Html::encode($this->title) ?>
+
+ head() ?>
+
+
+
+beginBody() ?>
+
+
+
+endBody() ?>
+
+
+endPage() ?>
diff --git a/backend/views/layouts/main-login.php b/backend/views/layouts/main-login.php
index f853f60..ae7c4c4 100644
--- a/backend/views/layouts/main-login.php
+++ b/backend/views/layouts/main-login.php
@@ -1,12 +1,27 @@
params['theme'] == \app\forms\SettingsForm::THEME_BLACK) {
+ //AdminLteDarkAsset::register($this);
+//}
+//else {
+ AdminLteLightAsset::register($this);
+//}
+//AdminLteICheckAsset::register($this);
?>
beginPage() ?>
@@ -16,13 +31,17 @@ dmstr\web\AdminLteAsset::register($this);
<?= Html::encode($this->title) ?>
-
head() ?>
-
+
beginBody() ?>
+
+ <?= Html::encode($this->title) ?>
+
+ head() ?>
+
+
+ beginBody() ?>
+ assetManager->getPublishedUrl('@vendor/almasaeed2010/adminlte/dist');
+ .breadcrumb {
+ font-size: 12px !important;
+ }
+ .sp-preview {
+ margin-right: 0 !important;
+ }
+ .sp-dd {
+ display: none;
+ }
+CSS;
+ $this->registerCss($css);
?>
beginPage() ?>
@@ -32,35 +91,62 @@ if (Yii::$app->controller->action->id === 'login') {
+
+
<?= Html::encode($this->title) ?>
-
+
+
+
+
+
+
head() ?>
-
+
+
beginBody() ?>
blocks['content-header'] ?>
- -- title !== null) { - echo \yii\helpers\Html::encode($this->title); - } else { - echo \yii\helpers\Inflector::camel2words( - \yii\helpers\Inflector::id2camel($this->context->module->id) - ); - echo ($this->context->module->id !== \Yii::$app->id) ? 'Module' : ''; - } ?> -
- +use core\components\adminlte3\widgets\Breadcrumbs; +use core\components\adminlte3\widgets\ToastrNotification; +use yii\web\View; +use yii\helpers\Html; +use yii\helpers\Inflector; - isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [], - ] - ) ?> -
+
+
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/backend/views/layouts/error-origin.php b/backend/views/layouts/error-origin.php
new file mode 100644
index 0000000..a7d670e
--- /dev/null
+++ b/backend/views/layouts/error-origin.php
@@ -0,0 +1,33 @@
+
+beginPage() ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ blocks['content-header'])) : ?>
+
+ blocks['content-header'] ?>
+ ++ title !== null) { + echo Html::encode($this->title); + } else { + echo Inflector::camel2words( + Inflector::id2camel($this->context->module->id) + ); + echo ($this->context->module->id !== \Yii::$app->id) ? 'Module' : ''; + } ?> +
+ + +
+
+ $this->params['breadcrumbs'] ?? [],
+ ]) ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
endBody() ?>
diff --git a/backend/views/layouts/main-origin.php b/backend/views/layouts/main-origin.php
new file mode 100644
index 0000000..8731723
--- /dev/null
+++ b/backend/views/layouts/main-origin.php
@@ -0,0 +1,66 @@
+controller->action->id === 'login') {
+ /**
+ * Do not use this code in your template. Remove it.
+ * Instead, use the code $this->layout = '//main-login'; in your controller.
+ */
+ echo $this->render(
+ 'main-login',
+ ['content' => $content]
+ );
+} else {
+ if (class_exists('backend\assets\AppAsset')) {
+ backend\assets\AppAsset::register($this);
+ } else {
+ app\assets\AppAsset::register($this);
+ }
+
+ dmstr\web\AdminLteAsset::register($this);
+ \backend\assets\AdminLteSkinAsset::register($this);
+ $directoryAsset = Yii::$app->assetManager->getPublishedUrl('@vendor/almasaeed2010/adminlte/dist');
+ ?>
+ beginPage() ?>
+
+
+
+
+
+
+
+
+
+
+ render(
+ 'header.php',
+ ['directoryAsset' => $directoryAsset]
+ ) ?>
+
+ render(
+ 'left.php',
+ ['directoryAsset' => $directoryAsset]
+ )
+ ?>
+
+ render(
+ 'content.php',
+ ['content' => $content, 'directoryAsset' => $directoryAsset]
+ ) ?>
+
+
+
+ endBody() ?>
+
+
+ endPage() ?>
+
diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php
index 8731723..b9771ec 100644
--- a/backend/views/layouts/main.php
+++ b/backend/views/layouts/main.php
@@ -1,30 +1,89 @@
controller->action->id === 'login') {
- /**
- * Do not use this code in your template. Remove it.
- * Instead, use the code $this->layout = '//main-login'; in your controller.
- */
+if (Yii::$app->controller->id == 'auth/auth' && in_array(Yii::$app->controller->action->id, ['login', 'request', 'confirm', 'login-hub', 'login-token', 'reset'])) {
echo $this->render(
'main-login',
['content' => $content]
);
} else {
- if (class_exists('backend\assets\AppAsset')) {
- backend\assets\AppAsset::register($this);
- } else {
- app\assets\AppAsset::register($this);
+
+ AppAsset::register($this);
+ AdminLteAsset::register($this);
+ AdminLteFontsAsset::register($this);
+
+//if (Yii::$app->params['theme'] == \app\forms\SettingsForm::THEME_BLACK) {
+ //AdminLteDarkAsset::register($this);
+//}
+//else {
+ AdminLteLightAsset::register($this);
+//}
+
+ $css = <<
+
+ render('header.php') ?>
+
- render(
- 'header.php',
- ['directoryAsset' => $directoryAsset]
- ) ?>
-
- render(
- 'left.php',
- ['directoryAsset' => $directoryAsset]
- )
- ?>
+
+ render('left.php') ?>
+
render(
'content.php',
- ['content' => $content, 'directoryAsset' => $directoryAsset]
+ ['content' => $content]
) ?>
+
+
+
+
+
+
+
+
+
+
+
+
endBody() ?>
endPage() ?>
+
+
diff --git a/backend/views/menu/_form.php b/backend/views/menu/_form.php
index f14f6f7..62bfc57 100644
--- a/backend/views/menu/_form.php
+++ b/backend/views/menu/_form.php
@@ -1,10 +1,13 @@
@@ -12,8 +15,8 @@ use yii\widgets\ActiveForm;
-
-
+
+
-
-
-
- 'btn btn-success']) ?>
+
diff --git a/backend/views/menu/_form_tab.php b/backend/views/menu/_form_tab.php
index 1bef429..76a1002 100644
--- a/backend/views/menu/_form_tab.php
+++ b/backend/views/menu/_form_tab.php
@@ -4,14 +4,19 @@
* Date: 24.08.2018
*/
+use core\forms\menu\MenuForm;
+use yii\web\View;
+use yii\widgets\ActiveForm;
+
/**
- * @var $this \yii\web\View
- * @var $form \yii\widgets\ActiveForm
- * @var $model \core\forms\menu\MenuForm
+ * @var $this View
+ * @var $form ActiveForm
+ * @var $model MenuForm
* @var $language string
*/
$postfix = $language == Yii::$app->params['defaultLanguage'] ? '' : '_' . $language;
?>
+
field($model, 'name' . $postfix)->textInput(['maxlength' => true]) ?>
diff --git a/backend/views/menu/create.php b/backend/views/menu/create.php
index 831553d..2014f42 100644
--- a/backend/views/menu/create.php
+++ b/backend/views/menu/create.php
@@ -1,7 +1,9 @@
title = Yii::t('menu', 'Create Menu');
$this->params['breadcrumbs'][] = ['label' => Yii::t('menu', 'Menu'), 'url' => ['index']];
diff --git a/backend/views/menu/menu.php b/backend/views/menu/menu.php
index 1d1e3dd..49caedd 100644
--- a/backend/views/menu/menu.php
+++ b/backend/views/menu/menu.php
@@ -4,14 +4,18 @@
* Date: 10.07.2018
*/
+use backend\components\menu\widgets\MenuEditorWidget;
+use core\entities\menu\Menu;
+use core\forms\menu\MenuSelectForm;
use kartik\form\ActiveForm;
use yii\helpers\Html;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $model \core\forms\menu\MenuSelectForm
- * @var $menus \core\entities\menu\Menu[]
- * @var $menu \core\entities\menu\Menu
+ * @var $this View
+ * @var $model MenuSelectForm
+ * @var $menus Menu[]
+ * @var $menu Menu
* @var $creator array
*/
@@ -41,11 +45,11 @@ $this->registerJs($js, $this::POS_HEAD);
?>
-
-
-
+
+
+
-
+
false,
@@ -54,6 +58,7 @@ $this->registerJs($js, $this::POS_HEAD);
]); ?>
field($model, 'id')->dropDownList($menus, [
+ 'class' => 'form-control mb-1',
//'prompt' => Yii::t('menu', 'Select menu...'),
'value' => $menu->id,
'onchange' => 'this.form.submit()',
@@ -63,15 +68,15 @@ $this->registerJs($js, $this::POS_HEAD);
'btn btn-success',
+ 'class' => 'btn btn-success d-block d-md-inline-block mb-1',
]) ?>
$menu->id], [
- 'class' => 'btn btn-primary',
+ 'class' => 'btn btn-primary d-block d-md-inline-block mb-1',
]) ?>
$menu->id], [
- 'class' => 'btn btn-danger',
+ 'class' => 'btn btn-danger d-block d-md-inline-block mb-1',
'data' => [
'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
'method' => 'post',
@@ -85,24 +90,25 @@ $this->registerJs($js, $this::POS_HEAD);
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
-
+
+
-
+
@@ -116,11 +122,11 @@ $this->registerJs($js, $this::POS_HEAD);
-
-
-
+
+
+
- $menu->id
]) ?>
@@ -129,35 +135,37 @@ $this->registerJs($js, $this::POS_HEAD);
-
-
-
+
+
+
" . $menu->id . ']) ?>';
?>
-
+
+
'form-control',
+ 'class' => 'form-control form-control-sm',
'id' => 'code_template',
]) ?>
-
+
" . $menu->id . ']) ?]';
?>
-
+
+
'form-control',
+ 'class' => 'form-control form-control-sm',
'id' => 'code_editor',
]) ?>
-
+
diff --git a/backend/views/menu/select_menu.php b/backend/views/menu/select_menu.php
index fa06de6..35b68f3 100644
--- a/backend/views/menu/select_menu.php
+++ b/backend/views/menu/select_menu.php
@@ -4,14 +4,16 @@
* Date: 10.07.2018
*/
+use core\entities\menu\Menu;
+use core\forms\menu\MenuSelectForm;
use kartik\form\ActiveForm;
-use yii\helpers\ArrayHelper;
use yii\helpers\Html;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $model \core\forms\menu\MenuSelectForm
- * @var $menus \core\entities\menu\Menu[]
+ * @var $this View
+ * @var $model MenuSelectForm
+ * @var $menus Menu[]
*/
$this->title = Yii::t('menu', 'Menu');
diff --git a/backend/views/menu/update.php b/backend/views/menu/update.php
index 7bc7489..207bbb1 100644
--- a/backend/views/menu/update.php
+++ b/backend/views/menu/update.php
@@ -1,8 +1,11 @@
title = Yii::t('menu', 'Update Menu: {name}', ['name' => isset($menu->translation) ? $menu->translation->name : Yii::t('menu', 'Not set')]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('menu', 'Menu'), 'url' => ['index']];
diff --git a/backend/views/module/list.php b/backend/views/module/list.php
index 3ac40c3..fcf4722 100644
--- a/backend/views/module/list.php
+++ b/backend/views/module/list.php
@@ -4,13 +4,15 @@
* Date: 17.08.2018
*/
+use core\entities\ModuleRecord;
use yii\helpers\Html;
use core\helpers\ModuleHelper;
use kartik\dialog\Dialog;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $modules \core\entities\ModuleRecord[]
+ * @var $this View
+ * @var $modules ModuleRecord[]
*/
$this->title = Yii::t('main', 'Modules');
@@ -47,15 +49,15 @@ $this->registerJs($js, $this::POS_READY);
-
-
+
+
-
+
-
+
isSystem()) : ?>
isEnabled()) : ?>
$module->id], [
diff --git a/backend/views/module/remote-list.php b/backend/views/module/remote-list.php
index e757a1c..443835e 100644
--- a/backend/views/module/remote-list.php
+++ b/backend/views/module/remote-list.php
@@ -6,9 +6,10 @@
use yii\helpers\Html;
use kartik\dialog\Dialog;
+use yii\web\View;
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $modules array
* @var $message string
*/
diff --git a/backend/views/permission/create.php b/backend/views/permission/create.php
index bf80bc4..02c2a0b 100644
--- a/backend/views/permission/create.php
+++ b/backend/views/permission/create.php
@@ -1,8 +1,9 @@
params['breadcrumbs'][] = $this->title;
-
-
+
+
field($model, 'name')->textInput(['maxLength' => true]) ?>
field($model, 'description')->textarea() ?>
field($model, 'rule_name')->textInput(['maxLength' => true]) ?>
field($model, 'data')->textarea() ?>
-
-
-
- 'btn btn-primary']) ?>
+
+ 'btn btn-success']) ?>
+
diff --git a/backend/views/permission/index.php b/backend/views/permission/index.php
index db46bd0..a86ebd1 100644
--- a/backend/views/permission/index.php
+++ b/backend/views/permission/index.php
@@ -11,13 +11,11 @@ $this->title = Yii::t('user', 'Permissions');
$this->params['breadcrumbs'][] = $this->title;
?>
-
-
- 'btn btn-success']) ?>
-
-
-
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'columns' => [
diff --git a/backend/views/permission/update.php b/backend/views/permission/update.php
index 17ef66f..131daa1 100644
--- a/backend/views/permission/update.php
+++ b/backend/views/permission/update.php
@@ -1,11 +1,12 @@
title = Yii::t('user', 'Update Permission: {permission}', ['permission' => $model->name]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Permissions'), 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->name]];
@@ -15,17 +16,16 @@ $this->params['breadcrumbs'][] = Yii::t('user', 'Editing');
-
-
+
+
field($model, 'name')->textInput(['maxLength' => true]) ?>
field($model, 'description')->textarea() ?>
field($model, 'rule_name')->textInput(['maxLength' => true]) ?>
field($model, 'data')->textarea() ?>
-
-
-
- 'btn btn-primary']) ?>
+
+ 'btn btn-success']) ?>
+
diff --git a/backend/views/permission/view.php b/backend/views/permission/view.php
index 8d58aa8..7352bed 100644
--- a/backend/views/permission/view.php
+++ b/backend/views/permission/view.php
@@ -1,11 +1,11 @@
title = $model->name;
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Permissions'), 'url' => ['index']];
@@ -14,10 +14,10 @@ $this->params['breadcrumbs'][] = $this->title;
- 'btn btn-default']) ?>
- $model->name], ['class' => 'btn btn-primary']) ?>
+ 'btn btn-outline-primary btn-sm']) ?>
+ $model->name], ['class' => 'btn btn-primary btn-sm']) ?>
$model->name], [
- 'class' => 'btn btn-danger',
+ 'class' => 'btn btn-danger btn-sm',
'data' => [
'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
'method' => 'post',
@@ -25,8 +25,8 @@ $this->params['breadcrumbs'][] = $this->title;
]) ?>
-
-
+
+
$model,
'attributes' => [
diff --git a/backend/views/post/articles/_form.php b/backend/views/post/articles/_form.php
index 740b8aa..bc603b7 100644
--- a/backend/views/post/articles/_form.php
+++ b/backend/views/post/articles/_form.php
@@ -1,19 +1,25 @@
_post)) {
- $tagsJson = \yii\helpers\Json::encode( \yii\helpers\Json::encode( \yii\helpers\ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
+ $tagsJson = Json::encode( Json::encode( ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
$js = <<
- 'btn btn-success']) ?>
-
-
-
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'columns' => [
@@ -38,5 +36,4 @@ $this->params['breadcrumbs'][] = $this->title;
]); ?>
-
diff --git a/backend/views/role/update.php b/backend/views/role/update.php
index 591b45a..399cd44 100644
--- a/backend/views/role/update.php
+++ b/backend/views/role/update.php
@@ -1,11 +1,12 @@
title = Yii::t('user', 'Update Role: {role}', ['role' => $model->name]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Roles'), 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->name]];
@@ -15,19 +16,18 @@ $this->params['breadcrumbs'][] = Yii::t('buttons', 'Editing');
-
-
+
+
field($model, 'name')->textInput(['maxLength' => true]) ?>
field($model, 'description')->textarea() ?>
field($model, 'rule_name')->textInput(['maxLength' => true]) ?>
field($model, 'data')->textarea() ?>
-
-
-
- 'btn btn-primary']) ?>
+
+ 'btn btn-success']) ?>
+
-
\ No newline at end of file
+
diff --git a/backend/views/role/view.php b/backend/views/role/view.php
index 163847b..fe3ee63 100644
--- a/backend/views/role/view.php
+++ b/backend/views/role/view.php
@@ -1,17 +1,20 @@
title = $model->name;
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Roles'), 'url' => ['index']];
@@ -20,10 +23,10 @@ $this->params['breadcrumbs'][] = $this->title;
- 'btn btn-default']) ?>
- $model->name], ['class' => 'btn btn-primary']) ?>
+ 'btn btn-outline-primary btn-sm']) ?>
+ $model->name], ['class' => 'btn btn-primary btn-sm']) ?>
$model->name], [
- 'class' => 'btn btn-danger',
+ 'class' => 'btn btn-danger btn-sm',
'data' => [
'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
'method' => 'post',
@@ -31,8 +34,8 @@ $this->params['breadcrumbs'][] = $this->title;
]) ?>
-
-
+
+
$model,
'attributes' => [
@@ -56,48 +59,51 @@ $this->params['breadcrumbs'][] = $this->title;
name !== 'admin') : ?>
-
-
+
+
+
+
- field($itemsForm, 'roles')->widget(
- Select2::class,
- [
- 'name' => 'childrenRoles',
- 'data' => $roles,
- 'size' => Select2::SMALL,
- 'options' => [
- 'placeholder' => Yii::t('user', 'Select role...'),
- 'multiple' => true,
- ],
- 'pluginOptions' => [
- 'allowClear' => true
- ],
- ]
- )->label(false);
- ?>
+ field($itemsForm, 'roles')->widget(
+ Select2::class,
+ [
+ 'name' => 'childrenRoles',
+ 'data' => $roles,
+ 'size' => Select2::SMALL,
+ 'options' => [
+ 'placeholder' => Yii::t('user', 'Select role...'),
+ 'multiple' => true,
+ ],
+ 'pluginOptions' => [
+ 'allowClear' => true
+ ],
+ ]
+ )->label(false);
+ ?>
-
+
- field($itemsForm, 'permissions')->widget(
- Select2::class,
- [
- 'name' => 'childrenPermissions',
- 'data' => $permissions,
- 'size' => Select2::SMALL,
- 'options' => [
- 'placeholder' => Yii::t('user', 'Select permission...'),
- 'multiple' => true
- ],
- 'pluginOptions' => [
- 'allowClear' => true
- ],
- ]
- )->label(false);
- ?>
-
-
- 'btn btn-primary']) ?>
+ field($itemsForm, 'permissions')->widget(
+ Select2::class,
+ [
+ 'name' => 'childrenPermissions',
+ 'data' => $permissions,
+ 'size' => Select2::SMALL,
+ 'options' => [
+ 'placeholder' => Yii::t('user', 'Select permission...'),
+ 'multiple' => true
+ ],
+ 'pluginOptions' => [
+ 'allowClear' => true
+ ],
+ ]
+ )->label(false);
+ ?>
+
+
diff --git a/backend/views/settings/list/_form.php b/backend/views/settings/list/_form.php
index b59c53e..807c295 100644
--- a/backend/views/settings/list/_form.php
+++ b/backend/views/settings/list/_form.php
@@ -1,5 +1,6 @@
registerJs($js2);
?>
diff --git a/backend/views/settings/list/_form_tab.php b/backend/views/settings/list/_form_tab.php
index 65b760d..1d2afe6 100644
--- a/backend/views/settings/list/_form_tab.php
+++ b/backend/views/settings/list/_form_tab.php
@@ -4,10 +4,14 @@
* Date: 24.08.2018
*/
+use core\forms\SettingsForm;
+use yii\web\View;
+use yii\widgets\ActiveForm;
+
/**
- * @var $this \yii\web\View
- * @var $form \yii\widgets\ActiveForm
- * @var $model \core\forms\SettingsForm
+ * @var $this View
+ * @var $form ActiveForm
+ * @var $model SettingsForm
* @var $language string
*/
diff --git a/backend/views/settings/list/_view_tab.php b/backend/views/settings/list/_view_tab.php
index 7538762..d9cf882 100644
--- a/backend/views/settings/list/_view_tab.php
+++ b/backend/views/settings/list/_view_tab.php
@@ -4,11 +4,12 @@
* Date: 25.08.2018
*/
+use yii\web\View;
use yii\widgets\DetailView;
use core\entities\Settings;
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $setting Settings
* @var $language string
*/
diff --git a/backend/views/settings/list/index.php b/backend/views/settings/list/index.php
index a46cfda..ba56c00 100644
--- a/backend/views/settings/list/index.php
+++ b/backend/views/settings/list/index.php
@@ -1,5 +1,6 @@
params['breadcrumbs'][] = $this->title;
[
'label' => Yii::t('main', 'Value'),
'value' => function (Settings $setting) {
- return isset($setting->translation->value) ? $setting->translation->value : '- ';
+ return $setting->translation->value ?? '- ';
},
'format' => 'ntext',
],
diff --git a/backend/views/settings/list/view.php b/backend/views/settings/list/view.php
index 9d8586e..a7a3b92 100644
--- a/backend/views/settings/list/view.php
+++ b/backend/views/settings/list/view.php
@@ -1,11 +1,13 @@
title = $model->section . '.' . $model->key;
@@ -75,7 +77,7 @@ $this->registerCss($css);
?>
diff --git a/backend/views/site/index.php b/backend/views/site/index.php
index 1d54530..a1ef5e8 100644
--- a/backend/views/site/index.php
+++ b/backend/views/site/index.php
@@ -1,5 +1,6 @@
registerJs($formatJs, $this::POS_HEAD);
'handle' => '.moveHandle',
],
]);
- $widgets = \core\helpers\UserHelper::getSetting('widgetsLayout', []);
+ $widgets = UserHelper::getSetting('widgetsLayout', []);
foreach ($widgets as $widget) {
$widgetData = [
'class'=>'grid-stack-item',
diff --git a/backend/views/site/login.php b/backend/views/site/login.php
index bbe2136..046b227 100644
--- a/backend/views/site/login.php
+++ b/backend/views/site/login.php
@@ -1,10 +1,12 @@
title = 'Sign In';
diff --git a/backend/views/site/search.php b/backend/views/site/search.php
index 33151f2..ef8dda1 100644
--- a/backend/views/site/search.php
+++ b/backend/views/site/search.php
@@ -1,13 +1,14 @@
title = $title . ' > ' . Html::encode($form->query);
diff --git a/backend/views/site/widgets-list.php b/backend/views/site/widgets-list.php
index 1b80ee7..001d9b8 100644
--- a/backend/views/site/widgets-list.php
+++ b/backend/views/site/widgets-list.php
@@ -2,9 +2,10 @@
use yii\helpers\Html;
use backend\helpers\DashboardHelper;
+use yii\web\View;
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $wl array
*/
diff --git a/backend/views/site/widgets-selected-list.php b/backend/views/site/widgets-selected-list.php
index 0eb8ce0..d076059 100644
--- a/backend/views/site/widgets-selected-list.php
+++ b/backend/views/site/widgets-selected-list.php
@@ -4,7 +4,9 @@
* @var $this \yii\web\View
*/
-$widgets = \core\helpers\UserHelper::getSetting('widgetsLayout', []);
+use core\helpers\UserHelper;
+
+$widgets = UserHelper::getSetting('widgetsLayout', []);
$i = 0;
?>
diff --git a/backend/views/slider/_form.php b/backend/views/slider/_form.php
index e546964..9822eb7 100644
--- a/backend/views/slider/_form.php
+++ b/backend/views/slider/_form.php
@@ -1,19 +1,20 @@
-
-
+
+
field($model, 'title')->textarea(['maxLength' => true, 'rows' => 2]) ?>
field($model, 'tagline')->textarea(['maxLength' => true, 'rows' => 2]) ?>
@@ -26,16 +27,15 @@ use yii\helpers\Html;
- field($model, 'image')->widget(\kartik\widgets\FileInput::classname(), [
+ field($model, 'image')->widget(FileInput::class, [
'pluginOptions' => [
'showUpload' => false,
],
])->label(Yii::t('slider', 'Background Image')) ?>
-
-
-
- 'btn btn-primary']) ?>
+
diff --git a/backend/views/slider/create.php b/backend/views/slider/create.php
index c79f614..1eef431 100644
--- a/backend/views/slider/create.php
+++ b/backend/views/slider/create.php
@@ -1,7 +1,9 @@
title = Yii::t('slider', 'Create Slide');
$this->params['breadcrumbs'][] = ['label' => Yii::t('slider', 'Slider'), 'url' => ['index']];
diff --git a/backend/views/slider/index.php b/backend/views/slider/index.php
index 7010b6c..3ddfa56 100644
--- a/backend/views/slider/index.php
+++ b/backend/views/slider/index.php
@@ -13,12 +13,11 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-
- 'btn btn-success']) ?>
-
-
-
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'columns' => [
diff --git a/backend/views/slider/update.php b/backend/views/slider/update.php
index 63bd7da..42f185b 100644
--- a/backend/views/slider/update.php
+++ b/backend/views/slider/update.php
@@ -1,9 +1,11 @@
title = Yii::t('slider', 'Update Slide');
$this->params['breadcrumbs'][] = ['label' => Yii::t('slider', 'Slider'), 'url' => ['index']];
diff --git a/backend/views/slider/view.php b/backend/views/slider/view.php
index 8a6a8ae..c7cf71c 100644
--- a/backend/views/slider/view.php
+++ b/backend/views/slider/view.php
@@ -1,12 +1,11 @@
title = $model->title;
$this->params['breadcrumbs'][] = ['label' => Yii::t('slider', 'Slider'), 'url' => ['index']];
@@ -15,10 +14,10 @@ $this->params['breadcrumbs'][] = $this->title;
- 'btn btn-default']) ?>
- $model->id], ['class' => 'btn btn-primary']) ?>
+ 'btn btn-outline-primary btn-sm']) ?>
+ $model->id], ['class' => 'btn btn-primary btn-sm']) ?>
$model->id], [
- 'class' => 'btn btn-danger',
+ 'class' => 'btn btn-danger btn-sm',
'data' => [
'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
'method' => 'post',
@@ -29,8 +28,8 @@ $this->params['breadcrumbs'][] = $this->title;
-
-
+
+
image): ?>
getThumbFileUrl('image', 'thumb')) ?>
@@ -40,8 +39,8 @@ $this->params['breadcrumbs'][] = $this->title;
-
-
+
+
$model,
'attributes' => [
@@ -55,7 +54,4 @@ $this->params['breadcrumbs'][] = $this->title;
-
-
-
diff --git a/backend/views/user/_form.php b/backend/views/user/_form.php
index 81d5b3d..4d2e66b 100644
--- a/backend/views/user/_form.php
+++ b/backend/views/user/_form.php
@@ -1,32 +1,28 @@
-
-
-
+
+
field($model, 'username')->textInput(['maxLength' => true]) ?>
field($model, 'email')->textInput(['maxLength' => true]) ?>
field($model, 'password')->passwordInput(['maxLength' => true]) ?>
field($model, 'role')->dropDownList($model->rolesList()) ?>
+
-
-
- 'btn btn-primary']) ?>
-
-
-
-
diff --git a/backend/views/user/create.php b/backend/views/user/create.php
index f5c71dd..f4cd17e 100644
--- a/backend/views/user/create.php
+++ b/backend/views/user/create.php
@@ -1,7 +1,8 @@
title = Yii::t('user', 'Create User');
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']];
diff --git a/backend/views/user/index.php b/backend/views/user/index.php
index 443d2e8..a43cbc6 100644
--- a/backend/views/user/index.php
+++ b/backend/views/user/index.php
@@ -16,13 +16,11 @@ $this->title = Yii::t('user', 'Users');
$this->params['breadcrumbs'][] = $this->title;
?>
-
-
- 'btn btn-success']) ?>
-
-
-
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'filterModel' => $searchModel,
diff --git a/backend/views/user/profile.php b/backend/views/user/profile.php
index 44eed73..418da43 100644
--- a/backend/views/user/profile.php
+++ b/backend/views/user/profile.php
@@ -1,12 +1,15 @@
title = Yii::t('user', 'Profile: {username}', ['username' => $user->username]);
$this->params['breadcrumbs'][] = ['label' => $user->username, 'url' => ['view', 'id' => $user->id]];
$this->params['breadcrumbs'][] = Yii::t('user', 'Profile');
@@ -16,14 +19,14 @@ $this->params['breadcrumbs'][] = Yii::t('user', 'Profile');
-
-
-
+
+
+
- field($model, 'user_pic')->widget(\kartik\widgets\FileInput::class, [
+ field($model, 'user_pic')->widget(FileInput::class, [
'options' => [
'accept' => 'image/*'
],
@@ -31,15 +34,15 @@ $this->params['breadcrumbs'][] = Yii::t('user', 'Profile');
'showPreview' => false,
'showCaption' => true,
'showRemove' => true,
- 'showUpload' => false
+ 'showUpload' => false,
],
]); ?>
-
-
-
+
+
+
field($model, 'username')->textInput(['maxLength' => true]) ?>
field($model, 'email')->textInput(['maxLength' => true]) ?>
field($model, 'password')->passwordInput(['maxLength' => true]) ?>
diff --git a/backend/views/user/update.php b/backend/views/user/update.php
index b9f865f..db9fb27 100644
--- a/backend/views/user/update.php
+++ b/backend/views/user/update.php
@@ -1,10 +1,13 @@
title = Yii::t('user', 'Update User: {user}', ['user' => $user->username]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $user->username, 'url' => ['view', 'id' => $user->id]];
diff --git a/backend/views/user/view.php b/backend/views/user/view.php
index 32ddfd8..6dfe8c6 100644
--- a/backend/views/user/view.php
+++ b/backend/views/user/view.php
@@ -1,12 +1,13 @@
title = $model->username;
$this->params['breadcrumbs'][] = ['label' => 'Users', 'url' => ['index']];
@@ -15,10 +16,10 @@ $this->params['breadcrumbs'][] = $this->title;
- 'btn btn-default']) ?>
- $model->id], ['class' => 'btn btn-primary']) ?>
+ 'btn btn-outline-primary btn-sm']) ?>
+ $model->id], ['class' => 'btn btn-primary btn-sm']) ?>
$model->id], [
- 'class' => 'btn btn-danger',
+ 'class' => 'btn btn-danger btn-sm',
'data' => [
'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
'method' => 'post',
@@ -26,8 +27,8 @@ $this->params['breadcrumbs'][] = $this->title;
]) ?>
-
-
+
+
$model,
'attributes' => [
diff --git a/backend/web/css/site-origin.css b/backend/web/css/site-origin.css
new file mode 100644
index 0000000..5e03acc
--- /dev/null
+++ b/backend/web/css/site-origin.css
@@ -0,0 +1,138 @@
+html,
+body {
+ height: 100%;
+}
+
+.wrap {
+ min-height: 100%;
+ height: auto;
+ margin: 0 auto -60px;
+ padding: 0 0 60px;
+}
+
+.wrap > .container {
+ padding: 70px 15px 20px;
+}
+
+.footer {
+ height: 60px;
+ background-color: #f5f5f5;
+ border-top: 1px solid #ddd;
+ padding-top: 20px;
+}
+
+.jumbotron {
+ text-align: center;
+ background-color: transparent;
+}
+
+.jumbotron .btn {
+ font-size: 21px;
+ padding: 14px 24px;
+}
+
+.not-set {
+ color: #c55;
+ font-style: italic;
+}
+
+/* add sorting icons to gridview sort links */
+a.asc:after, a.desc:after {
+ position: relative;
+ top: 1px;
+ display: inline-block;
+ font-family: 'Glyphicons Halflings';
+ font-style: normal;
+ font-weight: normal;
+ line-height: 1;
+ padding-left: 5px;
+}
+
+a.asc:after {
+ content: /*"\e113"*/ "\e151";
+}
+
+a.desc:after {
+ content: /*"\e114"*/ "\e152";
+}
+
+.sort-numerical a.asc:after {
+ content: "\e153";
+}
+
+.sort-numerical a.desc:after {
+ content: "\e154";
+}
+
+.sort-ordinal a.asc:after {
+ content: "\e155";
+}
+
+.sort-ordinal a.desc:after {
+ content: "\e156";
+}
+
+.grid-view td {
+ white-space: nowrap;
+}
+
+.grid-view .filters input,
+.grid-view .filters select {
+ min-width: 50px;
+}
+
+.hint-block {
+ display: block;
+ margin-top: 5px;
+ color: #999;
+}
+
+.error-summary {
+ color: #a94442;
+ background: #fdf7f7;
+ border-left: 3px solid #eed3d7;
+ padding: 10px 20px;
+ margin: 0 0 15px 0;
+}
+
+/* align the logout "link" (button in form) of the navbar */
+.nav li > form > button.logout {
+ padding: 15px;
+ border: none;
+}
+
+@media(max-width:767px) {
+ .nav li > form > button.logout {
+ display:block;
+ text-align: left;
+ width: 100%;
+ padding: 10px 15px;
+ }
+}
+
+.nav > li > form > button.logout:focus,
+.nav > li > form > button.logout:hover {
+ text-decoration: none;
+}
+
+.nav > li > form > button.logout:focus {
+ outline: none;
+}
+
+div.required label.control-label:after {
+ content: " *";
+ color: red;
+}
+
+.modal-content {
+ background-color: transparent !important;
+}
+
+.modal-content .modal-body, .modal-content .modal-footer {
+ background-color: white;
+}
+
+.bootstrap-dialog .modal-footer {
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+}
\ No newline at end of file
diff --git a/backend/web/css/site.css b/backend/web/css/site.css
index 5e03acc..f908ba0 100644
--- a/backend/web/css/site.css
+++ b/backend/web/css/site.css
@@ -1,6 +1,7 @@
html,
body {
height: 100%;
+ background-color: #ffffff !important;
}
.wrap {
@@ -36,24 +37,29 @@ body {
font-style: italic;
}
+a {
+ text-decoration: none;
+}
+
/* add sorting icons to gridview sort links */
a.asc:after, a.desc:after {
position: relative;
top: 1px;
display: inline-block;
- font-family: 'Glyphicons Halflings';
+ /*font-family: 'Glyphicons Halflings';*/
+ font-family: "Font Awesome 5 Free";
font-style: normal;
- font-weight: normal;
+ /*font-weight: normal;*/
line-height: 1;
padding-left: 5px;
}
a.asc:after {
- content: /*"\e113"*/ "\e151";
+ content: /*"\e113" "\e151";*/ "\f884";
}
a.desc:after {
- content: /*"\e114"*/ "\e152";
+ content: /*"\e114"* "\e152"*/ "\f160";
}
.sort-numerical a.asc:after {
@@ -72,15 +78,10 @@ a.desc:after {
content: "\e156";
}
-.grid-view td {
+.grid-view th {
white-space: nowrap;
}
-.grid-view .filters input,
-.grid-view .filters select {
- min-width: 50px;
-}
-
.hint-block {
display: block;
margin-top: 5px;
@@ -119,20 +120,341 @@ a.desc:after {
outline: none;
}
+.company-logo {
+ width: 100%;
+ text-align: center;
+}
+
+.sidebar-collapse .company-logo {
+ display: none;
+}
+
+.modal-content {
+ background: transparent;
+}
+
+.modal-content .modal-body, .modal-content .modal-footer {
+ background: #ffffff;
+}
+
div.required label.control-label:after {
content: " *";
color: red;
}
-.modal-content {
- background-color: transparent !important;
+.thumbnail .file-icon .fa {
+ font-size: 36px;
}
-.modal-content .modal-body, .modal-content .modal-footer {
- background-color: white;
+.sub-stop-led
+{
+ font-size: 11px;
+ color: #ae121d;
+}
+
+.grid-view .glyphicon {
+ display: inline-block;
+ padding: 5px;
+ background-color: #ffffff;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+}
+
+/* CARDS */
+.business-card {
+ background: #ddd;
+ /*padding: 10px;*/
+ border-radius: 4px;
+ margin-bottom: 10px;
+ position: relative;
+ overflow: hidden;
+}
+
+.business-card .media-left {
+ background-color: #999;
+ padding: 10px;
+}
+
+.business-card .media-body {
+ padding: 10px;
+}
+
+.business-card .profile-img {
+ height: 80px;
+ background: white;
+}
+.business-card .job {
+ color: #555;
+ font-size: 16px;
+}
+.business-card .name {
+ font-size: 20px;
+}
+
+.business-card .buttons {
+ position: absolute;
+ right: 10px;
+ bottom: 10px;
+ display: none;
+ font-size: 12px;
+}
+
+.business-card:hover .buttons {
+ display: block;
+}
+
+.business-card .buttons a {
+ color: #777;
+}
+
+.business-card-empty {
+ border: solid 3px #ccc;
+ padding: 10px;
+ border-radius: 4px;
+ margin-bottom: 10px;
+ position: relative;
+ overflow: hidden;
+ text-align: center;
+ color: #ccc;
+ font-size: 16px;
+ cursor: pointer;
+}
+.business-card-empty i {
+ font-size: 30px;
+}
+.business-card-empty:hover {
+ color: #484f58;
+}
+
+/* CONTACT CARD */
+.contact-card .job {
+ color: #999;
+ font-size: 16px;
+}
+.contact-card .name {
+ font-size: 20px;
+ color: #333;
+}
+
+.contact-card .cc_image {
+ width:180px;
+ height: 220px;
+ margin: 0 auto;
+ background-position: center;
+ background-size: cover;
+ background-repeat: no-repeat;
+}
+
+.modal .panel-body {
+ color: #ccc !important;
+}
+
+.modal #sub_data {
+ color: #555 !important;
+}
+
+.info-box-number {
+ font-size: 26px !important;
+}
+
+/* CALENDAR */
+.calendar-left-sidebar .list-group .btn {
+ border: 0;
+ background-color: transparent;
+ margin-top: -10px;
+ margin-right: -15px;
}
-.bootstrap-dialog .modal-footer {
- border-bottom-left-radius: 4px;
- border-bottom-right-radius: 4px;
+.calendar-left-sidebar .list-group .btn:hover {
+ border: 0;
+ background-color: transparent;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
+.business-card-avatar{
+ width: 80px;
+ height: 80px;
+ background-size: cover;
+ display: block;
+ border-radius: 50%;
+}
+
+/*.custom-checkbox { position: absolute; opacity: 0; z-index: -1; }
+/.custom-checkbox+span { font: 14px sans-serif; color: #3b3b3b; }
+.custom-checkbox+span:before { font: 16pt FontAwesome; content: '\00f096'; display: inline-block; width: 16pt; padding: 2px 0 0 3px; margin-right: 0.5em; }
+.custom-checkbox:checked+span:before { content: '\00f046'; color: limegreen }
+.custom-checkbox:focus+span:before { outline: 1px dotted #aaa; }
+.custom-checkbox:disabled+span { color: #999; }
+.custom-checkbox:not(:disabled)+span:hover:before { text-shadow: 0 1px 2px #77F; }*/
+
+.deadline-card-date-success { background-color: #2c9f32 }
+.deadline-card-date-danger { background-color:#cc3532 }
+.deadline-card-date-primary { background-color:#339ccc }
+
+.card-header-color {
+ background-color: #7BA7AB !important;
+ color: #ffffff;
+}
+.card-title-info {
+ color: rgba(255,255,255,0.5) !important;
+}
+
+.card, .card-header, .btn, .btn-lg, .form-control {
+ border-radius: 0 !important;
+}
+.card-header {
+ border-bottom: solid 3px #628589 !important;
+}
+
+.custom-control-input.is-valid ~ .custom-control-label::before {
+ color: #cccccc !important;
+ background-color: #cccccc !important;
+ border-color: #cccccc !important;
+}
+.was-validated .custom-control-input:valid:checked ~ .custom-control-label::before, .custom-control-input.is-valid:checked ~ .custom-control-label::before {
+ color: #7BA7AB !important;
+ background-color: #7BA7AB !important;
+ border-color: #7BA7AB !important;
+}
+.custom-control-input ~ .custom-control-label::before {
+ border-radius: 0 !important;
+ border-color: #7BA7AB !important;
+}
+.custom-checkbox .custom-control-input:checked ~ .custom-control-label::before {
+ background-color: #7BA7AB !important;
+ border-color: #7BA7AB;
+}
+.custom-checkbox .custom-control-input:checked:focus ~ .custom-control-label::before {
+ box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(123, 167, 171, 0.25)
+}
+.custom-checkbox .custom-control-input:focus ~ .custom-control-label::before {
+ box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 0, 0, 0.25)
+}
+.custom-checkbox .custom-control-input:active ~ .custom-control-label::before {
+ background-color: #9bd2d8;
+}
+.was-validated .custom-control-input:valid ~ .custom-control-label,
+.custom-control-input.is-valid ~ .custom-control-label,
+.custom-control-input.is-valid:checked ~ .custom-control-label::before {
+ color: inherit !important;
+}
+.was-validated .form-control:valid, .form-control.is-valid {
+ border-color: #cccccc !important;
+}
+.form-control:focus {
+ border-color: rgba(123, 167, 171, 0.44) !important;
+}
+
+.btn-success{color:#fff !important; background-color: #7bab83 !important; border-color:#7bab83 !important;border-bottom: solid 3px #658962 !important;}
+.btn-success:hover{color:#fff;background-color: #658962 !important;border-color:#658962 !important;}
+.btn-success:focus,.btn-success.focus{box-shadow:0 0 0 .2rem rgba(98, 137, 99, 0.5)
+}
+.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#7bab83;border-color:#658962}
+.btn-success:not(:disabled):not(.disabled):active,.btn-success:not(:disabled):not(.disabled).active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#7bab83;border-color:#000}
+.btn-success:not(:disabled):not(.disabled):active:focus,.btn-success:not(:disabled):not(.disabled).active:focus,.show>.btn-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(98, 137, 101, 0.5)
+}
+
+.btn-outline-success{color:#7bab83;background-color:transparent;background-image:none;border-color:#7bab83}.btn-outline-success:hover{color:#222;background-color: #009a1f;border-color:#7bab83}
+.btn-outline-success:focus,.btn-outline-success.focus{box-shadow:0 0 0 .2rem #658962}
+.btn-outline-success.disabled,.btn-outline-success:disabled{color:#7bab83;background-color:transparent}
+.btn-outline-success:not(:disabled):not(.disabled):active,.btn-outline-success:not(:disabled):not(.disabled).active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color: #8cc28f;border-color:#7bab83}
+.btn-outline-success:not(:disabled):not(.disabled):active:focus,.btn-outline-success:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem #658962}
+
+
+.btn-primary{color:#fff !important; background-color:#7BA7AB !important; border-color:#7BA7AB !important;border-bottom: solid 3px #628589 !important;}
+.btn-primary:hover{color:#fff;background-color:#628589 !important;border-color:#628589 !important;}
+.btn-primary:focus,.btn-primary.focus{box-shadow:0 0 0 .2rem rgba(98,133,137,0.5)}
+.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#7BA7AB;border-color:#628589}
+.btn-primary:not(:disabled):not(.disabled):active,.btn-primary:not(:disabled):not(.disabled).active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#7BA7AB;border-color:#000}
+.btn-primary:not(:disabled):not(.disabled):active:focus,.btn-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(98,133,137,0.5)}
+
+.btn-outline-primary{color:#7BA7AB !important;background-color:transparent !important;background-image:none !important;border-color:#7BA7AB !important; border-bottom: solid 3px #628589 !important;}.btn-outline-primary:hover{color:#FFFFFF !important;background-color:#628589 !important;border-color:#628589 !important; !important}
+.btn-outline-primary:focus,.btn-outline-primary.focus{box-shadow:0 0 0 .2rem #628589 !important;}
+.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#7BA7AB !important;background-color:transparent !important;}
+.btn-outline-primary:not(:disabled):not(.disabled):active,.btn-outline-primary:not(:disabled):not(.disabled).active,.show>.btn-outline-primary.dropdown-toggle{color:#fff !important;background-color: #8cbdc2 !important;border-color:#7BA7AB !important;}
+.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem #628589 !important;}
+
+
+.btn-danger{color:#fff !important; background-color: #dc565f !important; border-color:#dc565f !important;border-bottom: solid 3px #C82333 !important;}
+.btn-danger:hover{color:#fff;background-color:#C82333 !important;border-color:#C82333 !important;}
+.btn-danger:focus,.btn-primary.focus{box-shadow:0 0 0 .2rem rgba(200,35,51,0.5)}
+.btn-danger.disabled,.btn-primary:disabled{color:#fff;background-color:#dc565f;border-color:#C82333}
+.btn-danger:not(:disabled):not(.disabled):active,.btn-primary:not(:disabled):not(.disabled).active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#dc565f;border-color:#000}
+.btn-danger:not(:disabled):not(.disabled):active:focus,.btn-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(200,35,51,0.5)}
+
+.btn-outline-danger{color:#dc565f;background-color:transparent;background-image:none;border-color:#dc565f}.btn-outline-primary:hover{color:#222;background-color: #9a231e;border-color:#dc565f}
+.btn-outline-danger:focus,.btn-outline-primary.focus{box-shadow:0 0 0 .2rem #C82333}
+.btn-outline-danger.disabled,.btn-outline-primary:disabled{color:#dc565f;background-color:transparent}
+.btn-outline-danger:not(:disabled):not(.disabled):active,.btn-outline-primary:not(:disabled):not(.disabled).active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color: #dfa5a1;border-color:#dc565f}
+.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem #C82333}
+
+.btn-info{color:#fff !important; background-color:#17A2B8 !important; border-color:#17A2B8 !important;border-bottom: solid 3px #138496 !important;}
+.btn-info:hover{color:#fff;background-color:#138496 !important;border-color:#138496 !important;}
+.btn-info:focus,.btn-primary.focus{box-shadow:0 0 0 .2rem rgba(98,133,137,0.5)}
+.btn-info.disabled,.btn-primary:disabled{color:#fff;background-color:#17A2B8;border-color:#138496}
+.btn-info:not(:disabled):not(.disabled):active,.btn-primary:not(:disabled):not(.disabled).active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#17A2B8;border-color:#000}
+.btn-info:not(:disabled):not(.disabled):active:focus,.btn-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(98,133,137,0.5)}
+
+.btn-outline-info{color:#17A2B8;background-color:transparent;background-image:none;border-color:#17A2B8}.btn-outline-primary:hover{color:#222;background-color:#009a9a;border-color:#17A2B8}
+.btn-outline-info:focus,.btn-outline-primary.focus{box-shadow:0 0 0 .2rem #138496}
+.btn-outline-info.disabled,.btn-outline-primary:disabled{color:#17A2B8;background-color:transparent}
+.btn-outline-info:not(:disabled):not(.disabled):active,.btn-outline-primary:not(:disabled):not(.disabled).active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color: #8cbdc2;border-color:#17A2B8}
+.btn-outline-info:not(:disabled):not(.disabled):active:focus,.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem #138496}
+
+.nav-link {
+ color: #1e7785;
+}
+
+.nav-link:hover {
+ color: #06333b;
+}
+
+.nav-pills .nav-link.active,
+.nav-pills .show > .nav-link {
+ background-color: #7BA7AB !important;
+}
+
+.auth-icon {
+ display: inline-block !important;
+ margin: 0 10px;
+}
+
+.invalid-feedback {
+ font-size: 0.7em !important;
+ color: #F15B42 !important;
+}
+
+.was-validated .form-control:invalid,
+.form-control.is-invalid {
+ border-color: #cccccc !important;
+}
+
+.card-primary.card-outline {
+ border-top: 3px solid #7BA7AB !important;
+}
+
+.summary {
+ float: right;
+ font-size: 0.8em;
+ opacity: 0.5;
+}
+
+table {
+ font-size: 0.9em;
+}
+
+.card-header-info {
+ border-bottom-color: #17A2B8 !important;
+}
+
+.custom-control-input:checked ~ .custom-control-label::before {
+ background-color: #17A2B8 !important;
+}
+
+.help-block {
+ color: red;
+ font-size: 0.8em;
}
\ No newline at end of file
diff --git a/backend/web/css/skin.css b/backend/web/css/skin-origin.css
similarity index 100%
rename from backend/web/css/skin.css
rename to backend/web/css/skin-origin.css
diff --git a/backend/web/css/ui.jqgrid-bootstrap.css b/backend/web/css/ui.jqgrid-bootstrap.css
new file mode 100644
index 0000000..5166b23
--- /dev/null
+++ b/backend/web/css/ui.jqgrid-bootstrap.css
@@ -0,0 +1,1002 @@
+/*Grid*/
+.ui-jqgrid {
+ position: relative;
+ border: 1px solid #ddd; /*default*/
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+}
+.ui-jqgrid .ui-jqgrid-view {
+ position: relative;
+ left:0;
+ top: 0;
+ padding: 0;
+}
+.ui-jqgrid .ui-common-table {}
+
+/* Caption*/
+.ui-jqgrid .ui-jqgrid-titlebar {
+ font-weight: normal;
+ min-height:37px;
+ padding: 4px 8px;
+ position: relative;
+ margin-right: 2px;
+ border-bottom: 1px solid #ddd; /*default*/
+
+}
+.ui-jqgrid .ui-jqgrid-caption {
+ text-align: left;
+}
+.ui-jqgrid .ui-jqgrid-title {
+ padding-top: 5px;
+ vertical-align: middle;
+ position: absolute;
+}
+
+.ui-jqgrid .ui-jqgrid-titlebar-close {
+ color: inherit;
+ position: absolute;
+ top: 50%;
+ margin: -10px 7px 0 0;
+ padding: 1px;
+ cursor:pointer;
+}
+.ui-jqgrid .ui-jqgrid-titlebar-close span {
+ display: block;
+ margin: 1px;
+}
+.ui-jqgrid .ui-jqgrid-titlebar-close:hover { }
+
+/* Header*/
+.ui-jqgrid .ui-jqgrid-hdiv {
+ position: relative;
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
+}
+.ui-jqgrid .ui-jqgrid-hbox {
+ float: left;
+ padding-right: 20px;
+}
+.ui-jqgrid .ui-jqgrid-htable {
+ margin-bottom: 0;
+ table-layout: fixed;
+ border-top:none;
+}
+.ui-jqgrid .ui-jqgrid-htable thead th {
+ overflow : hidden;
+ border-bottom : none;
+ padding-right: 2px;
+}
+.ui-jqgrid .ui-jqgrid-htable thead th div {
+ overflow: hidden;
+ position:relative;
+}
+.ui-th-column, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column {
+ overflow: hidden;
+ white-space: nowrap;
+}
+.ui-th-column-header,
+.ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header {
+ overflow: hidden;
+ white-space: nowrap;
+}
+.ui-th-ltr, .ui-jqgrid .ui-jqgrid-htable th.ui-th-ltr {}
+.ui-th-rtl, .ui-jqgrid .ui-jqgrid-htable th.ui-th-rtl {text-align: center; }
+.ui-first-th-ltr { }
+.ui-first-th-rtl { }
+.ui-jqgrid tr.jqg-first-row-header th {
+ height:auto;
+ border-top:none;
+ padding-bottom: 0;
+ padding-top: 0;
+ border-bottom: none;
+ padding-right: 2px;
+ text-align: center;
+}
+.ui-jqgrid tr.jqg-second-row-header th,
+.ui-jqgrid tr.jqg-third--row-header th
+{
+ border-top:none;
+ text-align: center;
+}
+
+.ui-jqgrid .ui-th-div-ie {
+ white-space: nowrap;
+ height:17px;
+}
+.ui-jqgrid .ui-jqgrid-resize {
+ height:20px !important;
+ position: relative;
+ cursor :e-resize;
+ display: inline;
+ overflow: hidden;
+}
+.ui-jqgrid .ui-grid-ico-sort {
+ margin-left:5px;
+ overflow:hidden;
+ position:absolute;
+ right: auto;
+ font-size:12px;
+}
+.ui-jqgrid .ui-icon-asc {
+ margin-top:-3px;
+}
+.ui-jqgrid .ui-icon-desc {
+ margin-top:4px;
+}
+.ui-jqgrid .ui-i-asc {
+ margin-top:0;
+}
+.ui-jqgrid .ui-i-desc {
+ margin-top:0;
+ margin-right:13px;
+}
+.ui-jqgrid .ui-single-sort-asc {
+ margin-top:0;
+}
+.ui-jqgrid .ui-single-sort-desc {}
+.ui-jqgrid .ui-jqgrid-sortable {
+ cursor:pointer;
+}
+.ui-jqgrid tr.ui-search-toolbar th { }
+.ui-jqgrid .ui-search-table td.ui-search-clear { }
+.ui-jqgrid tr.ui-search-toolbar td > input { }
+.ui-jqgrid tr.ui-search-toolbar select {}
+
+.ui-jqgrid .ui-th-column > .ui-th-div {
+ padding-left: 14px;
+}
+.ui-jqgrid .ui-icon-left .ui-grid-ico-sort {
+ margin-left: -14px;
+}
+
+
+/* Body */
+.ui-jqgrid .table-bordered,
+.ui-jqgrid .table-bordered td,
+.ui-jqgrid .table-bordered th.ui-th-ltr
+{
+ border-left:0px none !important;
+}
+.ui-jqgrid .table-bordered th.ui-th-rtl
+{
+ border-right:0px none !important;
+}
+.ui-jqgrid .table-bordered tr.ui-row-rtl td
+{
+ border-right:0px none !important;
+ border-left: 1px solid #ddd !important;
+}
+div.tablediv > .table-bordered {
+ border-left : 1px solid #ddd !important;
+}
+.ui-jqgrid .ui-jqgrid-bdiv table.table-bordered td {
+ border-top: 0px none;
+}
+.ui-jqgrid .ui-jqgrid-bdiv {
+ position: relative;
+ margin: 0;
+ padding:0;
+ overflow: auto;
+ text-align:left;
+}
+.ui-jqgrid .ui-jqgrid-btable {
+ table-layout: fixed;
+ border-left:none ;
+ border-top:none;
+ margin-bottom: 0px
+}
+.ui-jqgrid tr.jqgrow {
+ outline-style: none;
+}
+.ui-jqgrid tr.jqgroup {
+ outline-style: none;
+}
+.ui-jqgrid .ui-jqgrid-btable tbody tr.jqgrow td {
+ overflow: hidden;
+ white-space: pre;
+ padding-right: 2px;
+}
+.ui-jqgrid tr.jqgfirstrow td {
+ height:auto;
+ border-top:none;
+ padding-bottom: 0;
+ padding-top: 0;
+ border-bottom: none;
+ padding-right: 2px;
+}
+.ui-jqgrid tr.jqgroup td {
+ white-space: nowrap;
+}
+.ui-jqgrid tr.jqfoot td {
+ white-space: nowrap;
+}
+.ui-jqgrid tr.ui-row-ltr td {}
+.ui-jqgrid tr.ui-row-rtl td {}
+.ui-jqgrid td.jqgrid-rownum { }
+.ui-jqgrid .ui-jqgrid-resize-mark {
+ width:2px;
+ left:0;
+ background-color:#777;
+ cursor: e-resize;
+ cursor: col-resize;
+ position:absolute;
+ top:0;
+ height:100px;
+ overflow:hidden;
+ display:none;
+ border:0 none;
+ z-index: 99999;
+
+}
+/* Footer */
+.ui-jqgrid .ui-jqgrid-sdiv {
+ position: relative;
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
+ border-left: 0 none !important;
+ border-top : 0 none !important;
+ border-right : 0 none !important;
+}
+.ui-jqgrid .ui-jqgrid-ftable {
+ table-layout:fixed;
+ margin-bottom:0;
+}
+
+.ui-jqgrid tr.footrow td {
+ font-weight: bold;
+ overflow: hidden;
+ white-space:nowrap;
+ padding-right: 2px;
+ border-bottom: 0px none;
+}
+.ui-jqgrid tr.footrow-ltr td {
+ text-align:left;
+}
+.ui-jqgrid tr.footrow-rtl td {
+ text-align:right;
+}
+
+/* Pager*/
+.ui-jqgrid .ui-jqgrid-pager,
+.ui-jqgrid .ui-jqgrid-toppager
+{
+ border-left-width: 0px;
+ border-top: 1px solid #ddd;
+ /*padding : 4px 0px;*/
+ position: relative;
+ /*height: auto; */
+ white-space: nowrap;
+ overflow: hidden;
+}
+.ui-jqgrid .ui-jqgrid-toppager {
+ border-top-width :0;
+ border-bottom : 1px solid #ddd;
+}
+.ui-jqgrid .ui-jqgrid-toppager .ui-pager-control,
+.ui-jqgrid .ui-jqgrid-pager .ui-pager-control {
+ position: relative;
+ border-left: 0;
+ border-bottom: 0;
+ border-top: 0;
+ /*height: 30px;*/
+}
+.ui-jqgrid .ui-pg-table {
+ position: relative;
+ padding: 1px 0;
+ width:auto;
+ margin: 0;
+}
+.ui-jqgrid .ui-pg-table td {
+ font-weight:normal;
+ vertical-align:middle;
+ /*padding:0px 6px;*/
+}
+.ui-jqgrid .ui-pager-control .ui-pager-table td {
+ border-top : 0px none !important;
+ min-height : 20px !important;
+}
+.ui-jqgrid .ui-pg-button {
+ height:auto;
+}
+.ui-jqgrid .ui-paging-pager td {
+ padding : 0 5px;
+}
+.ui-jqgrid .ui-pg-button span {
+ display: block;
+ margin: 0px 2px;
+ float:left;
+}
+.ui-jqgrid .ui-pg-button:hover { }
+.ui-jqgrid .ui-disabled:hover {}
+.ui-jqgrid .ui-pg-input,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-input {
+ display: inline-block;
+ height:auto;
+ width: auto;
+ font-size:.9em;
+ margin:0;
+ line-height: inherit;
+ border: none;
+ padding: 0px 3px
+}
+.ui-jqgrid .ui-pg-selbox,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-selbox {
+ font-size:.9em;
+ line-height:inherit;
+ display:block;
+ height:22px;
+ margin: 0;
+ padding: 3px 0px 3px 3px;
+ border:none;
+}
+.ui-jqgrid .ui-separator {
+ height: 18px;
+ border : none;
+ border-left: 2px solid #ccc ; /*default*/
+
+}
+.ui-separator-li {
+ height: 2px;
+ border : none;
+ border-top: 2px solid #ccc ; /*default*/
+ margin: 0; padding: 0; width:100%
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-pg-div,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-div
+{
+ float:left;
+ position:relative;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-pg-button,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-button
+{
+ cursor:pointer;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-pg-div span,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-div span
+{
+ float:left;
+}
+.ui-jqgrid td input,
+.ui-jqgrid td select,
+.ui-jqgrid td textarea {
+ margin: 0;
+}
+.ui-jqgrid td textarea {
+ width:auto;
+ height:auto;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-pager-table,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pager-table
+{
+ width:100%;
+ table-layout:fixed;
+ height:100%;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-paging-info,
+.ui-jqgrid .ui-jqgrid-toppager .ui-paging-info
+{
+ font-weight: normal;
+ height:auto;
+ margin-top:3px;
+ margin-right:4px;
+ display: inline;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-paging-pager,
+.ui-jqgrid .ui-jqgrid-toppager .ui-paging-pager
+{
+ table-layout:auto;
+ height:100%;
+}
+.ui-jqgrid .ui-jqgrid-pager .navtable,
+.ui-jqgrid .ui-jqgrid-toppager .navtable
+{
+ float:left;
+ table-layout:auto;
+ height:100%;
+}
+.ui-jqgrid .ui-jqgrid-pager .navtable td,
+.ui-jqgrid .ui-jqgrid-toppager .navtable td
+{
+ padding : 0 5px;
+}
+
+/*Subgrid*/
+
+.ui-jqgrid .ui-jqgrid-btable .ui-sgcollapsed span {
+ display: block;
+}
+.ui-jqgrid .ui-subgrid {
+ margin:0;
+ padding:0;
+ width:100%;
+}
+.ui-jqgrid .ui-subgrid table {
+ table-layout: fixed;
+}
+.ui-jqgrid .ui-subgrid tr.ui-subtblcell td {}
+.ui-jqgrid .ui-subgrid td.subgrid-data {
+ border-top: 0 none !important;
+}
+.ui-jqgrid .ui-subgrid td.subgrid-cell {
+ vertical-align: middle
+}
+.ui-jqgrid a.ui-sghref {
+ text-decoration: none;
+ color : #010101; /*default*/
+}
+.ui-jqgrid .ui-th-subgrid {height:20px;}
+.tablediv > .row { margin: 0 0}
+/* loading */
+.ui-jqgrid .loading,
+.loading_pivot {
+ position: absolute;
+ top: 45%;
+ left: 45%;
+ width: auto;
+ z-index:101;
+ padding: 6px;
+ margin: 5px;
+ text-align: center;
+ display: none;
+ border: 1px solid #ddd; /*default*/
+ font-size: 14px;
+ background-color: #d9edf7;
+}
+.ui-jqgrid .jqgrid-overlay {
+ display:none;
+}
+/* IE * html .jqgrid-overlay {width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');} */
+* .jqgrid-overlay iframe {
+ position:absolute;
+ top:0;
+ left:0;
+ z-index:-1;
+}
+/* IE width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');}*/
+/* end loading div */
+
+/* Toolbar */
+.ui-jqgrid .ui-userdata {
+ padding: 4px 0px;
+ overflow: hidden;
+ min-height: 32px;
+}
+.ui-jqgrid .ui-userdata-top {
+ border-left-width: 0px; /*default*/
+ border-bottom: 1px solid #ddd;
+}
+.ui-jqgrid .ui-userdata-bottom {
+ border-left-width: 0px; /*default*/
+ border-top: 1px solid #ddd;
+}
+/*Modal Window */
+.ui-jqdialog { }
+.ui-jqdialog {
+ display: none;
+ width: 500px;
+ position: absolute;
+ /*padding: 5px; */
+ overflow:visible;
+}
+.ui-jqdialog .ui-jqdialog-titlebar {
+ padding: .1em .1em;
+ min-height: 35px;
+}
+.ui-jqdialog .ui-jqdialog-title {
+ margin: .3em 0 .2em;
+ font-weight: bold;
+ padding-left :6px;
+ padding-right:6px;
+}
+.ui-jqdialog .ui-jqdialog-titlebar-close {
+ position: absolute;
+ top: 0%;
+ margin: 3px 5px 0 0;
+ padding: 8px;
+ cursor:pointer;
+}
+
+.ui-jqdialog .ui-jqdialog-titlebar-close span { }
+.ui-jqdialog .ui-jqdialog-titlebar-close:hover,
+.ui-jqdialog .ui-jqdialog-titlebar-close:focus {
+ padding: 8px;
+}
+.ui-jqdialog-content, .ui-jqdialog .ui-jqdialog-content {
+ border: 0;
+ padding: .3em .2em;
+ background: none;
+ height:auto;
+}
+.ui-jqdialog .ui-jqconfirm {
+ padding: .4em 1em;
+ border-width:3px;
+ position:absolute;
+ bottom:10px;
+ right:10px;
+ overflow:visible;
+ display:none;
+ height:120px;
+ width:220px;
+ text-align:center;
+ background-color: #fff;
+ border-radius: 4px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+}
+.ui-jqdialog>.ui-resizable-se { }
+.ui-jqgrid>.ui-resizable-se { }
+.jqgrid-overlay-modal {
+ display : none;
+}
+/* end Modal window*/
+/* Form edit */
+.ui-jqdialog-content .FormGrid {
+ margin: 0 8px 0 8px;
+ overflow:auto;
+ position:relative;
+}
+.ui-jqdialog-content .EditTable {
+ width: 100%;
+ margin-bottom:0;
+}
+.ui-jqdialog-content .DelTable {
+ width: 100%;
+ margin-bottom:0;
+}
+.EditTable td input,
+.EditTable td select,
+.EditTable td textarea {
+ width: 98%;
+ display: inline-block;
+}
+.EditTable td textarea {
+ width:auto;
+ height:auto;
+}
+.EditTable .FormData td {
+ height:37px !important;
+}
+.ui-jqdialog-content td.EditButton {
+ text-align: right;
+ padding: 5px 5px 5px 0;
+}
+.ui-jqdialog-content td.navButton {
+ text-align: center;
+ border-left: 0 none;
+ border-top: 0 none;
+ border-right: 0 none;
+ padding-bottom:5px;
+ padding-top:5px;
+}
+.ui-jqdialog-content input.FormElement {
+ padding: .5em .3em;
+ margin-bottom: 5px
+}
+.ui-jqdialog-content select.FormElement {
+ padding:.3em;
+ margin-bottom: 3px;
+}
+.ui-jqdialog-content .data-line {
+ padding-top:.1em;
+ border: 0 none;
+}
+
+.ui-jqdialog-content .CaptionTD {
+ vertical-align: middle;
+ border: 0 none;
+ padding: 2px;
+ white-space: nowrap;
+}
+.ui-jqdialog-content .DataTD {
+ padding: 2px;
+ border: 0 none;
+ vertical-align: top;
+}
+.ui-jqdialog-content .form-view-data {
+ white-space:pre
+}
+.fm-button { }
+.fm-button-icon-left {
+ margin-left: 4px;
+ margin-right: 4px;
+}
+.fm-button-icon-right {
+ margin-left: 4px;
+ margin-right: 4px;
+}
+.fm-button-icon-left { }
+.fm-button-icon-right { }
+#nData, #pData {
+ margin-left: 4px;
+ margin-right: 4px;
+}
+#sData span, #cData span {
+ margin-left: 5px;
+}
+/* End Eorm edit */
+/*.ui-jqgrid .edit-cell {}*/
+.ui-jqgrid .selected-row,
+div.ui-jqgrid .selected-row td {
+ font-style : normal;
+}
+/* inline edit actions button*/
+.ui-inline-del, .ui-inline-cancel {
+ margin-left: 14px;
+}
+.ui-jqgrid .inline-edit-cell {}
+/* Tree Grid */
+.ui-jqgrid .tree-wrap {
+ float: left;
+ position: relative;
+ height: 18px;
+ white-space: nowrap;
+ overflow: hidden;
+}
+.ui-jqgrid .tree-minus {
+ position: absolute;
+ height: 18px;
+ width: 18px;
+ overflow: hidden;
+}
+.ui-jqgrid .tree-plus {
+ position: absolute;
+ height: 18px;
+ width: 18px;
+ overflow: hidden;
+}
+.ui-jqgrid .tree-leaf {
+ position: absolute;
+ height: 18px;
+ width: 18px;
+ overflow: hidden;
+}
+.ui-jqgrid .treeclick {
+ cursor: pointer;
+}
+/* moda dialog */
+* iframe.jqm {
+ position:absolute;
+ top:0;
+ left:0;
+ z-index:-1;
+}
+/* width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');}*/
+.ui-jqgrid-dnd tr td {
+ border-right-width: 1px;
+ border-right-color: inherit;
+ border-right-style: solid;
+ height:20px
+}
+/* RTL Support */
+.ui-jqgrid .ui-jqgrid-caption-rtl {
+ text-align: right;
+}
+.ui-jqgrid .ui-jqgrid-hbox-rtl {
+ float: right;
+ /*padding-left: 20px;*/
+}
+.ui-jqgrid .ui-jqgrid-resize-ltr {
+ float: right;
+ margin: -2px -2px -2px 0;
+ height:100%;
+}
+.ui-jqgrid .ui-jqgrid-resize-rtl {
+ float: left;
+ margin: -2px -2px -2px -0px;
+}
+.ui-jqgrid .ui-sort-rtl {
+
+}
+.ui-jqgrid .tree-wrap-ltr {
+ float: left;
+}
+.ui-jqgrid .tree-wrap-rtl {
+ float: right;
+}
+.ui-jqgrid .ui-ellipsis {
+ -moz-text-overflow:ellipsis;
+ text-overflow:ellipsis;
+}
+/* Toolbar Search Menu. Nav menu */
+.ui-search-menu,
+.ui-nav-menu {
+ position: absolute;
+ padding: 2px 5px;
+ z-index:99999;
+}
+.ui-search-menu.ui-menu .ui-menu-item,
+.ui-nav-menu.ui-menu .ui-menu-item
+{
+ list-style-image: none;
+ padding-right: 0;
+ padding-left: 0;
+}
+.ui-search-menu.ui-menu .ui-menu-item a,
+.ui-nav-menu.ui-menu .ui-menu-item a
+{
+ display: block;
+}
+.ui-search-menu.ui-menu .ui-menu-item a.g-menu-item:hover,
+.ui-nav-menu.ui-menu .ui-menu-item a.g-menu-item:hover
+{
+ margin: -1px;
+ font-weight: normal;
+}
+.ui-jqgrid .ui-search-table {
+ padding: 0;
+ border: 0 none;
+ height:20px;
+ width:100%;
+}
+.ui-jqgrid .ui-search-table .ui-search-oper {
+ width:20px;
+}
+a.g-menu-item, a.soptclass, a.clearsearchclass {
+ cursor: pointer;
+}
+.ui-jqgrid .ui-jqgrid-view input,
+.ui-jqgrid .ui-jqgrid-view select,
+.ui-jqgrid .ui-jqgrid-view textarea,
+.ui-jqgrid .ui-jqgrid-view button {
+ /*font-size: 11px*/
+}
+.ui-jqgrid .ui-scroll-popup {
+ width: 100px;
+}
+.ui-search-table select,
+.ui-search-table input
+{
+ padding: 4px 3px;
+}
+
+.ui-disabled {
+ opacity: .35;
+ filter:Alpha(Opacity=35); /* support: IE8 */
+ background-image: none;
+}
+.ui-overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0,0,0,0.5);
+ opacity: .3;
+ filter: Alpha(Opacity=30); /* support: IE8 */
+}
+
+.ui-jqgrid-pager .ui-pg-table .ui-pg-button:hover,
+.ui-jqgrid-toppager .ui-pg-table .ui-pg-button:hover
+{
+ background-color: #ddd;
+}
+.ui-jqgrid-corner {
+ border-radius: 5px
+}
+.ui-resizable-handle {
+ /*position: absolute;*/
+ display: block;
+ left :97%;
+}
+.ui-jqdialog .ui-resizable-se {
+ width: 12px;
+ height: 12px;
+ right: -5px;
+ bottom: -5px;
+ background-position: 16px 16px;
+}
+.ui-resizable-se {
+ cursor: se-resize;
+ width: 12px;
+ height: 12px;
+ right: 1px;
+ bottom: 1px;
+}
+.ui-top-corner {
+ border-top-left-radius: 5px;
+ border-top-right-radius: 5px;
+}
+.ui-bottom-corner {
+ border-bottom-left-radius: 5px;
+ border-bottom-right-radius: 5px;
+}
+
+.ui-search-table {
+ margin-bottom: 0;
+}
+.ui-search-table .columns, .ui-search-table .operators {
+ padding-right: 5px;
+}
+.opsel {
+ float :left;
+ width : 100px;
+ margin-right : 5px;
+}
+.add-group, .add-rule, .delete-group {
+ width: 14%;
+ margin-right : 5px;
+}
+.delete-rule {
+ width : 15px;
+}
+ul.ui-search-menu, ul.ui-nav-menu {
+ list-style-type: none;
+}
+ul.ui-search-menu li a,
+ul.ui-nav-menu li a,
+.soptclass,
+.clearsearchclass {
+ text-decoration: none;
+ color : #010101;
+}
+ul.ui-search-menu li a:hover, ul.ui-nav-menu li a:hover, a.soptclass:hover, a.clearsearchclass:hover {
+ background-color: #ddd;
+ padding: 1px 1px;
+ text-decoration: none;
+}
+ul.ui-search-menu li, ul.ui-nav-menu li {
+ padding : 5px 5px;
+}
+.ui-menu-item hr {
+ margin-bottom: 0px;
+ margin-top:0px;
+}
+
+.searchFilter .ui-search-table td,
+.searchFilter .ui-search-table th
+{
+ border-top: 0px none !important;
+}
+
+.searchFilter .queryresult {
+ margin-bottom: 5px;
+}
+.searchFilter .queryresult tr td{
+ border-top: 0px none;
+}
+.ui-search-label {
+ padding-left: 5px;
+}
+
+.frozen-div, .frozen-bdiv {
+ background-color: #fff;
+}
+/*
+.ui-jqgrid .ui-jqgrid-caption,
+.ui-jqgrid .ui-jqgrid-pager,
+.ui-jqgrid .ui-jqgrid-toppager,
+.ui-jqgrid .ui-jqgrid-htable thead th,
+.ui-jqgrid .ui-userdata-top,
+.ui-jqgrid .ui-userdata-bottom,
+.ui-jqgrid .ui-jqgrid-hdiv,
+.ui-jqdialog .ui-jqdialog-titlebar
+{
+ background-image: none, linear-gradient(to bottom, #fff 0px, #e0e0e0 100%);
+ background-repeat: repeat-x;
+ border-color: #ccc;
+ text-shadow: 0 1px 0 #fff;
+}
+*/
+/* Column menu */
+.ui-jqgrid .ui-jqgrid-htable .colmenu {
+ position:absolute;
+ right:1px;
+ height:100%;
+ color : black;
+}
+.ui-jqgrid .ui-jqgrid-htable .colmenu-rtl {
+ right: auto;
+ left : 1px;
+}
+.ui-jqgrid .ui-jqgrid-htable .colmenuspan {
+ display:inline-block;
+}
+
+.ui-jqgrid .ui-jqgrid-htable .ui-th-div {
+ height:17px;
+ margin-top:5px;
+}
+.column-menu, .ui-search-menu {
+ padding: 10px 15px;
+}
+.column-menu .divider {
+ background-color: #e5e5e5;
+ height: 1px;
+ padding:0 0;
+ margin: 5px 0;
+ overflow: hidden;
+}
+.ui-menu-item .ui-common-table .menu_icon {
+ padding-right: 8px;
+ padding-left: 8px;
+}
+td.menu_text {
+ width: auto;
+ padding-left: 1px;
+ white-space: nowrap;
+}
+#search_menu .ui-menu-item div {
+ padding: 3px 0;
+ white-space: nowrap;
+}
+
+#search_menu .search_buttons {
+ display:inline-block;
+ width:50%;
+ padding: 3px 3px;
+}
+.search_buttons .btn-default:hover {
+ padding-bottom: 6px;
+ padding-top: 6px;
+}
+.search_buttons #bs_reset {
+ margin-right: 3px;
+}
+.search_buttons #bs_search {
+ margin-left: 3px;
+}
+/*menubar*/
+.ui-jqgrid .ui-jqgrid-menubar {
+ margin: 5px 5px;
+ width:16px;
+ height:16px;
+}
+.ui-jqgrid a.ui-jqgrid-menubar {
+ text-decoration: none;
+ color : #010101; /*default*/
+}
+.ui-jqgrid .ui-jqgrid-menubar:hover {
+ margin: 5px 5px;
+ background-color: #ddd;
+ text-decoration: none;
+}
+.ui-jqgrid .menubar-rtl {
+ float : right;
+}
+
+.ui-jqgrid .menubar-ltr {
+ float : left;
+}
+/*printing*/
+
+.jqgridprint {
+ width : 100%;
+ font-size: 13px;
+}
+
+.jqgridprint th,
+.jqgridprint td {
+ padding: 4px 4px 4px 4px ;
+ text-align: center ;
+}
+.jqgridprint th {
+ border-bottom: 2px solid #333333 ;
+}
+.jqgridprint td {
+ border-bottom: 1px dotted #999999 ;
+}
+
+.jqgridprint tfoot td {
+ border-bottom-width: 0px ;
+ border-top: 2px solid #333333 ;
+ padding-top: 20px ;
+}
+.ui-jqgrid .jqgrid-caption-menu
+{
+ left:0;
+ top:30px;
+ position:absolute;
+ display:none;
+ font-size: inherit;
+ width : auto;
+}
+.ui-jqgrid .jqgrid-column-menu
+{
+ font-size:inherit;
+ width:auto;
+ position :absolute;
+}
diff --git a/backend/widgets/NotificationCountWidget.php b/backend/widgets/NotificationCountWidget.php
index 6712f7e..aa38e62 100644
--- a/backend/widgets/NotificationCountWidget.php
+++ b/backend/widgets/NotificationCountWidget.php
@@ -6,7 +6,7 @@
namespace backend\widgets;
-
+use Yii;
use yii\base\Widget;
class NotificationCountWidget extends Widget
@@ -15,14 +15,14 @@ class NotificationCountWidget extends Widget
{
$count = 0;
- if (isset(\Yii::$app->params['notifications'])) {
- foreach ( \Yii::$app->params['notifications'] as $notification ) {
+ if (isset(Yii::$app->params['notifications'])) {
+ foreach ( Yii::$app->params['notifications'] as $notification ) {
$count += $notification['count'];
}
}
return $this->render('notification-count', [
- 'notifications' => isset(\Yii::$app->params['notifications']) ? \Yii::$app->params['notifications'] : [],
+ 'notifications' => Yii::$app->params['notifications'] ?? [],
'count' => $count,
]);
}
diff --git a/backend/widgets/grid/CheckBoxColumn.php b/backend/widgets/grid/CheckBoxColumn.php
index cac779e..df8816c 100644
--- a/backend/widgets/grid/CheckBoxColumn.php
+++ b/backend/widgets/grid/CheckBoxColumn.php
@@ -6,7 +6,6 @@
namespace backend\widgets\grid;
-
class CheckBoxColumn extends \yii\grid\CheckboxColumn
{
public $headerOptions = ['class' => 'text-center', 'style' => 'width: 3em'];
diff --git a/common/config/main.php b/common/config/main.php
index d69dfc0..6e72884 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -1,4 +1,9 @@
[
'@bower' => '@vendor/bower-asset',
@@ -29,12 +34,12 @@ return [
'queue' => [
//'class' => 'yii\queue\redis\Queue',
//'as log' => 'yii\queue\LogBehavior',
- 'class' => \yii\queue\file\Queue::class,
+ 'class' => Queue::class,
//'path' => '@runtime/queue',
'path' => '@common/runtime/queue',
],
'avatar' => [
- 'class' => \zertex\avatar_generator\AvatarGenerator::class,
+ 'class' => AvatarGenerator::class,
'images_folder' => '@staticRoot/images/avatars',
'images_url' => '@static/images/avatars',
'size_width' => 300, // default: 300
@@ -45,7 +50,7 @@ return [
'text_over_image' => false,
],
'moduleManager' => [
- 'class' => \core\components\modules\ModuleManager::class,
+ 'class' => ModuleManager::class,
],
],
];
diff --git a/common/modules/banners/BannersModule.php b/common/modules/banners/BannersModule.php
index f495a2e..c8f1334 100644
--- a/common/modules/banners/BannersModule.php
+++ b/common/modules/banners/BannersModule.php
@@ -3,12 +3,15 @@
namespace common\modules\banners;
use core\components\modules\ModuleInterface;
+use Yii;
+use yii\base\Module;
use yii\helpers\ArrayHelper;
+use yii\web\Application;
/**
* blog module definition class
*/
-class BannersModule extends \yii\base\Module implements ModuleInterface
+class BannersModule extends Module implements ModuleInterface
{
/**
* @inheritdoc
@@ -25,7 +28,7 @@ class BannersModule extends \yii\base\Module implements ModuleInterface
// custom initialization code goes here
}
- public function bootstrap($app)
+ public function bootstrap(Application $app)
{
// add migration path
$app->controllerMap['migrate']['migrationPath'][] = '@common/modules/banners/migrations';
@@ -51,25 +54,25 @@ class BannersModule extends \yii\base\Module implements ModuleInterface
]);
// add menu items
- if (basename(\Yii::$app->getBasePath()) === 'backend') {
+ if (basename(Yii::$app->getBasePath()) === 'backend') {
$app->params['adminMenu'][] = [
- 'label' => \Yii::t('banners', 'Banners'),
- 'icon' => 'flag',
+ 'label' => Yii::t('banners', 'Banners'),
+ 'icon' => 'fas fa-flag',
'items' => [
[
- 'label' => \Yii::t('banners', 'Banners'),
- 'icon' => 'caret-right',
+ 'label' => Yii::t('banners', 'Banners'),
+ 'icon' => 'fas fa-caret-right',
'url' => ['/banners/manage/banner/index'],
//'active' => \Yii::$app->controller->getUniqueId() == 'banners/manage/banner'
],
[
- 'label' => \Yii::t('banners', 'Places'),
- 'icon' => 'caret-right',
+ 'label' => Yii::t('banners', 'Places'),
+ 'icon' => 'fas fa-caret-right',
'url' => ['/banners/manage/place/index'],
//'active' => \Yii::$app->controller->getUniqueId() == 'banners/manage/place'
],
],
- 'visible' => $app->user->can('admin') || \Yii::$app->user->can('BannersManagement'),
+ 'visible' => $app->user->can('admin') || Yii::$app->user->can('BannersManagement'),
];
}
}
diff --git a/common/modules/banners/controllers/BannerController.php b/common/modules/banners/controllers/BannerController.php
index 4107068..97fe149 100644
--- a/common/modules/banners/controllers/BannerController.php
+++ b/common/modules/banners/controllers/BannerController.php
@@ -9,36 +9,48 @@ namespace common\modules\banners\controllers;
use common\modules\banners\entities\Banner;
use common\modules\banners\services\BannerManageService;
use frontend\components\FrontendController;
+use Yii;
use yii\web\NotFoundHttpException;
class BannerController extends FrontendController
{
- private $_service;
+ private BannerManageService $service;
public function __construct(string $id, $module, BannerManageService $service, array $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
+ /**
+ * @throws NotFoundHttpException
+ */
public function actionView()
{
$id = filter_input(INPUT_POST, 'id', FILTER_VALIDATE_INT);
- if (\Yii::$app->request->isAjax && $id) {
+ if (Yii::$app->request->isAjax && $id) {
$banner = $this->findModel($id);
- $this->_service->addView($banner);
+ $this->service->addView($banner);
}
}
+ /**
+ * @throws NotFoundHttpException
+ */
public function actionClick()
{
$id = filter_input(INPUT_POST, 'id', FILTER_VALIDATE_INT);
- if (\Yii::$app->request->isAjax && $id) {
+ if (Yii::$app->request->isAjax && $id) {
$banner = $this->findModel($id);
- $this->_service->addClick($banner);
+ $this->service->addClick($banner);
}
}
+ /**
+ * @param $id
+ * @return Banner
+ * @throws NotFoundHttpException
+ */
protected function findModel($id): Banner
{
if (($model = Banner::findOne($id)) !== null) {
diff --git a/common/modules/banners/controllers/manage/BannerController.php b/common/modules/banners/controllers/manage/BannerController.php
index ce0cec6..118281e 100644
--- a/common/modules/banners/controllers/manage/BannerController.php
+++ b/common/modules/banners/controllers/manage/BannerController.php
@@ -6,20 +6,22 @@ use common\modules\banners\entities\Banner;
use common\modules\banners\forms\BannerForm;
use common\modules\banners\forms\search\BannerSearch;
use common\modules\banners\services\BannerManageService;
+use DomainException;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\web\Controller;
use Yii;
+use yii\web\Response;
class BannerController extends Controller
{
- private $_service;
+ private BannerManageService $service;
public function __construct($id, $module, BannerManageService $service, $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
public function behaviors(): array
@@ -48,9 +50,9 @@ class BannerController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new BannerSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -67,7 +69,7 @@ class BannerController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'banner' => $this->findModel($id),
@@ -75,18 +77,18 @@ class BannerController extends Controller
}
/**
- * @return mixed
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): string|Response
{
$form = new BannerForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $form = $this->_service->create($form);
+ $form = $this->service->create($form);
return $this->redirect(['view', 'id' => $form->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -102,10 +104,10 @@ class BannerController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$banner = $this->findModel($id);
$form = new BannerForm($banner);
@@ -113,10 +115,10 @@ class BannerController extends Controller
$form->end_at = date('d.m.Y H:i:s', $form->end_at);
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_service->edit($banner->id, $form);
+ $this->service->edit($banner->id, $form);
return $this->redirect(['view', 'id' => $banner->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -129,15 +131,14 @@ class BannerController extends Controller
}
/**
- * @param integer $id
- *
- * @return mixed
+ * @param int $id
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
- $this->_service->remove($id);
- } catch (\DomainException $e) {
+ $this->service->remove($id);
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -151,7 +152,7 @@ class BannerController extends Controller
* @return Banner the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): Banner
+ protected function findModel(int $id): Banner
{
if (($model = Banner::findOne($id)) !== null) {
return $model;
diff --git a/common/modules/banners/controllers/manage/PlaceController.php b/common/modules/banners/controllers/manage/PlaceController.php
index f8f8b06..7b29de8 100644
--- a/common/modules/banners/controllers/manage/PlaceController.php
+++ b/common/modules/banners/controllers/manage/PlaceController.php
@@ -6,20 +6,22 @@ use common\modules\banners\entities\BannerPlace;
use common\modules\banners\forms\BannerPlaceForm;
use common\modules\banners\forms\search\PlaceSearch;
use common\modules\banners\services\BannerPlaceManageService;
+use DomainException;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\web\Controller;
use Yii;
+use yii\web\Response;
class PlaceController extends Controller
{
- private $_service;
+ private BannerPlaceManageService $service;
public function __construct($id, $module, BannerPlaceManageService $service, $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
public function behaviors(): array
@@ -48,9 +50,9 @@ class PlaceController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new PlaceSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -67,7 +69,7 @@ class PlaceController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'place' => $this->findModel($id),
@@ -75,17 +77,17 @@ class PlaceController extends Controller
}
/**
- * @return mixed
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): string|Response
{
$form = new BannerPlaceForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $form = $this->_service->create($form);
+ $form = $this->service->create($form);
return $this->redirect(['view', 'id' => $form->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -101,20 +103,20 @@ class PlaceController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$place = $this->findModel($id);
$form = new BannerPlaceForm($place);
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_service->edit($place->id, $form);
+ $this->service->edit($place->id, $form);
return $this->redirect(['view', 'id' => $place->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -129,13 +131,13 @@ class PlaceController extends Controller
/**
* @param integer $id
*
- * @return mixed
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
- $this->_service->remove($id);
- } catch (\DomainException $e) {
+ $this->service->remove($id);
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -149,7 +151,7 @@ class PlaceController extends Controller
* @return BannerPlace the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): BannerPlace
+ protected function findModel(int $id): BannerPlace
{
if (($model = BannerPlace::findOne($id)) !== null) {
return $model;
diff --git a/common/modules/banners/entities/Banner.php b/common/modules/banners/entities/Banner.php
index 39a0572..d09ece8 100644
--- a/common/modules/banners/entities/Banner.php
+++ b/common/modules/banners/entities/Banner.php
@@ -3,7 +3,9 @@
namespace common\modules\banners\entities;
use common\modules\banners\entities\queries\BannerQuery;
+use DomainException;
use yii\behaviors\TimestampBehavior;
+use yii\db\ActiveQuery;
use yii\db\ActiveRecord;
use yii\web\UploadedFile;
use Yii;
@@ -99,7 +101,7 @@ class Banner extends ActiveRecord
/**
* @inheritdoc
*/
- public static function tableName()
+ public static function tableName(): string
{
return 'banners';
}
@@ -107,7 +109,7 @@ class Banner extends ActiveRecord
/**
* @inheritdoc
*/
- public function attributeLabels()
+ public function attributeLabels(): array
{
return [
'id' => Yii::t('banners', 'ID'),
@@ -131,7 +133,7 @@ class Banner extends ActiveRecord
public function activate(): void
{
if ($this->isActive()) {
- throw new \DomainException('Banner is already active.');
+ throw new DomainException('Banner is already active.');
}
$this->active = self::STATUS_ACTIVE;
}
@@ -139,7 +141,7 @@ class Banner extends ActiveRecord
public function draft(): void
{
if ($this->isDraft()) {
- throw new \DomainException('Banner is already draft.');
+ throw new DomainException('Banner is already draft.');
}
$this->active = self::STATUS_DRAFT;
}
@@ -155,7 +157,7 @@ class Banner extends ActiveRecord
return $this->active == self::STATUS_DRAFT;
}
- public function getPlace()
+ public function getPlace(): ActiveQuery
{
return $this->hasOne(BannerPlace::class, ['id' => 'place_id']);
}
diff --git a/common/modules/banners/entities/BannerPlace.php b/common/modules/banners/entities/BannerPlace.php
index 1879de5..b2baeaa 100644
--- a/common/modules/banners/entities/BannerPlace.php
+++ b/common/modules/banners/entities/BannerPlace.php
@@ -3,6 +3,8 @@
namespace common\modules\banners\entities;
use common\modules\banners\entities\queries\BannerPlaceQuery;
+use DomainException;
+use yii\db\ActiveQuery;
use yii\db\ActiveRecord;
use Yii;
@@ -46,7 +48,7 @@ class BannerPlace extends ActiveRecord
/**
* @inheritdoc
*/
- public static function tableName()
+ public static function tableName(): string
{
return 'banners_places';
}
@@ -68,7 +70,7 @@ class BannerPlace extends ActiveRecord
public function activate(): void
{
if ($this->isActive()) {
- throw new \DomainException('Place is already active.');
+ throw new DomainException('Place is already active.');
}
$this->active = self::STATUS_ACTIVE;
}
@@ -76,7 +78,7 @@ class BannerPlace extends ActiveRecord
public function draft(): void
{
if ($this->isDraft()) {
- throw new \DomainException('Place is already draft.');
+ throw new DomainException('Place is already draft.');
}
$this->active = self::STATUS_DRAFT;
}
@@ -91,12 +93,12 @@ class BannerPlace extends ActiveRecord
return $this->active == self::STATUS_DRAFT;
}
- public function getBanners()
+ public function getBanners(): ActiveQuery
{
return $this->hasMany(Banner::class, ['place_id' => 'id']);
}
- public function getActiveBanners()
+ public function getActiveBanners(): ActiveQuery
{
return $this->hasMany(Banner::class, ['place_id' => 'id'])->andWhere(['active' => Banner::STATUS_ACTIVE]);
}
diff --git a/common/modules/banners/forms/BannerForm.php b/common/modules/banners/forms/BannerForm.php
index 5b2a1d6..3bc1c6c 100644
--- a/common/modules/banners/forms/BannerForm.php
+++ b/common/modules/banners/forms/BannerForm.php
@@ -9,22 +9,19 @@ use yii\web\UploadedFile;
class BannerForm extends Model
{
- public $title;
+ public ?string $title = null;
- /**
- * @var UploadedFile
- */
- public $image;
- public $url;
- public $target;
- public $active;
- public $start_at;
- public $end_at;
- public $include_urls;
- public $exclude_urls;
- public $place_id;
+ public string|null|UploadedFile $image = null;
+ public ?string $url = null;
+ public ?string $target = null;
+ public ?int $active = null;
+ public ?int $start_at = null;
+ public ?int $end_at = null;
+ public ?string $include_urls = null;
+ public ?string $exclude_urls = null;
+ public ?int $place_id = null;
- public $_banner;
+ public Banner $banner;
public function __construct(Banner $banner = null, $config = [])
{
@@ -39,7 +36,7 @@ class BannerForm extends Model
$this->include_urls = $banner->include_urls;
$this->exclude_urls = $banner->exclude_urls;
$this->place_id = $banner->place_id;
- $this->_banner = $banner;
+ $this->banner = $banner;
}
parent::__construct($config);
}
@@ -53,13 +50,10 @@ class BannerForm extends Model
[['include_urls', 'exclude_urls'], 'string'],
[['image'], 'file', 'extensions' => 'png, jpg, gif'],
[['start_at', 'end_at'], 'safe'],
- /*[['start_at', 'end_at'], 'date',
- 'format' => 'php:d.m.Y H:i'
- ],*/
];
}
- public function attributeLabels()
+ public function attributeLabels(): array
{
return [
'id' => Yii::t('banners', 'ID'),
@@ -80,7 +74,7 @@ class BannerForm extends Model
];
}
- public function beforeValidate()
+ public function beforeValidate(): bool
{
if (parent::beforeValidate()) {
$this->image = UploadedFile::getInstance($this, 'image');
@@ -92,13 +86,4 @@ class BannerForm extends Model
return false;
}
-
- /*public function afterValidate() {
- if (parent::afterValidate()) {
- $this->start_at = strtotime($this->start_at);
- $this->end_at = strtotime($this->end_at);
- return true;
- }
- return false;
- }*/
}
diff --git a/common/modules/banners/forms/BannerPlaceForm.php b/common/modules/banners/forms/BannerPlaceForm.php
index cd334bd..73e9a50 100644
--- a/common/modules/banners/forms/BannerPlaceForm.php
+++ b/common/modules/banners/forms/BannerPlaceForm.php
@@ -8,12 +8,12 @@ use Yii;
class BannerPlaceForm extends Model
{
- public $title;
- public $width;
- public $height;
- public $active;
+ public ?string $title = null;
+ public ?int $width = null;
+ public ?int $height = null;
+ public ?int $active = null;
- public $_place;
+ public BannerPlace $place;
public function __construct(BannerPlace $place = null, $config = [])
{
@@ -22,7 +22,7 @@ class BannerPlaceForm extends Model
$this->width = $place->width;
$this->height = $place->height;
$this->active = $place->active;
- $this->_place = $place;
+ $this->place = $place;
}
parent::__construct($config);
}
diff --git a/common/modules/banners/forms/search/BannerSearch.php b/common/modules/banners/forms/search/BannerSearch.php
index 7308f90..defb6a5 100644
--- a/common/modules/banners/forms/search/BannerSearch.php
+++ b/common/modules/banners/forms/search/BannerSearch.php
@@ -8,11 +8,11 @@ use yii\data\ActiveDataProvider;
class BannerSearch extends Model
{
- public $id;
- public $title;
- public $active;
- public $place_id;
- public $target;
+ public ?int $id = null;
+ public ?string $title = null;
+ public ?int $active = null;
+ public ?int $place_id = null;
+ public ?string $target = null;
public function rules(): array
{
diff --git a/common/modules/banners/forms/search/PlaceSearch.php b/common/modules/banners/forms/search/PlaceSearch.php
index 79347fe..ed825aa 100644
--- a/common/modules/banners/forms/search/PlaceSearch.php
+++ b/common/modules/banners/forms/search/PlaceSearch.php
@@ -8,11 +8,11 @@ use yii\data\ActiveDataProvider;
class PlaceSearch extends Model
{
- public $id;
- public $title;
- public $width;
- public $height;
- public $active;
+ public ?int $id = null;
+ public ?string $title = null;
+ public ?int $width = null;
+ public ?int $height = null;
+ public ?int $active = null;
public function rules(): array
{
diff --git a/common/modules/banners/helpers/BannerHelper.php b/common/modules/banners/helpers/BannerHelper.php
index e25e5e5..ce2c241 100644
--- a/common/modules/banners/helpers/BannerHelper.php
+++ b/common/modules/banners/helpers/BannerHelper.php
@@ -7,6 +7,7 @@
namespace common\modules\banners\helpers;
use common\modules\banners\entities\Banner;
+use Exception;
use yii\helpers\ArrayHelper;
use yii\helpers\Html;
use Yii;
@@ -21,6 +22,11 @@ class BannerHelper
];
}
+ /**
+ * @param $target
+ * @return string
+ * @throws Exception
+ */
public static function targetName($target): string
{
return ArrayHelper::getValue(self::targetList(), $target);
@@ -34,23 +40,28 @@ class BannerHelper
];
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusName($status): string
{
return ArrayHelper::getValue(self::statusList(), $status);
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusLabel($status): string
{
- switch ($status) {
- case Banner::STATUS_DRAFT:
- $class = 'label label-default';
- break;
- case Banner::STATUS_ACTIVE:
- $class = 'label label-success';
- break;
- default:
- $class = 'label label-default';
- }
+ $class = match ($status) {
+ Banner::STATUS_DRAFT => 'label label-default',
+ Banner::STATUS_ACTIVE => 'label label-success',
+ default => 'label label-default',
+ };
return Html::tag('span', ArrayHelper::getValue(self::statusList(), $status), [
'class' => $class,
diff --git a/common/modules/banners/repositories/BannerPlaceRepository.php b/common/modules/banners/repositories/BannerPlaceRepository.php
index 630ed9a..e5024fb 100644
--- a/common/modules/banners/repositories/BannerPlaceRepository.php
+++ b/common/modules/banners/repositories/BannerPlaceRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\banners\repositories;
use common\modules\banners\entities\BannerPlace;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class BannerPlaceRepository
{
@@ -18,14 +20,18 @@ class BannerPlaceRepository
public function save(BannerPlace $place): void
{
if (!$place->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param BannerPlace $place
+ * @throws StaleObjectException
+ */
public function remove(BannerPlace $place): void
{
if (!$place->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
}
diff --git a/common/modules/banners/repositories/BannerRepository.php b/common/modules/banners/repositories/BannerRepository.php
index 61bf2c4..f25bc1c 100644
--- a/common/modules/banners/repositories/BannerRepository.php
+++ b/common/modules/banners/repositories/BannerRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\banners\repositories;
use common\modules\banners\entities\Banner;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class BannerRepository
{
@@ -18,14 +20,18 @@ class BannerRepository
public function save(Banner $banner): void
{
if (!$banner->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param Banner $banner
+ * @throws StaleObjectException
+ */
public function remove(Banner $banner): void
{
if (!$banner->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
}
diff --git a/common/modules/banners/services/BannerManageService.php b/common/modules/banners/services/BannerManageService.php
index 3413fc6..2b874bc 100644
--- a/common/modules/banners/services/BannerManageService.php
+++ b/common/modules/banners/services/BannerManageService.php
@@ -5,22 +5,30 @@ namespace common\modules\banners\services;
use common\modules\banners\entities\Banner;
use common\modules\banners\forms\BannerForm;
use common\modules\banners\repositories\BannerRepository;
+use Yii;
+use yii\base\Exception;
use yii\base\Security;
+use yii\db\StaleObjectException;
class BannerManageService
{
- private $_repository;
+ private BannerRepository $repository;
public function __construct(BannerRepository $repository)
{
- $this->_repository = $repository;
+ $this->repository = $repository;
}
+ /**
+ * @param BannerForm $form
+ * @return Banner
+ * @throws Exception
+ */
public function create(BannerForm $form): Banner
{
if ($form->image) {
$filename = $form->image->baseName . '_' . (new Security())->generateRandomString(5) . '.' . $form->image->extension;
- $path = \Yii::getAlias(Banner::FILE_ORIGINAL_PATH);
+ $path = Yii::getAlias(Banner::FILE_ORIGINAL_PATH);
if (!file_exists($path)) {
mkdir($path, 0777, true);
}
@@ -40,18 +48,23 @@ class BannerManageService
$form->active,
$form->place_id
);
- $this->_repository->save($banner);
+ $this->repository->save($banner);
return $banner;
}
+ /**
+ * @param $id
+ * @param BannerForm $form
+ * @throws Exception
+ */
public function edit($id, BannerForm $form): void
{
- $banner = $this->_repository->get($id);
+ $banner = $this->repository->get($id);
if ($form->image) {
$filename = $form->image->baseName . '_' . (new Security())->generateRandomString(5) . '.' . $form->image->extension;
- $path = \Yii::getAlias(Banner::FILE_ORIGINAL_PATH);
+ $path = Yii::getAlias(Banner::FILE_ORIGINAL_PATH);
$form->image->saveAs($path . '/' . $filename);
$form->image = $filename;
} else {
@@ -70,24 +83,28 @@ class BannerManageService
$form->active,
$form->place_id
);
- $this->_repository->save($banner);
+ $this->repository->save($banner);
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
- $banner = $this->_repository->get($id);
- $this->_repository->remove($banner);
+ $banner = $this->repository->get($id);
+ $this->repository->remove($banner);
}
public function addView(Banner $banner)
{
$banner->views++;
- $this->_repository->save($banner);
+ $this->repository->save($banner);
}
public function addClick(Banner $banner)
{
$banner->clicks++;
- $this->_repository->save($banner);
+ $this->repository->save($banner);
}
}
diff --git a/common/modules/banners/services/BannerPlaceManageService.php b/common/modules/banners/services/BannerPlaceManageService.php
index b362e9b..71bbc1e 100644
--- a/common/modules/banners/services/BannerPlaceManageService.php
+++ b/common/modules/banners/services/BannerPlaceManageService.php
@@ -5,14 +5,15 @@ namespace common\modules\banners\services;
use common\modules\banners\entities\BannerPlace;
use common\modules\banners\forms\BannerPlaceForm;
use common\modules\banners\repositories\BannerPlaceRepository;
+use yii\db\StaleObjectException;
class BannerPlaceManageService
{
- private $_repository;
+ private BannerPlaceRepository $repository;
public function __construct(BannerPlaceRepository $repository)
{
- $this->_repository = $repository;
+ $this->repository = $repository;
}
public function create(BannerPlaceForm $form): BannerPlace
@@ -23,26 +24,30 @@ class BannerPlaceManageService
$form->height,
$form->active
);
- $this->_repository->save($place);
+ $this->repository->save($place);
return $place;
}
public function edit($id, BannerPlaceForm $form): void
{
- $place = $this->_repository->get($id);
+ $place = $this->repository->get($id);
$place->edit(
$form->title,
$form->width,
$form->height,
$form->active
);
- $this->_repository->save($place);
+ $this->repository->save($place);
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
- $place = $this->_repository->get($id);
- $this->_repository->remove($place);
+ $place = $this->repository->get($id);
+ $this->repository->remove($place);
}
}
diff --git a/common/modules/banners/views/manage/banner/_form.php b/common/modules/banners/views/manage/banner/_form.php
index b8fa27c..cf9e385 100644
--- a/common/modules/banners/views/manage/banner/_form.php
+++ b/common/modules/banners/views/manage/banner/_form.php
@@ -1,5 +1,6 @@
title = Yii::t('banners', 'Create Banner');
$this->params['breadcrumbs'][] = ['label' => Yii::t('banners', 'Banners'), 'url' => ['index']];
diff --git a/common/modules/banners/views/manage/banner/index.php b/common/modules/banners/views/manage/banner/index.php
index caa1d10..c1b237e 100644
--- a/common/modules/banners/views/manage/banner/index.php
+++ b/common/modules/banners/views/manage/banner/index.php
@@ -1,6 +1,7 @@
title = Yii::t('banners', 'Banners');
diff --git a/common/modules/banners/views/manage/banner/update.php b/common/modules/banners/views/manage/banner/update.php
index cdf268e..abd44ef 100644
--- a/common/modules/banners/views/manage/banner/update.php
+++ b/common/modules/banners/views/manage/banner/update.php
@@ -1,8 +1,11 @@
title = Yii::t('banners', 'Update Banner: {name}', ['name' => $banner->title]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('banners', 'Banners'), 'url' => ['index']];
diff --git a/common/modules/banners/views/manage/place/_form.php b/common/modules/banners/views/manage/place/_form.php
index 9b962e3..059ba75 100644
--- a/common/modules/banners/views/manage/place/_form.php
+++ b/common/modules/banners/views/manage/place/_form.php
@@ -32,8 +32,8 @@ $this->registerJs($js2);
-
-
+
+
field($model, 'title')->textInput(['maxlength' => true]) ?>
@@ -47,19 +47,20 @@ $this->registerJs($js2);
+
-
- 'btn btn-success']) ?>
-
+
-
-
-
+
+
+
field($model, 'active')->radioList(BannerHelper::statusList()) ?>
diff --git a/common/modules/banners/views/manage/place/index.php b/common/modules/banners/views/manage/place/index.php
index 97624fd..b2f184b 100644
--- a/common/modules/banners/views/manage/place/index.php
+++ b/common/modules/banners/views/manage/place/index.php
@@ -1,26 +1,25 @@
title = Yii::t('banners', 'Places');
$this->params['breadcrumbs'][] = $this->title;
?>
-
-
- 'btn btn-success']) ?>
-
-
-
-
+
+
+ 'btn btn-sm btn-success']) ?>
+
+
$dataProvider,
'filterModel' => $searchModel,
diff --git a/common/modules/banners/widgets/BannerWidget.php b/common/modules/banners/widgets/BannerWidget.php
index ee9b593..00794f8 100644
--- a/common/modules/banners/widgets/BannerWidget.php
+++ b/common/modules/banners/widgets/BannerWidget.php
@@ -12,9 +12,9 @@ use yii\base\Widget;
class BannerWidget extends Widget
{
- public $id;
+ public int $id;
- public function run()
+ public function run(): string
{
$place = BannerPlace::findOne($this->id);
if (!$place) {
@@ -24,7 +24,6 @@ class BannerWidget extends Widget
$banners = Banner::find()
->active()
->showTime()
- //->excludeFree()
->andWhere(['place_id' => $place->id])
->all();
diff --git a/common/modules/banners/widgets/views/banner.php b/common/modules/banners/widgets/views/banner.php
index 76c1eb5..9070d22 100644
--- a/common/modules/banners/widgets/views/banner.php
+++ b/common/modules/banners/widgets/views/banner.php
@@ -4,12 +4,14 @@
* Date: 22.08.2018
*/
+use common\modules\banners\entities\Banner;
use yii\helpers\Html;
use yii\helpers\Url;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $banner \common\modules\banners\entities\Banner;
+ * @var $this View
+ * @var $banner Banner;
*/
$banner_id = 'banner_' . $banner->id;
diff --git a/common/modules/forms/FormsModule.php b/common/modules/forms/FormsModule.php
index 8ae6b91..7e96bde 100644
--- a/common/modules/forms/FormsModule.php
+++ b/common/modules/forms/FormsModule.php
@@ -5,7 +5,9 @@ namespace common\modules\forms;
use common\modules\forms\entities\FormMessage;
use common\modules\forms\urls\FormsUrlRule;
use core\components\modules\ModuleInterface;
+use Yii;
use yii\helpers\ArrayHelper;
+use yii\web\Application;
/**
* blog module definition class
@@ -27,7 +29,7 @@ class FormsModule extends \yii\base\Module implements ModuleInterface
// custom initialization code goes here
}
- public function bootstrap($app)
+ public function bootstrap(Application $app)
{
// add migration path
$app->controllerMap['migrate']['migrationPath'][] = '@common/modules/forms/migrations';
@@ -52,26 +54,26 @@ class FormsModule extends \yii\base\Module implements ModuleInterface
// add menu items
if (basename($app->getBasePath()) === 'backend') {
$app->params['adminMenu'][] = [
- 'label' => \Yii::t('forms', 'Forms'),
- 'icon' => 'address-card-o',
+ 'label' => Yii::t('forms', 'Forms'),
+ 'icon' => 'far fa-address-card',
'items' => [
[
- 'label' => \Yii::t('forms', 'Forms'),
- 'icon' => 'caret-right',
+ 'label' => Yii::t('forms', 'Forms'),
+ 'icon' => 'fas fa-caret-right',
'url' => ['/forms/manage/form/index']
],
[
- 'label' => \Yii::t('forms', 'Messages'),
- 'icon' => 'caret-right',
- 'url' => ['/forms/manage/form-message/index']
+ 'label' => Yii::t('forms', 'Messages'),
+ 'icon' => 'fas fa-caret-right',
+ 'url' => ['/forms/manage/form-message/index'],
],
],
- 'visible' => \Yii::$app->user->can('admin') || \Yii::$app->user->can('FormsManagement'),
+ 'visible' => Yii::$app->user->can('admin') || Yii::$app->user->can('FormsManagement'),
];
}
// prepare notifications
- $new_messages_count = \Yii::$app->moduleManager->isTableExist('{{%forms}}') ? FormMessage::find()->unread()->count() : 0;
+ $new_messages_count = Yii::$app->moduleManager->isTableExist('{{%forms}}') ? FormMessage::find()->unread()->count() : 0;
if ($new_messages_count > 0) {
$app->params['notifications'][] = [
'icon' => 'address-card-o',
diff --git a/common/modules/forms/controllers/FormController.php b/common/modules/forms/controllers/FormController.php
index d5b0228..b9c841e 100644
--- a/common/modules/forms/controllers/FormController.php
+++ b/common/modules/forms/controllers/FormController.php
@@ -9,17 +9,19 @@ namespace common\modules\forms\controllers;
use common\modules\forms\entities\Form;
use common\modules\forms\services\FormMessageManageService;
use frontend\components\FrontendController;
+use RuntimeException;
use yii\base\Model;
use yii\helpers\Html;
use yii\helpers\Json;
use yii\mail\MailerInterface;
use yii\web\NotFoundHttpException;
use Yii;
+use yii\web\Response;
class FormController extends FrontendController
{
- public $mailer;
- public $message_service;
+ public MailerInterface $mailer;
+ public FormMessageManageService $message_service;
public function __construct(
string $id,
@@ -33,7 +35,12 @@ class FormController extends FrontendController
$this->message_service = $message_service;
}
- public function actionSend($id)
+ /**
+ * @param $id
+ * @return Response|string
+ * @throws NotFoundHttpException
+ */
+ public function actionSend($id): Response|string
{
$form = $this->findModel($id);
@@ -50,8 +57,6 @@ class FormController extends FrontendController
if ($form->complete_page_id) {
return $this->redirect(['/pages/page/view', 'id' => $form->complete_page_id]);
}
-
- //return $form->complete_text;
return $this->render('view', ['text' => $form->complete_text]);
}
@@ -78,7 +83,7 @@ class FormController extends FrontendController
->setSubject($form->subject)
->send();
if (!$sent) {
- throw new \RuntimeException('Sending error.');
+ throw new RuntimeException('Sending error.');
}
}
@@ -99,7 +104,7 @@ class FormController extends FrontendController
$item['name'] = str_replace('-', '_', $item['name']);
$items[] = [
- 'key' => isset($item['label']) ? $item['label'] : '',
+ 'key' => $item['label'] ?? '',
'value' => is_array($dynaForm->{$item['name']}) ? implode(', ', array_map(function ($el) {
return Html::encode($el);
}, $dynaForm->{$item['name']})) : Html::encode($dynaForm->{$item['name']}),
@@ -109,18 +114,11 @@ class FormController extends FrontendController
return $items;
}
- /*private function prepareMessage($json_string, $dynaForm): string
- {
- $message = '';
- $json = Json::decode($json_string, true);
- foreach ($json as $item) {
- if ($item['type'] == 'button') {continue;}
- $item['name'] = str_replace('-', '_', $item['name']);
- $message.=$item['label'] . ': ' . Html::encode($dynaForm->{$item['name']}) . "\n";
- }
- return $message;
- }*/
-
+ /**
+ * @param $id
+ * @return Form
+ * @throws NotFoundHttpException
+ */
protected function findModel($id): Form
{
if (($model = Form::findOne($id)) !== null) {
diff --git a/common/modules/forms/controllers/manage/FormController.php b/common/modules/forms/controllers/manage/FormController.php
index a6c78db..cd12b82 100644
--- a/common/modules/forms/controllers/manage/FormController.php
+++ b/common/modules/forms/controllers/manage/FormController.php
@@ -7,6 +7,7 @@ use common\modules\forms\forms\FormSearch;
use common\modules\forms\entities\Form;
use common\modules\pages\entities\Page;
use common\modules\forms\forms\FormForm;
+use DomainException;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
@@ -16,12 +17,12 @@ use Yii;
class FormController extends Controller
{
- private $_service;
+ private FormManageService $service;
public function __construct($id, $module, FormManageService $service, $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
public function behaviors(): array
@@ -50,9 +51,9 @@ class FormController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new FormSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -69,7 +70,7 @@ class FormController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'form' => $this->findModel($id),
@@ -77,17 +78,17 @@ class FormController extends Controller
}
/**
- * @return mixed
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): string|Response
{
$form = new FormForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $form = $this->_service->create($form);
+ $form = $this->service->create($form);
return $this->redirect(['view', 'id' => $form->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -101,20 +102,20 @@ class FormController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$form_model = $this->findModel($id);
$form = new FormForm($form_model);
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_service->edit($form_model->id, $form);
+ $this->service->edit($form_model->id, $form);
return $this->redirect(['view', 'id' => $form_model->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -129,13 +130,13 @@ class FormController extends Controller
/**
* @param integer $id
*
- * @return mixed
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
- $this->_service->remove($id);
- } catch (\DomainException $e) {
+ $this->service->remove($id);
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -143,10 +144,9 @@ class FormController extends Controller
return $this->redirect(['index']);
}
-
public function actionPageSearch($q = null, $id = null)
{
- \Yii::$app->response->format = Response::FORMAT_JSON;
+ Yii::$app->response->format = Response::FORMAT_JSON;
$out = ['results' => ['id' => '', 'text' => '']];
if (!is_null($q)) {
$data = [];
@@ -167,19 +167,6 @@ class FormController extends Controller
$tag_name = Page::findOne($id)->translation->title;
$out['results'] = ['id' => $tag_name, 'text' => $tag_name];
} else {
- /*$data = [];
- $pages = Page::find()
- ->with('translation')
- ->leftJoin('{{%pages_lng}}', '`pages_lng`.`page_id` = `pages`.`id`')
- ->limit(20)
- ->all();
- foreach ($pages as $page) {
- $data[] = [
- 'id' => $page->id,
- 'text' => isset($page->translation) ? $page->translation->title : null,
- ];
- }*/
-
$data = [];
$pages = Page::find()->typePublic()->orderBy(['id' => SORT_DESC])->limit(20)->all();
foreach ($pages as $page) {
@@ -200,7 +187,7 @@ class FormController extends Controller
* @return Form the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): Form
+ protected function findModel(int $id): Form
{
if (($model = Form::findOne($id)) !== null) {
return $model;
diff --git a/common/modules/forms/controllers/manage/FormMessageController.php b/common/modules/forms/controllers/manage/FormMessageController.php
index 3b06a8f..bab4f4d 100644
--- a/common/modules/forms/controllers/manage/FormMessageController.php
+++ b/common/modules/forms/controllers/manage/FormMessageController.php
@@ -5,6 +5,7 @@ namespace common\modules\forms\controllers\manage;
use common\modules\forms\entities\FormMessage;
use common\modules\forms\forms\FormMessageSearch;
use common\modules\forms\services\FormMessageManageService;
+use DomainException;
use yii\helpers\Json;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
@@ -15,7 +16,7 @@ use yii\web\Response;
class FormMessageController extends Controller
{
- private $service;
+ private FormMessageManageService $service;
public function __construct($id, $module, FormMessageManageService $service, $config = [])
{
@@ -49,9 +50,9 @@ class FormMessageController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new FormMessageSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -68,7 +69,7 @@ class FormMessageController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
$this->service->setRead($id);
return $this->render('view', [
@@ -78,13 +79,13 @@ class FormMessageController extends Controller
/**
* @param integer $id
- * @return mixed
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
$this->service->remove($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -94,7 +95,7 @@ class FormMessageController extends Controller
public function actionDeleteSelected()
{
$post = Yii::$app->request->post();
- $ids = isset($post['ids']) ? $post['ids'] : null;
+ $ids = $post['ids'] ?? null;
Yii::$app->response->format = Response::FORMAT_JSON;
if (!$ids) {
return [
@@ -107,7 +108,7 @@ class FormMessageController extends Controller
{
try {
$this->service->remove($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
return [
@@ -121,10 +122,10 @@ class FormMessageController extends Controller
];
}
- public function actionReadSelected()
+ public function actionReadSelected(): array
{
$post = Yii::$app->request->post();
- $ids = isset($post['ids']) ? $post['ids'] : null;
+ $ids = $post['ids'] ?? null;
Yii::$app->response->format = Response::FORMAT_JSON;
if (!$ids) {
return [
@@ -137,7 +138,7 @@ class FormMessageController extends Controller
{
try {
$this->service->setRead($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
return [
@@ -150,10 +151,10 @@ class FormMessageController extends Controller
];
}
- public function actionUnreadSelected()
+ public function actionUnreadSelected(): array
{
$post = Yii::$app->request->post();
- $ids = isset($post['ids']) ? $post['ids'] : null;
+ $ids = $post['ids'] ?? null;
Yii::$app->response->format = Response::FORMAT_JSON;
if (!$ids) {
return [
@@ -166,7 +167,7 @@ class FormMessageController extends Controller
{
try {
$this->service->setUnread($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
return [
diff --git a/common/modules/forms/entities/Form.php b/common/modules/forms/entities/Form.php
index 3eefb7e..7835afd 100644
--- a/common/modules/forms/entities/Form.php
+++ b/common/modules/forms/entities/Form.php
@@ -4,6 +4,7 @@ namespace common\modules\forms\entities;
use common\modules\forms\entities\queries\FormQuery;
use yii\behaviors\TimestampBehavior;
+use yii\db\ActiveQuery;
use yii\db\ActiveRecord;
use Yii;
@@ -95,7 +96,8 @@ class Form extends ActiveRecord
];
}
- public function attributeLabels() {
+ public function attributeLabels(): array
+ {
return [
'name' => Yii::t('forms', 'Name'),
'data' => Yii::t('forms', 'Form'),
@@ -110,7 +112,7 @@ class Form extends ActiveRecord
];
}
- public function getMessages()
+ public function getMessages(): ActiveQuery
{
return $this->hasMany(FormMessage::class, ['form_id' => 'id']);
}
@@ -119,4 +121,4 @@ class Form extends ActiveRecord
{
return new FormQuery(static::class);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/entities/FormMessage.php b/common/modules/forms/entities/FormMessage.php
index 2983cb4..c151df0 100644
--- a/common/modules/forms/entities/FormMessage.php
+++ b/common/modules/forms/entities/FormMessage.php
@@ -4,6 +4,7 @@ namespace common\modules\forms\entities;
use common\modules\forms\entities\queries\FormMessageQuery;
use yii\behaviors\TimestampBehavior;
+use yii\db\ActiveQuery;
use yii\db\ActiveRecord;
use Yii;
@@ -62,14 +63,15 @@ class FormMessage extends ActiveRecord
];
}
- public function attributeLabels() {
+ public function attributeLabels(): array
+ {
return [
'form_id' => Yii::t('forms', 'Form'),
'data' => Yii::t('forms', 'Form Data'),
];
}
- public function getForm()
+ public function getForm(): ActiveQuery
{
return $this->hasOne(Form::class, ['id' => 'form_id']);
}
@@ -78,4 +80,4 @@ class FormMessage extends ActiveRecord
{
return new FormMessageQuery(static::class);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/forms/FormForm.php b/common/modules/forms/forms/FormForm.php
index b16eb90..d9fdf35 100644
--- a/common/modules/forms/forms/FormForm.php
+++ b/common/modules/forms/forms/FormForm.php
@@ -9,18 +9,18 @@ use yii\helpers\Json;
class FormForm extends Model
{
- public $name;
- public $data;
- public $subject;
- public $from;
- public $reply;
- public $return;
- public $complete_text;
- public $complete_page_id;
- public $status;
- public $captcha;
+ public ?string $name = null;
+ public ?string $data = null;
+ public ?string $subject = null;
+ public ?string $from = null;
+ public ?string $reply = null;
+ public ?string $return = null;
+ public ?string $complete_text = null;
+ public ?int $complete_page_id = null;
+ public ?int $status = null;
+ public ?int $captcha = null;
- public $_form;
+ public Form $form;
public function __construct(Form $form = null, $config = [])
{
@@ -36,7 +36,7 @@ class FormForm extends Model
$this->status = $form->status;
$this->captcha = $form->captcha;
- $this->_form = $form;
+ $this->form = $form;
}
else {
$this->data = Json::encode([]);
@@ -56,7 +56,8 @@ class FormForm extends Model
];
}
- public function attributeLabels() {
+ public function attributeLabels(): array
+ {
return [
'name' => Yii::t('forms', 'Name'),
'data' => Yii::t('forms', 'Form'),
@@ -70,4 +71,4 @@ class FormForm extends Model
'captcha' => Yii::t('forms', 'Use Captcha'),
];
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/forms/FormMessageSearch.php b/common/modules/forms/forms/FormMessageSearch.php
index 6e965a2..4ea3764 100644
--- a/common/modules/forms/forms/FormMessageSearch.php
+++ b/common/modules/forms/forms/FormMessageSearch.php
@@ -8,8 +8,8 @@ use yii\data\ActiveDataProvider;
class FormMessageSearch extends Model
{
- public $id;
- public $form_id;
+ public ?int $id = null;
+ public ?int $form_id = null;
public function rules(): array
{
diff --git a/common/modules/forms/forms/FormSearch.php b/common/modules/forms/forms/FormSearch.php
index 863c33f..ffd3a39 100644
--- a/common/modules/forms/forms/FormSearch.php
+++ b/common/modules/forms/forms/FormSearch.php
@@ -8,10 +8,10 @@ use common\modules\forms\entities\Form;
class FormSearch extends Model
{
- public $id;
- public $name;
- public $slug;
- public $subject;
+ public ?int $id = null;
+ public ?string $name = null;
+ public ?string $slug = null;
+ public ?string $subject = null;
public function rules(): array
{
diff --git a/common/modules/forms/helpers/FormHelper.php b/common/modules/forms/helpers/FormHelper.php
index 0a62cd2..d4315ae 100644
--- a/common/modules/forms/helpers/FormHelper.php
+++ b/common/modules/forms/helpers/FormHelper.php
@@ -6,8 +6,8 @@
namespace common\modules\forms\helpers;
-
use common\modules\forms\entities\Form;
+use Exception;
use Yii;
use yii\helpers\ArrayHelper;
use yii\helpers\Html;
@@ -21,26 +21,31 @@ class FormHelper {
];
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusName($status): string
{
return ArrayHelper::getValue(self::statusList(), $status);
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusLabel($status): string
{
- switch ($status) {
- case Form::STATUS_DRAFT:
- $class = 'label label-default';
- break;
- case Form::STATUS_ACTIVE:
- $class = 'label label-success';
- break;
- default:
- $class = 'label label-default';
- }
+ $class = match ($status) {
+ Form::STATUS_DRAFT => 'label label-default',
+ Form::STATUS_ACTIVE => 'label label-success',
+ default => 'label label-default',
+ };
return Html::tag('span', ArrayHelper::getValue(self::statusList(), $status), [
'class' => $class,
]);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/mail/form-html.php b/common/modules/forms/mail/form-html.php
index 50b867a..e33b8e2 100644
--- a/common/modules/forms/mail/form-html.php
+++ b/common/modules/forms/mail/form-html.php
@@ -4,8 +4,10 @@
* Date: 01.08.2018
*/
+use yii\web\View;
+
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $items array
*/
?>
diff --git a/common/modules/forms/mail/form-text.php b/common/modules/forms/mail/form-text.php
index 4ec8c6c..89848f3 100644
--- a/common/modules/forms/mail/form-text.php
+++ b/common/modules/forms/mail/form-text.php
@@ -4,8 +4,10 @@
* Date: 01.08.2018
*/
+use yii\web\View;
+
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $items array
*/
?>
diff --git a/common/modules/forms/repositories/FormMessageRepository.php b/common/modules/forms/repositories/FormMessageRepository.php
index 32499d5..6f12e91 100644
--- a/common/modules/forms/repositories/FormMessageRepository.php
+++ b/common/modules/forms/repositories/FormMessageRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\forms\repositories;
use common\modules\forms\entities\FormMessage;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class FormMessageRepository
{
@@ -18,14 +20,18 @@ class FormMessageRepository
public function save(FormMessage $message): void
{
if (!$message->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param FormMessage $message
+ * @throws StaleObjectException
+ */
public function remove(FormMessage $message): void
{
if (!$message->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/repositories/FormRepository.php b/common/modules/forms/repositories/FormRepository.php
index 41b8cce..a468642 100644
--- a/common/modules/forms/repositories/FormRepository.php
+++ b/common/modules/forms/repositories/FormRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\forms\repositories;
use common\modules\forms\entities\Form;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class FormRepository
{
@@ -18,14 +20,18 @@ class FormRepository
public function save(Form $form): void
{
if (!$form->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param Form $form
+ * @throws StaleObjectException
+ */
public function remove(Form $form): void
{
if (!$form->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/services/FormManageService.php b/common/modules/forms/services/FormManageService.php
index 431ab6a..735bc54 100644
--- a/common/modules/forms/services/FormManageService.php
+++ b/common/modules/forms/services/FormManageService.php
@@ -6,18 +6,19 @@ use common\modules\forms\entities\Form;
use common\modules\forms\forms\FormForm;
use common\modules\forms\repositories\FormRepository;
use common\modules\forms\widgets\FormGenerator;
+use yii\db\StaleObjectException;
use yii\helpers\Json;
class FormManageService
{
- private $repository;
+ private FormRepository $repository;
public function __construct(FormRepository $repository)
{
$this->repository = $repository;
}
- public function clearJsonLabels($json)
+ public function clearJsonLabels($json): string
{
$new_data = [];
$data = Json::decode($json, true);
@@ -70,6 +71,10 @@ class FormManageService
FormGenerator::generateFormView($id, Json::decode($form->data, true));
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
$form = $this->repository->get($id);
diff --git a/common/modules/forms/services/FormMessageManageService.php b/common/modules/forms/services/FormMessageManageService.php
index 719d066..7902eb4 100644
--- a/common/modules/forms/services/FormMessageManageService.php
+++ b/common/modules/forms/services/FormMessageManageService.php
@@ -4,10 +4,11 @@ namespace common\modules\forms\services;
use common\modules\forms\entities\FormMessage;
use common\modules\forms\repositories\FormMessageRepository;
+use yii\db\StaleObjectException;
class FormMessageManageService
{
- private $repository;
+ private FormMessageRepository $repository;
public function __construct(FormMessageRepository $repository)
{
@@ -48,6 +49,10 @@ class FormMessageManageService
$this->repository->save($message);
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
$message = $this->repository->get($id);
diff --git a/common/modules/forms/urls/FormsUrlRule.php b/common/modules/forms/urls/FormsUrlRule.php
index 8286a9c..37ade5c 100644
--- a/common/modules/forms/urls/FormsUrlRule.php
+++ b/common/modules/forms/urls/FormsUrlRule.php
@@ -10,22 +10,22 @@ use yii;
class FormsUrlRule extends BaseObject implements UrlRuleInterface
{
- public $prefix = 'forms/form/send';
+ public string $prefix = 'forms/form/send';
- private $_repository;
+ private FormRepository $repository;
public function __construct(FormRepository $repository, array $config = [])
{
parent::__construct($config);
- $this->_repository = $repository;
+ $this->repository = $repository;
}
- public function parseRequest($manager, $request)
+ public function parseRequest($manager, $request): bool|array
{
$uri = ltrim(LanguageHelper::processLangInUrl($request->pathInfo), '/');
if ($uri == $this->prefix) {
$id = Yii::$app->request->get('id');
- $form = $this->_repository->get($id);
+ $form = $this->repository->get($id);
if ($form) {
return [$uri, ['id' => $id]];
@@ -34,7 +34,7 @@ class FormsUrlRule extends BaseObject implements UrlRuleInterface
return false;
}
- public function createUrl($manager, $route, $params)
+ public function createUrl($manager, $route, $params): bool
{
return false;
}
diff --git a/common/modules/forms/views/form/view.php b/common/modules/forms/views/form/view.php
index 909c761..d464d63 100644
--- a/common/modules/forms/views/form/view.php
+++ b/common/modules/forms/views/form/view.php
@@ -4,11 +4,12 @@
* Date: 01.08.2018
*/
+use yii\web\View;
+
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $text string
*/
-
?>
diff --git a/common/modules/forms/views/manage/form-message/index.php b/common/modules/forms/views/manage/form-message/index.php
index 7c76bd7..ef087af 100644
--- a/common/modules/forms/views/manage/form-message/index.php
+++ b/common/modules/forms/views/manage/form-message/index.php
@@ -1,6 +1,7 @@
title = Yii::t('forms', 'Messages');
@@ -100,14 +102,14 @@ $this->registerJs($js2, $this::POS_HEAD);
diff --git a/common/modules/forms/views/manage/form-message/view.php b/common/modules/forms/views/manage/form-message/view.php
index b0c8066..632e684 100644
--- a/common/modules/forms/views/manage/form-message/view.php
+++ b/common/modules/forms/views/manage/form-message/view.php
@@ -1,7 +1,6 @@
registerJs($js2);
-
-
-
+
+
+
- [
[
'label' => Yii::t('forms', 'Common'),
diff --git a/common/modules/forms/views/manage/form/_form/_form-builder.php b/common/modules/forms/views/manage/form/_form/_form-builder.php
index ae9b7a7..2bc3f7c 100644
--- a/common/modules/forms/views/manage/form/_form/_form-builder.php
+++ b/common/modules/forms/views/manage/form/_form/_form-builder.php
@@ -4,13 +4,16 @@
* Date: 29.07.2018
*/
+use backend\components\form_builder\assets\FormBuilderAsset;
+use common\modules\forms\forms\FormForm;
use \yii\helpers\Json;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $model \common\modules\forms\forms\FormForm
+ * @var $this View
+ * @var $model FormForm
*/
-$bundle = \backend\components\form_builder\assets\FormBuilderAsset::register($this);
+$bundle = FormBuilderAsset::register($this);
$lng = str_replace('_', '-', Yii::$app->language);
$lng_file = $bundle->baseUrl . '/js/languages/';
diff --git a/common/modules/forms/views/manage/form/_form/_form-items.php b/common/modules/forms/views/manage/form/_form/_form-items.php
index 717ad54..fcf061d 100644
--- a/common/modules/forms/views/manage/form/_form/_form-items.php
+++ b/common/modules/forms/views/manage/form/_form/_form-items.php
@@ -4,14 +4,18 @@
* Date: 29.07.2018
*/
+use common\modules\forms\forms\FormForm;
+use kartik\widgets\Select2;
+use yii\web\View;
+use yii\widgets\ActiveForm;
use zertex\ckeditor\CKEditor;
use yii\web\JsExpression;
use yii\helpers\Url;
/**
- * @var $this \yii\web\View
- * @var $form \yii\widgets\ActiveForm
- * @var $model \common\modules\forms\forms\FormForm
+ * @var $this View
+ * @var $form ActiveForm
+ * @var $model FormForm
*/
$fetchUrl = Url::to( [ '/forms/manage/form/page-search' ] );
@@ -38,7 +42,7 @@ $fetchUrl = Url::to( [ '/forms/manage/form/page-search' ] );
field($model, 'complete_text')->widget(CKEditor::class) ?>
- field($model, 'complete_page_id')->widget(\kartik\widgets\Select2::class, [
+ field($model, 'complete_page_id')->widget(Select2::class, [
'options' => [
'placeholder' => Yii::t('forms', 'Select page...'),
'id' => 'page_select',
diff --git a/common/modules/forms/views/manage/form/create.php b/common/modules/forms/views/manage/form/create.php
index 0ca88bc..61e64f9 100644
--- a/common/modules/forms/views/manage/form/create.php
+++ b/common/modules/forms/views/manage/form/create.php
@@ -1,7 +1,9 @@
title = Yii::t('forms', 'Create Form');
$this->params['breadcrumbs'][] = ['label' => Yii::t('forms', 'Forms'), 'url' => ['index']];
diff --git a/common/modules/forms/views/manage/form/index.php b/common/modules/forms/views/manage/form/index.php
index 0ee4f37..8502c7d 100644
--- a/common/modules/forms/views/manage/form/index.php
+++ b/common/modules/forms/views/manage/form/index.php
@@ -1,12 +1,13 @@
title = Yii::t('forms', 'Forms');
diff --git a/common/modules/forms/views/manage/form/update.php b/common/modules/forms/views/manage/form/update.php
index 510e057..27e10c2 100644
--- a/common/modules/forms/views/manage/form/update.php
+++ b/common/modules/forms/views/manage/form/update.php
@@ -1,8 +1,11 @@
title = Yii::t('forms', 'Update Form: {name}', ['name' => $form_model->name]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('pages', 'Pages'), 'url' => ['index']];
diff --git a/common/modules/forms/widgets/FormClassField.php b/common/modules/forms/widgets/FormClassField.php
index 596dd06..ea1516e 100644
--- a/common/modules/forms/widgets/FormClassField.php
+++ b/common/modules/forms/widgets/FormClassField.php
@@ -6,7 +6,6 @@
namespace common\modules\forms\widgets;
-
class FormClassField
{
public function text(array $settings): string
@@ -44,4 +43,4 @@ class FormClassField
}
return "['{$settings['name']}', 'string'],";
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/widgets/FormGenerator.php b/common/modules/forms/widgets/FormGenerator.php
index 967b194..1bd1849 100644
--- a/common/modules/forms/widgets/FormGenerator.php
+++ b/common/modules/forms/widgets/FormGenerator.php
@@ -6,8 +6,7 @@
namespace common\modules\forms\widgets;
-
-use yii\web\View;
+use Yii;
class FormGenerator
{
@@ -17,44 +16,24 @@ class FormGenerator
$fields = [];
$fieldRender = new FormViewField();
- //print_r($json); die;
-
foreach ($json as $item) {
if ( isset( $item['name'] ) ) {
$item['name'] = str_replace( '-', '_', $item['name'] );
}
- switch ($item['type']) {
- case 'text':
- $fields[] = $fieldRender->text($item);
- break;
- case 'header':
- $fields[] = $fieldRender->header($item);
- break;
- case 'paragraph':
- $fields[] = $fieldRender->paragraph($item);
- break;
- case 'hidden':
- $fields[] = $fieldRender->hidden($item);
- break;
- case 'radio-group':
- $fields[] = $fieldRender->radioGroup($item);
- break;
- case 'checkbox-group':
- $fields[] = $fieldRender->checkboxGroup($item);
- break;
- case 'select':
- $fields[] = $fieldRender->select($item);
- break;
- case 'button':
- $fields[] = $fieldRender->button($item);
- break;
- case 'textarea':
- $fields[] = $fieldRender->textArea($item);
- break;
- }
+ $fields[] = match ($item['type']) {
+ 'text' => $fieldRender->text($item),
+ 'header' => $fieldRender->header($item),
+ 'paragraph' => $fieldRender->paragraph($item),
+ 'hidden' => $fieldRender->hidden($item),
+ 'radio-group' => $fieldRender->radioGroup($item),
+ 'checkbox-group' => $fieldRender->checkboxGroup($item),
+ 'select' => $fieldRender->select($item),
+ 'button' => $fieldRender->button($item),
+ 'textarea' => $fieldRender->textArea($item),
+ };
}
$fields = implode("\n", $fields);
- $tpl = file_get_contents(\Yii::getAlias('@common/modules/forms/widgets/templates/DynaView.tpl'));
+ $tpl = file_get_contents(Yii::getAlias('@common/modules/forms/widgets/templates/DynaView.tpl'));
$tpl = preg_replace([
'/\{\$fields\}/'
@@ -62,7 +41,7 @@ class FormGenerator
$fields
], $tpl);
- file_put_contents(\Yii::getAlias('@common/modules/forms/runtime/' . $viewName . '.php'), $tpl);
+ file_put_contents(Yii::getAlias('@common/modules/forms/runtime/' . $viewName . '.php'), $tpl);
}
@@ -127,7 +106,7 @@ class FormGenerator
$options = [];
//$options[] = $selected ? "'value' => [{$selected}]" : "";
$options = implode(',', array_filter($options));
- $description = isset($item['description']) ? $item['description'] : '';
+ $description = $item['description'] ?? '';
$fields[] = "field(\$model, '{$item['name']}')
->radioList([
{$values}
@@ -153,7 +132,7 @@ class FormGenerator
$options = [];
//$options[] = $selected ? "'value' => [{$selected}]" : "";
$options = implode(',', array_filter($options));
- $description = isset($item['description']) ? $item['description'] : '';
+ $description = $item['description'] ?? '';
$fields[] = "field(\$model, '{$item['name']}')
->checkboxList([
{$values}
@@ -177,7 +156,7 @@ class FormGenerator
$options[] = isset($item['placeholder']) ? "'prompt' => '{$item['placeholder']}'" : "";
$options[] = isset($item['multiple']) && $item['multiple'] == true ? "'multiple' => 'multiple'" : "";
$options = implode(',', array_filter($options));
- $description = isset($item['description']) ? $item['description'] : '';
+ $description = $item['description'] ?? '';
$fields[] = "field(\$model, '{$item['name']}')->dropDownList([{$values}], [{$options}])->hint('{$description}') ?>";
}
@@ -212,7 +191,7 @@ use yii\\helpers\\Html;
VIEW;
- file_put_contents(\Yii::getAlias('@common/modules/forms/runtime/' . $viewName . '.php'), $view);
+ file_put_contents(Yii::getAlias('@common/modules/forms/runtime/' . $viewName . '.php'), $view);
}
public static function generateFormClass2($id, $json)
@@ -298,7 +277,7 @@ class {$className} extends Model
}
CLASS;
- file_put_contents(\Yii::getAlias('@common/modules/forms/runtime/' . $className . '.php'), $classData);
+ file_put_contents(Yii::getAlias('@common/modules/forms/runtime/' . $className . '.php'), $classData);
}
public static function generateFormClass($id, $json)
@@ -384,6 +363,6 @@ class {$className} extends Model
}
CLASS;
- file_put_contents(\Yii::getAlias('@common/modules/forms/runtime/' . $className . '.php'), $classData);
+ file_put_contents(Yii::getAlias('@common/modules/forms/runtime/' . $className . '.php'), $classData);
}
}
diff --git a/common/modules/forms/widgets/FormViewField.php b/common/modules/forms/widgets/FormViewField.php
index aa5f6d0..92cadf8 100644
--- a/common/modules/forms/widgets/FormViewField.php
+++ b/common/modules/forms/widgets/FormViewField.php
@@ -6,7 +6,6 @@
namespace common\modules\forms\widgets;
-
class FormViewField
{
public function text(array $settings): string
@@ -35,14 +34,12 @@ class FormViewField
public function header(array $settings): string
{
- $field = "<{$settings['subtype']}>{$settings['label']}";
- return $field;
+ return "<{$settings['subtype']}>{$settings['label']}";
}
public function paragraph(array $settings): string
{
- $field = "<{$settings['subtype']}>{$settings['label']}";
- return $field;
+ return "<{$settings['subtype']}>{$settings['label']}";
}
public function hidden(array $settings): string
@@ -50,8 +47,7 @@ class FormViewField
$options = [];
$options[] = isset($item['value']) ? "'value' => '{$settings['value']}'" : "";
$options = implode(',', array_filter($options));
- $field = "field(\$model, '{$settings['name']}')->hiddenInput([{$options}])->label(false) ?>";
- return $field;
+ return "field(\$model, '{$settings['name']}')->hiddenInput([{$options}])->label(false) ?>";
}
public function radioGroup(array $settings): string
@@ -73,12 +69,11 @@ class FormViewField
$options = [];
$options = implode(',', array_filter($options));
- $description = isset($settings['description']) ? $settings['description'] : '';
- $field = "field(\$model, '{$settings['name']}')
+ $description = $settings['description'] ?? '';
+ return "field(\$model, '{$settings['name']}')
->radioList([
{$values}
], [{$options}])->hint('{$description}'); ?>";
- return $field;
}
public function checkboxGroup(array $settings): string
@@ -100,12 +95,11 @@ class FormViewField
$options = [];
$options = implode(',', array_filter($options));
- $description = isset($settings['description']) ? $settings['description'] : '';
- $field = "field(\$model, '{$settings['name']}')
+ $description = $settings['description'] ?? '';
+ return "field(\$model, '{$settings['name']}')
->checkboxList([
{$values}
], [{$options}])->hint('{$description}'); ?>";
- return $field;
}
public function select(array $settings): string
@@ -126,25 +120,21 @@ class FormViewField
$options[] = isset($settings['placeholder']) ? "'prompt' => '{$settings['placeholder']}'" : "";
$options[] = isset($settings['multiple']) && $settings['multiple'] == true ? "'multiple' => 'multiple'" : "";
$options = implode(',', array_filter($options));
- $description = isset($settings['description']) ? $settings['description'] : '';
- $field = "field(\$model, '{$settings['name']}')->dropDownList([{$values}], [{$options}])->hint('{$description}') ?>";
- return $field;
+ $description = $settings['description'] ?? '';
+ return "field(\$model, '{$settings['name']}')->dropDownList([{$values}], [{$options}])->hint('{$description}') ?>";
}
public function button(array $settings): string
{
- $style = isset($settings['style']) ? $settings['style'] : 'default';
+ $style = $settings['style'] ?? 'default';
if ($settings['subtype'] == 'submit') {
- $field = " 'btn btn-{$style}']) ?>";
- return $field;
+ return " 'btn btn-{$style}']) ?>";
}
elseif ($settings['subtype'] == 'button') {
- $field = " 'btn btn-{$style}']) ?>";
- return $field;
+ return " 'btn btn-{$style}']) ?>";
}
elseif ($settings['subtype'] == 'reset') {
- $field = " 'btn btn-{$style}']) ?>";
- return $field;
+ return " 'btn btn-{$style}']) ?>";
}
return '';
}
diff --git a/common/modules/forms/widgets/FormWidget.php b/common/modules/forms/widgets/FormWidget.php
index 71d0d61..40b4631 100644
--- a/common/modules/forms/widgets/FormWidget.php
+++ b/common/modules/forms/widgets/FormWidget.php
@@ -11,9 +11,10 @@ use yii\base\Widget;
class FormWidget extends Widget
{
- public $id;
+ public int $id;
- public function run() {
+ public function run(): string
+ {
$form = Form::findOne($this->id);
if (!$form) {
return 'Form is not found';
@@ -24,4 +25,4 @@ class FormWidget extends Widget
return $this->renderFile(\Yii::getAlias('@common/modules/forms/runtime/' . 'DynaView' . $this->id . '.php'), ['model' => $dynaForm, 'form_entity' => $form]);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/languages/LanguagesModule.php b/common/modules/languages/LanguagesModule.php
index 528115e..1339a6c 100644
--- a/common/modules/languages/LanguagesModule.php
+++ b/common/modules/languages/LanguagesModule.php
@@ -4,6 +4,7 @@ namespace common\modules\languages;
use core\components\modules\ModuleInterface;
use yii\helpers\ArrayHelper;
+use yii\web\Application;
/**
@@ -26,7 +27,7 @@ class LanguagesModule extends \yii\base\Module implements ModuleInterface
// custom initialization code goes here
}
- public function bootstrap($app)
+ public function bootstrap(Application $app)
{
// add migration path
$app->controllerMap['migrate']['migrationPath'][] = '@common/modules/languages/migrations';
@@ -47,7 +48,7 @@ class LanguagesModule extends \yii\base\Module implements ModuleInterface
if (basename($app->getBasePath()) === 'backend') {
$app->params['adminMenu'][] = [
'label' => \Yii::t( 'languages', 'Site Languages' ),
- 'icon' => 'language',
+ 'icon' => 'fas fa-globe-americas',
'url' => [ '/languages/manage/language/index' ],
'visible' => \Yii::$app->user->can( 'admin' ) || \Yii::$app->user->can( 'LanguagesManagement' )
];
diff --git a/common/modules/languages/controllers/manage/LanguageController.php b/common/modules/languages/controllers/manage/LanguageController.php
index d79f872..13ad30b 100644
--- a/common/modules/languages/controllers/manage/LanguageController.php
+++ b/common/modules/languages/controllers/manage/LanguageController.php
@@ -6,15 +6,17 @@ use common\modules\languages\entities\Language;
use common\modules\languages\forms\LanguageForm;
use common\modules\languages\forms\search\LanguageSearch;
use common\modules\languages\services\LanguageManageService;
+use DomainException;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\web\Controller;
use Yii;
+use yii\web\Response;
class LanguageController extends Controller
{
- private $service;
+ private LanguageManageService $service;
public function __construct($id, $module, LanguageManageService $service, $config = [])
{
@@ -49,9 +51,9 @@ class LanguageController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new LanguageSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -68,7 +70,7 @@ class LanguageController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'language' => $this->findModel($id),
@@ -76,9 +78,9 @@ class LanguageController extends Controller
}
/**
- * @return mixed
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): string|Response
{
$form = new LanguageForm();
@@ -86,7 +88,7 @@ class LanguageController extends Controller
try {
$form = $this->service->create($form);
return $this->redirect(['view', 'id' => $form->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -102,10 +104,10 @@ class LanguageController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$language = $this->findModel($id);
$form = new LanguageForm($language);
@@ -114,7 +116,7 @@ class LanguageController extends Controller
try {
$this->service->edit($language->id, $form);
return $this->redirect(['view', 'id' => $language->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -128,20 +130,25 @@ class LanguageController extends Controller
/**
* @param integer $id
- * @return mixed
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
$this->service->remove($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
return $this->redirect(['index']);
}
- public function actionSetDefault($id)
+ /**
+ * @param $id
+ * @return Response
+ * @throws NotFoundHttpException
+ */
+ public function actionSetDefault($id): Response
{
$language = $this->findModel($id);
if ($language) {
@@ -156,7 +163,7 @@ class LanguageController extends Controller
* @return Language the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): Language
+ protected function findModel(int $id): Language
{
if (($model = Language::findOne($id)) !== null) {
return $model;
diff --git a/common/modules/languages/entities/Language.php b/common/modules/languages/entities/Language.php
index 2cfa865..429b748 100644
--- a/common/modules/languages/entities/Language.php
+++ b/common/modules/languages/entities/Language.php
@@ -3,10 +3,10 @@
namespace common\modules\languages\entities;
use common\modules\languages\entities\queries\LanguageQuery;
+use DomainException;
use yii\db\ActiveRecord;
use Yii;
-
/**
* This is the model class for table "languages".
*
@@ -44,7 +44,7 @@ class Language extends ActiveRecord
/**
* @inheritdoc
*/
- public static function tableName()
+ public static function tableName(): string
{
return 'languages';
}
@@ -66,7 +66,7 @@ class Language extends ActiveRecord
public function activate(): void
{
if ($this->isActive()) {
- throw new \DomainException('Language is already active.');
+ throw new DomainException('Language is already active.');
}
$this->status = self::STATUS_ACTIVE;
}
@@ -74,7 +74,7 @@ class Language extends ActiveRecord
public function draft(): void
{
if ($this->isDraft()) {
- throw new \DomainException('Language is already draft.');
+ throw new DomainException('Language is already draft.');
}
$this->status = self::STATUS_DRAFT;
}
diff --git a/common/modules/languages/entities/queries/LanguageQuery.php b/common/modules/languages/entities/queries/LanguageQuery.php
index a1d591a..2e46947 100644
--- a/common/modules/languages/entities/queries/LanguageQuery.php
+++ b/common/modules/languages/entities/queries/LanguageQuery.php
@@ -19,4 +19,4 @@ class LanguageQuery extends ActiveQuery
{
return $this->andWhere(['default' => Language::DEFAULT_TRUE]);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/languages/forms/LanguageForm.php b/common/modules/languages/forms/LanguageForm.php
index 16ec797..a5e2b35 100644
--- a/common/modules/languages/forms/LanguageForm.php
+++ b/common/modules/languages/forms/LanguageForm.php
@@ -8,11 +8,11 @@ use Yii;
class LanguageForm extends Model
{
- public $name;
- public $title;
- public $status;
+ public ?string $name = null;
+ public ?string $title = null;
+ public ?int $status = null;
- public $_language;
+ public Language $language;
public function __construct(Language $language = null, $config = [])
{
@@ -21,7 +21,7 @@ class LanguageForm extends Model
$this->title = $language->title;
$this->status = $language->status;
- $this->_language = $language;
+ $this->language = $language;
}
parent::__construct($config);
}
@@ -36,7 +36,8 @@ class LanguageForm extends Model
];
}
- public function attributeLabels() {
+ public function attributeLabels(): array
+ {
return [
'id' => Yii::t('languages', 'ID'),
'name' => Yii::t('languages', 'Name'),
diff --git a/common/modules/languages/forms/search/LanguageSearch.php b/common/modules/languages/forms/search/LanguageSearch.php
index 6148fac..3079403 100644
--- a/common/modules/languages/forms/search/LanguageSearch.php
+++ b/common/modules/languages/forms/search/LanguageSearch.php
@@ -8,10 +8,10 @@ use yii\data\ActiveDataProvider;
class LanguageSearch extends Model
{
- public $id;
- public $name;
- public $title;
- public $status;
+ public ?int $id = null;
+ public ?string $name = null;
+ public ?string $title = null;
+ public ?int $status = null;
public function rules(): array
{
diff --git a/common/modules/languages/helpers/LanguageHelper.php b/common/modules/languages/helpers/LanguageHelper.php
index 7c45ab1..ac08b61 100644
--- a/common/modules/languages/helpers/LanguageHelper.php
+++ b/common/modules/languages/helpers/LanguageHelper.php
@@ -7,6 +7,7 @@
namespace common\modules\languages\helpers;
use common\modules\languages\entities\Language;
+use Exception;
use yii\helpers\ArrayHelper;
use yii\helpers\Html;
use Yii;
@@ -15,16 +16,11 @@ class LanguageHelper
{
public static function defaultLabel($default): string
{
- switch ($default) {
- case Language::DEFAULT_FALSE:
- $class = 'text-gray';
- break;
- case Language::DEFAULT_TRUE:
- $class = 'text-yellow';
- break;
- default:
- $class = 'text-gray';
- }
+ $class = match ($default) {
+ Language::DEFAULT_FALSE => 'text-gray',
+ Language::DEFAULT_TRUE => 'text-yellow',
+ default => 'text-gray',
+ };
return '';
}
@@ -37,27 +33,31 @@ class LanguageHelper
];
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusName($status): string
{
return ArrayHelper::getValue(self::statusList(), $status);
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusLabel($status): string
{
- switch ($status) {
- case Language::STATUS_DRAFT:
- $class = 'label label-default';
- break;
- case Language::STATUS_ACTIVE:
- $class = 'label label-success';
- break;
- default:
- $class = 'label label-default';
- }
+ $class = match ($status) {
+ Language::STATUS_DRAFT => 'label label-default',
+ Language::STATUS_ACTIVE => 'label label-success',
+ default => 'label label-default',
+ };
return Html::tag('span', ArrayHelper::getValue(self::statusList(), $status), [
'class' => $class,
]);
}
}
-
diff --git a/common/modules/languages/repositories/LanguageRepository.php b/common/modules/languages/repositories/LanguageRepository.php
index 31ccf70..10e905a 100644
--- a/common/modules/languages/repositories/LanguageRepository.php
+++ b/common/modules/languages/repositories/LanguageRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\languages\repositories;
use common\modules\languages\entities\Language;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class LanguageRepository
{
@@ -18,14 +20,18 @@ class LanguageRepository
public function save(Language $language): void
{
if (!$language->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param Language $language
+ * @throws StaleObjectException
+ */
public function remove(Language $language): void
{
if (!$language->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
@@ -33,4 +39,4 @@ class LanguageRepository
{
Language::updateAll(['default' => 0]);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/languages/services/LanguageManageService.php b/common/modules/languages/services/LanguageManageService.php
index eceb37c..a3878a9 100644
--- a/common/modules/languages/services/LanguageManageService.php
+++ b/common/modules/languages/services/LanguageManageService.php
@@ -4,12 +4,12 @@ namespace common\modules\languages\services;
use common\modules\languages\entities\Language;
use common\modules\languages\forms\LanguageForm;
-use common\modules\languages\helpers\LanguageHelper;
use common\modules\languages\repositories\LanguageRepository;
+use yii\db\StaleObjectException;
class LanguageManageService
{
- private $repository;
+ private LanguageRepository $repository;
public function __construct(LanguageRepository $repository)
{
@@ -39,6 +39,10 @@ class LanguageManageService
$this->repository->save($language);
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
$language = $this->repository->get($id);
diff --git a/common/modules/languages/views/manage/language/_form.php b/common/modules/languages/views/manage/language/_form.php
index 1a5abac..01fa908 100644
--- a/common/modules/languages/views/manage/language/_form.php
+++ b/common/modules/languages/views/manage/language/_form.php
@@ -1,11 +1,12 @@
registerJs($js2);
-
-
+
+
@@ -54,9 +55,9 @@ $this->registerJs($js2);
-
-
-
+
+
+
_language->default) && $model->_language->default): ?>
diff --git a/common/modules/languages/views/manage/language/create.php b/common/modules/languages/views/manage/language/create.php
index 9cbf985..00dc16d 100644
--- a/common/modules/languages/views/manage/language/create.php
+++ b/common/modules/languages/views/manage/language/create.php
@@ -1,7 +1,9 @@
title = Yii::t('languages', 'Create Language');
$this->params['breadcrumbs'][] = ['label' => Yii::t('languages', 'Languages'), 'url' => ['index']];
diff --git a/common/modules/languages/views/manage/language/index.php b/common/modules/languages/views/manage/language/index.php
index d2622b0..df7daf6 100644
--- a/common/modules/languages/views/manage/language/index.php
+++ b/common/modules/languages/views/manage/language/index.php
@@ -1,5 +1,6 @@
title = Yii::t('languages', 'Languages');
@@ -15,12 +16,11 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-
- 'btn btn-success']) ?>
-
-
-
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'filterModel' => $searchModel,
@@ -60,8 +60,8 @@ $this->params['breadcrumbs'][] = $this->title;
[
'class' => ActionColumn::class,
'visibleButtons' => [
- 'delete' => function ($model, $key, $index) {
- return $model->default === 1 ? false : true;
+ 'delete' => function ($model) {
+ return !($model->default === 1);
}
],
'options' => ['style' => 'width: 100px;'],
diff --git a/common/modules/languages/views/manage/language/update.php b/common/modules/languages/views/manage/language/update.php
index 5484695..4e7a3ff 100644
--- a/common/modules/languages/views/manage/language/update.php
+++ b/common/modules/languages/views/manage/language/update.php
@@ -1,8 +1,11 @@
title = Yii::t('languages', 'Update Language: {name}', ['name' => $language->title]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('languages', 'Languages'), 'url' => ['index']];
diff --git a/common/modules/languages/views/manage/language/view.php b/common/modules/languages/views/manage/language/view.php
index 238f0f5..020258d 100644
--- a/common/modules/languages/views/manage/language/view.php
+++ b/common/modules/languages/views/manage/language/view.php
@@ -14,23 +14,22 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-
- 'btn btn-default']) ?>
- $language->id], ['class' => 'btn btn-primary']) ?>
- $language->id], [
- 'class' => 'btn btn-danger',
- 'data' => [
- 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
- 'method' => 'post',
- ],
- ]) ?>
-
-
-
-
+
+
+ 'btn btn-outline-primary btn-sm']) ?>
+ $language->id], ['class' => 'btn btn-primary btn-sm']) ?>
+ $language->id], [
+ 'class' => 'btn btn-danger btn-sm',
+ 'data' => [
+ 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
+ 'method' => 'post',
+ ],
+ ]) ?>
+
+
$language,
'attributes' => [
diff --git a/common/modules/links/LinksModule.php b/common/modules/links/LinksModule.php
index 7a1a98c..588d7fd 100644
--- a/common/modules/links/LinksModule.php
+++ b/common/modules/links/LinksModule.php
@@ -4,13 +4,15 @@ namespace common\modules\links;
use common\modules\links\widgets\MenuItemCreatorWidget;
use core\components\modules\ModuleInterface;
+use Yii;
+use yii\base\Module;
use yii\helpers\ArrayHelper;
-
+use yii\web\Application;
/**
* blog module definition class
*/
-class LinksModule extends \yii\base\Module implements ModuleInterface
+class LinksModule extends Module implements ModuleInterface
{
/**
* @inheritdoc
@@ -27,7 +29,7 @@ class LinksModule extends \yii\base\Module implements ModuleInterface
// custom initialization code goes here
}
- public function bootstrap($app)
+ public function bootstrap(Application $app)
{
// add languages
$app->getI18n()->translations = ArrayHelper::merge($app->getI18n()->translations, [
@@ -47,7 +49,7 @@ class LinksModule extends \yii\base\Module implements ModuleInterface
$widgets = [];
$widgets[] = [
'id' => 'links',
- 'title' => \Yii::t('links', 'Links'),
+ 'title' => Yii::t('links', 'Links'),
'content' => MenuItemCreatorWidget::widget([
'menu_id' => $menu_id,
]),
diff --git a/common/modules/links/widgets/MenuItemCreatorWidget.php b/common/modules/links/widgets/MenuItemCreatorWidget.php
index 1e28e43..f1fe938 100644
--- a/common/modules/links/widgets/MenuItemCreatorWidget.php
+++ b/common/modules/links/widgets/MenuItemCreatorWidget.php
@@ -11,10 +11,10 @@ use yii\base\Widget;
class MenuItemCreatorWidget extends Widget
{
- public $menu_id;
+ public int $menu_id;
- public function run()
- {
+ public function run(): string
+ {
$form = new MenuItemForm();
$form->module = 'links';
$form->menu_id = $this->menu_id;
diff --git a/common/modules/links/widgets/views/menu-item/creator.php b/common/modules/links/widgets/views/menu-item/creator.php
index 6b5ecc8..14bc7be 100644
--- a/common/modules/links/widgets/views/menu-item/creator.php
+++ b/common/modules/links/widgets/views/menu-item/creator.php
@@ -1,37 +1,42 @@
+
- + +
-
+
@@ -116,11 +122,11 @@ $this->registerJs($js, $this::POS_HEAD);
-
-
+
+
+
- $menu->id
]) ?>
@@ -129,35 +135,37 @@ $this->registerJs($js, $this::POS_HEAD);
-
-
-
+
+
+
" . $menu->id . ']) ?>';
?>
-
+
+
'form-control',
+ 'class' => 'form-control form-control-sm',
'id' => 'code_template',
]) ?>
-
+
" . $menu->id . ']) ?]';
?>
-
+
+
'form-control',
+ 'class' => 'form-control form-control-sm',
'id' => 'code_editor',
]) ?>
-
+
diff --git a/backend/views/menu/select_menu.php b/backend/views/menu/select_menu.php
index fa06de6..35b68f3 100644
--- a/backend/views/menu/select_menu.php
+++ b/backend/views/menu/select_menu.php
@@ -4,14 +4,16 @@
* Date: 10.07.2018
*/
+use core\entities\menu\Menu;
+use core\forms\menu\MenuSelectForm;
use kartik\form\ActiveForm;
-use yii\helpers\ArrayHelper;
use yii\helpers\Html;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $model \core\forms\menu\MenuSelectForm
- * @var $menus \core\entities\menu\Menu[]
+ * @var $this View
+ * @var $model MenuSelectForm
+ * @var $menus Menu[]
*/
$this->title = Yii::t('menu', 'Menu');
diff --git a/backend/views/menu/update.php b/backend/views/menu/update.php
index 7bc7489..207bbb1 100644
--- a/backend/views/menu/update.php
+++ b/backend/views/menu/update.php
@@ -1,8 +1,11 @@
title = Yii::t('menu', 'Update Menu: {name}', ['name' => isset($menu->translation) ? $menu->translation->name : Yii::t('menu', 'Not set')]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('menu', 'Menu'), 'url' => ['index']];
diff --git a/backend/views/module/list.php b/backend/views/module/list.php
index 3ac40c3..fcf4722 100644
--- a/backend/views/module/list.php
+++ b/backend/views/module/list.php
@@ -4,13 +4,15 @@
* Date: 17.08.2018
*/
+use core\entities\ModuleRecord;
use yii\helpers\Html;
use core\helpers\ModuleHelper;
use kartik\dialog\Dialog;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $modules \core\entities\ModuleRecord[]
+ * @var $this View
+ * @var $modules ModuleRecord[]
*/
$this->title = Yii::t('main', 'Modules');
@@ -47,15 +49,15 @@ $this->registerJs($js, $this::POS_READY);
-
-
+
+
-
+
-
+
isSystem()) : ?>
isEnabled()) : ?>
$module->id], [
diff --git a/backend/views/module/remote-list.php b/backend/views/module/remote-list.php
index e757a1c..443835e 100644
--- a/backend/views/module/remote-list.php
+++ b/backend/views/module/remote-list.php
@@ -6,9 +6,10 @@
use yii\helpers\Html;
use kartik\dialog\Dialog;
+use yii\web\View;
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $modules array
* @var $message string
*/
diff --git a/backend/views/permission/create.php b/backend/views/permission/create.php
index bf80bc4..02c2a0b 100644
--- a/backend/views/permission/create.php
+++ b/backend/views/permission/create.php
@@ -1,8 +1,9 @@
params['breadcrumbs'][] = $this->title;
-
-
+
+
-
-
field($model, 'name')->textInput(['maxLength' => true]) ?>
field($model, 'description')->textarea() ?>
field($model, 'rule_name')->textInput(['maxLength' => true]) ?>
field($model, 'data')->textarea() ?>
-
- 'btn btn-primary']) ?>
+
+ 'btn btn-success']) ?>
+
diff --git a/backend/views/permission/index.php b/backend/views/permission/index.php
index db46bd0..a86ebd1 100644
--- a/backend/views/permission/index.php
+++ b/backend/views/permission/index.php
@@ -11,13 +11,11 @@ $this->title = Yii::t('user', 'Permissions');
$this->params['breadcrumbs'][] = $this->title;
?>
-
-
- 'btn btn-success']) ?> -
- -
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'columns' => [
diff --git a/backend/views/permission/update.php b/backend/views/permission/update.php
index 17ef66f..131daa1 100644
--- a/backend/views/permission/update.php
+++ b/backend/views/permission/update.php
@@ -1,11 +1,12 @@
title = Yii::t('user', 'Update Permission: {permission}', ['permission' => $model->name]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Permissions'), 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->name]];
@@ -15,17 +16,16 @@ $this->params['breadcrumbs'][] = Yii::t('user', 'Editing');
-
-
+
+
-
-
field($model, 'name')->textInput(['maxLength' => true]) ?>
field($model, 'description')->textarea() ?>
field($model, 'rule_name')->textInput(['maxLength' => true]) ?>
field($model, 'data')->textarea() ?>
-
- 'btn btn-primary']) ?>
+
+ 'btn btn-success']) ?>
+
diff --git a/backend/views/permission/view.php b/backend/views/permission/view.php
index 8d58aa8..7352bed 100644
--- a/backend/views/permission/view.php
+++ b/backend/views/permission/view.php
@@ -1,11 +1,11 @@
title = $model->name;
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Permissions'), 'url' => ['index']];
@@ -14,10 +14,10 @@ $this->params['breadcrumbs'][] = $this->title;
- 'btn btn-default']) ?> - $model->name], ['class' => 'btn btn-primary']) ?> + 'btn btn-outline-primary btn-sm']) ?> + $model->name], ['class' => 'btn btn-primary btn-sm']) ?> $model->name], [ - 'class' => 'btn btn-danger', + 'class' => 'btn btn-danger btn-sm', 'data' => [ 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'), 'method' => 'post', @@ -25,8 +25,8 @@ $this->params['breadcrumbs'][] = $this->title; ]) ?>
-
-
+
+
diff --git a/backend/views/post/category/create.php b/backend/views/post/category/create.php
index b1e5c91..f320208 100644
--- a/backend/views/post/category/create.php
+++ b/backend/views/post/category/create.php
@@ -1,8 +1,11 @@
title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/category/index.php b/backend/views/post/category/index.php
index 74744e4..92de9c7 100644
--- a/backend/views/post/category/index.php
+++ b/backend/views/post/category/index.php
@@ -1,14 +1,16 @@
title = $type->plural .' > '. $title;
diff --git a/backend/views/post/category/update.php b/backend/views/post/category/update.php
index 822f9bb..f5d41eb 100644
--- a/backend/views/post/category/update.php
+++ b/backend/views/post/category/update.php
@@ -1,9 +1,13 @@
$category->name]);
$this->title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/category/view.php b/backend/views/post/category/view.php
index c0832ff..34322b6 100644
--- a/backend/views/post/category/view.php
+++ b/backend/views/post/category/view.php
@@ -1,11 +1,13 @@
name;
$this->title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/comment/index.php b/backend/views/post/comment/index.php
index 5c9bee6..9025afa 100644
--- a/backend/views/post/comment/index.php
+++ b/backend/views/post/comment/index.php
@@ -1,12 +1,13 @@
title = Yii::t('post', 'Comments');
diff --git a/backend/views/post/comment/update.php b/backend/views/post/comment/update.php
index 6d5463f..34908d1 100644
--- a/backend/views/post/comment/update.php
+++ b/backend/views/post/comment/update.php
@@ -1,11 +1,13 @@
title = Yii::t('post', 'Update Post Comment: {name}', ['name' => $post->title]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('post', 'Comment'), 'url' => ['index']];
diff --git a/backend/views/post/comment/view.php b/backend/views/post/comment/view.php
index cb58b5e..1146101 100644
--- a/backend/views/post/comment/view.php
+++ b/backend/views/post/comment/view.php
@@ -1,12 +1,14 @@
title = $post->title;
@@ -47,7 +49,7 @@ $this->params['breadcrumbs'][] = $this->title;
'active:boolean',
[
'attribute' => 'user_id',
- 'value' => function(\core\entities\post\PostComment $comment) {
+ 'value' => function(PostComment $comment) {
return User::findOne($comment->user_id)->username;
},
],
diff --git a/backend/views/post/gallery/_form.php b/backend/views/post/gallery/_form.php
index f0dc7cf..0f9ad24 100644
--- a/backend/views/post/gallery/_form.php
+++ b/backend/views/post/gallery/_form.php
@@ -1,18 +1,24 @@
_post)) {
- $tagsJson = \yii\helpers\Json::encode( \yii\helpers\Json::encode( \yii\helpers\ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
+ $tagsJson = Json::encode( Json::encode( ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
$js = <<
$model,
'attributes' => [
diff --git a/backend/views/post/articles/_form.php b/backend/views/post/articles/_form.php
index 740b8aa..bc603b7 100644
--- a/backend/views/post/articles/_form.php
+++ b/backend/views/post/articles/_form.php
@@ -1,19 +1,25 @@
_post)) {
- $tagsJson = \yii\helpers\Json::encode( \yii\helpers\Json::encode( \yii\helpers\ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
+ $tagsJson = Json::encode( Json::encode( ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
$js = <<
field($model, 'category_id')->dropDownList($model->categoriesList($model->type_id), ['prompt' => '']) ?>
- field($model, 'published_at')->widget(\kartik\widgets\DateTimePicker::classname(), [
+ field($model, 'published_at')->widget(DateTimePicker::class, [
'options' => [],
'pluginOptions' => [
'autoclose' => true,
@@ -52,7 +58,7 @@ JS;
diff --git a/backend/views/post/articles/create.php b/backend/views/post/articles/create.php
index 4720fde..0e03f9f 100644
--- a/backend/views/post/articles/create.php
+++ b/backend/views/post/articles/create.php
@@ -1,8 +1,11 @@
title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/articles/index.php b/backend/views/post/articles/index.php
index f371c20..2d09ea6 100644
--- a/backend/views/post/articles/index.php
+++ b/backend/views/post/articles/index.php
@@ -1,14 +1,18 @@
title = $type->plural .' > '. $title;
@@ -67,11 +71,11 @@ $this->params['breadcrumbs'][] = $title;
'contentOptions' => ['class' => 'text-center'],
],
[
- 'class' => \yii\grid\ActionColumn::class,
+ 'class' => ActionColumn::class,
'urlCreator' => function($action, Post $model, $key, $index, $column) {
$params = is_array($key) ? $key : ['id' => (string) $key, 'tid' => $model->type_id];
$params[0] = $column->controller ? $column->controller . '/' . $action : $action;
- return \yii\helpers\Url::toRoute($params);
+ return Url::toRoute($params);
},
'options' => ['style' => 'width: 100px;'],
'contentOptions' => ['class' => 'text-center'],
diff --git a/backend/views/post/articles/update.php b/backend/views/post/articles/update.php
index 68c9542..3941212 100644
--- a/backend/views/post/articles/update.php
+++ b/backend/views/post/articles/update.php
@@ -1,11 +1,16 @@
\yii\helpers\StringHelper::truncateWords($post->title, 6, '...')]);
+$title = Yii::t('post', 'Update Post: {name}', ['name' => StringHelper::truncateWords($post->title, 6, '...')]);
$this->title = $type->plural . ' > ' . $title;
$this->params['breadcrumbs'][] = ['label' => Yii::t('post', $type->plural), 'url' => ['index', 'tid' => $type->id]];
$this->params['breadcrumbs'][] = ['label' => $type->singular, 'url' => ['view', 'id' => $post->id]];
diff --git a/backend/views/post/articles/view.php b/backend/views/post/articles/view.php
index e566461..8eea103 100644
--- a/backend/views/post/articles/view.php
+++ b/backend/views/post/articles/view.php
@@ -1,14 +1,16 @@
title;
$this->title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/blog/_form.php b/backend/views/post/blog/_form.php
index 740b8aa..bc603b7 100644
--- a/backend/views/post/blog/_form.php
+++ b/backend/views/post/blog/_form.php
@@ -1,19 +1,25 @@
_post)) {
- $tagsJson = \yii\helpers\Json::encode( \yii\helpers\Json::encode( \yii\helpers\ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
+ $tagsJson = Json::encode( Json::encode( ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
$js = <<
- field($model->tags, 'new_tags')->widget(\kartik\widgets\Select2::classname(), [
+ field($model->tags, 'new_tags')->widget(Select2::class, [
'options' => [
'placeholder' => Yii::t('post','Set tags...'),
'multiple' => true,
@@ -81,7 +87,7 @@ JS;
field($model, 'title')->textInput(['maxlength' => true]) ?>
field($model, 'slug')->textInput(['maxlength' => true]) ?>
field($model, 'description')->textarea(['rows' => 5]) ?>
- field($model, 'content')->widget(CKEditor::className()) ?>
+ field($model, 'content')->widget(CKEditor::class) ?>
field($model, 'category_id')->dropDownList($model->categoriesList($model->type_id), ['prompt' => '']) ?>
- field($model, 'published_at')->widget(\kartik\widgets\DateTimePicker::classname(), [
+ field($model, 'published_at')->widget(DateTimePicker::class, [
'options' => [],
'pluginOptions' => [
'autoclose' => true,
@@ -52,7 +58,7 @@ JS;
diff --git a/backend/views/post/blog/create.php b/backend/views/post/blog/create.php
index 4720fde..8063e52 100644
--- a/backend/views/post/blog/create.php
+++ b/backend/views/post/blog/create.php
@@ -1,8 +1,11 @@
title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/blog/index.php b/backend/views/post/blog/index.php
index f371c20..4a9fdd5 100644
--- a/backend/views/post/blog/index.php
+++ b/backend/views/post/blog/index.php
@@ -1,14 +1,17 @@
title = $type->plural .' > '. $title;
@@ -71,7 +74,7 @@ $this->params['breadcrumbs'][] = $title;
'urlCreator' => function($action, Post $model, $key, $index, $column) {
$params = is_array($key) ? $key : ['id' => (string) $key, 'tid' => $model->type_id];
$params[0] = $column->controller ? $column->controller . '/' . $action : $action;
- return \yii\helpers\Url::toRoute($params);
+ return Url::toRoute($params);
},
'options' => ['style' => 'width: 100px;'],
'contentOptions' => ['class' => 'text-center'],
diff --git a/backend/views/post/blog/update.php b/backend/views/post/blog/update.php
index 68c9542..3941212 100644
--- a/backend/views/post/blog/update.php
+++ b/backend/views/post/blog/update.php
@@ -1,11 +1,16 @@
\yii\helpers\StringHelper::truncateWords($post->title, 6, '...')]);
+$title = Yii::t('post', 'Update Post: {name}', ['name' => StringHelper::truncateWords($post->title, 6, '...')]);
$this->title = $type->plural . ' > ' . $title;
$this->params['breadcrumbs'][] = ['label' => Yii::t('post', $type->plural), 'url' => ['index', 'tid' => $type->id]];
$this->params['breadcrumbs'][] = ['label' => $type->singular, 'url' => ['view', 'id' => $post->id]];
diff --git a/backend/views/post/blog/view.php b/backend/views/post/blog/view.php
index e566461..8eea103 100644
--- a/backend/views/post/blog/view.php
+++ b/backend/views/post/blog/view.php
@@ -1,14 +1,16 @@
title;
$this->title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/category/_form.php b/backend/views/post/category/_form.php
index e629333..b6a524d 100644
--- a/backend/views/post/category/_form.php
+++ b/backend/views/post/category/_form.php
@@ -1,11 +1,12 @@
@@ -31,7 +32,7 @@ use yii\widgets\ActiveForm;
field($model, 'title')->textInput(['maxlength' => true]) ?>
- field($model, 'description')->widget(CKEditor::className()) ?>
+ field($model, 'description')->widget(CKEditor::class) ?>
- field($model->tags, 'new_tags')->widget(\kartik\widgets\Select2::classname(), [
+ field($model->tags, 'new_tags')->widget(Select2::class, [
'options' => [
'placeholder' => Yii::t('post','Set tags...'),
'multiple' => true,
@@ -81,7 +87,7 @@ JS;
field($model, 'title')->textInput(['maxlength' => true]) ?>
field($model, 'slug')->textInput(['maxlength' => true]) ?>
field($model, 'description')->textarea(['rows' => 5]) ?>
- field($model, 'content')->widget(CKEditor::className()) ?>
+ field($model, 'content')->widget(CKEditor::class) ?>
field($model, 'category_id')->dropDownList($model->categoriesList($model->type_id), ['prompt' => '']) ?>
- field($model, 'published_at')->widget(\kartik\widgets\DateTimePicker::classname(), [
+ field($model, 'published_at')->widget(DateTimePicker::class, [
'options' => [],
'pluginOptions' => [
'autoclose' => true,
@@ -51,7 +57,7 @@ JS;
- field($model->tags, 'new_tags')->widget(\kartik\widgets\Select2::classname(), [
+ field($model->tags, 'new_tags')->widget(Select2::class, [
'options' => [
'placeholder' => Yii::t('post','Set tags...'),
'multiple' => true,
diff --git a/backend/views/post/gallery/create.php b/backend/views/post/gallery/create.php
index e27fe92..6b3a031 100644
--- a/backend/views/post/gallery/create.php
+++ b/backend/views/post/gallery/create.php
@@ -1,8 +1,11 @@
title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/gallery/index.php b/backend/views/post/gallery/index.php
index f371c20..4a9fdd5 100644
--- a/backend/views/post/gallery/index.php
+++ b/backend/views/post/gallery/index.php
@@ -1,14 +1,17 @@
title = $type->plural .' > '. $title;
@@ -71,7 +74,7 @@ $this->params['breadcrumbs'][] = $title;
'urlCreator' => function($action, Post $model, $key, $index, $column) {
$params = is_array($key) ? $key : ['id' => (string) $key, 'tid' => $model->type_id];
$params[0] = $column->controller ? $column->controller . '/' . $action : $action;
- return \yii\helpers\Url::toRoute($params);
+ return Url::toRoute($params);
},
'options' => ['style' => 'width: 100px;'],
'contentOptions' => ['class' => 'text-center'],
diff --git a/backend/views/post/gallery/update.php b/backend/views/post/gallery/update.php
index 690eec0..c0d8150 100644
--- a/backend/views/post/gallery/update.php
+++ b/backend/views/post/gallery/update.php
@@ -1,9 +1,13 @@
\yii\helpers\StringHelper::truncateWords($post->title, 6, '...')]);
$this->title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/gallery/view.php b/backend/views/post/gallery/view.php
index 827a69e..1b7c856 100644
--- a/backend/views/post/gallery/view.php
+++ b/backend/views/post/gallery/view.php
@@ -1,14 +1,16 @@
title;
$this->title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/news/_form.php b/backend/views/post/news/_form.php
index 81e597d..fe68dc9 100644
--- a/backend/views/post/news/_form.php
+++ b/backend/views/post/news/_form.php
@@ -1,20 +1,26 @@
_post)) {
- $tagsJson = \yii\helpers\Json::encode( \yii\helpers\Json::encode( \yii\helpers\ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
+ $tagsJson = Json::encode( Json::encode( ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
$js = <<
field($model, 'category_id')->dropDownList($model->categoriesList($model->type_id), ['prompt' => '']) ?>
- field($model, 'published_at')->widget(\kartik\widgets\DateTimePicker::classname(), [
+ field($model, 'published_at')->widget(DateTimePicker::class, [
'options' => [],
'pluginOptions' => [
'autoclose' => true,
@@ -53,7 +59,7 @@ JS;
diff --git a/backend/views/post/news/create.php b/backend/views/post/news/create.php
index 4720fde..8063e52 100644
--- a/backend/views/post/news/create.php
+++ b/backend/views/post/news/create.php
@@ -1,8 +1,11 @@
title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/news/index.php b/backend/views/post/news/index.php
index f371c20..2d09ea6 100644
--- a/backend/views/post/news/index.php
+++ b/backend/views/post/news/index.php
@@ -1,14 +1,18 @@
title = $type->plural .' > '. $title;
@@ -67,11 +71,11 @@ $this->params['breadcrumbs'][] = $title;
'contentOptions' => ['class' => 'text-center'],
],
[
- 'class' => \yii\grid\ActionColumn::class,
+ 'class' => ActionColumn::class,
'urlCreator' => function($action, Post $model, $key, $index, $column) {
$params = is_array($key) ? $key : ['id' => (string) $key, 'tid' => $model->type_id];
$params[0] = $column->controller ? $column->controller . '/' . $action : $action;
- return \yii\helpers\Url::toRoute($params);
+ return Url::toRoute($params);
},
'options' => ['style' => 'width: 100px;'],
'contentOptions' => ['class' => 'text-center'],
diff --git a/backend/views/post/news/update.php b/backend/views/post/news/update.php
index 68c9542..3941212 100644
--- a/backend/views/post/news/update.php
+++ b/backend/views/post/news/update.php
@@ -1,11 +1,16 @@
\yii\helpers\StringHelper::truncateWords($post->title, 6, '...')]);
+$title = Yii::t('post', 'Update Post: {name}', ['name' => StringHelper::truncateWords($post->title, 6, '...')]);
$this->title = $type->plural . ' > ' . $title;
$this->params['breadcrumbs'][] = ['label' => Yii::t('post', $type->plural), 'url' => ['index', 'tid' => $type->id]];
$this->params['breadcrumbs'][] = ['label' => $type->singular, 'url' => ['view', 'id' => $post->id]];
diff --git a/backend/views/post/news/view.php b/backend/views/post/news/view.php
index e566461..8eea103 100644
--- a/backend/views/post/news/view.php
+++ b/backend/views/post/news/view.php
@@ -1,14 +1,16 @@
title;
$this->title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/post/_form.php b/backend/views/post/post/_form.php
index 740b8aa..bc603b7 100644
--- a/backend/views/post/post/_form.php
+++ b/backend/views/post/post/_form.php
@@ -1,19 +1,25 @@
_post)) {
- $tagsJson = \yii\helpers\Json::encode( \yii\helpers\Json::encode( \yii\helpers\ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
+ $tagsJson = Json::encode( Json::encode( ArrayHelper::map( $model->_post->tags, 'id', 'name' ) ) );
$js = <<
- field($model->tags, 'new_tags')->widget(\kartik\widgets\Select2::classname(), [
+ field($model->tags, 'new_tags')->widget(Select2::class, [
'options' => [
'placeholder' => Yii::t('post','Set tags...'),
'multiple' => true,
@@ -82,7 +88,7 @@ JS;
field($model, 'title')->textInput(['maxlength' => true]) ?>
field($model, 'slug')->textInput(['maxlength' => true]) ?>
field($model, 'description')->textarea(['rows' => 5]) ?>
- field($model, 'content')->widget(CKEditor::className()) ?>
+ field($model, 'content')->widget(CKEditor::class) ?>
field($model, 'category_id')->dropDownList($model->categoriesList($model->type_id), ['prompt' => '']) ?>
- field($model, 'published_at')->widget(\kartik\widgets\DateTimePicker::classname(), [
+ field($model, 'published_at')->widget(DateTimePicker::class, [
'options' => [],
'pluginOptions' => [
'autoclose' => true,
@@ -52,7 +58,7 @@ JS;
diff --git a/backend/views/post/post/create.php b/backend/views/post/post/create.php
index 4720fde..8063e52 100644
--- a/backend/views/post/post/create.php
+++ b/backend/views/post/post/create.php
@@ -1,8 +1,11 @@
title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/post/index.php b/backend/views/post/post/index.php
index f371c20..2d09ea6 100644
--- a/backend/views/post/post/index.php
+++ b/backend/views/post/post/index.php
@@ -1,14 +1,18 @@
title = $type->plural .' > '. $title;
@@ -67,11 +71,11 @@ $this->params['breadcrumbs'][] = $title;
'contentOptions' => ['class' => 'text-center'],
],
[
- 'class' => \yii\grid\ActionColumn::class,
+ 'class' => ActionColumn::class,
'urlCreator' => function($action, Post $model, $key, $index, $column) {
$params = is_array($key) ? $key : ['id' => (string) $key, 'tid' => $model->type_id];
$params[0] = $column->controller ? $column->controller . '/' . $action : $action;
- return \yii\helpers\Url::toRoute($params);
+ return Url::toRoute($params);
},
'options' => ['style' => 'width: 100px;'],
'contentOptions' => ['class' => 'text-center'],
diff --git a/backend/views/post/post/update.php b/backend/views/post/post/update.php
index 68c9542..3941212 100644
--- a/backend/views/post/post/update.php
+++ b/backend/views/post/post/update.php
@@ -1,11 +1,16 @@
\yii\helpers\StringHelper::truncateWords($post->title, 6, '...')]);
+$title = Yii::t('post', 'Update Post: {name}', ['name' => StringHelper::truncateWords($post->title, 6, '...')]);
$this->title = $type->plural . ' > ' . $title;
$this->params['breadcrumbs'][] = ['label' => Yii::t('post', $type->plural), 'url' => ['index', 'tid' => $type->id]];
$this->params['breadcrumbs'][] = ['label' => $type->singular, 'url' => ['view', 'id' => $post->id]];
diff --git a/backend/views/post/post/view.php b/backend/views/post/post/view.php
index e566461..8eea103 100644
--- a/backend/views/post/post/view.php
+++ b/backend/views/post/post/view.php
@@ -1,14 +1,16 @@
title;
$this->title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/tag/_form.php b/backend/views/post/tag/_form.php
index 0a180ae..8d404bb 100644
--- a/backend/views/post/tag/_form.php
+++ b/backend/views/post/tag/_form.php
@@ -1,10 +1,11 @@
diff --git a/backend/views/post/tag/create.php b/backend/views/post/tag/create.php
index 2b5cf7d..d27c42b 100644
--- a/backend/views/post/tag/create.php
+++ b/backend/views/post/tag/create.php
@@ -1,8 +1,11 @@
title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/tag/index.php b/backend/views/post/tag/index.php
index 9a4d7c6..b5a46a4 100644
--- a/backend/views/post/tag/index.php
+++ b/backend/views/post/tag/index.php
@@ -1,14 +1,16 @@
title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/tag/update.php b/backend/views/post/tag/update.php
index 52eae90..71975df 100644
--- a/backend/views/post/tag/update.php
+++ b/backend/views/post/tag/update.php
@@ -1,9 +1,13 @@
$tag->name]);
$this->title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/tag/view.php b/backend/views/post/tag/view.php
index df5c684..af05b83 100644
--- a/backend/views/post/tag/view.php
+++ b/backend/views/post/tag/view.php
@@ -1,11 +1,13 @@
name;
$this->title = $type->plural . ' > ' . $title;
diff --git a/backend/views/post/type/_form.php b/backend/views/post/type/_form.php
index fd4fa17..0c297f5 100644
--- a/backend/views/post/type/_form.php
+++ b/backend/views/post/type/_form.php
@@ -1,10 +1,11 @@
diff --git a/backend/views/post/type/create.php b/backend/views/post/type/create.php
index 5486987..abf98f7 100644
--- a/backend/views/post/type/create.php
+++ b/backend/views/post/type/create.php
@@ -1,7 +1,9 @@
title = Yii::t('post', 'Create Type');
$this->params['breadcrumbs'][] = ['label' => Yii::t('post', 'Types'), 'url' => ['index']];
diff --git a/backend/views/post/type/index.php b/backend/views/post/type/index.php
index d1f7075..c87002e 100644
--- a/backend/views/post/type/index.php
+++ b/backend/views/post/type/index.php
@@ -1,12 +1,13 @@
title = Yii::t('post', 'Types');
diff --git a/backend/views/post/type/update.php b/backend/views/post/type/update.php
index e0ab680..11f7756 100644
--- a/backend/views/post/type/update.php
+++ b/backend/views/post/type/update.php
@@ -1,8 +1,11 @@
title = Yii::t('post', 'Update type: {name}', ['name' => $type->plural]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('post', 'Types'), 'url' => ['index']];
diff --git a/backend/views/post/type/view.php b/backend/views/post/type/view.php
index ca717d6..7faa7e2 100644
--- a/backend/views/post/type/view.php
+++ b/backend/views/post/type/view.php
@@ -1,10 +1,11 @@
title = $type->plural;
$this->params['breadcrumbs'][] = ['label' => Yii::t('post', 'Types'), 'url' => ['index']];
diff --git a/backend/views/role/create.php b/backend/views/role/create.php
index 6004538..5721180 100644
--- a/backend/views/role/create.php
+++ b/backend/views/role/create.php
@@ -1,11 +1,12 @@
title = Yii::t('user', 'Create Role');
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Roles'), 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
@@ -14,19 +15,18 @@ $this->params['breadcrumbs'][] = $this->title;
-
- field($model->tags, 'new_tags')->widget(\kartik\widgets\Select2::classname(), [
+ field($model->tags, 'new_tags')->widget(Select2::class, [
'options' => [
'placeholder' => Yii::t('post','Set tags...'),
'multiple' => true,
@@ -81,7 +87,7 @@ JS;
field($model, 'title')->textInput(['maxlength' => true]) ?>
field($model, 'slug')->textInput(['maxlength' => true]) ?>
field($model, 'description')->textarea(['rows' => 5]) ?>
- field($model, 'content')->widget(CKEditor::className()) ?>
+ field($model, 'content')->widget(CKEditor::class) ?>
-
diff --git a/backend/views/role/index.php b/backend/views/role/index.php
index d6b8dd3..2311c4d 100644
--- a/backend/views/role/index.php
+++ b/backend/views/role/index.php
@@ -11,13 +11,11 @@ $this->title = Yii::t('user', 'Roles');
$this->params['breadcrumbs'][] = $this->title;
?>
+
\ No newline at end of file
+
+
-
-
field($model, 'name')->textInput(['maxLength' => true]) ?>
field($model, 'description')->textarea() ?>
field($model, 'rule_name')->textInput(['maxLength' => true]) ?>
field($model, 'data')->textarea() ?>
-
- 'btn btn-primary']) ?>
+
-
-
-
- 'btn btn-success']) ?> -
- -
-
+
diff --git a/backend/views/role/update.php b/backend/views/role/update.php
index 591b45a..399cd44 100644
--- a/backend/views/role/update.php
+++ b/backend/views/role/update.php
@@ -1,11 +1,12 @@
title = Yii::t('user', 'Update Role: {role}', ['role' => $model->name]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Roles'), 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->name]];
@@ -15,19 +16,18 @@ $this->params['breadcrumbs'][] = Yii::t('buttons', 'Editing');
-
+
-
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'columns' => [
@@ -38,5 +36,4 @@ $this->params['breadcrumbs'][] = $this->title;
]); ?>
-
diff --git a/backend/views/role/view.php b/backend/views/role/view.php
index 163847b..fe3ee63 100644
--- a/backend/views/role/view.php
+++ b/backend/views/role/view.php
@@ -1,17 +1,20 @@
title = $model->name;
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Roles'), 'url' => ['index']];
@@ -20,10 +23,10 @@ $this->params['breadcrumbs'][] = $this->title;
+
\ No newline at end of file
+
+
-
-
field($model, 'name')->textInput(['maxLength' => true]) ?>
field($model, 'description')->textarea() ?>
field($model, 'rule_name')->textInput(['maxLength' => true]) ?>
field($model, 'data')->textarea() ?>
-
- 'btn btn-primary']) ?>
+
+ 'btn btn-success']) ?>
+
-- 'btn btn-default']) ?> - $model->name], ['class' => 'btn btn-primary']) ?> + 'btn btn-outline-primary btn-sm']) ?> + $model->name], ['class' => 'btn btn-primary btn-sm']) ?> $model->name], [ - 'class' => 'btn btn-danger', + 'class' => 'btn btn-danger btn-sm', 'data' => [ 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'), 'method' => 'post', @@ -31,8 +34,8 @@ $this->params['breadcrumbs'][] = $this->title; ]) ?>
-
-
+
+
$model,
'attributes' => [
@@ -56,48 +59,51 @@ $this->params['breadcrumbs'][] = $this->title;
name !== 'admin') : ?>
-
-
+
+
+
+
- field($itemsForm, 'roles')->widget(
- Select2::class,
- [
- 'name' => 'childrenRoles',
- 'data' => $roles,
- 'size' => Select2::SMALL,
- 'options' => [
- 'placeholder' => Yii::t('user', 'Select role...'),
- 'multiple' => true,
- ],
- 'pluginOptions' => [
- 'allowClear' => true
- ],
- ]
- )->label(false);
- ?>
+ field($itemsForm, 'roles')->widget(
+ Select2::class,
+ [
+ 'name' => 'childrenRoles',
+ 'data' => $roles,
+ 'size' => Select2::SMALL,
+ 'options' => [
+ 'placeholder' => Yii::t('user', 'Select role...'),
+ 'multiple' => true,
+ ],
+ 'pluginOptions' => [
+ 'allowClear' => true
+ ],
+ ]
+ )->label(false);
+ ?>
-
+
- field($itemsForm, 'permissions')->widget(
- Select2::class,
- [
- 'name' => 'childrenPermissions',
- 'data' => $permissions,
- 'size' => Select2::SMALL,
- 'options' => [
- 'placeholder' => Yii::t('user', 'Select permission...'),
- 'multiple' => true
- ],
- 'pluginOptions' => [
- 'allowClear' => true
- ],
- ]
- )->label(false);
- ?>
-
-
diff --git a/backend/views/settings/list/_form.php b/backend/views/settings/list/_form.php
index b59c53e..807c295 100644
--- a/backend/views/settings/list/_form.php
+++ b/backend/views/settings/list/_form.php
@@ -1,5 +1,6 @@
registerJs($js2);
?>
diff --git a/backend/views/settings/list/_form_tab.php b/backend/views/settings/list/_form_tab.php
index 65b760d..1d2afe6 100644
--- a/backend/views/settings/list/_form_tab.php
+++ b/backend/views/settings/list/_form_tab.php
@@ -4,10 +4,14 @@
* Date: 24.08.2018
*/
+use core\forms\SettingsForm;
+use yii\web\View;
+use yii\widgets\ActiveForm;
+
/**
- * @var $this \yii\web\View
- * @var $form \yii\widgets\ActiveForm
- * @var $model \core\forms\SettingsForm
+ * @var $this View
+ * @var $form ActiveForm
+ * @var $model SettingsForm
* @var $language string
*/
diff --git a/backend/views/settings/list/_view_tab.php b/backend/views/settings/list/_view_tab.php
index 7538762..d9cf882 100644
--- a/backend/views/settings/list/_view_tab.php
+++ b/backend/views/settings/list/_view_tab.php
@@ -4,11 +4,12 @@
* Date: 25.08.2018
*/
+use yii\web\View;
use yii\widgets\DetailView;
use core\entities\Settings;
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $setting Settings
* @var $language string
*/
diff --git a/backend/views/settings/list/index.php b/backend/views/settings/list/index.php
index a46cfda..ba56c00 100644
--- a/backend/views/settings/list/index.php
+++ b/backend/views/settings/list/index.php
@@ -1,5 +1,6 @@
params['breadcrumbs'][] = $this->title;
[
'label' => Yii::t('main', 'Value'),
'value' => function (Settings $setting) {
- return isset($setting->translation->value) ? $setting->translation->value : '- ';
+ return $setting->translation->value ?? '- ';
},
'format' => 'ntext',
],
diff --git a/backend/views/settings/list/view.php b/backend/views/settings/list/view.php
index 9d8586e..a7a3b92 100644
--- a/backend/views/settings/list/view.php
+++ b/backend/views/settings/list/view.php
@@ -1,11 +1,13 @@
title = $model->section . '.' . $model->key;
@@ -75,7 +77,7 @@ $this->registerCss($css);
?>
diff --git a/backend/views/site/index.php b/backend/views/site/index.php
index 1d54530..a1ef5e8 100644
--- a/backend/views/site/index.php
+++ b/backend/views/site/index.php
@@ -1,5 +1,6 @@
registerJs($formatJs, $this::POS_HEAD);
'handle' => '.moveHandle',
],
]);
- $widgets = \core\helpers\UserHelper::getSetting('widgetsLayout', []);
+ $widgets = UserHelper::getSetting('widgetsLayout', []);
foreach ($widgets as $widget) {
$widgetData = [
'class'=>'grid-stack-item',
diff --git a/backend/views/site/login.php b/backend/views/site/login.php
index bbe2136..046b227 100644
--- a/backend/views/site/login.php
+++ b/backend/views/site/login.php
@@ -1,10 +1,12 @@
title = 'Sign In';
diff --git a/backend/views/site/search.php b/backend/views/site/search.php
index 33151f2..ef8dda1 100644
--- a/backend/views/site/search.php
+++ b/backend/views/site/search.php
@@ -1,13 +1,14 @@
title = $title . ' > ' . Html::encode($form->query);
diff --git a/backend/views/site/widgets-list.php b/backend/views/site/widgets-list.php
index 1b80ee7..001d9b8 100644
--- a/backend/views/site/widgets-list.php
+++ b/backend/views/site/widgets-list.php
@@ -2,9 +2,10 @@
use yii\helpers\Html;
use backend\helpers\DashboardHelper;
+use yii\web\View;
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $wl array
*/
diff --git a/backend/views/site/widgets-selected-list.php b/backend/views/site/widgets-selected-list.php
index 0eb8ce0..d076059 100644
--- a/backend/views/site/widgets-selected-list.php
+++ b/backend/views/site/widgets-selected-list.php
@@ -4,7 +4,9 @@
* @var $this \yii\web\View
*/
-$widgets = \core\helpers\UserHelper::getSetting('widgetsLayout', []);
+use core\helpers\UserHelper;
+
+$widgets = UserHelper::getSetting('widgetsLayout', []);
$i = 0;
?>
diff --git a/backend/views/slider/_form.php b/backend/views/slider/_form.php
index e546964..9822eb7 100644
--- a/backend/views/slider/_form.php
+++ b/backend/views/slider/_form.php
@@ -1,19 +1,20 @@
- 'btn btn-primary']) ?>
+ field($itemsForm, 'permissions')->widget(
+ Select2::class,
+ [
+ 'name' => 'childrenPermissions',
+ 'data' => $permissions,
+ 'size' => Select2::SMALL,
+ 'options' => [
+ 'placeholder' => Yii::t('user', 'Select permission...'),
+ 'multiple' => true
+ ],
+ 'pluginOptions' => [
+ 'allowClear' => true
+ ],
+ ]
+ )->label(false);
+ ?>
+
+
-
-
-
-
+
-
+
- field($model, 'image')->widget(\kartik\widgets\FileInput::classname(), [
+ field($model, 'image')->widget(FileInput::class, [
'pluginOptions' => [
'showUpload' => false,
],
])->label(Yii::t('slider', 'Background Image')) ?>
field($model, 'title')->textarea(['maxLength' => true, 'rows' => 2]) ?>
field($model, 'tagline')->textarea(['maxLength' => true, 'rows' => 2]) ?>
@@ -26,16 +27,15 @@ use yii\helpers\Html;
- 'btn btn-primary']) ?>
+
diff --git a/backend/views/slider/create.php b/backend/views/slider/create.php
index c79f614..1eef431 100644
--- a/backend/views/slider/create.php
+++ b/backend/views/slider/create.php
@@ -1,7 +1,9 @@
title = Yii::t('slider', 'Create Slide');
$this->params['breadcrumbs'][] = ['label' => Yii::t('slider', 'Slider'), 'url' => ['index']];
diff --git a/backend/views/slider/index.php b/backend/views/slider/index.php
index 7010b6c..3ddfa56 100644
--- a/backend/views/slider/index.php
+++ b/backend/views/slider/index.php
@@ -13,12 +13,11 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-
- 'btn btn-success']) ?> -
- -
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'columns' => [
diff --git a/backend/views/slider/update.php b/backend/views/slider/update.php
index 63bd7da..42f185b 100644
--- a/backend/views/slider/update.php
+++ b/backend/views/slider/update.php
@@ -1,9 +1,11 @@
title = Yii::t('slider', 'Update Slide');
$this->params['breadcrumbs'][] = ['label' => Yii::t('slider', 'Slider'), 'url' => ['index']];
diff --git a/backend/views/slider/view.php b/backend/views/slider/view.php
index 8a6a8ae..c7cf71c 100644
--- a/backend/views/slider/view.php
+++ b/backend/views/slider/view.php
@@ -1,12 +1,11 @@
title = $model->title;
$this->params['breadcrumbs'][] = ['label' => Yii::t('slider', 'Slider'), 'url' => ['index']];
@@ -15,10 +14,10 @@ $this->params['breadcrumbs'][] = $this->title;
- 'btn btn-default']) ?> - $model->id], ['class' => 'btn btn-primary']) ?> + 'btn btn-outline-primary btn-sm']) ?> + $model->id], ['class' => 'btn btn-primary btn-sm']) ?> $model->id], [ - 'class' => 'btn btn-danger', + 'class' => 'btn btn-danger btn-sm', 'data' => [ 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'), 'method' => 'post', @@ -29,8 +28,8 @@ $this->params['breadcrumbs'][] = $this->title;
-
-
+
+
image): ?>
getThumbFileUrl('image', 'thumb')) ?>
@@ -40,8 +39,8 @@ $this->params['breadcrumbs'][] = $this->title;
-
-
diff --git a/backend/views/user/_form.php b/backend/views/user/_form.php
index 81d5b3d..4d2e66b 100644
--- a/backend/views/user/_form.php
+++ b/backend/views/user/_form.php
@@ -1,32 +1,28 @@
+
-
-
-
+
$model,
'attributes' => [
@@ -55,7 +54,4 @@ $this->params['breadcrumbs'][] = $this->title;
-
-
-
+
-
diff --git a/backend/views/user/create.php b/backend/views/user/create.php
index f5c71dd..f4cd17e 100644
--- a/backend/views/user/create.php
+++ b/backend/views/user/create.php
@@ -1,7 +1,8 @@
title = Yii::t('user', 'Create User');
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']];
diff --git a/backend/views/user/index.php b/backend/views/user/index.php
index 443d2e8..a43cbc6 100644
--- a/backend/views/user/index.php
+++ b/backend/views/user/index.php
@@ -16,13 +16,11 @@ $this->title = Yii::t('user', 'Users');
$this->params['breadcrumbs'][] = $this->title;
?>
+
-
-
field($model, 'username')->textInput(['maxLength' => true]) ?>
field($model, 'email')->textInput(['maxLength' => true]) ?>
field($model, 'password')->passwordInput(['maxLength' => true]) ?>
field($model, 'role')->dropDownList($model->rolesList()) ?>
+
- 'btn btn-primary']) ?>
-
-
-
-
-
- 'btn btn-success']) ?> -
- -
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'filterModel' => $searchModel,
diff --git a/backend/views/user/profile.php b/backend/views/user/profile.php
index 44eed73..418da43 100644
--- a/backend/views/user/profile.php
+++ b/backend/views/user/profile.php
@@ -1,12 +1,15 @@
title = Yii::t('user', 'Profile: {username}', ['username' => $user->username]);
$this->params['breadcrumbs'][] = ['label' => $user->username, 'url' => ['view', 'id' => $user->id]];
$this->params['breadcrumbs'][] = Yii::t('user', 'Profile');
@@ -16,14 +19,14 @@ $this->params['breadcrumbs'][] = Yii::t('user', 'Profile');
-
-
-
+
+
-
+
- field($model, 'user_pic')->widget(\kartik\widgets\FileInput::class, [
+ field($model, 'user_pic')->widget(FileInput::class, [
'options' => [
'accept' => 'image/*'
],
@@ -31,15 +34,15 @@ $this->params['breadcrumbs'][] = Yii::t('user', 'Profile');
'showPreview' => false,
'showCaption' => true,
'showRemove' => true,
- 'showUpload' => false
+ 'showUpload' => false,
],
]); ?>
-
-
+
+
+
field($model, 'username')->textInput(['maxLength' => true]) ?>
field($model, 'email')->textInput(['maxLength' => true]) ?>
field($model, 'password')->passwordInput(['maxLength' => true]) ?>
diff --git a/backend/views/user/update.php b/backend/views/user/update.php
index b9f865f..db9fb27 100644
--- a/backend/views/user/update.php
+++ b/backend/views/user/update.php
@@ -1,10 +1,13 @@
title = Yii::t('user', 'Update User: {user}', ['user' => $user->username]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $user->username, 'url' => ['view', 'id' => $user->id]];
diff --git a/backend/views/user/view.php b/backend/views/user/view.php
index 32ddfd8..6dfe8c6 100644
--- a/backend/views/user/view.php
+++ b/backend/views/user/view.php
@@ -1,12 +1,13 @@
title = $model->username;
$this->params['breadcrumbs'][] = ['label' => 'Users', 'url' => ['index']];
@@ -15,10 +16,10 @@ $this->params['breadcrumbs'][] = $this->title;
- 'btn btn-default']) ?> - $model->id], ['class' => 'btn btn-primary']) ?> + 'btn btn-outline-primary btn-sm']) ?> + $model->id], ['class' => 'btn btn-primary btn-sm']) ?> $model->id], [ - 'class' => 'btn btn-danger', + 'class' => 'btn btn-danger btn-sm', 'data' => [ 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'), 'method' => 'post', @@ -26,8 +27,8 @@ $this->params['breadcrumbs'][] = $this->title; ]) ?>
-
-
+
+
$model,
'attributes' => [
diff --git a/backend/web/css/site-origin.css b/backend/web/css/site-origin.css
new file mode 100644
index 0000000..5e03acc
--- /dev/null
+++ b/backend/web/css/site-origin.css
@@ -0,0 +1,138 @@
+html,
+body {
+ height: 100%;
+}
+
+.wrap {
+ min-height: 100%;
+ height: auto;
+ margin: 0 auto -60px;
+ padding: 0 0 60px;
+}
+
+.wrap > .container {
+ padding: 70px 15px 20px;
+}
+
+.footer {
+ height: 60px;
+ background-color: #f5f5f5;
+ border-top: 1px solid #ddd;
+ padding-top: 20px;
+}
+
+.jumbotron {
+ text-align: center;
+ background-color: transparent;
+}
+
+.jumbotron .btn {
+ font-size: 21px;
+ padding: 14px 24px;
+}
+
+.not-set {
+ color: #c55;
+ font-style: italic;
+}
+
+/* add sorting icons to gridview sort links */
+a.asc:after, a.desc:after {
+ position: relative;
+ top: 1px;
+ display: inline-block;
+ font-family: 'Glyphicons Halflings';
+ font-style: normal;
+ font-weight: normal;
+ line-height: 1;
+ padding-left: 5px;
+}
+
+a.asc:after {
+ content: /*"\e113"*/ "\e151";
+}
+
+a.desc:after {
+ content: /*"\e114"*/ "\e152";
+}
+
+.sort-numerical a.asc:after {
+ content: "\e153";
+}
+
+.sort-numerical a.desc:after {
+ content: "\e154";
+}
+
+.sort-ordinal a.asc:after {
+ content: "\e155";
+}
+
+.sort-ordinal a.desc:after {
+ content: "\e156";
+}
+
+.grid-view td {
+ white-space: nowrap;
+}
+
+.grid-view .filters input,
+.grid-view .filters select {
+ min-width: 50px;
+}
+
+.hint-block {
+ display: block;
+ margin-top: 5px;
+ color: #999;
+}
+
+.error-summary {
+ color: #a94442;
+ background: #fdf7f7;
+ border-left: 3px solid #eed3d7;
+ padding: 10px 20px;
+ margin: 0 0 15px 0;
+}
+
+/* align the logout "link" (button in form) of the navbar */
+.nav li > form > button.logout {
+ padding: 15px;
+ border: none;
+}
+
+@media(max-width:767px) {
+ .nav li > form > button.logout {
+ display:block;
+ text-align: left;
+ width: 100%;
+ padding: 10px 15px;
+ }
+}
+
+.nav > li > form > button.logout:focus,
+.nav > li > form > button.logout:hover {
+ text-decoration: none;
+}
+
+.nav > li > form > button.logout:focus {
+ outline: none;
+}
+
+div.required label.control-label:after {
+ content: " *";
+ color: red;
+}
+
+.modal-content {
+ background-color: transparent !important;
+}
+
+.modal-content .modal-body, .modal-content .modal-footer {
+ background-color: white;
+}
+
+.bootstrap-dialog .modal-footer {
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+}
\ No newline at end of file
diff --git a/backend/web/css/site.css b/backend/web/css/site.css
index 5e03acc..f908ba0 100644
--- a/backend/web/css/site.css
+++ b/backend/web/css/site.css
@@ -1,6 +1,7 @@
html,
body {
height: 100%;
+ background-color: #ffffff !important;
}
.wrap {
@@ -36,24 +37,29 @@ body {
font-style: italic;
}
+a {
+ text-decoration: none;
+}
+
/* add sorting icons to gridview sort links */
a.asc:after, a.desc:after {
position: relative;
top: 1px;
display: inline-block;
- font-family: 'Glyphicons Halflings';
+ /*font-family: 'Glyphicons Halflings';*/
+ font-family: "Font Awesome 5 Free";
font-style: normal;
- font-weight: normal;
+ /*font-weight: normal;*/
line-height: 1;
padding-left: 5px;
}
a.asc:after {
- content: /*"\e113"*/ "\e151";
+ content: /*"\e113" "\e151";*/ "\f884";
}
a.desc:after {
- content: /*"\e114"*/ "\e152";
+ content: /*"\e114"* "\e152"*/ "\f160";
}
.sort-numerical a.asc:after {
@@ -72,15 +78,10 @@ a.desc:after {
content: "\e156";
}
-.grid-view td {
+.grid-view th {
white-space: nowrap;
}
-.grid-view .filters input,
-.grid-view .filters select {
- min-width: 50px;
-}
-
.hint-block {
display: block;
margin-top: 5px;
@@ -119,20 +120,341 @@ a.desc:after {
outline: none;
}
+.company-logo {
+ width: 100%;
+ text-align: center;
+}
+
+.sidebar-collapse .company-logo {
+ display: none;
+}
+
+.modal-content {
+ background: transparent;
+}
+
+.modal-content .modal-body, .modal-content .modal-footer {
+ background: #ffffff;
+}
+
div.required label.control-label:after {
content: " *";
color: red;
}
-.modal-content {
- background-color: transparent !important;
+.thumbnail .file-icon .fa {
+ font-size: 36px;
}
-.modal-content .modal-body, .modal-content .modal-footer {
- background-color: white;
+.sub-stop-led
+{
+ font-size: 11px;
+ color: #ae121d;
+}
+
+.grid-view .glyphicon {
+ display: inline-block;
+ padding: 5px;
+ background-color: #ffffff;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+}
+
+/* CARDS */
+.business-card {
+ background: #ddd;
+ /*padding: 10px;*/
+ border-radius: 4px;
+ margin-bottom: 10px;
+ position: relative;
+ overflow: hidden;
+}
+
+.business-card .media-left {
+ background-color: #999;
+ padding: 10px;
+}
+
+.business-card .media-body {
+ padding: 10px;
+}
+
+.business-card .profile-img {
+ height: 80px;
+ background: white;
+}
+.business-card .job {
+ color: #555;
+ font-size: 16px;
+}
+.business-card .name {
+ font-size: 20px;
+}
+
+.business-card .buttons {
+ position: absolute;
+ right: 10px;
+ bottom: 10px;
+ display: none;
+ font-size: 12px;
+}
+
+.business-card:hover .buttons {
+ display: block;
+}
+
+.business-card .buttons a {
+ color: #777;
+}
+
+.business-card-empty {
+ border: solid 3px #ccc;
+ padding: 10px;
+ border-radius: 4px;
+ margin-bottom: 10px;
+ position: relative;
+ overflow: hidden;
+ text-align: center;
+ color: #ccc;
+ font-size: 16px;
+ cursor: pointer;
+}
+.business-card-empty i {
+ font-size: 30px;
+}
+.business-card-empty:hover {
+ color: #484f58;
+}
+
+/* CONTACT CARD */
+.contact-card .job {
+ color: #999;
+ font-size: 16px;
+}
+.contact-card .name {
+ font-size: 20px;
+ color: #333;
+}
+
+.contact-card .cc_image {
+ width:180px;
+ height: 220px;
+ margin: 0 auto;
+ background-position: center;
+ background-size: cover;
+ background-repeat: no-repeat;
+}
+
+.modal .panel-body {
+ color: #ccc !important;
+}
+
+.modal #sub_data {
+ color: #555 !important;
+}
+
+.info-box-number {
+ font-size: 26px !important;
+}
+
+/* CALENDAR */
+.calendar-left-sidebar .list-group .btn {
+ border: 0;
+ background-color: transparent;
+ margin-top: -10px;
+ margin-right: -15px;
}
-.bootstrap-dialog .modal-footer {
- border-bottom-left-radius: 4px;
- border-bottom-right-radius: 4px;
+.calendar-left-sidebar .list-group .btn:hover {
+ border: 0;
+ background-color: transparent;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
+.business-card-avatar{
+ width: 80px;
+ height: 80px;
+ background-size: cover;
+ display: block;
+ border-radius: 50%;
+}
+
+/*.custom-checkbox { position: absolute; opacity: 0; z-index: -1; }
+/.custom-checkbox+span { font: 14px sans-serif; color: #3b3b3b; }
+.custom-checkbox+span:before { font: 16pt FontAwesome; content: '\00f096'; display: inline-block; width: 16pt; padding: 2px 0 0 3px; margin-right: 0.5em; }
+.custom-checkbox:checked+span:before { content: '\00f046'; color: limegreen }
+.custom-checkbox:focus+span:before { outline: 1px dotted #aaa; }
+.custom-checkbox:disabled+span { color: #999; }
+.custom-checkbox:not(:disabled)+span:hover:before { text-shadow: 0 1px 2px #77F; }*/
+
+.deadline-card-date-success { background-color: #2c9f32 }
+.deadline-card-date-danger { background-color:#cc3532 }
+.deadline-card-date-primary { background-color:#339ccc }
+
+.card-header-color {
+ background-color: #7BA7AB !important;
+ color: #ffffff;
+}
+.card-title-info {
+ color: rgba(255,255,255,0.5) !important;
+}
+
+.card, .card-header, .btn, .btn-lg, .form-control {
+ border-radius: 0 !important;
+}
+.card-header {
+ border-bottom: solid 3px #628589 !important;
+}
+
+.custom-control-input.is-valid ~ .custom-control-label::before {
+ color: #cccccc !important;
+ background-color: #cccccc !important;
+ border-color: #cccccc !important;
+}
+.was-validated .custom-control-input:valid:checked ~ .custom-control-label::before, .custom-control-input.is-valid:checked ~ .custom-control-label::before {
+ color: #7BA7AB !important;
+ background-color: #7BA7AB !important;
+ border-color: #7BA7AB !important;
+}
+.custom-control-input ~ .custom-control-label::before {
+ border-radius: 0 !important;
+ border-color: #7BA7AB !important;
+}
+.custom-checkbox .custom-control-input:checked ~ .custom-control-label::before {
+ background-color: #7BA7AB !important;
+ border-color: #7BA7AB;
+}
+.custom-checkbox .custom-control-input:checked:focus ~ .custom-control-label::before {
+ box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(123, 167, 171, 0.25)
+}
+.custom-checkbox .custom-control-input:focus ~ .custom-control-label::before {
+ box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 0, 0, 0.25)
+}
+.custom-checkbox .custom-control-input:active ~ .custom-control-label::before {
+ background-color: #9bd2d8;
+}
+.was-validated .custom-control-input:valid ~ .custom-control-label,
+.custom-control-input.is-valid ~ .custom-control-label,
+.custom-control-input.is-valid:checked ~ .custom-control-label::before {
+ color: inherit !important;
+}
+.was-validated .form-control:valid, .form-control.is-valid {
+ border-color: #cccccc !important;
+}
+.form-control:focus {
+ border-color: rgba(123, 167, 171, 0.44) !important;
+}
+
+.btn-success{color:#fff !important; background-color: #7bab83 !important; border-color:#7bab83 !important;border-bottom: solid 3px #658962 !important;}
+.btn-success:hover{color:#fff;background-color: #658962 !important;border-color:#658962 !important;}
+.btn-success:focus,.btn-success.focus{box-shadow:0 0 0 .2rem rgba(98, 137, 99, 0.5)
+}
+.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#7bab83;border-color:#658962}
+.btn-success:not(:disabled):not(.disabled):active,.btn-success:not(:disabled):not(.disabled).active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#7bab83;border-color:#000}
+.btn-success:not(:disabled):not(.disabled):active:focus,.btn-success:not(:disabled):not(.disabled).active:focus,.show>.btn-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(98, 137, 101, 0.5)
+}
+
+.btn-outline-success{color:#7bab83;background-color:transparent;background-image:none;border-color:#7bab83}.btn-outline-success:hover{color:#222;background-color: #009a1f;border-color:#7bab83}
+.btn-outline-success:focus,.btn-outline-success.focus{box-shadow:0 0 0 .2rem #658962}
+.btn-outline-success.disabled,.btn-outline-success:disabled{color:#7bab83;background-color:transparent}
+.btn-outline-success:not(:disabled):not(.disabled):active,.btn-outline-success:not(:disabled):not(.disabled).active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color: #8cc28f;border-color:#7bab83}
+.btn-outline-success:not(:disabled):not(.disabled):active:focus,.btn-outline-success:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem #658962}
+
+
+.btn-primary{color:#fff !important; background-color:#7BA7AB !important; border-color:#7BA7AB !important;border-bottom: solid 3px #628589 !important;}
+.btn-primary:hover{color:#fff;background-color:#628589 !important;border-color:#628589 !important;}
+.btn-primary:focus,.btn-primary.focus{box-shadow:0 0 0 .2rem rgba(98,133,137,0.5)}
+.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#7BA7AB;border-color:#628589}
+.btn-primary:not(:disabled):not(.disabled):active,.btn-primary:not(:disabled):not(.disabled).active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#7BA7AB;border-color:#000}
+.btn-primary:not(:disabled):not(.disabled):active:focus,.btn-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(98,133,137,0.5)}
+
+.btn-outline-primary{color:#7BA7AB !important;background-color:transparent !important;background-image:none !important;border-color:#7BA7AB !important; border-bottom: solid 3px #628589 !important;}.btn-outline-primary:hover{color:#FFFFFF !important;background-color:#628589 !important;border-color:#628589 !important; !important}
+.btn-outline-primary:focus,.btn-outline-primary.focus{box-shadow:0 0 0 .2rem #628589 !important;}
+.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#7BA7AB !important;background-color:transparent !important;}
+.btn-outline-primary:not(:disabled):not(.disabled):active,.btn-outline-primary:not(:disabled):not(.disabled).active,.show>.btn-outline-primary.dropdown-toggle{color:#fff !important;background-color: #8cbdc2 !important;border-color:#7BA7AB !important;}
+.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem #628589 !important;}
+
+
+.btn-danger{color:#fff !important; background-color: #dc565f !important; border-color:#dc565f !important;border-bottom: solid 3px #C82333 !important;}
+.btn-danger:hover{color:#fff;background-color:#C82333 !important;border-color:#C82333 !important;}
+.btn-danger:focus,.btn-primary.focus{box-shadow:0 0 0 .2rem rgba(200,35,51,0.5)}
+.btn-danger.disabled,.btn-primary:disabled{color:#fff;background-color:#dc565f;border-color:#C82333}
+.btn-danger:not(:disabled):not(.disabled):active,.btn-primary:not(:disabled):not(.disabled).active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#dc565f;border-color:#000}
+.btn-danger:not(:disabled):not(.disabled):active:focus,.btn-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(200,35,51,0.5)}
+
+.btn-outline-danger{color:#dc565f;background-color:transparent;background-image:none;border-color:#dc565f}.btn-outline-primary:hover{color:#222;background-color: #9a231e;border-color:#dc565f}
+.btn-outline-danger:focus,.btn-outline-primary.focus{box-shadow:0 0 0 .2rem #C82333}
+.btn-outline-danger.disabled,.btn-outline-primary:disabled{color:#dc565f;background-color:transparent}
+.btn-outline-danger:not(:disabled):not(.disabled):active,.btn-outline-primary:not(:disabled):not(.disabled).active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color: #dfa5a1;border-color:#dc565f}
+.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem #C82333}
+
+.btn-info{color:#fff !important; background-color:#17A2B8 !important; border-color:#17A2B8 !important;border-bottom: solid 3px #138496 !important;}
+.btn-info:hover{color:#fff;background-color:#138496 !important;border-color:#138496 !important;}
+.btn-info:focus,.btn-primary.focus{box-shadow:0 0 0 .2rem rgba(98,133,137,0.5)}
+.btn-info.disabled,.btn-primary:disabled{color:#fff;background-color:#17A2B8;border-color:#138496}
+.btn-info:not(:disabled):not(.disabled):active,.btn-primary:not(:disabled):not(.disabled).active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#17A2B8;border-color:#000}
+.btn-info:not(:disabled):not(.disabled):active:focus,.btn-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(98,133,137,0.5)}
+
+.btn-outline-info{color:#17A2B8;background-color:transparent;background-image:none;border-color:#17A2B8}.btn-outline-primary:hover{color:#222;background-color:#009a9a;border-color:#17A2B8}
+.btn-outline-info:focus,.btn-outline-primary.focus{box-shadow:0 0 0 .2rem #138496}
+.btn-outline-info.disabled,.btn-outline-primary:disabled{color:#17A2B8;background-color:transparent}
+.btn-outline-info:not(:disabled):not(.disabled):active,.btn-outline-primary:not(:disabled):not(.disabled).active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color: #8cbdc2;border-color:#17A2B8}
+.btn-outline-info:not(:disabled):not(.disabled):active:focus,.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem #138496}
+
+.nav-link {
+ color: #1e7785;
+}
+
+.nav-link:hover {
+ color: #06333b;
+}
+
+.nav-pills .nav-link.active,
+.nav-pills .show > .nav-link {
+ background-color: #7BA7AB !important;
+}
+
+.auth-icon {
+ display: inline-block !important;
+ margin: 0 10px;
+}
+
+.invalid-feedback {
+ font-size: 0.7em !important;
+ color: #F15B42 !important;
+}
+
+.was-validated .form-control:invalid,
+.form-control.is-invalid {
+ border-color: #cccccc !important;
+}
+
+.card-primary.card-outline {
+ border-top: 3px solid #7BA7AB !important;
+}
+
+.summary {
+ float: right;
+ font-size: 0.8em;
+ opacity: 0.5;
+}
+
+table {
+ font-size: 0.9em;
+}
+
+.card-header-info {
+ border-bottom-color: #17A2B8 !important;
+}
+
+.custom-control-input:checked ~ .custom-control-label::before {
+ background-color: #17A2B8 !important;
+}
+
+.help-block {
+ color: red;
+ font-size: 0.8em;
}
\ No newline at end of file
diff --git a/backend/web/css/skin.css b/backend/web/css/skin-origin.css
similarity index 100%
rename from backend/web/css/skin.css
rename to backend/web/css/skin-origin.css
diff --git a/backend/web/css/ui.jqgrid-bootstrap.css b/backend/web/css/ui.jqgrid-bootstrap.css
new file mode 100644
index 0000000..5166b23
--- /dev/null
+++ b/backend/web/css/ui.jqgrid-bootstrap.css
@@ -0,0 +1,1002 @@
+/*Grid*/
+.ui-jqgrid {
+ position: relative;
+ border: 1px solid #ddd; /*default*/
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+}
+.ui-jqgrid .ui-jqgrid-view {
+ position: relative;
+ left:0;
+ top: 0;
+ padding: 0;
+}
+.ui-jqgrid .ui-common-table {}
+
+/* Caption*/
+.ui-jqgrid .ui-jqgrid-titlebar {
+ font-weight: normal;
+ min-height:37px;
+ padding: 4px 8px;
+ position: relative;
+ margin-right: 2px;
+ border-bottom: 1px solid #ddd; /*default*/
+
+}
+.ui-jqgrid .ui-jqgrid-caption {
+ text-align: left;
+}
+.ui-jqgrid .ui-jqgrid-title {
+ padding-top: 5px;
+ vertical-align: middle;
+ position: absolute;
+}
+
+.ui-jqgrid .ui-jqgrid-titlebar-close {
+ color: inherit;
+ position: absolute;
+ top: 50%;
+ margin: -10px 7px 0 0;
+ padding: 1px;
+ cursor:pointer;
+}
+.ui-jqgrid .ui-jqgrid-titlebar-close span {
+ display: block;
+ margin: 1px;
+}
+.ui-jqgrid .ui-jqgrid-titlebar-close:hover { }
+
+/* Header*/
+.ui-jqgrid .ui-jqgrid-hdiv {
+ position: relative;
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
+}
+.ui-jqgrid .ui-jqgrid-hbox {
+ float: left;
+ padding-right: 20px;
+}
+.ui-jqgrid .ui-jqgrid-htable {
+ margin-bottom: 0;
+ table-layout: fixed;
+ border-top:none;
+}
+.ui-jqgrid .ui-jqgrid-htable thead th {
+ overflow : hidden;
+ border-bottom : none;
+ padding-right: 2px;
+}
+.ui-jqgrid .ui-jqgrid-htable thead th div {
+ overflow: hidden;
+ position:relative;
+}
+.ui-th-column, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column {
+ overflow: hidden;
+ white-space: nowrap;
+}
+.ui-th-column-header,
+.ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header {
+ overflow: hidden;
+ white-space: nowrap;
+}
+.ui-th-ltr, .ui-jqgrid .ui-jqgrid-htable th.ui-th-ltr {}
+.ui-th-rtl, .ui-jqgrid .ui-jqgrid-htable th.ui-th-rtl {text-align: center; }
+.ui-first-th-ltr { }
+.ui-first-th-rtl { }
+.ui-jqgrid tr.jqg-first-row-header th {
+ height:auto;
+ border-top:none;
+ padding-bottom: 0;
+ padding-top: 0;
+ border-bottom: none;
+ padding-right: 2px;
+ text-align: center;
+}
+.ui-jqgrid tr.jqg-second-row-header th,
+.ui-jqgrid tr.jqg-third--row-header th
+{
+ border-top:none;
+ text-align: center;
+}
+
+.ui-jqgrid .ui-th-div-ie {
+ white-space: nowrap;
+ height:17px;
+}
+.ui-jqgrid .ui-jqgrid-resize {
+ height:20px !important;
+ position: relative;
+ cursor :e-resize;
+ display: inline;
+ overflow: hidden;
+}
+.ui-jqgrid .ui-grid-ico-sort {
+ margin-left:5px;
+ overflow:hidden;
+ position:absolute;
+ right: auto;
+ font-size:12px;
+}
+.ui-jqgrid .ui-icon-asc {
+ margin-top:-3px;
+}
+.ui-jqgrid .ui-icon-desc {
+ margin-top:4px;
+}
+.ui-jqgrid .ui-i-asc {
+ margin-top:0;
+}
+.ui-jqgrid .ui-i-desc {
+ margin-top:0;
+ margin-right:13px;
+}
+.ui-jqgrid .ui-single-sort-asc {
+ margin-top:0;
+}
+.ui-jqgrid .ui-single-sort-desc {}
+.ui-jqgrid .ui-jqgrid-sortable {
+ cursor:pointer;
+}
+.ui-jqgrid tr.ui-search-toolbar th { }
+.ui-jqgrid .ui-search-table td.ui-search-clear { }
+.ui-jqgrid tr.ui-search-toolbar td > input { }
+.ui-jqgrid tr.ui-search-toolbar select {}
+
+.ui-jqgrid .ui-th-column > .ui-th-div {
+ padding-left: 14px;
+}
+.ui-jqgrid .ui-icon-left .ui-grid-ico-sort {
+ margin-left: -14px;
+}
+
+
+/* Body */
+.ui-jqgrid .table-bordered,
+.ui-jqgrid .table-bordered td,
+.ui-jqgrid .table-bordered th.ui-th-ltr
+{
+ border-left:0px none !important;
+}
+.ui-jqgrid .table-bordered th.ui-th-rtl
+{
+ border-right:0px none !important;
+}
+.ui-jqgrid .table-bordered tr.ui-row-rtl td
+{
+ border-right:0px none !important;
+ border-left: 1px solid #ddd !important;
+}
+div.tablediv > .table-bordered {
+ border-left : 1px solid #ddd !important;
+}
+.ui-jqgrid .ui-jqgrid-bdiv table.table-bordered td {
+ border-top: 0px none;
+}
+.ui-jqgrid .ui-jqgrid-bdiv {
+ position: relative;
+ margin: 0;
+ padding:0;
+ overflow: auto;
+ text-align:left;
+}
+.ui-jqgrid .ui-jqgrid-btable {
+ table-layout: fixed;
+ border-left:none ;
+ border-top:none;
+ margin-bottom: 0px
+}
+.ui-jqgrid tr.jqgrow {
+ outline-style: none;
+}
+.ui-jqgrid tr.jqgroup {
+ outline-style: none;
+}
+.ui-jqgrid .ui-jqgrid-btable tbody tr.jqgrow td {
+ overflow: hidden;
+ white-space: pre;
+ padding-right: 2px;
+}
+.ui-jqgrid tr.jqgfirstrow td {
+ height:auto;
+ border-top:none;
+ padding-bottom: 0;
+ padding-top: 0;
+ border-bottom: none;
+ padding-right: 2px;
+}
+.ui-jqgrid tr.jqgroup td {
+ white-space: nowrap;
+}
+.ui-jqgrid tr.jqfoot td {
+ white-space: nowrap;
+}
+.ui-jqgrid tr.ui-row-ltr td {}
+.ui-jqgrid tr.ui-row-rtl td {}
+.ui-jqgrid td.jqgrid-rownum { }
+.ui-jqgrid .ui-jqgrid-resize-mark {
+ width:2px;
+ left:0;
+ background-color:#777;
+ cursor: e-resize;
+ cursor: col-resize;
+ position:absolute;
+ top:0;
+ height:100px;
+ overflow:hidden;
+ display:none;
+ border:0 none;
+ z-index: 99999;
+
+}
+/* Footer */
+.ui-jqgrid .ui-jqgrid-sdiv {
+ position: relative;
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
+ border-left: 0 none !important;
+ border-top : 0 none !important;
+ border-right : 0 none !important;
+}
+.ui-jqgrid .ui-jqgrid-ftable {
+ table-layout:fixed;
+ margin-bottom:0;
+}
+
+.ui-jqgrid tr.footrow td {
+ font-weight: bold;
+ overflow: hidden;
+ white-space:nowrap;
+ padding-right: 2px;
+ border-bottom: 0px none;
+}
+.ui-jqgrid tr.footrow-ltr td {
+ text-align:left;
+}
+.ui-jqgrid tr.footrow-rtl td {
+ text-align:right;
+}
+
+/* Pager*/
+.ui-jqgrid .ui-jqgrid-pager,
+.ui-jqgrid .ui-jqgrid-toppager
+{
+ border-left-width: 0px;
+ border-top: 1px solid #ddd;
+ /*padding : 4px 0px;*/
+ position: relative;
+ /*height: auto; */
+ white-space: nowrap;
+ overflow: hidden;
+}
+.ui-jqgrid .ui-jqgrid-toppager {
+ border-top-width :0;
+ border-bottom : 1px solid #ddd;
+}
+.ui-jqgrid .ui-jqgrid-toppager .ui-pager-control,
+.ui-jqgrid .ui-jqgrid-pager .ui-pager-control {
+ position: relative;
+ border-left: 0;
+ border-bottom: 0;
+ border-top: 0;
+ /*height: 30px;*/
+}
+.ui-jqgrid .ui-pg-table {
+ position: relative;
+ padding: 1px 0;
+ width:auto;
+ margin: 0;
+}
+.ui-jqgrid .ui-pg-table td {
+ font-weight:normal;
+ vertical-align:middle;
+ /*padding:0px 6px;*/
+}
+.ui-jqgrid .ui-pager-control .ui-pager-table td {
+ border-top : 0px none !important;
+ min-height : 20px !important;
+}
+.ui-jqgrid .ui-pg-button {
+ height:auto;
+}
+.ui-jqgrid .ui-paging-pager td {
+ padding : 0 5px;
+}
+.ui-jqgrid .ui-pg-button span {
+ display: block;
+ margin: 0px 2px;
+ float:left;
+}
+.ui-jqgrid .ui-pg-button:hover { }
+.ui-jqgrid .ui-disabled:hover {}
+.ui-jqgrid .ui-pg-input,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-input {
+ display: inline-block;
+ height:auto;
+ width: auto;
+ font-size:.9em;
+ margin:0;
+ line-height: inherit;
+ border: none;
+ padding: 0px 3px
+}
+.ui-jqgrid .ui-pg-selbox,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-selbox {
+ font-size:.9em;
+ line-height:inherit;
+ display:block;
+ height:22px;
+ margin: 0;
+ padding: 3px 0px 3px 3px;
+ border:none;
+}
+.ui-jqgrid .ui-separator {
+ height: 18px;
+ border : none;
+ border-left: 2px solid #ccc ; /*default*/
+
+}
+.ui-separator-li {
+ height: 2px;
+ border : none;
+ border-top: 2px solid #ccc ; /*default*/
+ margin: 0; padding: 0; width:100%
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-pg-div,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-div
+{
+ float:left;
+ position:relative;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-pg-button,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-button
+{
+ cursor:pointer;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-pg-div span,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-div span
+{
+ float:left;
+}
+.ui-jqgrid td input,
+.ui-jqgrid td select,
+.ui-jqgrid td textarea {
+ margin: 0;
+}
+.ui-jqgrid td textarea {
+ width:auto;
+ height:auto;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-pager-table,
+.ui-jqgrid .ui-jqgrid-toppager .ui-pager-table
+{
+ width:100%;
+ table-layout:fixed;
+ height:100%;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-paging-info,
+.ui-jqgrid .ui-jqgrid-toppager .ui-paging-info
+{
+ font-weight: normal;
+ height:auto;
+ margin-top:3px;
+ margin-right:4px;
+ display: inline;
+}
+.ui-jqgrid .ui-jqgrid-pager .ui-paging-pager,
+.ui-jqgrid .ui-jqgrid-toppager .ui-paging-pager
+{
+ table-layout:auto;
+ height:100%;
+}
+.ui-jqgrid .ui-jqgrid-pager .navtable,
+.ui-jqgrid .ui-jqgrid-toppager .navtable
+{
+ float:left;
+ table-layout:auto;
+ height:100%;
+}
+.ui-jqgrid .ui-jqgrid-pager .navtable td,
+.ui-jqgrid .ui-jqgrid-toppager .navtable td
+{
+ padding : 0 5px;
+}
+
+/*Subgrid*/
+
+.ui-jqgrid .ui-jqgrid-btable .ui-sgcollapsed span {
+ display: block;
+}
+.ui-jqgrid .ui-subgrid {
+ margin:0;
+ padding:0;
+ width:100%;
+}
+.ui-jqgrid .ui-subgrid table {
+ table-layout: fixed;
+}
+.ui-jqgrid .ui-subgrid tr.ui-subtblcell td {}
+.ui-jqgrid .ui-subgrid td.subgrid-data {
+ border-top: 0 none !important;
+}
+.ui-jqgrid .ui-subgrid td.subgrid-cell {
+ vertical-align: middle
+}
+.ui-jqgrid a.ui-sghref {
+ text-decoration: none;
+ color : #010101; /*default*/
+}
+.ui-jqgrid .ui-th-subgrid {height:20px;}
+.tablediv > .row { margin: 0 0}
+/* loading */
+.ui-jqgrid .loading,
+.loading_pivot {
+ position: absolute;
+ top: 45%;
+ left: 45%;
+ width: auto;
+ z-index:101;
+ padding: 6px;
+ margin: 5px;
+ text-align: center;
+ display: none;
+ border: 1px solid #ddd; /*default*/
+ font-size: 14px;
+ background-color: #d9edf7;
+}
+.ui-jqgrid .jqgrid-overlay {
+ display:none;
+}
+/* IE * html .jqgrid-overlay {width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');} */
+* .jqgrid-overlay iframe {
+ position:absolute;
+ top:0;
+ left:0;
+ z-index:-1;
+}
+/* IE width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');}*/
+/* end loading div */
+
+/* Toolbar */
+.ui-jqgrid .ui-userdata {
+ padding: 4px 0px;
+ overflow: hidden;
+ min-height: 32px;
+}
+.ui-jqgrid .ui-userdata-top {
+ border-left-width: 0px; /*default*/
+ border-bottom: 1px solid #ddd;
+}
+.ui-jqgrid .ui-userdata-bottom {
+ border-left-width: 0px; /*default*/
+ border-top: 1px solid #ddd;
+}
+/*Modal Window */
+.ui-jqdialog { }
+.ui-jqdialog {
+ display: none;
+ width: 500px;
+ position: absolute;
+ /*padding: 5px; */
+ overflow:visible;
+}
+.ui-jqdialog .ui-jqdialog-titlebar {
+ padding: .1em .1em;
+ min-height: 35px;
+}
+.ui-jqdialog .ui-jqdialog-title {
+ margin: .3em 0 .2em;
+ font-weight: bold;
+ padding-left :6px;
+ padding-right:6px;
+}
+.ui-jqdialog .ui-jqdialog-titlebar-close {
+ position: absolute;
+ top: 0%;
+ margin: 3px 5px 0 0;
+ padding: 8px;
+ cursor:pointer;
+}
+
+.ui-jqdialog .ui-jqdialog-titlebar-close span { }
+.ui-jqdialog .ui-jqdialog-titlebar-close:hover,
+.ui-jqdialog .ui-jqdialog-titlebar-close:focus {
+ padding: 8px;
+}
+.ui-jqdialog-content, .ui-jqdialog .ui-jqdialog-content {
+ border: 0;
+ padding: .3em .2em;
+ background: none;
+ height:auto;
+}
+.ui-jqdialog .ui-jqconfirm {
+ padding: .4em 1em;
+ border-width:3px;
+ position:absolute;
+ bottom:10px;
+ right:10px;
+ overflow:visible;
+ display:none;
+ height:120px;
+ width:220px;
+ text-align:center;
+ background-color: #fff;
+ border-radius: 4px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+}
+.ui-jqdialog>.ui-resizable-se { }
+.ui-jqgrid>.ui-resizable-se { }
+.jqgrid-overlay-modal {
+ display : none;
+}
+/* end Modal window*/
+/* Form edit */
+.ui-jqdialog-content .FormGrid {
+ margin: 0 8px 0 8px;
+ overflow:auto;
+ position:relative;
+}
+.ui-jqdialog-content .EditTable {
+ width: 100%;
+ margin-bottom:0;
+}
+.ui-jqdialog-content .DelTable {
+ width: 100%;
+ margin-bottom:0;
+}
+.EditTable td input,
+.EditTable td select,
+.EditTable td textarea {
+ width: 98%;
+ display: inline-block;
+}
+.EditTable td textarea {
+ width:auto;
+ height:auto;
+}
+.EditTable .FormData td {
+ height:37px !important;
+}
+.ui-jqdialog-content td.EditButton {
+ text-align: right;
+ padding: 5px 5px 5px 0;
+}
+.ui-jqdialog-content td.navButton {
+ text-align: center;
+ border-left: 0 none;
+ border-top: 0 none;
+ border-right: 0 none;
+ padding-bottom:5px;
+ padding-top:5px;
+}
+.ui-jqdialog-content input.FormElement {
+ padding: .5em .3em;
+ margin-bottom: 5px
+}
+.ui-jqdialog-content select.FormElement {
+ padding:.3em;
+ margin-bottom: 3px;
+}
+.ui-jqdialog-content .data-line {
+ padding-top:.1em;
+ border: 0 none;
+}
+
+.ui-jqdialog-content .CaptionTD {
+ vertical-align: middle;
+ border: 0 none;
+ padding: 2px;
+ white-space: nowrap;
+}
+.ui-jqdialog-content .DataTD {
+ padding: 2px;
+ border: 0 none;
+ vertical-align: top;
+}
+.ui-jqdialog-content .form-view-data {
+ white-space:pre
+}
+.fm-button { }
+.fm-button-icon-left {
+ margin-left: 4px;
+ margin-right: 4px;
+}
+.fm-button-icon-right {
+ margin-left: 4px;
+ margin-right: 4px;
+}
+.fm-button-icon-left { }
+.fm-button-icon-right { }
+#nData, #pData {
+ margin-left: 4px;
+ margin-right: 4px;
+}
+#sData span, #cData span {
+ margin-left: 5px;
+}
+/* End Eorm edit */
+/*.ui-jqgrid .edit-cell {}*/
+.ui-jqgrid .selected-row,
+div.ui-jqgrid .selected-row td {
+ font-style : normal;
+}
+/* inline edit actions button*/
+.ui-inline-del, .ui-inline-cancel {
+ margin-left: 14px;
+}
+.ui-jqgrid .inline-edit-cell {}
+/* Tree Grid */
+.ui-jqgrid .tree-wrap {
+ float: left;
+ position: relative;
+ height: 18px;
+ white-space: nowrap;
+ overflow: hidden;
+}
+.ui-jqgrid .tree-minus {
+ position: absolute;
+ height: 18px;
+ width: 18px;
+ overflow: hidden;
+}
+.ui-jqgrid .tree-plus {
+ position: absolute;
+ height: 18px;
+ width: 18px;
+ overflow: hidden;
+}
+.ui-jqgrid .tree-leaf {
+ position: absolute;
+ height: 18px;
+ width: 18px;
+ overflow: hidden;
+}
+.ui-jqgrid .treeclick {
+ cursor: pointer;
+}
+/* moda dialog */
+* iframe.jqm {
+ position:absolute;
+ top:0;
+ left:0;
+ z-index:-1;
+}
+/* width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');}*/
+.ui-jqgrid-dnd tr td {
+ border-right-width: 1px;
+ border-right-color: inherit;
+ border-right-style: solid;
+ height:20px
+}
+/* RTL Support */
+.ui-jqgrid .ui-jqgrid-caption-rtl {
+ text-align: right;
+}
+.ui-jqgrid .ui-jqgrid-hbox-rtl {
+ float: right;
+ /*padding-left: 20px;*/
+}
+.ui-jqgrid .ui-jqgrid-resize-ltr {
+ float: right;
+ margin: -2px -2px -2px 0;
+ height:100%;
+}
+.ui-jqgrid .ui-jqgrid-resize-rtl {
+ float: left;
+ margin: -2px -2px -2px -0px;
+}
+.ui-jqgrid .ui-sort-rtl {
+
+}
+.ui-jqgrid .tree-wrap-ltr {
+ float: left;
+}
+.ui-jqgrid .tree-wrap-rtl {
+ float: right;
+}
+.ui-jqgrid .ui-ellipsis {
+ -moz-text-overflow:ellipsis;
+ text-overflow:ellipsis;
+}
+/* Toolbar Search Menu. Nav menu */
+.ui-search-menu,
+.ui-nav-menu {
+ position: absolute;
+ padding: 2px 5px;
+ z-index:99999;
+}
+.ui-search-menu.ui-menu .ui-menu-item,
+.ui-nav-menu.ui-menu .ui-menu-item
+{
+ list-style-image: none;
+ padding-right: 0;
+ padding-left: 0;
+}
+.ui-search-menu.ui-menu .ui-menu-item a,
+.ui-nav-menu.ui-menu .ui-menu-item a
+{
+ display: block;
+}
+.ui-search-menu.ui-menu .ui-menu-item a.g-menu-item:hover,
+.ui-nav-menu.ui-menu .ui-menu-item a.g-menu-item:hover
+{
+ margin: -1px;
+ font-weight: normal;
+}
+.ui-jqgrid .ui-search-table {
+ padding: 0;
+ border: 0 none;
+ height:20px;
+ width:100%;
+}
+.ui-jqgrid .ui-search-table .ui-search-oper {
+ width:20px;
+}
+a.g-menu-item, a.soptclass, a.clearsearchclass {
+ cursor: pointer;
+}
+.ui-jqgrid .ui-jqgrid-view input,
+.ui-jqgrid .ui-jqgrid-view select,
+.ui-jqgrid .ui-jqgrid-view textarea,
+.ui-jqgrid .ui-jqgrid-view button {
+ /*font-size: 11px*/
+}
+.ui-jqgrid .ui-scroll-popup {
+ width: 100px;
+}
+.ui-search-table select,
+.ui-search-table input
+{
+ padding: 4px 3px;
+}
+
+.ui-disabled {
+ opacity: .35;
+ filter:Alpha(Opacity=35); /* support: IE8 */
+ background-image: none;
+}
+.ui-overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0,0,0,0.5);
+ opacity: .3;
+ filter: Alpha(Opacity=30); /* support: IE8 */
+}
+
+.ui-jqgrid-pager .ui-pg-table .ui-pg-button:hover,
+.ui-jqgrid-toppager .ui-pg-table .ui-pg-button:hover
+{
+ background-color: #ddd;
+}
+.ui-jqgrid-corner {
+ border-radius: 5px
+}
+.ui-resizable-handle {
+ /*position: absolute;*/
+ display: block;
+ left :97%;
+}
+.ui-jqdialog .ui-resizable-se {
+ width: 12px;
+ height: 12px;
+ right: -5px;
+ bottom: -5px;
+ background-position: 16px 16px;
+}
+.ui-resizable-se {
+ cursor: se-resize;
+ width: 12px;
+ height: 12px;
+ right: 1px;
+ bottom: 1px;
+}
+.ui-top-corner {
+ border-top-left-radius: 5px;
+ border-top-right-radius: 5px;
+}
+.ui-bottom-corner {
+ border-bottom-left-radius: 5px;
+ border-bottom-right-radius: 5px;
+}
+
+.ui-search-table {
+ margin-bottom: 0;
+}
+.ui-search-table .columns, .ui-search-table .operators {
+ padding-right: 5px;
+}
+.opsel {
+ float :left;
+ width : 100px;
+ margin-right : 5px;
+}
+.add-group, .add-rule, .delete-group {
+ width: 14%;
+ margin-right : 5px;
+}
+.delete-rule {
+ width : 15px;
+}
+ul.ui-search-menu, ul.ui-nav-menu {
+ list-style-type: none;
+}
+ul.ui-search-menu li a,
+ul.ui-nav-menu li a,
+.soptclass,
+.clearsearchclass {
+ text-decoration: none;
+ color : #010101;
+}
+ul.ui-search-menu li a:hover, ul.ui-nav-menu li a:hover, a.soptclass:hover, a.clearsearchclass:hover {
+ background-color: #ddd;
+ padding: 1px 1px;
+ text-decoration: none;
+}
+ul.ui-search-menu li, ul.ui-nav-menu li {
+ padding : 5px 5px;
+}
+.ui-menu-item hr {
+ margin-bottom: 0px;
+ margin-top:0px;
+}
+
+.searchFilter .ui-search-table td,
+.searchFilter .ui-search-table th
+{
+ border-top: 0px none !important;
+}
+
+.searchFilter .queryresult {
+ margin-bottom: 5px;
+}
+.searchFilter .queryresult tr td{
+ border-top: 0px none;
+}
+.ui-search-label {
+ padding-left: 5px;
+}
+
+.frozen-div, .frozen-bdiv {
+ background-color: #fff;
+}
+/*
+.ui-jqgrid .ui-jqgrid-caption,
+.ui-jqgrid .ui-jqgrid-pager,
+.ui-jqgrid .ui-jqgrid-toppager,
+.ui-jqgrid .ui-jqgrid-htable thead th,
+.ui-jqgrid .ui-userdata-top,
+.ui-jqgrid .ui-userdata-bottom,
+.ui-jqgrid .ui-jqgrid-hdiv,
+.ui-jqdialog .ui-jqdialog-titlebar
+{
+ background-image: none, linear-gradient(to bottom, #fff 0px, #e0e0e0 100%);
+ background-repeat: repeat-x;
+ border-color: #ccc;
+ text-shadow: 0 1px 0 #fff;
+}
+*/
+/* Column menu */
+.ui-jqgrid .ui-jqgrid-htable .colmenu {
+ position:absolute;
+ right:1px;
+ height:100%;
+ color : black;
+}
+.ui-jqgrid .ui-jqgrid-htable .colmenu-rtl {
+ right: auto;
+ left : 1px;
+}
+.ui-jqgrid .ui-jqgrid-htable .colmenuspan {
+ display:inline-block;
+}
+
+.ui-jqgrid .ui-jqgrid-htable .ui-th-div {
+ height:17px;
+ margin-top:5px;
+}
+.column-menu, .ui-search-menu {
+ padding: 10px 15px;
+}
+.column-menu .divider {
+ background-color: #e5e5e5;
+ height: 1px;
+ padding:0 0;
+ margin: 5px 0;
+ overflow: hidden;
+}
+.ui-menu-item .ui-common-table .menu_icon {
+ padding-right: 8px;
+ padding-left: 8px;
+}
+td.menu_text {
+ width: auto;
+ padding-left: 1px;
+ white-space: nowrap;
+}
+#search_menu .ui-menu-item div {
+ padding: 3px 0;
+ white-space: nowrap;
+}
+
+#search_menu .search_buttons {
+ display:inline-block;
+ width:50%;
+ padding: 3px 3px;
+}
+.search_buttons .btn-default:hover {
+ padding-bottom: 6px;
+ padding-top: 6px;
+}
+.search_buttons #bs_reset {
+ margin-right: 3px;
+}
+.search_buttons #bs_search {
+ margin-left: 3px;
+}
+/*menubar*/
+.ui-jqgrid .ui-jqgrid-menubar {
+ margin: 5px 5px;
+ width:16px;
+ height:16px;
+}
+.ui-jqgrid a.ui-jqgrid-menubar {
+ text-decoration: none;
+ color : #010101; /*default*/
+}
+.ui-jqgrid .ui-jqgrid-menubar:hover {
+ margin: 5px 5px;
+ background-color: #ddd;
+ text-decoration: none;
+}
+.ui-jqgrid .menubar-rtl {
+ float : right;
+}
+
+.ui-jqgrid .menubar-ltr {
+ float : left;
+}
+/*printing*/
+
+.jqgridprint {
+ width : 100%;
+ font-size: 13px;
+}
+
+.jqgridprint th,
+.jqgridprint td {
+ padding: 4px 4px 4px 4px ;
+ text-align: center ;
+}
+.jqgridprint th {
+ border-bottom: 2px solid #333333 ;
+}
+.jqgridprint td {
+ border-bottom: 1px dotted #999999 ;
+}
+
+.jqgridprint tfoot td {
+ border-bottom-width: 0px ;
+ border-top: 2px solid #333333 ;
+ padding-top: 20px ;
+}
+.ui-jqgrid .jqgrid-caption-menu
+{
+ left:0;
+ top:30px;
+ position:absolute;
+ display:none;
+ font-size: inherit;
+ width : auto;
+}
+.ui-jqgrid .jqgrid-column-menu
+{
+ font-size:inherit;
+ width:auto;
+ position :absolute;
+}
diff --git a/backend/widgets/NotificationCountWidget.php b/backend/widgets/NotificationCountWidget.php
index 6712f7e..aa38e62 100644
--- a/backend/widgets/NotificationCountWidget.php
+++ b/backend/widgets/NotificationCountWidget.php
@@ -6,7 +6,7 @@
namespace backend\widgets;
-
+use Yii;
use yii\base\Widget;
class NotificationCountWidget extends Widget
@@ -15,14 +15,14 @@ class NotificationCountWidget extends Widget
{
$count = 0;
- if (isset(\Yii::$app->params['notifications'])) {
- foreach ( \Yii::$app->params['notifications'] as $notification ) {
+ if (isset(Yii::$app->params['notifications'])) {
+ foreach ( Yii::$app->params['notifications'] as $notification ) {
$count += $notification['count'];
}
}
return $this->render('notification-count', [
- 'notifications' => isset(\Yii::$app->params['notifications']) ? \Yii::$app->params['notifications'] : [],
+ 'notifications' => Yii::$app->params['notifications'] ?? [],
'count' => $count,
]);
}
diff --git a/backend/widgets/grid/CheckBoxColumn.php b/backend/widgets/grid/CheckBoxColumn.php
index cac779e..df8816c 100644
--- a/backend/widgets/grid/CheckBoxColumn.php
+++ b/backend/widgets/grid/CheckBoxColumn.php
@@ -6,7 +6,6 @@
namespace backend\widgets\grid;
-
class CheckBoxColumn extends \yii\grid\CheckboxColumn
{
public $headerOptions = ['class' => 'text-center', 'style' => 'width: 3em'];
diff --git a/common/config/main.php b/common/config/main.php
index d69dfc0..6e72884 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -1,4 +1,9 @@
[
'@bower' => '@vendor/bower-asset',
@@ -29,12 +34,12 @@ return [
'queue' => [
//'class' => 'yii\queue\redis\Queue',
//'as log' => 'yii\queue\LogBehavior',
- 'class' => \yii\queue\file\Queue::class,
+ 'class' => Queue::class,
//'path' => '@runtime/queue',
'path' => '@common/runtime/queue',
],
'avatar' => [
- 'class' => \zertex\avatar_generator\AvatarGenerator::class,
+ 'class' => AvatarGenerator::class,
'images_folder' => '@staticRoot/images/avatars',
'images_url' => '@static/images/avatars',
'size_width' => 300, // default: 300
@@ -45,7 +50,7 @@ return [
'text_over_image' => false,
],
'moduleManager' => [
- 'class' => \core\components\modules\ModuleManager::class,
+ 'class' => ModuleManager::class,
],
],
];
diff --git a/common/modules/banners/BannersModule.php b/common/modules/banners/BannersModule.php
index f495a2e..c8f1334 100644
--- a/common/modules/banners/BannersModule.php
+++ b/common/modules/banners/BannersModule.php
@@ -3,12 +3,15 @@
namespace common\modules\banners;
use core\components\modules\ModuleInterface;
+use Yii;
+use yii\base\Module;
use yii\helpers\ArrayHelper;
+use yii\web\Application;
/**
* blog module definition class
*/
-class BannersModule extends \yii\base\Module implements ModuleInterface
+class BannersModule extends Module implements ModuleInterface
{
/**
* @inheritdoc
@@ -25,7 +28,7 @@ class BannersModule extends \yii\base\Module implements ModuleInterface
// custom initialization code goes here
}
- public function bootstrap($app)
+ public function bootstrap(Application $app)
{
// add migration path
$app->controllerMap['migrate']['migrationPath'][] = '@common/modules/banners/migrations';
@@ -51,25 +54,25 @@ class BannersModule extends \yii\base\Module implements ModuleInterface
]);
// add menu items
- if (basename(\Yii::$app->getBasePath()) === 'backend') {
+ if (basename(Yii::$app->getBasePath()) === 'backend') {
$app->params['adminMenu'][] = [
- 'label' => \Yii::t('banners', 'Banners'),
- 'icon' => 'flag',
+ 'label' => Yii::t('banners', 'Banners'),
+ 'icon' => 'fas fa-flag',
'items' => [
[
- 'label' => \Yii::t('banners', 'Banners'),
- 'icon' => 'caret-right',
+ 'label' => Yii::t('banners', 'Banners'),
+ 'icon' => 'fas fa-caret-right',
'url' => ['/banners/manage/banner/index'],
//'active' => \Yii::$app->controller->getUniqueId() == 'banners/manage/banner'
],
[
- 'label' => \Yii::t('banners', 'Places'),
- 'icon' => 'caret-right',
+ 'label' => Yii::t('banners', 'Places'),
+ 'icon' => 'fas fa-caret-right',
'url' => ['/banners/manage/place/index'],
//'active' => \Yii::$app->controller->getUniqueId() == 'banners/manage/place'
],
],
- 'visible' => $app->user->can('admin') || \Yii::$app->user->can('BannersManagement'),
+ 'visible' => $app->user->can('admin') || Yii::$app->user->can('BannersManagement'),
];
}
}
diff --git a/common/modules/banners/controllers/BannerController.php b/common/modules/banners/controllers/BannerController.php
index 4107068..97fe149 100644
--- a/common/modules/banners/controllers/BannerController.php
+++ b/common/modules/banners/controllers/BannerController.php
@@ -9,36 +9,48 @@ namespace common\modules\banners\controllers;
use common\modules\banners\entities\Banner;
use common\modules\banners\services\BannerManageService;
use frontend\components\FrontendController;
+use Yii;
use yii\web\NotFoundHttpException;
class BannerController extends FrontendController
{
- private $_service;
+ private BannerManageService $service;
public function __construct(string $id, $module, BannerManageService $service, array $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
+ /**
+ * @throws NotFoundHttpException
+ */
public function actionView()
{
$id = filter_input(INPUT_POST, 'id', FILTER_VALIDATE_INT);
- if (\Yii::$app->request->isAjax && $id) {
+ if (Yii::$app->request->isAjax && $id) {
$banner = $this->findModel($id);
- $this->_service->addView($banner);
+ $this->service->addView($banner);
}
}
+ /**
+ * @throws NotFoundHttpException
+ */
public function actionClick()
{
$id = filter_input(INPUT_POST, 'id', FILTER_VALIDATE_INT);
- if (\Yii::$app->request->isAjax && $id) {
+ if (Yii::$app->request->isAjax && $id) {
$banner = $this->findModel($id);
- $this->_service->addClick($banner);
+ $this->service->addClick($banner);
}
}
+ /**
+ * @param $id
+ * @return Banner
+ * @throws NotFoundHttpException
+ */
protected function findModel($id): Banner
{
if (($model = Banner::findOne($id)) !== null) {
diff --git a/common/modules/banners/controllers/manage/BannerController.php b/common/modules/banners/controllers/manage/BannerController.php
index ce0cec6..118281e 100644
--- a/common/modules/banners/controllers/manage/BannerController.php
+++ b/common/modules/banners/controllers/manage/BannerController.php
@@ -6,20 +6,22 @@ use common\modules\banners\entities\Banner;
use common\modules\banners\forms\BannerForm;
use common\modules\banners\forms\search\BannerSearch;
use common\modules\banners\services\BannerManageService;
+use DomainException;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\web\Controller;
use Yii;
+use yii\web\Response;
class BannerController extends Controller
{
- private $_service;
+ private BannerManageService $service;
public function __construct($id, $module, BannerManageService $service, $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
public function behaviors(): array
@@ -48,9 +50,9 @@ class BannerController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new BannerSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -67,7 +69,7 @@ class BannerController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'banner' => $this->findModel($id),
@@ -75,18 +77,18 @@ class BannerController extends Controller
}
/**
- * @return mixed
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): string|Response
{
$form = new BannerForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $form = $this->_service->create($form);
+ $form = $this->service->create($form);
return $this->redirect(['view', 'id' => $form->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -102,10 +104,10 @@ class BannerController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$banner = $this->findModel($id);
$form = new BannerForm($banner);
@@ -113,10 +115,10 @@ class BannerController extends Controller
$form->end_at = date('d.m.Y H:i:s', $form->end_at);
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_service->edit($banner->id, $form);
+ $this->service->edit($banner->id, $form);
return $this->redirect(['view', 'id' => $banner->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -129,15 +131,14 @@ class BannerController extends Controller
}
/**
- * @param integer $id
- *
- * @return mixed
+ * @param int $id
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
- $this->_service->remove($id);
- } catch (\DomainException $e) {
+ $this->service->remove($id);
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -151,7 +152,7 @@ class BannerController extends Controller
* @return Banner the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): Banner
+ protected function findModel(int $id): Banner
{
if (($model = Banner::findOne($id)) !== null) {
return $model;
diff --git a/common/modules/banners/controllers/manage/PlaceController.php b/common/modules/banners/controllers/manage/PlaceController.php
index f8f8b06..7b29de8 100644
--- a/common/modules/banners/controllers/manage/PlaceController.php
+++ b/common/modules/banners/controllers/manage/PlaceController.php
@@ -6,20 +6,22 @@ use common\modules\banners\entities\BannerPlace;
use common\modules\banners\forms\BannerPlaceForm;
use common\modules\banners\forms\search\PlaceSearch;
use common\modules\banners\services\BannerPlaceManageService;
+use DomainException;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\web\Controller;
use Yii;
+use yii\web\Response;
class PlaceController extends Controller
{
- private $_service;
+ private BannerPlaceManageService $service;
public function __construct($id, $module, BannerPlaceManageService $service, $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
public function behaviors(): array
@@ -48,9 +50,9 @@ class PlaceController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new PlaceSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -67,7 +69,7 @@ class PlaceController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'place' => $this->findModel($id),
@@ -75,17 +77,17 @@ class PlaceController extends Controller
}
/**
- * @return mixed
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): string|Response
{
$form = new BannerPlaceForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $form = $this->_service->create($form);
+ $form = $this->service->create($form);
return $this->redirect(['view', 'id' => $form->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -101,20 +103,20 @@ class PlaceController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$place = $this->findModel($id);
$form = new BannerPlaceForm($place);
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_service->edit($place->id, $form);
+ $this->service->edit($place->id, $form);
return $this->redirect(['view', 'id' => $place->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -129,13 +131,13 @@ class PlaceController extends Controller
/**
* @param integer $id
*
- * @return mixed
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
- $this->_service->remove($id);
- } catch (\DomainException $e) {
+ $this->service->remove($id);
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -149,7 +151,7 @@ class PlaceController extends Controller
* @return BannerPlace the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): BannerPlace
+ protected function findModel(int $id): BannerPlace
{
if (($model = BannerPlace::findOne($id)) !== null) {
return $model;
diff --git a/common/modules/banners/entities/Banner.php b/common/modules/banners/entities/Banner.php
index 39a0572..d09ece8 100644
--- a/common/modules/banners/entities/Banner.php
+++ b/common/modules/banners/entities/Banner.php
@@ -3,7 +3,9 @@
namespace common\modules\banners\entities;
use common\modules\banners\entities\queries\BannerQuery;
+use DomainException;
use yii\behaviors\TimestampBehavior;
+use yii\db\ActiveQuery;
use yii\db\ActiveRecord;
use yii\web\UploadedFile;
use Yii;
@@ -99,7 +101,7 @@ class Banner extends ActiveRecord
/**
* @inheritdoc
*/
- public static function tableName()
+ public static function tableName(): string
{
return 'banners';
}
@@ -107,7 +109,7 @@ class Banner extends ActiveRecord
/**
* @inheritdoc
*/
- public function attributeLabels()
+ public function attributeLabels(): array
{
return [
'id' => Yii::t('banners', 'ID'),
@@ -131,7 +133,7 @@ class Banner extends ActiveRecord
public function activate(): void
{
if ($this->isActive()) {
- throw new \DomainException('Banner is already active.');
+ throw new DomainException('Banner is already active.');
}
$this->active = self::STATUS_ACTIVE;
}
@@ -139,7 +141,7 @@ class Banner extends ActiveRecord
public function draft(): void
{
if ($this->isDraft()) {
- throw new \DomainException('Banner is already draft.');
+ throw new DomainException('Banner is already draft.');
}
$this->active = self::STATUS_DRAFT;
}
@@ -155,7 +157,7 @@ class Banner extends ActiveRecord
return $this->active == self::STATUS_DRAFT;
}
- public function getPlace()
+ public function getPlace(): ActiveQuery
{
return $this->hasOne(BannerPlace::class, ['id' => 'place_id']);
}
diff --git a/common/modules/banners/entities/BannerPlace.php b/common/modules/banners/entities/BannerPlace.php
index 1879de5..b2baeaa 100644
--- a/common/modules/banners/entities/BannerPlace.php
+++ b/common/modules/banners/entities/BannerPlace.php
@@ -3,6 +3,8 @@
namespace common\modules\banners\entities;
use common\modules\banners\entities\queries\BannerPlaceQuery;
+use DomainException;
+use yii\db\ActiveQuery;
use yii\db\ActiveRecord;
use Yii;
@@ -46,7 +48,7 @@ class BannerPlace extends ActiveRecord
/**
* @inheritdoc
*/
- public static function tableName()
+ public static function tableName(): string
{
return 'banners_places';
}
@@ -68,7 +70,7 @@ class BannerPlace extends ActiveRecord
public function activate(): void
{
if ($this->isActive()) {
- throw new \DomainException('Place is already active.');
+ throw new DomainException('Place is already active.');
}
$this->active = self::STATUS_ACTIVE;
}
@@ -76,7 +78,7 @@ class BannerPlace extends ActiveRecord
public function draft(): void
{
if ($this->isDraft()) {
- throw new \DomainException('Place is already draft.');
+ throw new DomainException('Place is already draft.');
}
$this->active = self::STATUS_DRAFT;
}
@@ -91,12 +93,12 @@ class BannerPlace extends ActiveRecord
return $this->active == self::STATUS_DRAFT;
}
- public function getBanners()
+ public function getBanners(): ActiveQuery
{
return $this->hasMany(Banner::class, ['place_id' => 'id']);
}
- public function getActiveBanners()
+ public function getActiveBanners(): ActiveQuery
{
return $this->hasMany(Banner::class, ['place_id' => 'id'])->andWhere(['active' => Banner::STATUS_ACTIVE]);
}
diff --git a/common/modules/banners/forms/BannerForm.php b/common/modules/banners/forms/BannerForm.php
index 5b2a1d6..3bc1c6c 100644
--- a/common/modules/banners/forms/BannerForm.php
+++ b/common/modules/banners/forms/BannerForm.php
@@ -9,22 +9,19 @@ use yii\web\UploadedFile;
class BannerForm extends Model
{
- public $title;
+ public ?string $title = null;
- /**
- * @var UploadedFile
- */
- public $image;
- public $url;
- public $target;
- public $active;
- public $start_at;
- public $end_at;
- public $include_urls;
- public $exclude_urls;
- public $place_id;
+ public string|null|UploadedFile $image = null;
+ public ?string $url = null;
+ public ?string $target = null;
+ public ?int $active = null;
+ public ?int $start_at = null;
+ public ?int $end_at = null;
+ public ?string $include_urls = null;
+ public ?string $exclude_urls = null;
+ public ?int $place_id = null;
- public $_banner;
+ public Banner $banner;
public function __construct(Banner $banner = null, $config = [])
{
@@ -39,7 +36,7 @@ class BannerForm extends Model
$this->include_urls = $banner->include_urls;
$this->exclude_urls = $banner->exclude_urls;
$this->place_id = $banner->place_id;
- $this->_banner = $banner;
+ $this->banner = $banner;
}
parent::__construct($config);
}
@@ -53,13 +50,10 @@ class BannerForm extends Model
[['include_urls', 'exclude_urls'], 'string'],
[['image'], 'file', 'extensions' => 'png, jpg, gif'],
[['start_at', 'end_at'], 'safe'],
- /*[['start_at', 'end_at'], 'date',
- 'format' => 'php:d.m.Y H:i'
- ],*/
];
}
- public function attributeLabels()
+ public function attributeLabels(): array
{
return [
'id' => Yii::t('banners', 'ID'),
@@ -80,7 +74,7 @@ class BannerForm extends Model
];
}
- public function beforeValidate()
+ public function beforeValidate(): bool
{
if (parent::beforeValidate()) {
$this->image = UploadedFile::getInstance($this, 'image');
@@ -92,13 +86,4 @@ class BannerForm extends Model
return false;
}
-
- /*public function afterValidate() {
- if (parent::afterValidate()) {
- $this->start_at = strtotime($this->start_at);
- $this->end_at = strtotime($this->end_at);
- return true;
- }
- return false;
- }*/
}
diff --git a/common/modules/banners/forms/BannerPlaceForm.php b/common/modules/banners/forms/BannerPlaceForm.php
index cd334bd..73e9a50 100644
--- a/common/modules/banners/forms/BannerPlaceForm.php
+++ b/common/modules/banners/forms/BannerPlaceForm.php
@@ -8,12 +8,12 @@ use Yii;
class BannerPlaceForm extends Model
{
- public $title;
- public $width;
- public $height;
- public $active;
+ public ?string $title = null;
+ public ?int $width = null;
+ public ?int $height = null;
+ public ?int $active = null;
- public $_place;
+ public BannerPlace $place;
public function __construct(BannerPlace $place = null, $config = [])
{
@@ -22,7 +22,7 @@ class BannerPlaceForm extends Model
$this->width = $place->width;
$this->height = $place->height;
$this->active = $place->active;
- $this->_place = $place;
+ $this->place = $place;
}
parent::__construct($config);
}
diff --git a/common/modules/banners/forms/search/BannerSearch.php b/common/modules/banners/forms/search/BannerSearch.php
index 7308f90..defb6a5 100644
--- a/common/modules/banners/forms/search/BannerSearch.php
+++ b/common/modules/banners/forms/search/BannerSearch.php
@@ -8,11 +8,11 @@ use yii\data\ActiveDataProvider;
class BannerSearch extends Model
{
- public $id;
- public $title;
- public $active;
- public $place_id;
- public $target;
+ public ?int $id = null;
+ public ?string $title = null;
+ public ?int $active = null;
+ public ?int $place_id = null;
+ public ?string $target = null;
public function rules(): array
{
diff --git a/common/modules/banners/forms/search/PlaceSearch.php b/common/modules/banners/forms/search/PlaceSearch.php
index 79347fe..ed825aa 100644
--- a/common/modules/banners/forms/search/PlaceSearch.php
+++ b/common/modules/banners/forms/search/PlaceSearch.php
@@ -8,11 +8,11 @@ use yii\data\ActiveDataProvider;
class PlaceSearch extends Model
{
- public $id;
- public $title;
- public $width;
- public $height;
- public $active;
+ public ?int $id = null;
+ public ?string $title = null;
+ public ?int $width = null;
+ public ?int $height = null;
+ public ?int $active = null;
public function rules(): array
{
diff --git a/common/modules/banners/helpers/BannerHelper.php b/common/modules/banners/helpers/BannerHelper.php
index e25e5e5..ce2c241 100644
--- a/common/modules/banners/helpers/BannerHelper.php
+++ b/common/modules/banners/helpers/BannerHelper.php
@@ -7,6 +7,7 @@
namespace common\modules\banners\helpers;
use common\modules\banners\entities\Banner;
+use Exception;
use yii\helpers\ArrayHelper;
use yii\helpers\Html;
use Yii;
@@ -21,6 +22,11 @@ class BannerHelper
];
}
+ /**
+ * @param $target
+ * @return string
+ * @throws Exception
+ */
public static function targetName($target): string
{
return ArrayHelper::getValue(self::targetList(), $target);
@@ -34,23 +40,28 @@ class BannerHelper
];
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusName($status): string
{
return ArrayHelper::getValue(self::statusList(), $status);
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusLabel($status): string
{
- switch ($status) {
- case Banner::STATUS_DRAFT:
- $class = 'label label-default';
- break;
- case Banner::STATUS_ACTIVE:
- $class = 'label label-success';
- break;
- default:
- $class = 'label label-default';
- }
+ $class = match ($status) {
+ Banner::STATUS_DRAFT => 'label label-default',
+ Banner::STATUS_ACTIVE => 'label label-success',
+ default => 'label label-default',
+ };
return Html::tag('span', ArrayHelper::getValue(self::statusList(), $status), [
'class' => $class,
diff --git a/common/modules/banners/repositories/BannerPlaceRepository.php b/common/modules/banners/repositories/BannerPlaceRepository.php
index 630ed9a..e5024fb 100644
--- a/common/modules/banners/repositories/BannerPlaceRepository.php
+++ b/common/modules/banners/repositories/BannerPlaceRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\banners\repositories;
use common\modules\banners\entities\BannerPlace;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class BannerPlaceRepository
{
@@ -18,14 +20,18 @@ class BannerPlaceRepository
public function save(BannerPlace $place): void
{
if (!$place->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param BannerPlace $place
+ * @throws StaleObjectException
+ */
public function remove(BannerPlace $place): void
{
if (!$place->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
}
diff --git a/common/modules/banners/repositories/BannerRepository.php b/common/modules/banners/repositories/BannerRepository.php
index 61bf2c4..f25bc1c 100644
--- a/common/modules/banners/repositories/BannerRepository.php
+++ b/common/modules/banners/repositories/BannerRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\banners\repositories;
use common\modules\banners\entities\Banner;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class BannerRepository
{
@@ -18,14 +20,18 @@ class BannerRepository
public function save(Banner $banner): void
{
if (!$banner->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param Banner $banner
+ * @throws StaleObjectException
+ */
public function remove(Banner $banner): void
{
if (!$banner->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
}
diff --git a/common/modules/banners/services/BannerManageService.php b/common/modules/banners/services/BannerManageService.php
index 3413fc6..2b874bc 100644
--- a/common/modules/banners/services/BannerManageService.php
+++ b/common/modules/banners/services/BannerManageService.php
@@ -5,22 +5,30 @@ namespace common\modules\banners\services;
use common\modules\banners\entities\Banner;
use common\modules\banners\forms\BannerForm;
use common\modules\banners\repositories\BannerRepository;
+use Yii;
+use yii\base\Exception;
use yii\base\Security;
+use yii\db\StaleObjectException;
class BannerManageService
{
- private $_repository;
+ private BannerRepository $repository;
public function __construct(BannerRepository $repository)
{
- $this->_repository = $repository;
+ $this->repository = $repository;
}
+ /**
+ * @param BannerForm $form
+ * @return Banner
+ * @throws Exception
+ */
public function create(BannerForm $form): Banner
{
if ($form->image) {
$filename = $form->image->baseName . '_' . (new Security())->generateRandomString(5) . '.' . $form->image->extension;
- $path = \Yii::getAlias(Banner::FILE_ORIGINAL_PATH);
+ $path = Yii::getAlias(Banner::FILE_ORIGINAL_PATH);
if (!file_exists($path)) {
mkdir($path, 0777, true);
}
@@ -40,18 +48,23 @@ class BannerManageService
$form->active,
$form->place_id
);
- $this->_repository->save($banner);
+ $this->repository->save($banner);
return $banner;
}
+ /**
+ * @param $id
+ * @param BannerForm $form
+ * @throws Exception
+ */
public function edit($id, BannerForm $form): void
{
- $banner = $this->_repository->get($id);
+ $banner = $this->repository->get($id);
if ($form->image) {
$filename = $form->image->baseName . '_' . (new Security())->generateRandomString(5) . '.' . $form->image->extension;
- $path = \Yii::getAlias(Banner::FILE_ORIGINAL_PATH);
+ $path = Yii::getAlias(Banner::FILE_ORIGINAL_PATH);
$form->image->saveAs($path . '/' . $filename);
$form->image = $filename;
} else {
@@ -70,24 +83,28 @@ class BannerManageService
$form->active,
$form->place_id
);
- $this->_repository->save($banner);
+ $this->repository->save($banner);
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
- $banner = $this->_repository->get($id);
- $this->_repository->remove($banner);
+ $banner = $this->repository->get($id);
+ $this->repository->remove($banner);
}
public function addView(Banner $banner)
{
$banner->views++;
- $this->_repository->save($banner);
+ $this->repository->save($banner);
}
public function addClick(Banner $banner)
{
$banner->clicks++;
- $this->_repository->save($banner);
+ $this->repository->save($banner);
}
}
diff --git a/common/modules/banners/services/BannerPlaceManageService.php b/common/modules/banners/services/BannerPlaceManageService.php
index b362e9b..71bbc1e 100644
--- a/common/modules/banners/services/BannerPlaceManageService.php
+++ b/common/modules/banners/services/BannerPlaceManageService.php
@@ -5,14 +5,15 @@ namespace common\modules\banners\services;
use common\modules\banners\entities\BannerPlace;
use common\modules\banners\forms\BannerPlaceForm;
use common\modules\banners\repositories\BannerPlaceRepository;
+use yii\db\StaleObjectException;
class BannerPlaceManageService
{
- private $_repository;
+ private BannerPlaceRepository $repository;
public function __construct(BannerPlaceRepository $repository)
{
- $this->_repository = $repository;
+ $this->repository = $repository;
}
public function create(BannerPlaceForm $form): BannerPlace
@@ -23,26 +24,30 @@ class BannerPlaceManageService
$form->height,
$form->active
);
- $this->_repository->save($place);
+ $this->repository->save($place);
return $place;
}
public function edit($id, BannerPlaceForm $form): void
{
- $place = $this->_repository->get($id);
+ $place = $this->repository->get($id);
$place->edit(
$form->title,
$form->width,
$form->height,
$form->active
);
- $this->_repository->save($place);
+ $this->repository->save($place);
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
- $place = $this->_repository->get($id);
- $this->_repository->remove($place);
+ $place = $this->repository->get($id);
+ $this->repository->remove($place);
}
}
diff --git a/common/modules/banners/views/manage/banner/_form.php b/common/modules/banners/views/manage/banner/_form.php
index b8fa27c..cf9e385 100644
--- a/common/modules/banners/views/manage/banner/_form.php
+++ b/common/modules/banners/views/manage/banner/_form.php
@@ -1,5 +1,6 @@
title = Yii::t('banners', 'Create Banner');
$this->params['breadcrumbs'][] = ['label' => Yii::t('banners', 'Banners'), 'url' => ['index']];
diff --git a/common/modules/banners/views/manage/banner/index.php b/common/modules/banners/views/manage/banner/index.php
index caa1d10..c1b237e 100644
--- a/common/modules/banners/views/manage/banner/index.php
+++ b/common/modules/banners/views/manage/banner/index.php
@@ -1,6 +1,7 @@
title = Yii::t('banners', 'Banners');
diff --git a/common/modules/banners/views/manage/banner/update.php b/common/modules/banners/views/manage/banner/update.php
index cdf268e..abd44ef 100644
--- a/common/modules/banners/views/manage/banner/update.php
+++ b/common/modules/banners/views/manage/banner/update.php
@@ -1,8 +1,11 @@
title = Yii::t('banners', 'Update Banner: {name}', ['name' => $banner->title]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('banners', 'Banners'), 'url' => ['index']];
diff --git a/common/modules/banners/views/manage/place/_form.php b/common/modules/banners/views/manage/place/_form.php
index 9b962e3..059ba75 100644
--- a/common/modules/banners/views/manage/place/_form.php
+++ b/common/modules/banners/views/manage/place/_form.php
@@ -32,8 +32,8 @@ $this->registerJs($js2);
-
-
+
+
field($model, 'title')->textInput(['maxlength' => true]) ?>
-
@@ -47,19 +47,20 @@ $this->registerJs($js2);
+
- 'btn btn-success']) ?>
-
+
-
-
-
+
+
+
field($model, 'active')->radioList(BannerHelper::statusList()) ?>
diff --git a/common/modules/banners/views/manage/place/index.php b/common/modules/banners/views/manage/place/index.php
index 97624fd..b2f184b 100644
--- a/common/modules/banners/views/manage/place/index.php
+++ b/common/modules/banners/views/manage/place/index.php
@@ -1,26 +1,25 @@
title = Yii::t('banners', 'Places');
$this->params['breadcrumbs'][] = $this->title;
?>
-
-
- 'btn btn-success']) ?> -
- -
-
+
+
+ 'btn btn-sm btn-success']) ?>
+
+
$dataProvider,
'filterModel' => $searchModel,
diff --git a/common/modules/banners/widgets/BannerWidget.php b/common/modules/banners/widgets/BannerWidget.php
index ee9b593..00794f8 100644
--- a/common/modules/banners/widgets/BannerWidget.php
+++ b/common/modules/banners/widgets/BannerWidget.php
@@ -12,9 +12,9 @@ use yii\base\Widget;
class BannerWidget extends Widget
{
- public $id;
+ public int $id;
- public function run()
+ public function run(): string
{
$place = BannerPlace::findOne($this->id);
if (!$place) {
@@ -24,7 +24,6 @@ class BannerWidget extends Widget
$banners = Banner::find()
->active()
->showTime()
- //->excludeFree()
->andWhere(['place_id' => $place->id])
->all();
diff --git a/common/modules/banners/widgets/views/banner.php b/common/modules/banners/widgets/views/banner.php
index 76c1eb5..9070d22 100644
--- a/common/modules/banners/widgets/views/banner.php
+++ b/common/modules/banners/widgets/views/banner.php
@@ -4,12 +4,14 @@
* Date: 22.08.2018
*/
+use common\modules\banners\entities\Banner;
use yii\helpers\Html;
use yii\helpers\Url;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $banner \common\modules\banners\entities\Banner;
+ * @var $this View
+ * @var $banner Banner;
*/
$banner_id = 'banner_' . $banner->id;
diff --git a/common/modules/forms/FormsModule.php b/common/modules/forms/FormsModule.php
index 8ae6b91..7e96bde 100644
--- a/common/modules/forms/FormsModule.php
+++ b/common/modules/forms/FormsModule.php
@@ -5,7 +5,9 @@ namespace common\modules\forms;
use common\modules\forms\entities\FormMessage;
use common\modules\forms\urls\FormsUrlRule;
use core\components\modules\ModuleInterface;
+use Yii;
use yii\helpers\ArrayHelper;
+use yii\web\Application;
/**
* blog module definition class
@@ -27,7 +29,7 @@ class FormsModule extends \yii\base\Module implements ModuleInterface
// custom initialization code goes here
}
- public function bootstrap($app)
+ public function bootstrap(Application $app)
{
// add migration path
$app->controllerMap['migrate']['migrationPath'][] = '@common/modules/forms/migrations';
@@ -52,26 +54,26 @@ class FormsModule extends \yii\base\Module implements ModuleInterface
// add menu items
if (basename($app->getBasePath()) === 'backend') {
$app->params['adminMenu'][] = [
- 'label' => \Yii::t('forms', 'Forms'),
- 'icon' => 'address-card-o',
+ 'label' => Yii::t('forms', 'Forms'),
+ 'icon' => 'far fa-address-card',
'items' => [
[
- 'label' => \Yii::t('forms', 'Forms'),
- 'icon' => 'caret-right',
+ 'label' => Yii::t('forms', 'Forms'),
+ 'icon' => 'fas fa-caret-right',
'url' => ['/forms/manage/form/index']
],
[
- 'label' => \Yii::t('forms', 'Messages'),
- 'icon' => 'caret-right',
- 'url' => ['/forms/manage/form-message/index']
+ 'label' => Yii::t('forms', 'Messages'),
+ 'icon' => 'fas fa-caret-right',
+ 'url' => ['/forms/manage/form-message/index'],
],
],
- 'visible' => \Yii::$app->user->can('admin') || \Yii::$app->user->can('FormsManagement'),
+ 'visible' => Yii::$app->user->can('admin') || Yii::$app->user->can('FormsManagement'),
];
}
// prepare notifications
- $new_messages_count = \Yii::$app->moduleManager->isTableExist('{{%forms}}') ? FormMessage::find()->unread()->count() : 0;
+ $new_messages_count = Yii::$app->moduleManager->isTableExist('{{%forms}}') ? FormMessage::find()->unread()->count() : 0;
if ($new_messages_count > 0) {
$app->params['notifications'][] = [
'icon' => 'address-card-o',
diff --git a/common/modules/forms/controllers/FormController.php b/common/modules/forms/controllers/FormController.php
index d5b0228..b9c841e 100644
--- a/common/modules/forms/controllers/FormController.php
+++ b/common/modules/forms/controllers/FormController.php
@@ -9,17 +9,19 @@ namespace common\modules\forms\controllers;
use common\modules\forms\entities\Form;
use common\modules\forms\services\FormMessageManageService;
use frontend\components\FrontendController;
+use RuntimeException;
use yii\base\Model;
use yii\helpers\Html;
use yii\helpers\Json;
use yii\mail\MailerInterface;
use yii\web\NotFoundHttpException;
use Yii;
+use yii\web\Response;
class FormController extends FrontendController
{
- public $mailer;
- public $message_service;
+ public MailerInterface $mailer;
+ public FormMessageManageService $message_service;
public function __construct(
string $id,
@@ -33,7 +35,12 @@ class FormController extends FrontendController
$this->message_service = $message_service;
}
- public function actionSend($id)
+ /**
+ * @param $id
+ * @return Response|string
+ * @throws NotFoundHttpException
+ */
+ public function actionSend($id): Response|string
{
$form = $this->findModel($id);
@@ -50,8 +57,6 @@ class FormController extends FrontendController
if ($form->complete_page_id) {
return $this->redirect(['/pages/page/view', 'id' => $form->complete_page_id]);
}
-
- //return $form->complete_text;
return $this->render('view', ['text' => $form->complete_text]);
}
@@ -78,7 +83,7 @@ class FormController extends FrontendController
->setSubject($form->subject)
->send();
if (!$sent) {
- throw new \RuntimeException('Sending error.');
+ throw new RuntimeException('Sending error.');
}
}
@@ -99,7 +104,7 @@ class FormController extends FrontendController
$item['name'] = str_replace('-', '_', $item['name']);
$items[] = [
- 'key' => isset($item['label']) ? $item['label'] : '',
+ 'key' => $item['label'] ?? '',
'value' => is_array($dynaForm->{$item['name']}) ? implode(', ', array_map(function ($el) {
return Html::encode($el);
}, $dynaForm->{$item['name']})) : Html::encode($dynaForm->{$item['name']}),
@@ -109,18 +114,11 @@ class FormController extends FrontendController
return $items;
}
- /*private function prepareMessage($json_string, $dynaForm): string
- {
- $message = '';
- $json = Json::decode($json_string, true);
- foreach ($json as $item) {
- if ($item['type'] == 'button') {continue;}
- $item['name'] = str_replace('-', '_', $item['name']);
- $message.=$item['label'] . ': ' . Html::encode($dynaForm->{$item['name']}) . "\n";
- }
- return $message;
- }*/
-
+ /**
+ * @param $id
+ * @return Form
+ * @throws NotFoundHttpException
+ */
protected function findModel($id): Form
{
if (($model = Form::findOne($id)) !== null) {
diff --git a/common/modules/forms/controllers/manage/FormController.php b/common/modules/forms/controllers/manage/FormController.php
index a6c78db..cd12b82 100644
--- a/common/modules/forms/controllers/manage/FormController.php
+++ b/common/modules/forms/controllers/manage/FormController.php
@@ -7,6 +7,7 @@ use common\modules\forms\forms\FormSearch;
use common\modules\forms\entities\Form;
use common\modules\pages\entities\Page;
use common\modules\forms\forms\FormForm;
+use DomainException;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
@@ -16,12 +17,12 @@ use Yii;
class FormController extends Controller
{
- private $_service;
+ private FormManageService $service;
public function __construct($id, $module, FormManageService $service, $config = [])
{
parent::__construct($id, $module, $config);
- $this->_service = $service;
+ $this->service = $service;
}
public function behaviors(): array
@@ -50,9 +51,9 @@ class FormController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new FormSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -69,7 +70,7 @@ class FormController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'form' => $this->findModel($id),
@@ -77,17 +78,17 @@ class FormController extends Controller
}
/**
- * @return mixed
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): string|Response
{
$form = new FormForm();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $form = $this->_service->create($form);
+ $form = $this->service->create($form);
return $this->redirect(['view', 'id' => $form->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -101,20 +102,20 @@ class FormController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$form_model = $this->findModel($id);
$form = new FormForm($form_model);
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
try {
- $this->_service->edit($form_model->id, $form);
+ $this->service->edit($form_model->id, $form);
return $this->redirect(['view', 'id' => $form_model->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -129,13 +130,13 @@ class FormController extends Controller
/**
* @param integer $id
*
- * @return mixed
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
- $this->_service->remove($id);
- } catch (\DomainException $e) {
+ $this->service->remove($id);
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -143,10 +144,9 @@ class FormController extends Controller
return $this->redirect(['index']);
}
-
public function actionPageSearch($q = null, $id = null)
{
- \Yii::$app->response->format = Response::FORMAT_JSON;
+ Yii::$app->response->format = Response::FORMAT_JSON;
$out = ['results' => ['id' => '', 'text' => '']];
if (!is_null($q)) {
$data = [];
@@ -167,19 +167,6 @@ class FormController extends Controller
$tag_name = Page::findOne($id)->translation->title;
$out['results'] = ['id' => $tag_name, 'text' => $tag_name];
} else {
- /*$data = [];
- $pages = Page::find()
- ->with('translation')
- ->leftJoin('{{%pages_lng}}', '`pages_lng`.`page_id` = `pages`.`id`')
- ->limit(20)
- ->all();
- foreach ($pages as $page) {
- $data[] = [
- 'id' => $page->id,
- 'text' => isset($page->translation) ? $page->translation->title : null,
- ];
- }*/
-
$data = [];
$pages = Page::find()->typePublic()->orderBy(['id' => SORT_DESC])->limit(20)->all();
foreach ($pages as $page) {
@@ -200,7 +187,7 @@ class FormController extends Controller
* @return Form the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): Form
+ protected function findModel(int $id): Form
{
if (($model = Form::findOne($id)) !== null) {
return $model;
diff --git a/common/modules/forms/controllers/manage/FormMessageController.php b/common/modules/forms/controllers/manage/FormMessageController.php
index 3b06a8f..bab4f4d 100644
--- a/common/modules/forms/controllers/manage/FormMessageController.php
+++ b/common/modules/forms/controllers/manage/FormMessageController.php
@@ -5,6 +5,7 @@ namespace common\modules\forms\controllers\manage;
use common\modules\forms\entities\FormMessage;
use common\modules\forms\forms\FormMessageSearch;
use common\modules\forms\services\FormMessageManageService;
+use DomainException;
use yii\helpers\Json;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
@@ -15,7 +16,7 @@ use yii\web\Response;
class FormMessageController extends Controller
{
- private $service;
+ private FormMessageManageService $service;
public function __construct($id, $module, FormMessageManageService $service, $config = [])
{
@@ -49,9 +50,9 @@ class FormMessageController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new FormMessageSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -68,7 +69,7 @@ class FormMessageController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
$this->service->setRead($id);
return $this->render('view', [
@@ -78,13 +79,13 @@ class FormMessageController extends Controller
/**
* @param integer $id
- * @return mixed
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
$this->service->remove($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -94,7 +95,7 @@ class FormMessageController extends Controller
public function actionDeleteSelected()
{
$post = Yii::$app->request->post();
- $ids = isset($post['ids']) ? $post['ids'] : null;
+ $ids = $post['ids'] ?? null;
Yii::$app->response->format = Response::FORMAT_JSON;
if (!$ids) {
return [
@@ -107,7 +108,7 @@ class FormMessageController extends Controller
{
try {
$this->service->remove($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
return [
@@ -121,10 +122,10 @@ class FormMessageController extends Controller
];
}
- public function actionReadSelected()
+ public function actionReadSelected(): array
{
$post = Yii::$app->request->post();
- $ids = isset($post['ids']) ? $post['ids'] : null;
+ $ids = $post['ids'] ?? null;
Yii::$app->response->format = Response::FORMAT_JSON;
if (!$ids) {
return [
@@ -137,7 +138,7 @@ class FormMessageController extends Controller
{
try {
$this->service->setRead($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
return [
@@ -150,10 +151,10 @@ class FormMessageController extends Controller
];
}
- public function actionUnreadSelected()
+ public function actionUnreadSelected(): array
{
$post = Yii::$app->request->post();
- $ids = isset($post['ids']) ? $post['ids'] : null;
+ $ids = $post['ids'] ?? null;
Yii::$app->response->format = Response::FORMAT_JSON;
if (!$ids) {
return [
@@ -166,7 +167,7 @@ class FormMessageController extends Controller
{
try {
$this->service->setUnread($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
return [
diff --git a/common/modules/forms/entities/Form.php b/common/modules/forms/entities/Form.php
index 3eefb7e..7835afd 100644
--- a/common/modules/forms/entities/Form.php
+++ b/common/modules/forms/entities/Form.php
@@ -4,6 +4,7 @@ namespace common\modules\forms\entities;
use common\modules\forms\entities\queries\FormQuery;
use yii\behaviors\TimestampBehavior;
+use yii\db\ActiveQuery;
use yii\db\ActiveRecord;
use Yii;
@@ -95,7 +96,8 @@ class Form extends ActiveRecord
];
}
- public function attributeLabels() {
+ public function attributeLabels(): array
+ {
return [
'name' => Yii::t('forms', 'Name'),
'data' => Yii::t('forms', 'Form'),
@@ -110,7 +112,7 @@ class Form extends ActiveRecord
];
}
- public function getMessages()
+ public function getMessages(): ActiveQuery
{
return $this->hasMany(FormMessage::class, ['form_id' => 'id']);
}
@@ -119,4 +121,4 @@ class Form extends ActiveRecord
{
return new FormQuery(static::class);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/entities/FormMessage.php b/common/modules/forms/entities/FormMessage.php
index 2983cb4..c151df0 100644
--- a/common/modules/forms/entities/FormMessage.php
+++ b/common/modules/forms/entities/FormMessage.php
@@ -4,6 +4,7 @@ namespace common\modules\forms\entities;
use common\modules\forms\entities\queries\FormMessageQuery;
use yii\behaviors\TimestampBehavior;
+use yii\db\ActiveQuery;
use yii\db\ActiveRecord;
use Yii;
@@ -62,14 +63,15 @@ class FormMessage extends ActiveRecord
];
}
- public function attributeLabels() {
+ public function attributeLabels(): array
+ {
return [
'form_id' => Yii::t('forms', 'Form'),
'data' => Yii::t('forms', 'Form Data'),
];
}
- public function getForm()
+ public function getForm(): ActiveQuery
{
return $this->hasOne(Form::class, ['id' => 'form_id']);
}
@@ -78,4 +80,4 @@ class FormMessage extends ActiveRecord
{
return new FormMessageQuery(static::class);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/forms/FormForm.php b/common/modules/forms/forms/FormForm.php
index b16eb90..d9fdf35 100644
--- a/common/modules/forms/forms/FormForm.php
+++ b/common/modules/forms/forms/FormForm.php
@@ -9,18 +9,18 @@ use yii\helpers\Json;
class FormForm extends Model
{
- public $name;
- public $data;
- public $subject;
- public $from;
- public $reply;
- public $return;
- public $complete_text;
- public $complete_page_id;
- public $status;
- public $captcha;
+ public ?string $name = null;
+ public ?string $data = null;
+ public ?string $subject = null;
+ public ?string $from = null;
+ public ?string $reply = null;
+ public ?string $return = null;
+ public ?string $complete_text = null;
+ public ?int $complete_page_id = null;
+ public ?int $status = null;
+ public ?int $captcha = null;
- public $_form;
+ public Form $form;
public function __construct(Form $form = null, $config = [])
{
@@ -36,7 +36,7 @@ class FormForm extends Model
$this->status = $form->status;
$this->captcha = $form->captcha;
- $this->_form = $form;
+ $this->form = $form;
}
else {
$this->data = Json::encode([]);
@@ -56,7 +56,8 @@ class FormForm extends Model
];
}
- public function attributeLabels() {
+ public function attributeLabels(): array
+ {
return [
'name' => Yii::t('forms', 'Name'),
'data' => Yii::t('forms', 'Form'),
@@ -70,4 +71,4 @@ class FormForm extends Model
'captcha' => Yii::t('forms', 'Use Captcha'),
];
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/forms/FormMessageSearch.php b/common/modules/forms/forms/FormMessageSearch.php
index 6e965a2..4ea3764 100644
--- a/common/modules/forms/forms/FormMessageSearch.php
+++ b/common/modules/forms/forms/FormMessageSearch.php
@@ -8,8 +8,8 @@ use yii\data\ActiveDataProvider;
class FormMessageSearch extends Model
{
- public $id;
- public $form_id;
+ public ?int $id = null;
+ public ?int $form_id = null;
public function rules(): array
{
diff --git a/common/modules/forms/forms/FormSearch.php b/common/modules/forms/forms/FormSearch.php
index 863c33f..ffd3a39 100644
--- a/common/modules/forms/forms/FormSearch.php
+++ b/common/modules/forms/forms/FormSearch.php
@@ -8,10 +8,10 @@ use common\modules\forms\entities\Form;
class FormSearch extends Model
{
- public $id;
- public $name;
- public $slug;
- public $subject;
+ public ?int $id = null;
+ public ?string $name = null;
+ public ?string $slug = null;
+ public ?string $subject = null;
public function rules(): array
{
diff --git a/common/modules/forms/helpers/FormHelper.php b/common/modules/forms/helpers/FormHelper.php
index 0a62cd2..d4315ae 100644
--- a/common/modules/forms/helpers/FormHelper.php
+++ b/common/modules/forms/helpers/FormHelper.php
@@ -6,8 +6,8 @@
namespace common\modules\forms\helpers;
-
use common\modules\forms\entities\Form;
+use Exception;
use Yii;
use yii\helpers\ArrayHelper;
use yii\helpers\Html;
@@ -21,26 +21,31 @@ class FormHelper {
];
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusName($status): string
{
return ArrayHelper::getValue(self::statusList(), $status);
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusLabel($status): string
{
- switch ($status) {
- case Form::STATUS_DRAFT:
- $class = 'label label-default';
- break;
- case Form::STATUS_ACTIVE:
- $class = 'label label-success';
- break;
- default:
- $class = 'label label-default';
- }
+ $class = match ($status) {
+ Form::STATUS_DRAFT => 'label label-default',
+ Form::STATUS_ACTIVE => 'label label-success',
+ default => 'label label-default',
+ };
return Html::tag('span', ArrayHelper::getValue(self::statusList(), $status), [
'class' => $class,
]);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/mail/form-html.php b/common/modules/forms/mail/form-html.php
index 50b867a..e33b8e2 100644
--- a/common/modules/forms/mail/form-html.php
+++ b/common/modules/forms/mail/form-html.php
@@ -4,8 +4,10 @@
* Date: 01.08.2018
*/
+use yii\web\View;
+
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $items array
*/
?>
diff --git a/common/modules/forms/mail/form-text.php b/common/modules/forms/mail/form-text.php
index 4ec8c6c..89848f3 100644
--- a/common/modules/forms/mail/form-text.php
+++ b/common/modules/forms/mail/form-text.php
@@ -4,8 +4,10 @@
* Date: 01.08.2018
*/
+use yii\web\View;
+
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $items array
*/
?>
diff --git a/common/modules/forms/repositories/FormMessageRepository.php b/common/modules/forms/repositories/FormMessageRepository.php
index 32499d5..6f12e91 100644
--- a/common/modules/forms/repositories/FormMessageRepository.php
+++ b/common/modules/forms/repositories/FormMessageRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\forms\repositories;
use common\modules\forms\entities\FormMessage;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class FormMessageRepository
{
@@ -18,14 +20,18 @@ class FormMessageRepository
public function save(FormMessage $message): void
{
if (!$message->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param FormMessage $message
+ * @throws StaleObjectException
+ */
public function remove(FormMessage $message): void
{
if (!$message->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/repositories/FormRepository.php b/common/modules/forms/repositories/FormRepository.php
index 41b8cce..a468642 100644
--- a/common/modules/forms/repositories/FormRepository.php
+++ b/common/modules/forms/repositories/FormRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\forms\repositories;
use common\modules\forms\entities\Form;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class FormRepository
{
@@ -18,14 +20,18 @@ class FormRepository
public function save(Form $form): void
{
if (!$form->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param Form $form
+ * @throws StaleObjectException
+ */
public function remove(Form $form): void
{
if (!$form->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/services/FormManageService.php b/common/modules/forms/services/FormManageService.php
index 431ab6a..735bc54 100644
--- a/common/modules/forms/services/FormManageService.php
+++ b/common/modules/forms/services/FormManageService.php
@@ -6,18 +6,19 @@ use common\modules\forms\entities\Form;
use common\modules\forms\forms\FormForm;
use common\modules\forms\repositories\FormRepository;
use common\modules\forms\widgets\FormGenerator;
+use yii\db\StaleObjectException;
use yii\helpers\Json;
class FormManageService
{
- private $repository;
+ private FormRepository $repository;
public function __construct(FormRepository $repository)
{
$this->repository = $repository;
}
- public function clearJsonLabels($json)
+ public function clearJsonLabels($json): string
{
$new_data = [];
$data = Json::decode($json, true);
@@ -70,6 +71,10 @@ class FormManageService
FormGenerator::generateFormView($id, Json::decode($form->data, true));
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
$form = $this->repository->get($id);
diff --git a/common/modules/forms/services/FormMessageManageService.php b/common/modules/forms/services/FormMessageManageService.php
index 719d066..7902eb4 100644
--- a/common/modules/forms/services/FormMessageManageService.php
+++ b/common/modules/forms/services/FormMessageManageService.php
@@ -4,10 +4,11 @@ namespace common\modules\forms\services;
use common\modules\forms\entities\FormMessage;
use common\modules\forms\repositories\FormMessageRepository;
+use yii\db\StaleObjectException;
class FormMessageManageService
{
- private $repository;
+ private FormMessageRepository $repository;
public function __construct(FormMessageRepository $repository)
{
@@ -48,6 +49,10 @@ class FormMessageManageService
$this->repository->save($message);
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
$message = $this->repository->get($id);
diff --git a/common/modules/forms/urls/FormsUrlRule.php b/common/modules/forms/urls/FormsUrlRule.php
index 8286a9c..37ade5c 100644
--- a/common/modules/forms/urls/FormsUrlRule.php
+++ b/common/modules/forms/urls/FormsUrlRule.php
@@ -10,22 +10,22 @@ use yii;
class FormsUrlRule extends BaseObject implements UrlRuleInterface
{
- public $prefix = 'forms/form/send';
+ public string $prefix = 'forms/form/send';
- private $_repository;
+ private FormRepository $repository;
public function __construct(FormRepository $repository, array $config = [])
{
parent::__construct($config);
- $this->_repository = $repository;
+ $this->repository = $repository;
}
- public function parseRequest($manager, $request)
+ public function parseRequest($manager, $request): bool|array
{
$uri = ltrim(LanguageHelper::processLangInUrl($request->pathInfo), '/');
if ($uri == $this->prefix) {
$id = Yii::$app->request->get('id');
- $form = $this->_repository->get($id);
+ $form = $this->repository->get($id);
if ($form) {
return [$uri, ['id' => $id]];
@@ -34,7 +34,7 @@ class FormsUrlRule extends BaseObject implements UrlRuleInterface
return false;
}
- public function createUrl($manager, $route, $params)
+ public function createUrl($manager, $route, $params): bool
{
return false;
}
diff --git a/common/modules/forms/views/form/view.php b/common/modules/forms/views/form/view.php
index 909c761..d464d63 100644
--- a/common/modules/forms/views/form/view.php
+++ b/common/modules/forms/views/form/view.php
@@ -4,11 +4,12 @@
* Date: 01.08.2018
*/
+use yii\web\View;
+
/**
- * @var $this \yii\web\View
+ * @var $this View
* @var $text string
*/
-
?>
diff --git a/common/modules/forms/views/manage/form-message/index.php b/common/modules/forms/views/manage/form-message/index.php
index 7c76bd7..ef087af 100644
--- a/common/modules/forms/views/manage/form-message/index.php
+++ b/common/modules/forms/views/manage/form-message/index.php
@@ -1,6 +1,7 @@
title = Yii::t('forms', 'Messages');
@@ -100,14 +102,14 @@ $this->registerJs($js2, $this::POS_HEAD);
diff --git a/common/modules/forms/views/manage/form-message/view.php b/common/modules/forms/views/manage/form-message/view.php
index b0c8066..632e684 100644
--- a/common/modules/forms/views/manage/form-message/view.php
+++ b/common/modules/forms/views/manage/form-message/view.php
@@ -1,7 +1,6 @@
registerJs($js2);
-
-
-
+
+
+
- [
[
'label' => Yii::t('forms', 'Common'),
diff --git a/common/modules/forms/views/manage/form/_form/_form-builder.php b/common/modules/forms/views/manage/form/_form/_form-builder.php
index ae9b7a7..2bc3f7c 100644
--- a/common/modules/forms/views/manage/form/_form/_form-builder.php
+++ b/common/modules/forms/views/manage/form/_form/_form-builder.php
@@ -4,13 +4,16 @@
* Date: 29.07.2018
*/
+use backend\components\form_builder\assets\FormBuilderAsset;
+use common\modules\forms\forms\FormForm;
use \yii\helpers\Json;
+use yii\web\View;
/**
- * @var $this \yii\web\View
- * @var $model \common\modules\forms\forms\FormForm
+ * @var $this View
+ * @var $model FormForm
*/
-$bundle = \backend\components\form_builder\assets\FormBuilderAsset::register($this);
+$bundle = FormBuilderAsset::register($this);
$lng = str_replace('_', '-', Yii::$app->language);
$lng_file = $bundle->baseUrl . '/js/languages/';
diff --git a/common/modules/forms/views/manage/form/_form/_form-items.php b/common/modules/forms/views/manage/form/_form/_form-items.php
index 717ad54..fcf061d 100644
--- a/common/modules/forms/views/manage/form/_form/_form-items.php
+++ b/common/modules/forms/views/manage/form/_form/_form-items.php
@@ -4,14 +4,18 @@
* Date: 29.07.2018
*/
+use common\modules\forms\forms\FormForm;
+use kartik\widgets\Select2;
+use yii\web\View;
+use yii\widgets\ActiveForm;
use zertex\ckeditor\CKEditor;
use yii\web\JsExpression;
use yii\helpers\Url;
/**
- * @var $this \yii\web\View
- * @var $form \yii\widgets\ActiveForm
- * @var $model \common\modules\forms\forms\FormForm
+ * @var $this View
+ * @var $form ActiveForm
+ * @var $model FormForm
*/
$fetchUrl = Url::to( [ '/forms/manage/form/page-search' ] );
@@ -38,7 +42,7 @@ $fetchUrl = Url::to( [ '/forms/manage/form/page-search' ] );
field($model, 'complete_text')->widget(CKEditor::class) ?>
- field($model, 'complete_page_id')->widget(\kartik\widgets\Select2::class, [
+ field($model, 'complete_page_id')->widget(Select2::class, [
'options' => [
'placeholder' => Yii::t('forms', 'Select page...'),
'id' => 'page_select',
diff --git a/common/modules/forms/views/manage/form/create.php b/common/modules/forms/views/manage/form/create.php
index 0ca88bc..61e64f9 100644
--- a/common/modules/forms/views/manage/form/create.php
+++ b/common/modules/forms/views/manage/form/create.php
@@ -1,7 +1,9 @@
title = Yii::t('forms', 'Create Form');
$this->params['breadcrumbs'][] = ['label' => Yii::t('forms', 'Forms'), 'url' => ['index']];
diff --git a/common/modules/forms/views/manage/form/index.php b/common/modules/forms/views/manage/form/index.php
index 0ee4f37..8502c7d 100644
--- a/common/modules/forms/views/manage/form/index.php
+++ b/common/modules/forms/views/manage/form/index.php
@@ -1,12 +1,13 @@
title = Yii::t('forms', 'Forms');
diff --git a/common/modules/forms/views/manage/form/update.php b/common/modules/forms/views/manage/form/update.php
index 510e057..27e10c2 100644
--- a/common/modules/forms/views/manage/form/update.php
+++ b/common/modules/forms/views/manage/form/update.php
@@ -1,8 +1,11 @@
title = Yii::t('forms', 'Update Form: {name}', ['name' => $form_model->name]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('pages', 'Pages'), 'url' => ['index']];
diff --git a/common/modules/forms/widgets/FormClassField.php b/common/modules/forms/widgets/FormClassField.php
index 596dd06..ea1516e 100644
--- a/common/modules/forms/widgets/FormClassField.php
+++ b/common/modules/forms/widgets/FormClassField.php
@@ -6,7 +6,6 @@
namespace common\modules\forms\widgets;
-
class FormClassField
{
public function text(array $settings): string
@@ -44,4 +43,4 @@ class FormClassField
}
return "['{$settings['name']}', 'string'],";
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/forms/widgets/FormGenerator.php b/common/modules/forms/widgets/FormGenerator.php
index 967b194..1bd1849 100644
--- a/common/modules/forms/widgets/FormGenerator.php
+++ b/common/modules/forms/widgets/FormGenerator.php
@@ -6,8 +6,7 @@
namespace common\modules\forms\widgets;
-
-use yii\web\View;
+use Yii;
class FormGenerator
{
@@ -17,44 +16,24 @@ class FormGenerator
$fields = [];
$fieldRender = new FormViewField();
- //print_r($json); die;
-
foreach ($json as $item) {
if ( isset( $item['name'] ) ) {
$item['name'] = str_replace( '-', '_', $item['name'] );
}
- switch ($item['type']) {
- case 'text':
- $fields[] = $fieldRender->text($item);
- break;
- case 'header':
- $fields[] = $fieldRender->header($item);
- break;
- case 'paragraph':
- $fields[] = $fieldRender->paragraph($item);
- break;
- case 'hidden':
- $fields[] = $fieldRender->hidden($item);
- break;
- case 'radio-group':
- $fields[] = $fieldRender->radioGroup($item);
- break;
- case 'checkbox-group':
- $fields[] = $fieldRender->checkboxGroup($item);
- break;
- case 'select':
- $fields[] = $fieldRender->select($item);
- break;
- case 'button':
- $fields[] = $fieldRender->button($item);
- break;
- case 'textarea':
- $fields[] = $fieldRender->textArea($item);
- break;
- }
+ $fields[] = match ($item['type']) {
+ 'text' => $fieldRender->text($item),
+ 'header' => $fieldRender->header($item),
+ 'paragraph' => $fieldRender->paragraph($item),
+ 'hidden' => $fieldRender->hidden($item),
+ 'radio-group' => $fieldRender->radioGroup($item),
+ 'checkbox-group' => $fieldRender->checkboxGroup($item),
+ 'select' => $fieldRender->select($item),
+ 'button' => $fieldRender->button($item),
+ 'textarea' => $fieldRender->textArea($item),
+ };
}
$fields = implode("\n", $fields);
- $tpl = file_get_contents(\Yii::getAlias('@common/modules/forms/widgets/templates/DynaView.tpl'));
+ $tpl = file_get_contents(Yii::getAlias('@common/modules/forms/widgets/templates/DynaView.tpl'));
$tpl = preg_replace([
'/\{\$fields\}/'
@@ -62,7 +41,7 @@ class FormGenerator
$fields
], $tpl);
- file_put_contents(\Yii::getAlias('@common/modules/forms/runtime/' . $viewName . '.php'), $tpl);
+ file_put_contents(Yii::getAlias('@common/modules/forms/runtime/' . $viewName . '.php'), $tpl);
}
@@ -127,7 +106,7 @@ class FormGenerator
$options = [];
//$options[] = $selected ? "'value' => [{$selected}]" : "";
$options = implode(',', array_filter($options));
- $description = isset($item['description']) ? $item['description'] : '';
+ $description = $item['description'] ?? '';
$fields[] = "field(\$model, '{$item['name']}')
->radioList([
{$values}
@@ -153,7 +132,7 @@ class FormGenerator
$options = [];
//$options[] = $selected ? "'value' => [{$selected}]" : "";
$options = implode(',', array_filter($options));
- $description = isset($item['description']) ? $item['description'] : '';
+ $description = $item['description'] ?? '';
$fields[] = "field(\$model, '{$item['name']}')
->checkboxList([
{$values}
@@ -177,7 +156,7 @@ class FormGenerator
$options[] = isset($item['placeholder']) ? "'prompt' => '{$item['placeholder']}'" : "";
$options[] = isset($item['multiple']) && $item['multiple'] == true ? "'multiple' => 'multiple'" : "";
$options = implode(',', array_filter($options));
- $description = isset($item['description']) ? $item['description'] : '';
+ $description = $item['description'] ?? '';
$fields[] = "field(\$model, '{$item['name']}')->dropDownList([{$values}], [{$options}])->hint('{$description}') ?>";
}
@@ -212,7 +191,7 @@ use yii\\helpers\\Html;
VIEW;
- file_put_contents(\Yii::getAlias('@common/modules/forms/runtime/' . $viewName . '.php'), $view);
+ file_put_contents(Yii::getAlias('@common/modules/forms/runtime/' . $viewName . '.php'), $view);
}
public static function generateFormClass2($id, $json)
@@ -298,7 +277,7 @@ class {$className} extends Model
}
CLASS;
- file_put_contents(\Yii::getAlias('@common/modules/forms/runtime/' . $className . '.php'), $classData);
+ file_put_contents(Yii::getAlias('@common/modules/forms/runtime/' . $className . '.php'), $classData);
}
public static function generateFormClass($id, $json)
@@ -384,6 +363,6 @@ class {$className} extends Model
}
CLASS;
- file_put_contents(\Yii::getAlias('@common/modules/forms/runtime/' . $className . '.php'), $classData);
+ file_put_contents(Yii::getAlias('@common/modules/forms/runtime/' . $className . '.php'), $classData);
}
}
diff --git a/common/modules/forms/widgets/FormViewField.php b/common/modules/forms/widgets/FormViewField.php
index aa5f6d0..92cadf8 100644
--- a/common/modules/forms/widgets/FormViewField.php
+++ b/common/modules/forms/widgets/FormViewField.php
@@ -6,7 +6,6 @@
namespace common\modules\forms\widgets;
-
class FormViewField
{
public function text(array $settings): string
@@ -35,14 +34,12 @@ class FormViewField
public function header(array $settings): string
{
- $field = "<{$settings['subtype']}>{$settings['label']}";
- return $field;
+ return "<{$settings['subtype']}>{$settings['label']}";
}
public function paragraph(array $settings): string
{
- $field = "<{$settings['subtype']}>{$settings['label']}";
- return $field;
+ return "<{$settings['subtype']}>{$settings['label']}";
}
public function hidden(array $settings): string
@@ -50,8 +47,7 @@ class FormViewField
$options = [];
$options[] = isset($item['value']) ? "'value' => '{$settings['value']}'" : "";
$options = implode(',', array_filter($options));
- $field = "field(\$model, '{$settings['name']}')->hiddenInput([{$options}])->label(false) ?>";
- return $field;
+ return "field(\$model, '{$settings['name']}')->hiddenInput([{$options}])->label(false) ?>";
}
public function radioGroup(array $settings): string
@@ -73,12 +69,11 @@ class FormViewField
$options = [];
$options = implode(',', array_filter($options));
- $description = isset($settings['description']) ? $settings['description'] : '';
- $field = "field(\$model, '{$settings['name']}')
+ $description = $settings['description'] ?? '';
+ return "field(\$model, '{$settings['name']}')
->radioList([
{$values}
], [{$options}])->hint('{$description}'); ?>";
- return $field;
}
public function checkboxGroup(array $settings): string
@@ -100,12 +95,11 @@ class FormViewField
$options = [];
$options = implode(',', array_filter($options));
- $description = isset($settings['description']) ? $settings['description'] : '';
- $field = "field(\$model, '{$settings['name']}')
+ $description = $settings['description'] ?? '';
+ return "field(\$model, '{$settings['name']}')
->checkboxList([
{$values}
], [{$options}])->hint('{$description}'); ?>";
- return $field;
}
public function select(array $settings): string
@@ -126,25 +120,21 @@ class FormViewField
$options[] = isset($settings['placeholder']) ? "'prompt' => '{$settings['placeholder']}'" : "";
$options[] = isset($settings['multiple']) && $settings['multiple'] == true ? "'multiple' => 'multiple'" : "";
$options = implode(',', array_filter($options));
- $description = isset($settings['description']) ? $settings['description'] : '';
- $field = "field(\$model, '{$settings['name']}')->dropDownList([{$values}], [{$options}])->hint('{$description}') ?>";
- return $field;
+ $description = $settings['description'] ?? '';
+ return "field(\$model, '{$settings['name']}')->dropDownList([{$values}], [{$options}])->hint('{$description}') ?>";
}
public function button(array $settings): string
{
- $style = isset($settings['style']) ? $settings['style'] : 'default';
+ $style = $settings['style'] ?? 'default';
if ($settings['subtype'] == 'submit') {
- $field = "
'btn btn-{$style}']) ?>
";
- return $field;
+ return " 'btn btn-{$style}']) ?>
";
}
elseif ($settings['subtype'] == 'button') {
- $field = " 'btn btn-{$style}']) ?>
";
- return $field;
+ return " 'btn btn-{$style}']) ?>
";
}
elseif ($settings['subtype'] == 'reset') {
- $field = " 'btn btn-{$style}']) ?>
";
- return $field;
+ return " 'btn btn-{$style}']) ?>
";
}
return '';
}
diff --git a/common/modules/forms/widgets/FormWidget.php b/common/modules/forms/widgets/FormWidget.php
index 71d0d61..40b4631 100644
--- a/common/modules/forms/widgets/FormWidget.php
+++ b/common/modules/forms/widgets/FormWidget.php
@@ -11,9 +11,10 @@ use yii\base\Widget;
class FormWidget extends Widget
{
- public $id;
+ public int $id;
- public function run() {
+ public function run(): string
+ {
$form = Form::findOne($this->id);
if (!$form) {
return 'Form is not found';
@@ -24,4 +25,4 @@ class FormWidget extends Widget
return $this->renderFile(\Yii::getAlias('@common/modules/forms/runtime/' . 'DynaView' . $this->id . '.php'), ['model' => $dynaForm, 'form_entity' => $form]);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/languages/LanguagesModule.php b/common/modules/languages/LanguagesModule.php
index 528115e..1339a6c 100644
--- a/common/modules/languages/LanguagesModule.php
+++ b/common/modules/languages/LanguagesModule.php
@@ -4,6 +4,7 @@ namespace common\modules\languages;
use core\components\modules\ModuleInterface;
use yii\helpers\ArrayHelper;
+use yii\web\Application;
/**
@@ -26,7 +27,7 @@ class LanguagesModule extends \yii\base\Module implements ModuleInterface
// custom initialization code goes here
}
- public function bootstrap($app)
+ public function bootstrap(Application $app)
{
// add migration path
$app->controllerMap['migrate']['migrationPath'][] = '@common/modules/languages/migrations';
@@ -47,7 +48,7 @@ class LanguagesModule extends \yii\base\Module implements ModuleInterface
if (basename($app->getBasePath()) === 'backend') {
$app->params['adminMenu'][] = [
'label' => \Yii::t( 'languages', 'Site Languages' ),
- 'icon' => 'language',
+ 'icon' => 'fas fa-globe-americas',
'url' => [ '/languages/manage/language/index' ],
'visible' => \Yii::$app->user->can( 'admin' ) || \Yii::$app->user->can( 'LanguagesManagement' )
];
diff --git a/common/modules/languages/controllers/manage/LanguageController.php b/common/modules/languages/controllers/manage/LanguageController.php
index d79f872..13ad30b 100644
--- a/common/modules/languages/controllers/manage/LanguageController.php
+++ b/common/modules/languages/controllers/manage/LanguageController.php
@@ -6,15 +6,17 @@ use common\modules\languages\entities\Language;
use common\modules\languages\forms\LanguageForm;
use common\modules\languages\forms\search\LanguageSearch;
use common\modules\languages\services\LanguageManageService;
+use DomainException;
use yii\web\NotFoundHttpException;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\web\Controller;
use Yii;
+use yii\web\Response;
class LanguageController extends Controller
{
- private $service;
+ private LanguageManageService $service;
public function __construct($id, $module, LanguageManageService $service, $config = [])
{
@@ -49,9 +51,9 @@ class LanguageController extends Controller
}
/**
- * @return mixed
+ * @return string
*/
- public function actionIndex()
+ public function actionIndex(): string
{
$searchModel = new LanguageSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
@@ -68,7 +70,7 @@ class LanguageController extends Controller
* @return string
* @throws NotFoundHttpException
*/
- public function actionView($id)
+ public function actionView($id): string
{
return $this->render('view', [
'language' => $this->findModel($id),
@@ -76,9 +78,9 @@ class LanguageController extends Controller
}
/**
- * @return mixed
+ * @return string|Response
*/
- public function actionCreate()
+ public function actionCreate(): string|Response
{
$form = new LanguageForm();
@@ -86,7 +88,7 @@ class LanguageController extends Controller
try {
$form = $this->service->create($form);
return $this->redirect(['view', 'id' => $form->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -102,10 +104,10 @@ class LanguageController extends Controller
/**
* @param $id
*
- * @return string|\yii\web\Response
+ * @return string|Response
* @throws NotFoundHttpException
*/
- public function actionUpdate($id)
+ public function actionUpdate($id): Response|string
{
$language = $this->findModel($id);
$form = new LanguageForm($language);
@@ -114,7 +116,7 @@ class LanguageController extends Controller
try {
$this->service->edit($language->id, $form);
return $this->redirect(['view', 'id' => $language->id]);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
@@ -128,20 +130,25 @@ class LanguageController extends Controller
/**
* @param integer $id
- * @return mixed
+ * @return Response
*/
- public function actionDelete($id)
+ public function actionDelete(int $id): Response
{
try {
$this->service->remove($id);
- } catch (\DomainException $e) {
+ } catch (DomainException $e) {
Yii::$app->errorHandler->logException($e);
Yii::$app->session->setFlash('error', $e->getMessage());
}
return $this->redirect(['index']);
}
- public function actionSetDefault($id)
+ /**
+ * @param $id
+ * @return Response
+ * @throws NotFoundHttpException
+ */
+ public function actionSetDefault($id): Response
{
$language = $this->findModel($id);
if ($language) {
@@ -156,7 +163,7 @@ class LanguageController extends Controller
* @return Language the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
- protected function findModel($id): Language
+ protected function findModel(int $id): Language
{
if (($model = Language::findOne($id)) !== null) {
return $model;
diff --git a/common/modules/languages/entities/Language.php b/common/modules/languages/entities/Language.php
index 2cfa865..429b748 100644
--- a/common/modules/languages/entities/Language.php
+++ b/common/modules/languages/entities/Language.php
@@ -3,10 +3,10 @@
namespace common\modules\languages\entities;
use common\modules\languages\entities\queries\LanguageQuery;
+use DomainException;
use yii\db\ActiveRecord;
use Yii;
-
/**
* This is the model class for table "languages".
*
@@ -44,7 +44,7 @@ class Language extends ActiveRecord
/**
* @inheritdoc
*/
- public static function tableName()
+ public static function tableName(): string
{
return 'languages';
}
@@ -66,7 +66,7 @@ class Language extends ActiveRecord
public function activate(): void
{
if ($this->isActive()) {
- throw new \DomainException('Language is already active.');
+ throw new DomainException('Language is already active.');
}
$this->status = self::STATUS_ACTIVE;
}
@@ -74,7 +74,7 @@ class Language extends ActiveRecord
public function draft(): void
{
if ($this->isDraft()) {
- throw new \DomainException('Language is already draft.');
+ throw new DomainException('Language is already draft.');
}
$this->status = self::STATUS_DRAFT;
}
diff --git a/common/modules/languages/entities/queries/LanguageQuery.php b/common/modules/languages/entities/queries/LanguageQuery.php
index a1d591a..2e46947 100644
--- a/common/modules/languages/entities/queries/LanguageQuery.php
+++ b/common/modules/languages/entities/queries/LanguageQuery.php
@@ -19,4 +19,4 @@ class LanguageQuery extends ActiveQuery
{
return $this->andWhere(['default' => Language::DEFAULT_TRUE]);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/languages/forms/LanguageForm.php b/common/modules/languages/forms/LanguageForm.php
index 16ec797..a5e2b35 100644
--- a/common/modules/languages/forms/LanguageForm.php
+++ b/common/modules/languages/forms/LanguageForm.php
@@ -8,11 +8,11 @@ use Yii;
class LanguageForm extends Model
{
- public $name;
- public $title;
- public $status;
+ public ?string $name = null;
+ public ?string $title = null;
+ public ?int $status = null;
- public $_language;
+ public Language $language;
public function __construct(Language $language = null, $config = [])
{
@@ -21,7 +21,7 @@ class LanguageForm extends Model
$this->title = $language->title;
$this->status = $language->status;
- $this->_language = $language;
+ $this->language = $language;
}
parent::__construct($config);
}
@@ -36,7 +36,8 @@ class LanguageForm extends Model
];
}
- public function attributeLabels() {
+ public function attributeLabels(): array
+ {
return [
'id' => Yii::t('languages', 'ID'),
'name' => Yii::t('languages', 'Name'),
diff --git a/common/modules/languages/forms/search/LanguageSearch.php b/common/modules/languages/forms/search/LanguageSearch.php
index 6148fac..3079403 100644
--- a/common/modules/languages/forms/search/LanguageSearch.php
+++ b/common/modules/languages/forms/search/LanguageSearch.php
@@ -8,10 +8,10 @@ use yii\data\ActiveDataProvider;
class LanguageSearch extends Model
{
- public $id;
- public $name;
- public $title;
- public $status;
+ public ?int $id = null;
+ public ?string $name = null;
+ public ?string $title = null;
+ public ?int $status = null;
public function rules(): array
{
diff --git a/common/modules/languages/helpers/LanguageHelper.php b/common/modules/languages/helpers/LanguageHelper.php
index 7c45ab1..ac08b61 100644
--- a/common/modules/languages/helpers/LanguageHelper.php
+++ b/common/modules/languages/helpers/LanguageHelper.php
@@ -7,6 +7,7 @@
namespace common\modules\languages\helpers;
use common\modules\languages\entities\Language;
+use Exception;
use yii\helpers\ArrayHelper;
use yii\helpers\Html;
use Yii;
@@ -15,16 +16,11 @@ class LanguageHelper
{
public static function defaultLabel($default): string
{
- switch ($default) {
- case Language::DEFAULT_FALSE:
- $class = 'text-gray';
- break;
- case Language::DEFAULT_TRUE:
- $class = 'text-yellow';
- break;
- default:
- $class = 'text-gray';
- }
+ $class = match ($default) {
+ Language::DEFAULT_FALSE => 'text-gray',
+ Language::DEFAULT_TRUE => 'text-yellow',
+ default => 'text-gray',
+ };
return '';
}
@@ -37,27 +33,31 @@ class LanguageHelper
];
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusName($status): string
{
return ArrayHelper::getValue(self::statusList(), $status);
}
+ /**
+ * @param $status
+ * @return string
+ * @throws Exception
+ */
public static function statusLabel($status): string
{
- switch ($status) {
- case Language::STATUS_DRAFT:
- $class = 'label label-default';
- break;
- case Language::STATUS_ACTIVE:
- $class = 'label label-success';
- break;
- default:
- $class = 'label label-default';
- }
+ $class = match ($status) {
+ Language::STATUS_DRAFT => 'label label-default',
+ Language::STATUS_ACTIVE => 'label label-success',
+ default => 'label label-default',
+ };
return Html::tag('span', ArrayHelper::getValue(self::statusList(), $status), [
'class' => $class,
]);
}
}
-
diff --git a/common/modules/languages/repositories/LanguageRepository.php b/common/modules/languages/repositories/LanguageRepository.php
index 31ccf70..10e905a 100644
--- a/common/modules/languages/repositories/LanguageRepository.php
+++ b/common/modules/languages/repositories/LanguageRepository.php
@@ -4,6 +4,8 @@ namespace common\modules\languages\repositories;
use common\modules\languages\entities\Language;
use core\repositories\NotFoundException;
+use RuntimeException;
+use yii\db\StaleObjectException;
class LanguageRepository
{
@@ -18,14 +20,18 @@ class LanguageRepository
public function save(Language $language): void
{
if (!$language->save()) {
- throw new \RuntimeException('Saving error.');
+ throw new RuntimeException('Saving error.');
}
}
+ /**
+ * @param Language $language
+ * @throws StaleObjectException
+ */
public function remove(Language $language): void
{
if (!$language->delete()) {
- throw new \RuntimeException('Removing error.');
+ throw new RuntimeException('Removing error.');
}
}
@@ -33,4 +39,4 @@ class LanguageRepository
{
Language::updateAll(['default' => 0]);
}
-}
\ No newline at end of file
+}
diff --git a/common/modules/languages/services/LanguageManageService.php b/common/modules/languages/services/LanguageManageService.php
index eceb37c..a3878a9 100644
--- a/common/modules/languages/services/LanguageManageService.php
+++ b/common/modules/languages/services/LanguageManageService.php
@@ -4,12 +4,12 @@ namespace common\modules\languages\services;
use common\modules\languages\entities\Language;
use common\modules\languages\forms\LanguageForm;
-use common\modules\languages\helpers\LanguageHelper;
use common\modules\languages\repositories\LanguageRepository;
+use yii\db\StaleObjectException;
class LanguageManageService
{
- private $repository;
+ private LanguageRepository $repository;
public function __construct(LanguageRepository $repository)
{
@@ -39,6 +39,10 @@ class LanguageManageService
$this->repository->save($language);
}
+ /**
+ * @param $id
+ * @throws StaleObjectException
+ */
public function remove($id): void
{
$language = $this->repository->get($id);
diff --git a/common/modules/languages/views/manage/language/_form.php b/common/modules/languages/views/manage/language/_form.php
index 1a5abac..01fa908 100644
--- a/common/modules/languages/views/manage/language/_form.php
+++ b/common/modules/languages/views/manage/language/_form.php
@@ -1,11 +1,12 @@
registerJs($js2);
-
-
+
+
@@ -54,9 +55,9 @@ $this->registerJs($js2);
-
-
-
+
+
+
_language->default) && $model->_language->default): ?>
diff --git a/common/modules/languages/views/manage/language/create.php b/common/modules/languages/views/manage/language/create.php
index 9cbf985..00dc16d 100644
--- a/common/modules/languages/views/manage/language/create.php
+++ b/common/modules/languages/views/manage/language/create.php
@@ -1,7 +1,9 @@
title = Yii::t('languages', 'Create Language');
$this->params['breadcrumbs'][] = ['label' => Yii::t('languages', 'Languages'), 'url' => ['index']];
diff --git a/common/modules/languages/views/manage/language/index.php b/common/modules/languages/views/manage/language/index.php
index d2622b0..df7daf6 100644
--- a/common/modules/languages/views/manage/language/index.php
+++ b/common/modules/languages/views/manage/language/index.php
@@ -1,5 +1,6 @@
title = Yii::t('languages', 'Languages');
@@ -15,12 +16,11 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-
- 'btn btn-success']) ?> -
- -
-
+
+
+ 'btn btn-success btn-sm']) ?>
+
+
$dataProvider,
'filterModel' => $searchModel,
@@ -60,8 +60,8 @@ $this->params['breadcrumbs'][] = $this->title;
[
'class' => ActionColumn::class,
'visibleButtons' => [
- 'delete' => function ($model, $key, $index) {
- return $model->default === 1 ? false : true;
+ 'delete' => function ($model) {
+ return !($model->default === 1);
}
],
'options' => ['style' => 'width: 100px;'],
diff --git a/common/modules/languages/views/manage/language/update.php b/common/modules/languages/views/manage/language/update.php
index 5484695..4e7a3ff 100644
--- a/common/modules/languages/views/manage/language/update.php
+++ b/common/modules/languages/views/manage/language/update.php
@@ -1,8 +1,11 @@
title = Yii::t('languages', 'Update Language: {name}', ['name' => $language->title]);
$this->params['breadcrumbs'][] = ['label' => Yii::t('languages', 'Languages'), 'url' => ['index']];
diff --git a/common/modules/languages/views/manage/language/view.php b/common/modules/languages/views/manage/language/view.php
index 238f0f5..020258d 100644
--- a/common/modules/languages/views/manage/language/view.php
+++ b/common/modules/languages/views/manage/language/view.php
@@ -14,23 +14,22 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-
- 'btn btn-default']) ?> - $language->id], ['class' => 'btn btn-primary']) ?> - $language->id], [ - 'class' => 'btn btn-danger', - 'data' => [ - 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'), - 'method' => 'post', - ], - ]) ?> -
-
-
-
+
+
+ 'btn btn-outline-primary btn-sm']) ?>
+ $language->id], ['class' => 'btn btn-primary btn-sm']) ?>
+ $language->id], [
+ 'class' => 'btn btn-danger btn-sm',
+ 'data' => [
+ 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'),
+ 'method' => 'post',
+ ],
+ ]) ?>
+
+
$language,
'attributes' => [
diff --git a/common/modules/links/LinksModule.php b/common/modules/links/LinksModule.php
index 7a1a98c..588d7fd 100644
--- a/common/modules/links/LinksModule.php
+++ b/common/modules/links/LinksModule.php
@@ -4,13 +4,15 @@ namespace common\modules\links;
use common\modules\links\widgets\MenuItemCreatorWidget;
use core\components\modules\ModuleInterface;
+use Yii;
+use yii\base\Module;
use yii\helpers\ArrayHelper;
-
+use yii\web\Application;
/**
* blog module definition class
*/
-class LinksModule extends \yii\base\Module implements ModuleInterface
+class LinksModule extends Module implements ModuleInterface
{
/**
* @inheritdoc
@@ -27,7 +29,7 @@ class LinksModule extends \yii\base\Module implements ModuleInterface
// custom initialization code goes here
}
- public function bootstrap($app)
+ public function bootstrap(Application $app)
{
// add languages
$app->getI18n()->translations = ArrayHelper::merge($app->getI18n()->translations, [
@@ -47,7 +49,7 @@ class LinksModule extends \yii\base\Module implements ModuleInterface
$widgets = [];
$widgets[] = [
'id' => 'links',
- 'title' => \Yii::t('links', 'Links'),
+ 'title' => Yii::t('links', 'Links'),
'content' => MenuItemCreatorWidget::widget([
'menu_id' => $menu_id,
]),
diff --git a/common/modules/links/widgets/MenuItemCreatorWidget.php b/common/modules/links/widgets/MenuItemCreatorWidget.php
index 1e28e43..f1fe938 100644
--- a/common/modules/links/widgets/MenuItemCreatorWidget.php
+++ b/common/modules/links/widgets/MenuItemCreatorWidget.php
@@ -11,10 +11,10 @@ use yii\base\Widget;
class MenuItemCreatorWidget extends Widget
{
- public $menu_id;
+ public int $menu_id;
- public function run()
- {
+ public function run(): string
+ {
$form = new MenuItemForm();
$form->module = 'links';
$form->menu_id = $this->menu_id;
diff --git a/common/modules/links/widgets/views/menu-item/creator.php b/common/modules/links/widgets/views/menu-item/creator.php
index 6b5ecc8..14bc7be 100644
--- a/common/modules/links/widgets/views/menu-item/creator.php
+++ b/common/modules/links/widgets/views/menu-item/creator.php
@@ -1,37 +1,42 @@