From dfad5f76c0ec4bfc240dc6f7df79b6e5786d445f Mon Sep 17 00:00:00 2001
From: tonis ormisson <tonis@andmemasin.eu>
Date: Tue, 10 Jan 2023 16:06:12 +0200
Subject: [PATCH 01/10] move views

---
 .github/workflows/php.yml                                     | 2 +-
 {src/User/resources => resources}/i18n/ca/usuario.php         | 0
 {src/User/resources => resources}/i18n/config.php             | 0
 {src/User/resources => resources}/i18n/da/usuario.php         | 0
 {src/User/resources => resources}/i18n/de-DU/usuario.php      | 0
 {src/User/resources => resources}/i18n/de/usuario.php         | 0
 {src/User/resources => resources}/i18n/es/usuario.php         | 0
 {src/User/resources => resources}/i18n/et/usuario.php         | 0
 {src/User/resources => resources}/i18n/fa-IR/usuario.php      | 0
 {src/User/resources => resources}/i18n/fi/usuario.php         | 0
 {src/User/resources => resources}/i18n/fr/usuario.php         | 0
 {src/User/resources => resources}/i18n/hr/usuario.php         | 0
 {src/User/resources => resources}/i18n/hu/usuario.php         | 0
 {src/User/resources => resources}/i18n/it/usuario.php         | 0
 {src/User/resources => resources}/i18n/kk/usuario.php         | 0
 {src/User/resources => resources}/i18n/lt/usuario.php         | 0
 {src/User/resources => resources}/i18n/nl/usuario.php         | 0
 {src/User/resources => resources}/i18n/pl/usuario.php         | 0
 {src/User/resources => resources}/i18n/pt-BR/usuario.php      | 0
 {src/User/resources => resources}/i18n/pt-PT/usuario.php      | 0
 {src/User/resources => resources}/i18n/ro/usuario.php         | 0
 {src/User/resources => resources}/i18n/ru/usuario.php         | 0
 {src/User/resources => resources}/i18n/sk/usuario.php         | 0
 {src/User/resources => resources}/i18n/th/usuario.php         | 0
 {src/User/resources => resources}/i18n/tr-TR/usuario.php      | 0
 {src/User/resources => resources}/i18n/uk/usuario.php         | 0
 {src/User/resources => resources}/i18n/vi/usuario.php         | 0
 {src/User/resources => resources}/i18n/zh-CN/usuario.php      | 0
 {src/User/resources => resources}/views/admin/_account.php    | 2 +-
 .../User/resources => resources}/views/admin/_assignments.php | 2 +-
 {src/User/resources => resources}/views/admin/_info.php       | 0
 {src/User/resources => resources}/views/admin/_profile.php    | 2 +-
 .../resources => resources}/views/admin/_session-history.php  | 0
 {src/User/resources => resources}/views/admin/_user.php       | 0
 {src/User/resources => resources}/views/admin/create.php      | 4 ++--
 {src/User/resources => resources}/views/admin/index.php       | 0
 {src/User/resources => resources}/views/admin/update.php      | 2 +-
 {src/User/resources => resources}/views/mail/confirmation.php | 0
 {src/User/resources => resources}/views/mail/layouts/html.php | 0
 {src/User/resources => resources}/views/mail/layouts/text.php | 0
 .../resources => resources}/views/mail/reconfirmation.php     | 0
 {src/User/resources => resources}/views/mail/recovery.php     | 0
 .../resources => resources}/views/mail/text/confirmation.php  | 0
 .../views/mail/text/reconfirmation.php                        | 0
 .../User/resources => resources}/views/mail/text/recovery.php | 0
 .../resources => resources}/views/mail/text/twofactorcode.php | 0
 {src/User/resources => resources}/views/mail/text/welcome.php | 0
 .../User/resources => resources}/views/mail/twofactorcode.php | 0
 {src/User/resources => resources}/views/mail/welcome.php      | 0
 {src/User/resources => resources}/views/permission/_form.php  | 0
 {src/User/resources => resources}/views/permission/create.php | 0
 {src/User/resources => resources}/views/permission/index.php  | 0
 {src/User/resources => resources}/views/permission/update.php | 0
 {src/User/resources => resources}/views/profile/show.php      | 0
 {src/User/resources => resources}/views/recovery/request.php  | 0
 {src/User/resources => resources}/views/recovery/reset.php    | 0
 .../resources => resources}/views/registration/connect.php    | 0
 .../resources => resources}/views/registration/register.php   | 0
 .../resources => resources}/views/registration/resend.php     | 0
 {src/User/resources => resources}/views/role/_form.php        | 0
 {src/User/resources => resources}/views/role/create.php       | 0
 {src/User/resources => resources}/views/role/index.php        | 0
 {src/User/resources => resources}/views/role/update.php       | 0
 {src/User/resources => resources}/views/rule/_form.php        | 0
 {src/User/resources => resources}/views/rule/create.php       | 0
 {src/User/resources => resources}/views/rule/index.php        | 0
 {src/User/resources => resources}/views/rule/update.php       | 0
 {src/User/resources => resources}/views/security/confirm.php  | 0
 {src/User/resources => resources}/views/security/login.php    | 0
 {src/User/resources => resources}/views/settings/_menu.php    | 0
 {src/User/resources => resources}/views/settings/account.php  | 0
 .../resources => resources}/views/settings/gdpr-consent.php   | 0
 .../resources => resources}/views/settings/gdpr-delete.php    | 0
 {src/User/resources => resources}/views/settings/networks.php | 0
 {src/User/resources => resources}/views/settings/privacy.php  | 0
 {src/User/resources => resources}/views/settings/profile.php  | 0
 .../views/settings/session-history.php                        | 0
 .../views/settings/two-factor-email.php                       | 0
 .../resources => resources}/views/settings/two-factor-sms.php | 0
 .../resources => resources}/views/settings/two-factor.php     | 0
 {src/User/resources => resources}/views/shared/_alert.php     | 2 +-
 {src/User/resources => resources}/views/shared/_menu.php      | 2 +-
 .../resources => resources}/views/shared/admin_layout.php     | 0
 {src/User/resources => resources}/views/shared/message.php    | 0
 .../views/widgets/assignments/form.php                        | 2 +-
 .../User/resources => resources}/views/widgets/login/form.php | 0
 src/User/Module.php                                           | 2 +-
 87 files changed, 11 insertions(+), 11 deletions(-)
 rename {src/User/resources => resources}/i18n/ca/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/config.php (100%)
 rename {src/User/resources => resources}/i18n/da/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/de-DU/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/de/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/es/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/et/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/fa-IR/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/fi/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/fr/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/hr/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/hu/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/it/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/kk/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/lt/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/nl/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/pl/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/pt-BR/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/pt-PT/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/ro/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/ru/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/sk/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/th/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/tr-TR/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/uk/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/vi/usuario.php (100%)
 rename {src/User/resources => resources}/i18n/zh-CN/usuario.php (100%)
 rename {src/User/resources => resources}/views/admin/_account.php (97%)
 rename {src/User/resources => resources}/views/admin/_assignments.php (96%)
 rename {src/User/resources => resources}/views/admin/_info.php (100%)
 rename {src/User/resources => resources}/views/admin/_profile.php (97%)
 rename {src/User/resources => resources}/views/admin/_session-history.php (100%)
 rename {src/User/resources => resources}/views/admin/_user.php (100%)
 rename {src/User/resources => resources}/views/admin/create.php (98%)
 rename {src/User/resources => resources}/views/admin/index.php (100%)
 rename {src/User/resources => resources}/views/admin/update.php (99%)
 rename {src/User/resources => resources}/views/mail/confirmation.php (100%)
 rename {src/User/resources => resources}/views/mail/layouts/html.php (100%)
 rename {src/User/resources => resources}/views/mail/layouts/text.php (100%)
 rename {src/User/resources => resources}/views/mail/reconfirmation.php (100%)
 rename {src/User/resources => resources}/views/mail/recovery.php (100%)
 rename {src/User/resources => resources}/views/mail/text/confirmation.php (100%)
 rename {src/User/resources => resources}/views/mail/text/reconfirmation.php (100%)
 rename {src/User/resources => resources}/views/mail/text/recovery.php (100%)
 rename {src/User/resources => resources}/views/mail/text/twofactorcode.php (100%)
 rename {src/User/resources => resources}/views/mail/text/welcome.php (100%)
 rename {src/User/resources => resources}/views/mail/twofactorcode.php (100%)
 rename {src/User/resources => resources}/views/mail/welcome.php (100%)
 rename {src/User/resources => resources}/views/permission/_form.php (100%)
 rename {src/User/resources => resources}/views/permission/create.php (100%)
 rename {src/User/resources => resources}/views/permission/index.php (100%)
 rename {src/User/resources => resources}/views/permission/update.php (100%)
 rename {src/User/resources => resources}/views/profile/show.php (100%)
 rename {src/User/resources => resources}/views/recovery/request.php (100%)
 rename {src/User/resources => resources}/views/recovery/reset.php (100%)
 rename {src/User/resources => resources}/views/registration/connect.php (100%)
 rename {src/User/resources => resources}/views/registration/register.php (100%)
 rename {src/User/resources => resources}/views/registration/resend.php (100%)
 rename {src/User/resources => resources}/views/role/_form.php (100%)
 rename {src/User/resources => resources}/views/role/create.php (100%)
 rename {src/User/resources => resources}/views/role/index.php (100%)
 rename {src/User/resources => resources}/views/role/update.php (100%)
 rename {src/User/resources => resources}/views/rule/_form.php (100%)
 rename {src/User/resources => resources}/views/rule/create.php (100%)
 rename {src/User/resources => resources}/views/rule/index.php (100%)
 rename {src/User/resources => resources}/views/rule/update.php (100%)
 rename {src/User/resources => resources}/views/security/confirm.php (100%)
 rename {src/User/resources => resources}/views/security/login.php (100%)
 rename {src/User/resources => resources}/views/settings/_menu.php (100%)
 rename {src/User/resources => resources}/views/settings/account.php (100%)
 rename {src/User/resources => resources}/views/settings/gdpr-consent.php (100%)
 rename {src/User/resources => resources}/views/settings/gdpr-delete.php (100%)
 rename {src/User/resources => resources}/views/settings/networks.php (100%)
 rename {src/User/resources => resources}/views/settings/privacy.php (100%)
 rename {src/User/resources => resources}/views/settings/profile.php (100%)
 rename {src/User/resources => resources}/views/settings/session-history.php (100%)
 rename {src/User/resources => resources}/views/settings/two-factor-email.php (100%)
 rename {src/User/resources => resources}/views/settings/two-factor-sms.php (100%)
 rename {src/User/resources => resources}/views/settings/two-factor.php (100%)
 rename {src/User/resources => resources}/views/shared/_alert.php (97%)
 rename {src/User/resources => resources}/views/shared/_menu.php (98%)
 rename {src/User/resources => resources}/views/shared/admin_layout.php (100%)
 rename {src/User/resources => resources}/views/shared/message.php (100%)
 rename {src/User/resources => resources}/views/widgets/assignments/form.php (97%)
 rename {src/User/resources => resources}/views/widgets/login/form.php (100%)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 4e67fd00..054540de 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -14,7 +14,7 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: ['ubuntu-latest']
-                php-versions: ['8.1', '8.0','7.4']
+                php-versions: ['8.2','8.1', '8.0','7.4']
 
         services:
             mariadb:
diff --git a/src/User/resources/i18n/ca/usuario.php b/resources/i18n/ca/usuario.php
similarity index 100%
rename from src/User/resources/i18n/ca/usuario.php
rename to resources/i18n/ca/usuario.php
diff --git a/src/User/resources/i18n/config.php b/resources/i18n/config.php
similarity index 100%
rename from src/User/resources/i18n/config.php
rename to resources/i18n/config.php
diff --git a/src/User/resources/i18n/da/usuario.php b/resources/i18n/da/usuario.php
similarity index 100%
rename from src/User/resources/i18n/da/usuario.php
rename to resources/i18n/da/usuario.php
diff --git a/src/User/resources/i18n/de-DU/usuario.php b/resources/i18n/de-DU/usuario.php
similarity index 100%
rename from src/User/resources/i18n/de-DU/usuario.php
rename to resources/i18n/de-DU/usuario.php
diff --git a/src/User/resources/i18n/de/usuario.php b/resources/i18n/de/usuario.php
similarity index 100%
rename from src/User/resources/i18n/de/usuario.php
rename to resources/i18n/de/usuario.php
diff --git a/src/User/resources/i18n/es/usuario.php b/resources/i18n/es/usuario.php
similarity index 100%
rename from src/User/resources/i18n/es/usuario.php
rename to resources/i18n/es/usuario.php
diff --git a/src/User/resources/i18n/et/usuario.php b/resources/i18n/et/usuario.php
similarity index 100%
rename from src/User/resources/i18n/et/usuario.php
rename to resources/i18n/et/usuario.php
diff --git a/src/User/resources/i18n/fa-IR/usuario.php b/resources/i18n/fa-IR/usuario.php
similarity index 100%
rename from src/User/resources/i18n/fa-IR/usuario.php
rename to resources/i18n/fa-IR/usuario.php
diff --git a/src/User/resources/i18n/fi/usuario.php b/resources/i18n/fi/usuario.php
similarity index 100%
rename from src/User/resources/i18n/fi/usuario.php
rename to resources/i18n/fi/usuario.php
diff --git a/src/User/resources/i18n/fr/usuario.php b/resources/i18n/fr/usuario.php
similarity index 100%
rename from src/User/resources/i18n/fr/usuario.php
rename to resources/i18n/fr/usuario.php
diff --git a/src/User/resources/i18n/hr/usuario.php b/resources/i18n/hr/usuario.php
similarity index 100%
rename from src/User/resources/i18n/hr/usuario.php
rename to resources/i18n/hr/usuario.php
diff --git a/src/User/resources/i18n/hu/usuario.php b/resources/i18n/hu/usuario.php
similarity index 100%
rename from src/User/resources/i18n/hu/usuario.php
rename to resources/i18n/hu/usuario.php
diff --git a/src/User/resources/i18n/it/usuario.php b/resources/i18n/it/usuario.php
similarity index 100%
rename from src/User/resources/i18n/it/usuario.php
rename to resources/i18n/it/usuario.php
diff --git a/src/User/resources/i18n/kk/usuario.php b/resources/i18n/kk/usuario.php
similarity index 100%
rename from src/User/resources/i18n/kk/usuario.php
rename to resources/i18n/kk/usuario.php
diff --git a/src/User/resources/i18n/lt/usuario.php b/resources/i18n/lt/usuario.php
similarity index 100%
rename from src/User/resources/i18n/lt/usuario.php
rename to resources/i18n/lt/usuario.php
diff --git a/src/User/resources/i18n/nl/usuario.php b/resources/i18n/nl/usuario.php
similarity index 100%
rename from src/User/resources/i18n/nl/usuario.php
rename to resources/i18n/nl/usuario.php
diff --git a/src/User/resources/i18n/pl/usuario.php b/resources/i18n/pl/usuario.php
similarity index 100%
rename from src/User/resources/i18n/pl/usuario.php
rename to resources/i18n/pl/usuario.php
diff --git a/src/User/resources/i18n/pt-BR/usuario.php b/resources/i18n/pt-BR/usuario.php
similarity index 100%
rename from src/User/resources/i18n/pt-BR/usuario.php
rename to resources/i18n/pt-BR/usuario.php
diff --git a/src/User/resources/i18n/pt-PT/usuario.php b/resources/i18n/pt-PT/usuario.php
similarity index 100%
rename from src/User/resources/i18n/pt-PT/usuario.php
rename to resources/i18n/pt-PT/usuario.php
diff --git a/src/User/resources/i18n/ro/usuario.php b/resources/i18n/ro/usuario.php
similarity index 100%
rename from src/User/resources/i18n/ro/usuario.php
rename to resources/i18n/ro/usuario.php
diff --git a/src/User/resources/i18n/ru/usuario.php b/resources/i18n/ru/usuario.php
similarity index 100%
rename from src/User/resources/i18n/ru/usuario.php
rename to resources/i18n/ru/usuario.php
diff --git a/src/User/resources/i18n/sk/usuario.php b/resources/i18n/sk/usuario.php
similarity index 100%
rename from src/User/resources/i18n/sk/usuario.php
rename to resources/i18n/sk/usuario.php
diff --git a/src/User/resources/i18n/th/usuario.php b/resources/i18n/th/usuario.php
similarity index 100%
rename from src/User/resources/i18n/th/usuario.php
rename to resources/i18n/th/usuario.php
diff --git a/src/User/resources/i18n/tr-TR/usuario.php b/resources/i18n/tr-TR/usuario.php
similarity index 100%
rename from src/User/resources/i18n/tr-TR/usuario.php
rename to resources/i18n/tr-TR/usuario.php
diff --git a/src/User/resources/i18n/uk/usuario.php b/resources/i18n/uk/usuario.php
similarity index 100%
rename from src/User/resources/i18n/uk/usuario.php
rename to resources/i18n/uk/usuario.php
diff --git a/src/User/resources/i18n/vi/usuario.php b/resources/i18n/vi/usuario.php
similarity index 100%
rename from src/User/resources/i18n/vi/usuario.php
rename to resources/i18n/vi/usuario.php
diff --git a/src/User/resources/i18n/zh-CN/usuario.php b/resources/i18n/zh-CN/usuario.php
similarity index 100%
rename from src/User/resources/i18n/zh-CN/usuario.php
rename to resources/i18n/zh-CN/usuario.php
diff --git a/src/User/resources/views/admin/_account.php b/resources/views/admin/_account.php
similarity index 97%
rename from src/User/resources/views/admin/_account.php
rename to resources/views/admin/_account.php
index 7b440214..09dc270d 100644
--- a/src/User/resources/views/admin/_account.php
+++ b/resources/views/admin/_account.php
@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use yii\bootstrap\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 use yii\helpers\Html;
 
 /** @var yii\web\View $this */
diff --git a/src/User/resources/views/admin/_assignments.php b/resources/views/admin/_assignments.php
similarity index 96%
rename from src/User/resources/views/admin/_assignments.php
rename to resources/views/admin/_assignments.php
index d2b0a729..b7860002 100644
--- a/src/User/resources/views/admin/_assignments.php
+++ b/resources/views/admin/_assignments.php
@@ -20,7 +20,7 @@
 
 <?php $this->beginContent($module->viewPath. '/admin/update.php', ['user' => $user]) ?>
 
-<?= yii\bootstrap\Alert::widget(
+<?= yii\bootstrap5\Alert::widget(
     [
         'options' => [
             'class' => 'alert-info alert-dismissible',
diff --git a/src/User/resources/views/admin/_info.php b/resources/views/admin/_info.php
similarity index 100%
rename from src/User/resources/views/admin/_info.php
rename to resources/views/admin/_info.php
diff --git a/src/User/resources/views/admin/_profile.php b/resources/views/admin/_profile.php
similarity index 97%
rename from src/User/resources/views/admin/_profile.php
rename to resources/views/admin/_profile.php
index 17994bea..e750cf7c 100644
--- a/src/User/resources/views/admin/_profile.php
+++ b/resources/views/admin/_profile.php
@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use yii\bootstrap\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 use yii\helpers\Html;
 
 /**
diff --git a/src/User/resources/views/admin/_session-history.php b/resources/views/admin/_session-history.php
similarity index 100%
rename from src/User/resources/views/admin/_session-history.php
rename to resources/views/admin/_session-history.php
diff --git a/src/User/resources/views/admin/_user.php b/resources/views/admin/_user.php
similarity index 100%
rename from src/User/resources/views/admin/_user.php
rename to resources/views/admin/_user.php
diff --git a/src/User/resources/views/admin/create.php b/resources/views/admin/create.php
similarity index 98%
rename from src/User/resources/views/admin/create.php
rename to resources/views/admin/create.php
index f65d7de1..f36d233b 100644
--- a/src/User/resources/views/admin/create.php
+++ b/resources/views/admin/create.php
@@ -9,8 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use yii\bootstrap\ActiveForm;
-use yii\bootstrap\Nav;
+use yii\bootstrap5\ActiveForm;
+use yii\bootstrap5\Nav;
 use yii\helpers\Html;
 
 /**
diff --git a/src/User/resources/views/admin/index.php b/resources/views/admin/index.php
similarity index 100%
rename from src/User/resources/views/admin/index.php
rename to resources/views/admin/index.php
diff --git a/src/User/resources/views/admin/update.php b/resources/views/admin/update.php
similarity index 99%
rename from src/User/resources/views/admin/update.php
rename to resources/views/admin/update.php
index a90fd96f..98a77fb7 100755
--- a/src/User/resources/views/admin/update.php
+++ b/resources/views/admin/update.php
@@ -10,7 +10,7 @@
  */
 
 use Da\User\Model\User;
-use yii\bootstrap\Nav;
+use yii\bootstrap5\Nav;
 use yii\helpers\Html;
 use yii\web\View;
 use Da\User\Module as UserModule;
diff --git a/src/User/resources/views/mail/confirmation.php b/resources/views/mail/confirmation.php
similarity index 100%
rename from src/User/resources/views/mail/confirmation.php
rename to resources/views/mail/confirmation.php
diff --git a/src/User/resources/views/mail/layouts/html.php b/resources/views/mail/layouts/html.php
similarity index 100%
rename from src/User/resources/views/mail/layouts/html.php
rename to resources/views/mail/layouts/html.php
diff --git a/src/User/resources/views/mail/layouts/text.php b/resources/views/mail/layouts/text.php
similarity index 100%
rename from src/User/resources/views/mail/layouts/text.php
rename to resources/views/mail/layouts/text.php
diff --git a/src/User/resources/views/mail/reconfirmation.php b/resources/views/mail/reconfirmation.php
similarity index 100%
rename from src/User/resources/views/mail/reconfirmation.php
rename to resources/views/mail/reconfirmation.php
diff --git a/src/User/resources/views/mail/recovery.php b/resources/views/mail/recovery.php
similarity index 100%
rename from src/User/resources/views/mail/recovery.php
rename to resources/views/mail/recovery.php
diff --git a/src/User/resources/views/mail/text/confirmation.php b/resources/views/mail/text/confirmation.php
similarity index 100%
rename from src/User/resources/views/mail/text/confirmation.php
rename to resources/views/mail/text/confirmation.php
diff --git a/src/User/resources/views/mail/text/reconfirmation.php b/resources/views/mail/text/reconfirmation.php
similarity index 100%
rename from src/User/resources/views/mail/text/reconfirmation.php
rename to resources/views/mail/text/reconfirmation.php
diff --git a/src/User/resources/views/mail/text/recovery.php b/resources/views/mail/text/recovery.php
similarity index 100%
rename from src/User/resources/views/mail/text/recovery.php
rename to resources/views/mail/text/recovery.php
diff --git a/src/User/resources/views/mail/text/twofactorcode.php b/resources/views/mail/text/twofactorcode.php
similarity index 100%
rename from src/User/resources/views/mail/text/twofactorcode.php
rename to resources/views/mail/text/twofactorcode.php
diff --git a/src/User/resources/views/mail/text/welcome.php b/resources/views/mail/text/welcome.php
similarity index 100%
rename from src/User/resources/views/mail/text/welcome.php
rename to resources/views/mail/text/welcome.php
diff --git a/src/User/resources/views/mail/twofactorcode.php b/resources/views/mail/twofactorcode.php
similarity index 100%
rename from src/User/resources/views/mail/twofactorcode.php
rename to resources/views/mail/twofactorcode.php
diff --git a/src/User/resources/views/mail/welcome.php b/resources/views/mail/welcome.php
similarity index 100%
rename from src/User/resources/views/mail/welcome.php
rename to resources/views/mail/welcome.php
diff --git a/src/User/resources/views/permission/_form.php b/resources/views/permission/_form.php
similarity index 100%
rename from src/User/resources/views/permission/_form.php
rename to resources/views/permission/_form.php
diff --git a/src/User/resources/views/permission/create.php b/resources/views/permission/create.php
similarity index 100%
rename from src/User/resources/views/permission/create.php
rename to resources/views/permission/create.php
diff --git a/src/User/resources/views/permission/index.php b/resources/views/permission/index.php
similarity index 100%
rename from src/User/resources/views/permission/index.php
rename to resources/views/permission/index.php
diff --git a/src/User/resources/views/permission/update.php b/resources/views/permission/update.php
similarity index 100%
rename from src/User/resources/views/permission/update.php
rename to resources/views/permission/update.php
diff --git a/src/User/resources/views/profile/show.php b/resources/views/profile/show.php
similarity index 100%
rename from src/User/resources/views/profile/show.php
rename to resources/views/profile/show.php
diff --git a/src/User/resources/views/recovery/request.php b/resources/views/recovery/request.php
similarity index 100%
rename from src/User/resources/views/recovery/request.php
rename to resources/views/recovery/request.php
diff --git a/src/User/resources/views/recovery/reset.php b/resources/views/recovery/reset.php
similarity index 100%
rename from src/User/resources/views/recovery/reset.php
rename to resources/views/recovery/reset.php
diff --git a/src/User/resources/views/registration/connect.php b/resources/views/registration/connect.php
similarity index 100%
rename from src/User/resources/views/registration/connect.php
rename to resources/views/registration/connect.php
diff --git a/src/User/resources/views/registration/register.php b/resources/views/registration/register.php
similarity index 100%
rename from src/User/resources/views/registration/register.php
rename to resources/views/registration/register.php
diff --git a/src/User/resources/views/registration/resend.php b/resources/views/registration/resend.php
similarity index 100%
rename from src/User/resources/views/registration/resend.php
rename to resources/views/registration/resend.php
diff --git a/src/User/resources/views/role/_form.php b/resources/views/role/_form.php
similarity index 100%
rename from src/User/resources/views/role/_form.php
rename to resources/views/role/_form.php
diff --git a/src/User/resources/views/role/create.php b/resources/views/role/create.php
similarity index 100%
rename from src/User/resources/views/role/create.php
rename to resources/views/role/create.php
diff --git a/src/User/resources/views/role/index.php b/resources/views/role/index.php
similarity index 100%
rename from src/User/resources/views/role/index.php
rename to resources/views/role/index.php
diff --git a/src/User/resources/views/role/update.php b/resources/views/role/update.php
similarity index 100%
rename from src/User/resources/views/role/update.php
rename to resources/views/role/update.php
diff --git a/src/User/resources/views/rule/_form.php b/resources/views/rule/_form.php
similarity index 100%
rename from src/User/resources/views/rule/_form.php
rename to resources/views/rule/_form.php
diff --git a/src/User/resources/views/rule/create.php b/resources/views/rule/create.php
similarity index 100%
rename from src/User/resources/views/rule/create.php
rename to resources/views/rule/create.php
diff --git a/src/User/resources/views/rule/index.php b/resources/views/rule/index.php
similarity index 100%
rename from src/User/resources/views/rule/index.php
rename to resources/views/rule/index.php
diff --git a/src/User/resources/views/rule/update.php b/resources/views/rule/update.php
similarity index 100%
rename from src/User/resources/views/rule/update.php
rename to resources/views/rule/update.php
diff --git a/src/User/resources/views/security/confirm.php b/resources/views/security/confirm.php
similarity index 100%
rename from src/User/resources/views/security/confirm.php
rename to resources/views/security/confirm.php
diff --git a/src/User/resources/views/security/login.php b/resources/views/security/login.php
similarity index 100%
rename from src/User/resources/views/security/login.php
rename to resources/views/security/login.php
diff --git a/src/User/resources/views/settings/_menu.php b/resources/views/settings/_menu.php
similarity index 100%
rename from src/User/resources/views/settings/_menu.php
rename to resources/views/settings/_menu.php
diff --git a/src/User/resources/views/settings/account.php b/resources/views/settings/account.php
similarity index 100%
rename from src/User/resources/views/settings/account.php
rename to resources/views/settings/account.php
diff --git a/src/User/resources/views/settings/gdpr-consent.php b/resources/views/settings/gdpr-consent.php
similarity index 100%
rename from src/User/resources/views/settings/gdpr-consent.php
rename to resources/views/settings/gdpr-consent.php
diff --git a/src/User/resources/views/settings/gdpr-delete.php b/resources/views/settings/gdpr-delete.php
similarity index 100%
rename from src/User/resources/views/settings/gdpr-delete.php
rename to resources/views/settings/gdpr-delete.php
diff --git a/src/User/resources/views/settings/networks.php b/resources/views/settings/networks.php
similarity index 100%
rename from src/User/resources/views/settings/networks.php
rename to resources/views/settings/networks.php
diff --git a/src/User/resources/views/settings/privacy.php b/resources/views/settings/privacy.php
similarity index 100%
rename from src/User/resources/views/settings/privacy.php
rename to resources/views/settings/privacy.php
diff --git a/src/User/resources/views/settings/profile.php b/resources/views/settings/profile.php
similarity index 100%
rename from src/User/resources/views/settings/profile.php
rename to resources/views/settings/profile.php
diff --git a/src/User/resources/views/settings/session-history.php b/resources/views/settings/session-history.php
similarity index 100%
rename from src/User/resources/views/settings/session-history.php
rename to resources/views/settings/session-history.php
diff --git a/src/User/resources/views/settings/two-factor-email.php b/resources/views/settings/two-factor-email.php
similarity index 100%
rename from src/User/resources/views/settings/two-factor-email.php
rename to resources/views/settings/two-factor-email.php
diff --git a/src/User/resources/views/settings/two-factor-sms.php b/resources/views/settings/two-factor-sms.php
similarity index 100%
rename from src/User/resources/views/settings/two-factor-sms.php
rename to resources/views/settings/two-factor-sms.php
diff --git a/src/User/resources/views/settings/two-factor.php b/resources/views/settings/two-factor.php
similarity index 100%
rename from src/User/resources/views/settings/two-factor.php
rename to resources/views/settings/two-factor.php
diff --git a/src/User/resources/views/shared/_alert.php b/resources/views/shared/_alert.php
similarity index 97%
rename from src/User/resources/views/shared/_alert.php
rename to resources/views/shared/_alert.php
index 500385f0..6cfda598 100644
--- a/src/User/resources/views/shared/_alert.php
+++ b/resources/views/shared/_alert.php
@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use yii\bootstrap\Alert;
+use yii\bootstrap5\Alert;
 
 /** @var \Da\User\Module $module */
 
diff --git a/src/User/resources/views/shared/_menu.php b/resources/views/shared/_menu.php
similarity index 98%
rename from src/User/resources/views/shared/_menu.php
rename to resources/views/shared/_menu.php
index af7d660f..529316e9 100644
--- a/src/User/resources/views/shared/_menu.php
+++ b/resources/views/shared/_menu.php
@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use yii\bootstrap\Nav;
+use yii\bootstrap5\Nav;
 
 ?>
 
diff --git a/src/User/resources/views/shared/admin_layout.php b/resources/views/shared/admin_layout.php
similarity index 100%
rename from src/User/resources/views/shared/admin_layout.php
rename to resources/views/shared/admin_layout.php
diff --git a/src/User/resources/views/shared/message.php b/resources/views/shared/message.php
similarity index 100%
rename from src/User/resources/views/shared/message.php
rename to resources/views/shared/message.php
diff --git a/src/User/resources/views/widgets/assignments/form.php b/resources/views/widgets/assignments/form.php
similarity index 97%
rename from src/User/resources/views/widgets/assignments/form.php
rename to resources/views/widgets/assignments/form.php
index 0fa55a03..3751388a 100644
--- a/src/User/resources/views/widgets/assignments/form.php
+++ b/resources/views/widgets/assignments/form.php
@@ -10,7 +10,7 @@
  */
 
 use dosamigos\selectize\SelectizeDropDownList;
-use yii\bootstrap\Alert;
+use yii\bootstrap5\Alert;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
diff --git a/src/User/resources/views/widgets/login/form.php b/resources/views/widgets/login/form.php
similarity index 100%
rename from src/User/resources/views/widgets/login/form.php
rename to resources/views/widgets/login/form.php
diff --git a/src/User/Module.php b/src/User/Module.php
index 0e00f587..a9463405 100755
--- a/src/User/Module.php
+++ b/src/User/Module.php
@@ -216,7 +216,7 @@ class Module extends BaseModule
     /**
      * @var string
      */
-    public $viewPath = '@Da/User/resources/views';
+    public $viewPath = '@Da/User/../../resources/views';
     /**
      * @var string the session key name to impersonate users. Please, modify it for security reasons!
      */

From dfece8fa60329ab7f120fad935487e3fde641c9c Mon Sep 17 00:00:00 2001
From: tonis ormisson <tonis@andmemasin.eu>
Date: Tue, 10 Jan 2023 16:11:53 +0200
Subject: [PATCH 02/10] composer, ActiveForm

---
 composer.json                                 |  7 +++--
 resources/views/admin/_account.php            |  5 ----
 resources/views/admin/_profile.php            |  5 ----
 resources/views/admin/create.php              |  5 ----
 resources/views/permission/_form.php          |  2 +-
 resources/views/recovery/request.php          |  2 +-
 resources/views/recovery/reset.php            |  2 +-
 resources/views/registration/connect.php      |  2 +-
 resources/views/registration/register.php     |  2 +-
 resources/views/registration/resend.php       |  2 +-
 resources/views/role/_form.php                |  2 +-
 resources/views/rule/_form.php                |  2 +-
 resources/views/security/confirm.php          |  2 +-
 resources/views/security/login.php            |  2 +-
 resources/views/settings/account.php          | 28 ++++++++-----------
 resources/views/settings/gdpr-consent.php     |  2 +-
 resources/views/settings/gdpr-delete.php      |  2 +-
 resources/views/settings/profile.php          |  8 ++----
 resources/views/widgets/assignments/form.php  |  2 +-
 resources/views/widgets/login/form.php        |  2 +-
 .../Validator/AjaxRequestModelValidator.php   |  2 +-
 21 files changed, 34 insertions(+), 54 deletions(-)

diff --git a/composer.json b/composer.json
index c1761fd8..d28fd1cb 100644
--- a/composer.json
+++ b/composer.json
@@ -41,19 +41,22 @@
     "prefer-stable": true,
     "require": {
         "php": ">=5.5",
-        "2amigos/yii2-selectize-widget": "^1.1",
         "yiisoft/yii2-authclient": "^2.1",
         "yiisoft/yii2-httpclient": "^2.0",
-        "yiisoft/yii2-bootstrap": "^2.0",
         "yetopen/yii2-sms-sender-interface": "^0.1.1"
     },
     "suggest": {
+        "yiisoft/yii2-bootstrap5": "Front-end framework needed for the default views",
+        "kartik-v/yii2-widget-select2": "needed for default Botstrap-5 views",
+        "twbs/bootstrap-icons": "Icons for Bootstrap 5 views",
         "yiisoft/yii2-symfonymailer": "A mailer driver is needed to send e-mails. Older versions use abandoned Swiftmailer which can be replaced with symfonymailer",
         "2amigos/2fa-library": "Needed if you want to enable 2 Factor Authentication. Require version ^1.0",
         "2amigos/qrcode-library": "Needed if you want to enable 2FA with QR Code generation. Require version ^1.1"
     },
     "require-dev": {
         "php": ">=7.4",
+        "kartik-v/yii2-widget-select2": "^2.2",
+        "yiisoft/yii2-bootstrap5": "^2.0",
         "2amigos/2fa-library": "^2.0",
         "2amigos/qrcode-library": "^2.0",
         "friendsofphp/php-cs-fixer": "^3",
diff --git a/resources/views/admin/_account.php b/resources/views/admin/_account.php
index 09dc270d..8f0f5d32 100644
--- a/resources/views/admin/_account.php
+++ b/resources/views/admin/_account.php
@@ -25,11 +25,6 @@
         'layout' => 'horizontal',
         'enableAjaxValidation' => true,
         'enableClientValidation' => false,
-        'fieldConfig' => [
-            'horizontalCssClasses' => [
-                'wrapper' => 'col-sm-9',
-            ],
-        ],
     ]
 ); ?>
 
diff --git a/resources/views/admin/_profile.php b/resources/views/admin/_profile.php
index e750cf7c..95dd2925 100644
--- a/resources/views/admin/_profile.php
+++ b/resources/views/admin/_profile.php
@@ -28,11 +28,6 @@
         'layout' => 'horizontal',
         'enableAjaxValidation' => true,
         'enableClientValidation' => false,
-        'fieldConfig' => [
-            'horizontalCssClasses' => [
-                'wrapper' => 'col-sm-9',
-            ],
-        ],
     ]
 ); ?>
 
diff --git a/resources/views/admin/create.php b/resources/views/admin/create.php
index f36d233b..b85d7a34 100644
--- a/resources/views/admin/create.php
+++ b/resources/views/admin/create.php
@@ -88,11 +88,6 @@
                                         'layout' => 'horizontal',
                                         'enableAjaxValidation' => true,
                                         'enableClientValidation' => false,
-                                        'fieldConfig' => [
-                                            'horizontalCssClasses' => [
-                                                'wrapper' => 'col-sm-9',
-                                            ],
-                                        ],
                                     ]
                                 ); ?>
 
diff --git a/resources/views/permission/_form.php b/resources/views/permission/_form.php
index 1ab6575e..94bc61db 100644
--- a/resources/views/permission/_form.php
+++ b/resources/views/permission/_form.php
@@ -12,7 +12,7 @@
 use dosamigos\selectize\SelectizeDropDownList;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 
 /**
  * @var yii\web\View $this
diff --git a/resources/views/recovery/request.php b/resources/views/recovery/request.php
index 6b0b6d71..614b0a24 100644
--- a/resources/views/recovery/request.php
+++ b/resources/views/recovery/request.php
@@ -10,7 +10,7 @@
  */
 
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 
 /**
  * @var yii\web\View               $this
diff --git a/resources/views/recovery/reset.php b/resources/views/recovery/reset.php
index 8f225f1c..544fcf78 100644
--- a/resources/views/recovery/reset.php
+++ b/resources/views/recovery/reset.php
@@ -10,7 +10,7 @@
  */
 
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 
 /**
  * @var yii\web\View               $this
diff --git a/resources/views/registration/connect.php b/resources/views/registration/connect.php
index e6e8a505..63f19a03 100644
--- a/resources/views/registration/connect.php
+++ b/resources/views/registration/connect.php
@@ -10,7 +10,7 @@
  */
 
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 
 /**
  * @var yii\web\View                        $this
diff --git a/resources/views/registration/register.php b/resources/views/registration/register.php
index 29d1e753..fac3be0c 100644
--- a/resources/views/registration/register.php
+++ b/resources/views/registration/register.php
@@ -10,7 +10,7 @@
  */
 
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 
 /**
  * @var yii\web\View                   $this
diff --git a/resources/views/registration/resend.php b/resources/views/registration/resend.php
index b687a1e9..ac8c803c 100644
--- a/resources/views/registration/resend.php
+++ b/resources/views/registration/resend.php
@@ -10,7 +10,7 @@
  */
 
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 
 /**
  * @var yii\web\View             $this
diff --git a/resources/views/role/_form.php b/resources/views/role/_form.php
index 33eb2e93..6c00455d 100644
--- a/resources/views/role/_form.php
+++ b/resources/views/role/_form.php
@@ -18,7 +18,7 @@
 use dosamigos\selectize\SelectizeDropDownList;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 
 $unassignedItems = Yii::$container->get(AuthHelper::class)->getUnassignedItems($model);
 ?>
diff --git a/resources/views/rule/_form.php b/resources/views/rule/_form.php
index 498a0a82..a329a8c9 100644
--- a/resources/views/rule/_form.php
+++ b/resources/views/rule/_form.php
@@ -6,7 +6,7 @@
  */
 
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 
 ?>
 
diff --git a/resources/views/security/confirm.php b/resources/views/security/confirm.php
index ed064742..3f6c09db 100644
--- a/resources/views/security/confirm.php
+++ b/resources/views/security/confirm.php
@@ -11,7 +11,7 @@
 
 use Da\User\Widget\ConnectWidget;
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 
 /**
  * @var yii\web\View            $this
diff --git a/resources/views/security/login.php b/resources/views/security/login.php
index 8bbc5cef..3dd00ee6 100644
--- a/resources/views/security/login.php
+++ b/resources/views/security/login.php
@@ -11,7 +11,7 @@
 
 use Da\User\Widget\ConnectWidget;
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 
 /**
  * @var yii\web\View            $this
diff --git a/resources/views/settings/account.php b/resources/views/settings/account.php
index 71acb076..8931cdb2 100644
--- a/resources/views/settings/account.php
+++ b/resources/views/settings/account.php
@@ -11,7 +11,7 @@
 
 use yii\helpers\Html;
 use yii\helpers\Url;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 use dmstr\widgets\Alert;
 
 /**
@@ -43,11 +43,7 @@
                 <?php $form = ActiveForm::begin(
                     [
                         'id' => $model->formName(),
-                        'options' => ['class' => 'form-horizontal'],
-                        'fieldConfig' => [
-                            'template' => "{label}\n<div class=\"col-lg-9\">{input}</div>\n<div class=\"col-sm-offset-3 col-lg-9\">{error}\n{hint}</div>",
-                            'labelOptions' => ['class' => 'col-lg-3 control-label'],
-                        ],
+                        'layout' => 'horizontal',
                         'enableAjaxValidation' => true,
                         'enableClientValidation' => false,
                     ]
@@ -87,7 +83,7 @@
                         <div class="modal-body">
                             ...
                         </div>
-                        <div class="modal-footer">                            
+                        <div class="modal-footer">
                             <button type="button" class="btn btn-default" data-dismiss="modal" onClick='window.location.reload();'>
                                 <?= Yii::t('usuario', 'Close') ?>
                             </button>
@@ -103,16 +99,16 @@
                     <p>
                         <?= Yii::t('usuario', 'Two factor authentication protects you in case of stolen credentials') ?>.
                     </p>
-                    <?php if (!$model->getUser()->auth_tf_enabled):  
+                    <?php if (!$model->getUser()->auth_tf_enabled):
                         $validators = $module->twoFactorAuthenticationValidators;
-                        $theFirstFound = false; 
+                        $theFirstFound = false;
                         $checked = '';
                         foreach( $validators as $name => $validator ) {
                             if($validator[ "enabled" ]){
                                 // I want to check in the radio field the first validator I get
                                 if(!$theFirstFound){
                                     $checked = 'checked';
-                                    $theFirstFound = true; 
+                                    $theFirstFound = true;
                                 }
                                 $description = $validator[ "description" ];
                                 ?>
@@ -140,7 +136,7 @@
                     <?php else:
                          ?>
                             <p>
-                                <?php 
+                                <?php
                                     $method = $model->getUser()->auth_tf_type;
                                     $message = '';
                                     switch ($method) {
@@ -207,7 +203,7 @@
     $verify = Url::to(['two-factor-enable', 'id' => $model->getUser()->id]);
     $mobilePhoneRegistration = Url::to(['two-factor-mobile-phone', 'id' => $model->getUser()->id]);
     $js = <<<JS
-    var choice = ''; 
+    var choice = '';
     $('#tfmodal')
     .on('show.bs.modal', function(){
         var element = document.getElementsByName('2famethod');
@@ -222,20 +218,20 @@
         }
     });
 
-    
+
 
 $(document)
     .on('click', '.btn-submit-code', function(e) {
         e.preventDefault();
         var btn = $(this);
         btn.prop('disabled', true);
-        var choice = ''; 
+        var choice = '';
         var element = document.getElementsByName('2famethod');
         for(i = 0; i < element.length; i++) {
             if(element[i].checked)
                 choice = element[i].value;
         }
-        
+
         $.getJSON('{$verify}', {code: $('#tfcode').val(), choice: choice}, function(data){
             btn.prop('disabled', false);
             if(data.success) {
@@ -266,7 +262,7 @@
                 $('#tfmessagephone').removeClass('alert-info').addClass('alert-danger').find('p').text(data.message);
             }
         }).fail(function(){ btn.prop('disabled', false); });
-       
+
     })
 JS;
 
diff --git a/resources/views/settings/gdpr-consent.php b/resources/views/settings/gdpr-consent.php
index a7b69ae5..c78cb6a7 100644
--- a/resources/views/settings/gdpr-consent.php
+++ b/resources/views/settings/gdpr-consent.php
@@ -1,6 +1,6 @@
 <?php
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 /** @var \yii\base\DynamicModel $model */
 /** @var string $gdpr_consent_hint */
 ?>
diff --git a/resources/views/settings/gdpr-delete.php b/resources/views/settings/gdpr-delete.php
index 2ed34df0..00d5bdfc 100644
--- a/resources/views/settings/gdpr-delete.php
+++ b/resources/views/settings/gdpr-delete.php
@@ -8,7 +8,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 use yii\helpers\Html;
 
 /** @var \Da\User\Form\GdprDeleteForm $model */
diff --git a/resources/views/settings/profile.php b/resources/views/settings/profile.php
index 0237aa02..25ee10c6 100644
--- a/resources/views/settings/profile.php
+++ b/resources/views/settings/profile.php
@@ -12,7 +12,7 @@
 use Da\User\Helper\TimezoneHelper;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 
 /**
  * @var yii\web\View           $this
@@ -43,11 +43,7 @@
                 <?php $form = ActiveForm::begin(
                     [
                         'id' => $model->formName(),
-                        'options' => ['class' => 'form-horizontal'],
-                        'fieldConfig' => [
-                            'template' => "{label}\n<div class=\"col-lg-9\">{input}</div>\n<div class=\"col-sm-offset-3 col-lg-9\">{error}\n{hint}</div>",
-                            'labelOptions' => ['class' => 'col-lg-3 control-label'],
-                        ],
+                        'layout' => 'horizontal',
                         'enableAjaxValidation' => true,
                         'enableClientValidation' => false,
                         'validateOnBlur' => false,
diff --git a/resources/views/widgets/assignments/form.php b/resources/views/widgets/assignments/form.php
index 3751388a..0ca6df9b 100644
--- a/resources/views/widgets/assignments/form.php
+++ b/resources/views/widgets/assignments/form.php
@@ -12,7 +12,7 @@
 use dosamigos\selectize\SelectizeDropDownList;
 use yii\bootstrap5\Alert;
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 
 /** @var \yii\web\View $this */
 /** @var string[] $availableItems */
diff --git a/resources/views/widgets/login/form.php b/resources/views/widgets/login/form.php
index 90032da9..34671968 100644
--- a/resources/views/widgets/login/form.php
+++ b/resources/views/widgets/login/form.php
@@ -11,7 +11,7 @@
 
 use yii\helpers\Html;
 use yii\helpers\Url;
-use yii\widgets\ActiveForm;
+use yii\bootstrap5\ActiveForm;
 
 /**
  * @var yii\web\View           $this
diff --git a/src/User/Validator/AjaxRequestModelValidator.php b/src/User/Validator/AjaxRequestModelValidator.php
index a4ea712e..99088128 100644
--- a/src/User/Validator/AjaxRequestModelValidator.php
+++ b/src/User/Validator/AjaxRequestModelValidator.php
@@ -14,7 +14,7 @@
 use Da\User\Contracts\ValidatorInterface;
 use Yii;
 use yii\base\Model;
-use yii\bootstrap\ActiveForm;
+use yii\widgets\ActiveForm;
 use yii\web\Response;
 
 class AjaxRequestModelValidator implements ValidatorInterface

From 0a5929c84d6438f7d99bbac83dc035ef0db19d81 Mon Sep 17 00:00:00 2001
From: tonis ormisson <tonis@andmemasin.eu>
Date: Tue, 10 Jan 2023 16:25:18 +0200
Subject: [PATCH 03/10] panel->card

---
 docs/guides/how-to-add-captcha-widget.md     |  8 ++---
 docs/guides/how-to-use-recaptcha-widget.md   |  8 ++---
 resources/views/admin/_account.php           |  9 ++++--
 resources/views/admin/_profile.php           |  9 ++++--
 resources/views/admin/create.php             | 28 ++++++++--------
 resources/views/admin/update.php             | 16 ++++-----
 resources/views/recovery/request.php         |  8 ++---
 resources/views/recovery/reset.php           |  8 ++---
 resources/views/registration/connect.php     |  8 ++---
 resources/views/registration/register.php    |  8 ++---
 resources/views/registration/resend.php      |  8 ++---
 resources/views/security/confirm.php         |  8 ++---
 resources/views/security/login.php           |  8 ++---
 resources/views/settings/_menu.php           |  8 ++---
 resources/views/settings/account.php         | 34 +++++++++++---------
 resources/views/settings/gdpr-consent.php    | 10 +++---
 resources/views/settings/gdpr-delete.php     |  8 ++---
 resources/views/settings/networks.php        |  6 ++--
 resources/views/settings/privacy.php         |  8 ++---
 resources/views/settings/profile.php         | 17 ++++++----
 resources/views/settings/session-history.php |  6 ++--
 resources/views/shared/admin_layout.php      |  8 ++---
 tests/functional/GdprCest.php                |  2 +-
 23 files changed, 131 insertions(+), 110 deletions(-)

diff --git a/docs/guides/how-to-add-captcha-widget.md b/docs/guides/how-to-add-captcha-widget.md
index a43c0942..2556b7bf 100644
--- a/docs/guides/how-to-add-captcha-widget.md
+++ b/docs/guides/how-to-add-captcha-widget.md
@@ -57,11 +57,11 @@ $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="row">
     <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card ">
+            <div class="card-header">
+                    <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <?php $form = ActiveForm::begin(
                     [
                         'id' => $model->formName(),
diff --git a/docs/guides/how-to-use-recaptcha-widget.md b/docs/guides/how-to-use-recaptcha-widget.md
index 9565aec9..72980d72 100644
--- a/docs/guides/how-to-use-recaptcha-widget.md
+++ b/docs/guides/how-to-use-recaptcha-widget.md
@@ -88,11 +88,11 @@ $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="row">
     <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card ">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <?php $form = ActiveForm::begin(
                     [
                         'id' => $model->formName(),
diff --git a/resources/views/admin/_account.php b/resources/views/admin/_account.php
index 8f0f5d32..0b3b93a5 100644
--- a/resources/views/admin/_account.php
+++ b/resources/views/admin/_account.php
@@ -31,8 +31,13 @@
 <?= $this->render('/admin/_user', ['form' => $form, 'user' => $user]) ?>
 
 <div class="form-group">
-    <div class="col-lg-offset-3 col-lg-9">
-        <?= Html::submitButton(Yii::t('usuario', 'Update'), ['class' => 'btn btn-block btn-success']) ?>
+    <div class="offset-sm-2 col-lg-10">
+        <div class="d-grid">
+            <?= Html::submitButton(
+                Yii::t('usuario', 'Update'),
+                ['class' => 'btn btn-success']
+            ) ?>
+        </div>
     </div>
 </div>
 
diff --git a/resources/views/admin/_profile.php b/resources/views/admin/_profile.php
index 95dd2925..91c87d29 100644
--- a/resources/views/admin/_profile.php
+++ b/resources/views/admin/_profile.php
@@ -40,8 +40,13 @@
 
 
 <div class="form-group">
-    <div class="col-lg-offset-3 col-lg-9">
-        <?= Html::submitButton(Yii::t('usuario', 'Update'), ['class' => 'btn btn-block btn-success']) ?>
+    <div class="offset-sm-2 col-lg-10">
+        <div class="d-grid">
+            <?= Html::submitButton(
+                Yii::t('usuario', 'Update'),
+                ['class' => 'btn btn-success']
+            ) ?>
+        </div>
     </div>
 </div>
 
diff --git a/resources/views/admin/create.php b/resources/views/admin/create.php
index b85d7a34..a6dfcaf1 100644
--- a/resources/views/admin/create.php
+++ b/resources/views/admin/create.php
@@ -33,16 +33,16 @@
 
 <div class="row">
     <div class="col-md-12">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <?= $this->render('/shared/_menu') ?>
                 <div class="row">
                     <div class="col-md-3">
-                        <div class="panel panel-default">
-                            <div class="panel-body">
+                        <div class="card">
+                            <div class="card-body">
                                 <?= Nav::widget(
                                     [
                                         'options' => [
@@ -74,8 +74,8 @@
                         </div>
                     </div>
                     <div class="col-md-9">
-                        <div class="panel panel-default">
-                            <div class="panel-body">
+                        <div class="card">
+                            <div class="card-body">
                                 <div class="alert alert-info">
                                     <?= Yii::t('usuario', 'Credentials will be sent to the user by email') ?>.
                                     <?= Yii::t(
@@ -94,11 +94,13 @@
                                 <?= $this->render('/admin/_user', ['form' => $form, 'user' => $user]) ?>
 
                                 <div class="form-group">
-                                    <div class="col-lg-offset-3 col-lg-9">
-                                        <?= Html::submitButton(
-                                            Yii::t('usuario', 'Save'),
-                                            ['class' => 'btn btn-block btn-success']
-                                        ) ?>
+                                    <div class="offset-sm-2 col-lg-10">
+                                        <div class="d-grid">
+                                            <?= Html::submitButton(
+                                                Yii::t('usuario', 'Save'),
+                                                ['class' => 'btn btn-success']
+                                            ) ?>
+                                        </div>
                                     </div>
                                 </div>
 
diff --git a/resources/views/admin/update.php b/resources/views/admin/update.php
index 98a77fb7..b6d0a4b6 100755
--- a/resources/views/admin/update.php
+++ b/resources/views/admin/update.php
@@ -38,16 +38,16 @@
 
 <div class="row">
     <div class="col-md-12">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <?= $this->render('/shared/_menu') ?>
                 <div class="row">
                     <div class="col-md-3">
-                        <div class="panel panel-default">
-                            <div class="panel-body">
+                        <div class="card">
+                            <div class="card-body">
                                 <?= Nav::widget(
                                     [
                                         'options' => [
@@ -134,8 +134,8 @@
                         </div>
                     </div>
                     <div class="col-md-9">
-                        <div class="panel panel-default">
-                            <div class="panel-body">
+                        <div class="card">
+                            <div class="card-body">
                                 <?= $content ?>
                             </div>
                         </div>
diff --git a/resources/views/recovery/request.php b/resources/views/recovery/request.php
index 614b0a24..0082377c 100644
--- a/resources/views/recovery/request.php
+++ b/resources/views/recovery/request.php
@@ -23,11 +23,11 @@
 ?>
 <div class="row">
     <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <?php $form = ActiveForm::begin(
                     [
                         'id' => $model->formName(),
diff --git a/resources/views/recovery/reset.php b/resources/views/recovery/reset.php
index 544fcf78..54114877 100644
--- a/resources/views/recovery/reset.php
+++ b/resources/views/recovery/reset.php
@@ -23,11 +23,11 @@
 ?>
 <div class="row">
     <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <?php $form = ActiveForm::begin(
                     [
                         'id' => $model->formName(),
diff --git a/resources/views/registration/connect.php b/resources/views/registration/connect.php
index 63f19a03..a6e2f70d 100644
--- a/resources/views/registration/connect.php
+++ b/resources/views/registration/connect.php
@@ -24,11 +24,11 @@
 ?>
 <div class="row">
     <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <div class="alert alert-info">
                     <p>
                         <?= Yii::t(
diff --git a/resources/views/registration/register.php b/resources/views/registration/register.php
index fac3be0c..4c89e9f0 100644
--- a/resources/views/registration/register.php
+++ b/resources/views/registration/register.php
@@ -24,11 +24,11 @@
 ?>
 <div class="row">
     <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <?php $form = ActiveForm::begin(
                     [
                         'id' => $model->formName(),
diff --git a/resources/views/registration/resend.php b/resources/views/registration/resend.php
index ac8c803c..d25f392d 100644
--- a/resources/views/registration/resend.php
+++ b/resources/views/registration/resend.php
@@ -22,11 +22,11 @@
 ?>
 <div class="row">
     <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <?php $form = ActiveForm::begin(
                     [
                         'id' => $model->formName(),
diff --git a/resources/views/security/confirm.php b/resources/views/security/confirm.php
index 3f6c09db..728d2b9c 100644
--- a/resources/views/security/confirm.php
+++ b/resources/views/security/confirm.php
@@ -27,11 +27,11 @@
 
 <div class="row">
     <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <?php $form = ActiveForm::begin(
                     [
                         'id' => $model->formName(),
diff --git a/resources/views/security/login.php b/resources/views/security/login.php
index 3dd00ee6..db7d3360 100644
--- a/resources/views/security/login.php
+++ b/resources/views/security/login.php
@@ -27,11 +27,11 @@
 
 <div class="row">
     <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <?php $form = ActiveForm::begin(
                     [
                         'id' => $model->formName(),
diff --git a/resources/views/settings/_menu.php b/resources/views/settings/_menu.php
index bd3c2aff..77190585 100755
--- a/resources/views/settings/_menu.php
+++ b/resources/views/settings/_menu.php
@@ -22,9 +22,9 @@
 
 ?>
 
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <h3 class="panel-title">
+<div class="card">
+    <div class="card-header">
+        <h3 class="m-0">
             <?= Html::img(
                 $user->profile->getAvatarUrl(24),
                 [
@@ -35,7 +35,7 @@
             <?= $user->username ?>
         </h3>
     </div>
-    <div class="panel-body">
+    <div class="card-body">
         <?= Menu::widget(
             [
                 'options' => [
diff --git a/resources/views/settings/account.php b/resources/views/settings/account.php
index 8931cdb2..637c2b79 100644
--- a/resources/views/settings/account.php
+++ b/resources/views/settings/account.php
@@ -35,11 +35,11 @@
         <?= $this->render('/settings/_menu') ?>
     </div>
     <div class="col-md-9">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <?php $form = ActiveForm::begin(
                     [
                         'id' => $model->formName(),
@@ -60,9 +60,13 @@
                 <?= $form->field($model, 'current_password')->passwordInput() ?>
 
                 <div class="form-group">
-                    <div class="col-lg-offset-3 col-lg-9">
-                        <?= Html::submitButton(Yii::t('usuario', 'Save'), ['class' => 'btn btn-block btn-success']) ?>
-                        <br>
+                    <div class="offset-sm-2 col-lg-10">
+                        <div class="d-grid">
+                            <?= Html::submitButton(
+                                Yii::t('usuario', 'Save'),
+                                ['class' => 'btn btn-success']
+                            ) ?>
+                        </div>
                     </div>
                 </div>
 
@@ -91,11 +95,11 @@
                     </div>
                 </div>
             </div>
-            <div class="panel panel-info">
-                <div class="panel-heading">
-                    <h3 class="panel-title"><?= Yii::t('usuario', 'Two Factor Authentication (2FA)') ?></h3>
+            <div class="card bg-info">
+                <div class="card-header">
+                    <h3 class="m-0"><?= Yii::t('usuario', 'Two Factor Authentication (2FA)') ?></h3>
                 </div>
-                <div class="panel-body">
+                <div class="card-body">
                     <p>
                         <?= Yii::t('usuario', 'Two factor authentication protects you in case of stolen credentials') ?>.
                     </p>
@@ -168,11 +172,11 @@
             </div>
         <?php endif; ?>
         <?php if ($model->module->allowAccountDelete): ?>
-            <div class="panel panel-danger">
-                <div class="panel-heading">
-                    <h3 class="panel-title"><?= Yii::t('usuario', 'Delete account') ?></h3>
+            <div class="card bg-danger">
+                <div class="card-header">
+                    <h3 class="m-0"><?= Yii::t('usuario', 'Delete account') ?></h3>
                 </div>
-                <div class="panel-body">
+                <div class="card-body">
                     <p>
                         <?= Yii::t('usuario', 'Once you delete your account, there is no going back') ?>.
                         <?= Yii::t('usuario', 'It will be deleted forever') ?>.
diff --git a/resources/views/settings/gdpr-consent.php b/resources/views/settings/gdpr-consent.php
index c78cb6a7..e246315c 100644
--- a/resources/views/settings/gdpr-consent.php
+++ b/resources/views/settings/gdpr-consent.php
@@ -12,11 +12,11 @@
                 'id' => $model->formName(),
             ]
         ); ?>
-        <div class="panel panel-info give-consent-panel">
-            <div class="panel-heading">
-                <h1 class="panel-title"><?= Yii::t('usuario', 'Data privacy') ?></h1>
+            <div class="card bg-info give-consent-panel">
+                <div class="card-header">
+                <h1 class="m-0"><?= Yii::t('usuario', 'Data privacy') ?></h1>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
 
                 <p><?= Yii::t('usuario', 'According to the European General Data Protection Regulation (GDPR) we need your consent to work with your personal data.') ?></p>
                 <p><?php Yii::t('usuario', 'Unfortunately, you can not work with this site without giving us consent to process your data.') ?></p>
@@ -24,7 +24,7 @@
                 <?= $form->field($model, 'gdpr_consent')->checkbox(['value' => 1, 'label' => $gdpr_consent_hint])?>
 
             </div>
-            <div class="panel-footer">
+            <div class="card-footer">
                 <?= Html::submitButton(Yii::t('usuario', 'Submit'), ['class' => 'btn btn-success']) ?>
                 <p class="pull-right small"><?= Html::a(Yii::t('usuario', 'Account details'), ['/user/settings']) ?></p>
             </div>
diff --git a/resources/views/settings/gdpr-delete.php b/resources/views/settings/gdpr-delete.php
index 00d5bdfc..f38f08aa 100644
--- a/resources/views/settings/gdpr-delete.php
+++ b/resources/views/settings/gdpr-delete.php
@@ -16,13 +16,13 @@
 
 <div class="row">
     <div class="col-md-6 col-md-offset-3">
-        <div class="panel panel-danger">
-            <div class="panel-heading">
-                <h3 class="panel-title">
+        <div class="card bg-danger">
+            <div class="card-header">
+                <h3 class="m-0">
                     <?= Yii::t('usuario', 'Delete personal data') ?>
                 </h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <p><?= Yii::t('usuario', 'You are about to delete all your personal data from this site.') ?></p>
                 <p class="text-danger">
                     <?= Yii::t(
diff --git a/resources/views/settings/networks.php b/resources/views/settings/networks.php
index 6d7a74da..69e9b59a 100644
--- a/resources/views/settings/networks.php
+++ b/resources/views/settings/networks.php
@@ -31,11 +31,11 @@
         <?= $this->render('/settings/_menu') ?>
     </div>
     <div class="col-md-9">
-        <div class="panel panel-default">
-            <div class="panel-heading">
+        <div class="card">
+            <div class="card-header">
                 <?= Html::encode($this->title) ?>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <div class="alert alert-info">
                     <p><?= Yii::t('usuario', 'You can connect multiple accounts to be able to log in using them') ?>
                         .</p>
diff --git a/resources/views/settings/privacy.php b/resources/views/settings/privacy.php
index bc5765ff..7bd90d6f 100644
--- a/resources/views/settings/privacy.php
+++ b/resources/views/settings/privacy.php
@@ -14,11 +14,11 @@
         <?= $this->render('_menu') ?>
     </div>
     <div class="col-md-9">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <div class="row">
                     <div class="col-md-6">
                         <h3><?= Yii::t('usuario', 'Export my data') ?></h3>
diff --git a/resources/views/settings/profile.php b/resources/views/settings/profile.php
index 25ee10c6..399d69da 100644
--- a/resources/views/settings/profile.php
+++ b/resources/views/settings/profile.php
@@ -35,11 +35,11 @@
         <?= $this->render('_menu') ?>
     </div>
     <div class="col-md-9">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <?php $form = ActiveForm::begin(
                     [
                         'id' => $model->formName(),
@@ -75,8 +75,13 @@
                 <?= $form->field($model, 'bio')->textarea() ?>
 
                 <div class="form-group">
-                    <div class="col-lg-offset-3 col-lg-9">
-                        <?= Html::submitButton(Yii::t('usuario', 'Save'), ['class' => 'btn btn-block btn-success']) ?>
+                    <div class="offset-sm-2 col-lg-10">
+                        <div class="d-grid">
+                            <?= Html::submitButton(
+                                Yii::t('usuario', 'Save'),
+                                ['class' => 'btn btn-success']
+                            ) ?>
+                        </div>
                         <br>
                     </div>
                 </div>
diff --git a/resources/views/settings/session-history.php b/resources/views/settings/session-history.php
index 0c75ec88..6fe7de8a 100755
--- a/resources/views/settings/session-history.php
+++ b/resources/views/settings/session-history.php
@@ -35,8 +35,8 @@
         <?= $this->render('/settings/_menu') ?>
     </div>
     <div class="col-md-9">
-        <div class="panel panel-default">
-            <div class="panel-heading">
+        <div class="card">
+            <div class="card-header">
                 <?= Html::encode($this->title) ?>
                 <?= Html::a(
                     Yii::t('usuario', 'Terminate all sessions'),
@@ -47,7 +47,7 @@
                     ]
                 ) ?>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
 
                 <?php Pjax::begin(); ?>
 
diff --git a/resources/views/shared/admin_layout.php b/resources/views/shared/admin_layout.php
index 1716356e..2a085ea0 100644
--- a/resources/views/shared/admin_layout.php
+++ b/resources/views/shared/admin_layout.php
@@ -26,11 +26,11 @@
 
 <div class="row">
     <div class="col-md-12">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card">
+            <div class="card-header">
+                <h3 class="m-0"><?= Html::encode($this->title) ?></h3>
             </div>
-            <div class="panel-body">
+            <div class="card-body">
                 <?= $this->render('/shared/_menu') ?>
                 <?= $content ?>
             </div>
diff --git a/tests/functional/GdprCest.php b/tests/functional/GdprCest.php
index 7544f094..2c8afaa4 100644
--- a/tests/functional/GdprCest.php
+++ b/tests/functional/GdprCest.php
@@ -176,7 +176,7 @@ public function testForcedConsentRequirement(FunctionalTester $I)
         $I->amGoingTo('Try to access a page without giving data processing consent');
         $I->amLoggedInAs(1);
         $I->amOnRoute('/site/index');
-        $I->seeElement('.give-consent-panel');
+        $I->seeElement('.give-consent-card');
         $I->checkOption('#dynamicmodel-gdpr_consent');
         $I->click('Submit');
         $I->see('Profile settings');

From c0d685d5114fde6bf5861aaa64cafba268cf1d5e Mon Sep 17 00:00:00 2001
From: tonis ormisson <tonis@andmemasin.eu>
Date: Tue, 10 Jan 2023 16:35:36 +0200
Subject: [PATCH 04/10] menus, icons

---
 resources/views/admin/create.php             |  2 +-
 resources/views/admin/index.php              |  8 +++---
 resources/views/admin/update.php             |  2 +-
 resources/views/profile/show.php             | 11 ++++----
 resources/views/widgets/assignments/form.php | 28 ++++++++++----------
 5 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/resources/views/admin/create.php b/resources/views/admin/create.php
index a6dfcaf1..16b61f2c 100644
--- a/resources/views/admin/create.php
+++ b/resources/views/admin/create.php
@@ -46,7 +46,7 @@
                                 <?= Nav::widget(
                                     [
                                         'options' => [
-                                            'class' => 'nav-pills nav-stacked',
+                                            'class' => 'nav-pills nav-stacked flex-column',
                                         ],
                                         'items' => [
                                             [
diff --git a/resources/views/admin/index.php b/resources/views/admin/index.php
index a991fda0..437dfaaf 100644
--- a/resources/views/admin/index.php
+++ b/resources/views/admin/index.php
@@ -23,7 +23,7 @@
 
 $this->title = Yii::t('usuario', 'Manage users');
 $this->params['breadcrumbs'][] = $this->title;
-
+\yii\bootstrap5\BootstrapIconAsset::register($this);
 ?>
 
 <?php $this->beginContent($module->viewPath . '/shared/admin_layout.php') ?>
@@ -137,7 +137,7 @@
                     'switch' => function ($url, $model) use ($module) {
                         if ($model->id != Yii::$app->user->id && $module->enableSwitchIdentities) {
                             return Html::a(
-                                '<span class="glyphicon glyphicon-user"></span>',
+                                '<i class="bi-person-fill"></i>',
                                 ['/user/admin/switch-identity', 'id' => $model->id],
                                 [
                                     'title' => Yii::t('usuario', 'Impersonate this user'),
@@ -155,7 +155,7 @@
                     'reset' => function ($url, $model) use ($module) {
                         if($module->allowAdminPasswordRecovery) {
                             return Html::a(
-                                '<span class="glyphicon glyphicon-flash"></span>',
+                                '<i class="bi-lightning-charge-fill"></i>',
                                 ['/user/admin/password-reset', 'id' => $model->id],
                                 [
                                     'title' => Yii::t('usuario', 'Send password recovery email'),
@@ -175,7 +175,7 @@
                             return null;
                         }
                         return Html::a(
-                            '<span class="glyphicon glyphicon-time"></span>',
+                            '<i class="fas fa-stopwatch"></i>',
                             ['/user/admin/force-password-change', 'id' => $model->id],
                             [
                                 'title' => Yii::t('usuario', 'Force password change at next login'),
diff --git a/resources/views/admin/update.php b/resources/views/admin/update.php
index b6d0a4b6..84ef66ab 100755
--- a/resources/views/admin/update.php
+++ b/resources/views/admin/update.php
@@ -51,7 +51,7 @@
                                 <?= Nav::widget(
                                     [
                                         'options' => [
-                                            'class' => 'nav-pills nav-stacked',
+                                            'class' => 'nav-pills nav-stacked flex-column',
                                         ],
                                         'items' => [
                                             [
diff --git a/resources/views/profile/show.php b/resources/views/profile/show.php
index a101a975..5f69dcd8 100644
--- a/resources/views/profile/show.php
+++ b/resources/views/profile/show.php
@@ -18,13 +18,14 @@
 
 $this->title = empty($profile->name) ? Html::encode($profile->user->username) : Html::encode($profile->name);
 $this->params['breadcrumbs'][] = $this->title;
+\yii\bootstrap5\BootstrapIconAsset::register($this);
 ?>
 <div class="row">
     <div class="col-xs-12 col-sm-6 col-md-6">
         <div class="row">
             <div class="col-sm-6 col-md-4">
                 <?= Html::img(
-                    $profile->getAvatarUrl(230),
+                    $profile->getAvatarUrl(200),
                     [
                         'class' => 'img-rounded img-responsive',
                         'alt' => $profile->user->username,
@@ -36,19 +37,19 @@
                 <ul style="padding: 0; list-style: none outside none;">
                     <?php if (!empty($profile->location)): ?>
                         <li>
-                            <i class="glyphicon glyphicon-map-marker text-muted"></i>
+                            <i class="bi-geo-alt-fill text-muted"></i>
                             <?= Html::encode($profile->location) ?>
                         </li>
                     <?php endif; ?>
                     <?php if (!empty($profile->website)): ?>
                         <li>
-                            <i class="glyphicon glyphicon-globe text-muted"></i>
+                            <i class="bi-globe text-muted"></i>
                             <?= Html::a(Html::encode($profile->website), Html::encode($profile->website)) ?>
                         </li>
                     <?php endif; ?>
                     <?php if (!empty($profile->public_email)): ?>
                         <li>
-                            <i class="glyphicon glyphicon-envelope text-muted"></i>
+                            <i class="bi-envelope text-muted"></i>
                             <?= Html::a(
                                 Html::encode($profile->public_email),
                                 'mailto:' .
@@ -58,7 +59,7 @@
                         </li>
                     <?php endif; ?>
                     <li>
-                        <i class="glyphicon glyphicon-time text-muted"></i>
+                        <i class="bi-stopwatch text-muted"></i>
                         <?= Yii::t('usuario', 'Joined on {0, date}', $profile->user->created_at) ?>
                     </li>
                 </ul>
diff --git a/resources/views/widgets/assignments/form.php b/resources/views/widgets/assignments/form.php
index 0ca6df9b..a0256f11 100644
--- a/resources/views/widgets/assignments/form.php
+++ b/resources/views/widgets/assignments/form.php
@@ -9,10 +9,10 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use dosamigos\selectize\SelectizeDropDownList;
 use yii\bootstrap5\Alert;
 use yii\helpers\Html;
 use yii\bootstrap5\ActiveForm;
+use kartik\select2\Select2;
 
 /** @var \yii\web\View $this */
 /** @var string[] $availableItems */
@@ -43,17 +43,17 @@
 
 <?= Html::activeHiddenInput($model, 'user_id') ?>
 
-<?= $form->field($model, 'items')->widget(
-    SelectizeDropDownList::class,
-    [
-        'items' => $availableItems,
-        'options' => [
-            'id' => 'children',
-            'multiple' => true,
-        ],
-    ]
-) ?>
-
-<?= Html::submitButton(Yii::t('usuario', 'Update assignments'), ['class' => 'btn btn-success btn-block']) ?>
-
+<?= $form->field($model, 'items')->widget(Select2::class, [
+    'data' => $availableItems,
+    'options' => [
+        'multiple' => true
+    ],
+    'pluginOptions' => [
+        'allowClear' => true
+    ],
+]);
+?>
+<div class="d-grid gap-2">
+    <?= Html::submitButton(Yii::t('usuario', 'Update assignments'), ['class' => 'btn btn-success  mt-3']) ?>
+</div>
 <?php ActiveForm::end() ?>

From 019ccaecedcc37ca2ccf02ab55a7bf046eb2e66c Mon Sep 17 00:00:00 2001
From: tonis ormisson <tonis@andmemasin.eu>
Date: Tue, 10 Jan 2023 18:34:40 +0200
Subject: [PATCH 05/10] some buttons

---
 resources/views/admin/_session-history.php |  2 +-
 resources/views/permission/_form.php       | 10 +++++-----
 resources/views/role/_form.php             | 10 +++++-----
 resources/views/settings/_menu.php         |  2 +-
 resources/views/settings/account.php       | 11 ++++++-----
 resources/views/settings/gdpr-consent.php  |  3 ++-
 resources/views/settings/profile.php       |  2 +-
 7 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/resources/views/admin/_session-history.php b/resources/views/admin/_session-history.php
index df1ad7b2..3def03c3 100755
--- a/resources/views/admin/_session-history.php
+++ b/resources/views/admin/_session-history.php
@@ -34,7 +34,7 @@
                 Yii::t('usuario', 'Terminate all sessions'),
                 ['/user/admin/terminate-sessions', 'id' => $user->id],
                 [
-                    'class' => 'btn btn-danger btn-xs pull-right',
+                    'class' => 'btn btn-danger btn-xs float-right',
                     'data-method' => 'post'
                 ]
             ) ?>
diff --git a/resources/views/permission/_form.php b/resources/views/permission/_form.php
index 94bc61db..28a7857b 100644
--- a/resources/views/permission/_form.php
+++ b/resources/views/permission/_form.php
@@ -9,10 +9,10 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use dosamigos\selectize\SelectizeDropDownList;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use yii\bootstrap5\ActiveForm;
+use kartik\select2\Select2;
 
 /**
  * @var yii\web\View $this
@@ -33,8 +33,8 @@
 
 <?= $form->field($model, 'description') ?>
 
-<?= $form->field($model, 'rule')->widget(SelectizeDropDownList::class, [
-    'items' => ArrayHelper::map(Yii::$app->getAuthManager()->getRules(), 'name', 'name'),
+<?= $form->field($model, 'rule')->widget(Select2::class, [
+    'data' => ArrayHelper::map(Yii::$app->getAuthManager()->getRules(), 'name', 'name'),
     'options' => [
         'prompt' => Yii::t('usuario', 'Select rule...'),
     ]
@@ -42,9 +42,9 @@
 
 
 <?= $form->field($model, 'children')->widget(
-    SelectizeDropDownList::class,
+    Select2::class,
     [
-        'items' => $unassignedItems,
+        'data' => $unassignedItems,
         'options' => [
             'id' => 'children',
             'multiple' => true,
diff --git a/resources/views/role/_form.php b/resources/views/role/_form.php
index 6c00455d..a8c01923 100644
--- a/resources/views/role/_form.php
+++ b/resources/views/role/_form.php
@@ -15,7 +15,7 @@
  */
 
 use Da\User\Helper\AuthHelper;
-use dosamigos\selectize\SelectizeDropDownList;
+use kartik\select2\Select2;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use yii\bootstrap5\ActiveForm;
@@ -34,17 +34,17 @@
 
 <?= $form->field($model, 'description') ?>
 
-<?= $form->field($model, 'rule')->widget(SelectizeDropDownList::class, [
-    'items' => ArrayHelper::map(Yii::$app->getAuthManager()->getRules(), 'name', 'name'),
+<?= $form->field($model, 'rule')->widget(Select2::class, [
+    'data' => ArrayHelper::map(Yii::$app->getAuthManager()->getRules(), 'name', 'name'),
     'options' => [
         'prompt' => 'Select rule...'
     ]
 ]) ?>
 
 <?= $form->field($model, 'children')->widget(
-    SelectizeDropDownList::class,
+    Select2::class,
     [
-        'items' => $unassignedItems,
+        'data' => $unassignedItems,
         'options' => [
             'id' => 'children',
             'multiple' => true,
diff --git a/resources/views/settings/_menu.php b/resources/views/settings/_menu.php
index 77190585..1fbd8974 100755
--- a/resources/views/settings/_menu.php
+++ b/resources/views/settings/_menu.php
@@ -39,7 +39,7 @@
         <?= Menu::widget(
             [
                 'options' => [
-                    'class' => 'nav nav-pills nav-stacked',
+                    'class' => 'nav-pills nav-stacked flex-column',
                 ],
                 'items' => [
                     ['label' => Yii::t('usuario', 'Profile'), 'url' => ['/user/settings/profile']],
diff --git a/resources/views/settings/account.php b/resources/views/settings/account.php
index 637c2b79..cad48c28 100644
--- a/resources/views/settings/account.php
+++ b/resources/views/settings/account.php
@@ -95,7 +95,8 @@
                     </div>
                 </div>
             </div>
-            <div class="card bg-info">
+
+            <div class="card  mt-4  bg-info">
                 <div class="card-header">
                     <h3 class="m-0"><?= Yii::t('usuario', 'Two Factor Authentication (2FA)') ?></h3>
                 </div>
@@ -132,7 +133,7 @@
                             '#tfmodal',
                             [
                                 'id' => 'enable_tf_btn',
-                                'class' => 'btn btn-info',
+                                'class' => 'btn btn-light',
                                 'data-toggle' => 'modal',
                                 'data-target' => '#tfmodal'
                             ]
@@ -160,7 +161,7 @@
                                 ['two-factor-disable', 'id' => $model->getUser()->id],
                                 [
                                     'id' => 'disable_tf_btn',
-                                    'class' => 'btn btn-warning ',
+                                    'class' => 'btn btn-light ',
                                     'data-method' => 'post',
                                     'data-confirm' => Yii::t('usuario', 'This will disable two factor authentication. Are you sure?'),
                                 ]
@@ -172,7 +173,7 @@
             </div>
         <?php endif; ?>
         <?php if ($model->module->allowAccountDelete): ?>
-            <div class="card bg-danger">
+            <div class="card bg-danger mt-4">
                 <div class="card-header">
                     <h3 class="m-0"><?= Yii::t('usuario', 'Delete account') ?></h3>
                 </div>
@@ -187,7 +188,7 @@
                             Yii::t('usuario', 'Delete account'),
                             ['delete'],
                             [
-                                'class' => 'btn btn-danger',
+                                'class' => 'btn btn-light',
                                 'data-method' => 'post',
                                 'data-confirm' => Yii::t('usuario', 'Are you sure? There is no going back'),
                             ]
diff --git a/resources/views/settings/gdpr-consent.php b/resources/views/settings/gdpr-consent.php
index e246315c..34730dfc 100644
--- a/resources/views/settings/gdpr-consent.php
+++ b/resources/views/settings/gdpr-consent.php
@@ -26,7 +26,8 @@
             </div>
             <div class="card-footer">
                 <?= Html::submitButton(Yii::t('usuario', 'Submit'), ['class' => 'btn btn-success']) ?>
-                <p class="pull-right small"><?= Html::a(Yii::t('usuario', 'Account details'), ['/user/settings']) ?></p>
+                <small><?= Html::a(Yii::t('usuario', 'Account details'), ['/user/settings'],
+                        ['class' => "float-right"]) ?></small>
             </div>
         </div>
         <?php ActiveForm::end(); ?>
diff --git a/resources/views/settings/profile.php b/resources/views/settings/profile.php
index 399d69da..1a9440c6 100644
--- a/resources/views/settings/profile.php
+++ b/resources/views/settings/profile.php
@@ -67,7 +67,7 @@
                     ->hint(
                         Html::a(
                             Yii::t('usuario', 'Change your avatar at Gravatar.com'),
-                            'http://gravatar.com',
+                            'https://gravatar.com',
                             ['target' => '_blank']
                         )
                     ) ?>

From f6b45f5fcb91d82b8ceb2ac1138dcc28149e36fe Mon Sep 17 00:00:00 2001
From: tonis ormisson <tonis@andmemasin.eu>
Date: Tue, 10 Jan 2023 19:22:28 +0200
Subject: [PATCH 06/10] floats

---
 resources/views/settings/account.php | 47 +++++++++++-----------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/resources/views/settings/account.php b/resources/views/settings/account.php
index cad48c28..b2fba0dd 100644
--- a/resources/views/settings/account.php
+++ b/resources/views/settings/account.php
@@ -9,6 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+use yii\bootstrap5\Modal;
 use yii\helpers\Html;
 use yii\helpers\Url;
 use yii\bootstrap5\ActiveForm;
@@ -25,6 +26,7 @@
 
 /** @var \Da\User\Module $module */
 $module = Yii::$app->getModule('user');
+
 ?>
 <div class="clearfix"></div>
 
@@ -73,28 +75,9 @@
                 <?php ActiveForm::end(); ?>
             </div>
         </div>
+
         <?php if ($module->enableTwoFactorAuthentication): ?>
-            <div class="modal fade" id="tfmodal" tabindex="-1" role="dialog" aria-labelledby="tfamodalLabel"
-                 aria-hidden="true">
-                <div class="modal-dialog">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                                    aria-hidden="true">&times;</span></button>
-                            <h4 class="modal-title" id="myModalLabel">
-                                <?= Yii::t('usuario', 'Two Factor Authentication (2FA)') ?></h4>
-                        </div>
-                        <div class="modal-body">
-                            ...
-                        </div>
-                        <div class="modal-footer">
-                            <button type="button" class="btn btn-default" data-dismiss="modal" onClick='window.location.reload();'>
-                                <?= Yii::t('usuario', 'Close') ?>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-            </div>
+
 
             <div class="card  mt-4  bg-info">
                 <div class="card-header">
@@ -128,16 +111,21 @@
                             }
                         } ;
                     ?>
-                        <?= Html::a(
-                            Yii::t('usuario', 'Enable two factor authentication'),
-                            '#tfmodal',
-                            [
+
+                        <?php
+                        Modal::begin([
+                            'id' => 'tfmodal',
+                            'title' =>Yii::t('usuario', 'Two Factor Authentication (2FA)'),
+                            'toggleButton' => [
                                 'id' => 'enable_tf_btn',
+                                'label' => Yii::t('usuario', 'Enable two factor authentication'),
                                 'class' => 'btn btn-light',
-                                'data-toggle' => 'modal',
-                                'data-target' => '#tfmodal'
-                            ]
-                        ) ?>
+                            ],
+                        ]);
+                        ?>
+                        ...
+                        <?php Modal::end(); ?>
+
                     <?php else:
                          ?>
                             <p>
@@ -211,6 +199,7 @@
     var choice = '';
     $('#tfmodal')
     .on('show.bs.modal', function(){
+        console.log("show");
         var element = document.getElementsByName('2famethod');
         for(i = 0; i < element.length; i++) {
             if(element[i].checked)

From 5ee6dae443029d65ffe17f28a7e212a5c5394550 Mon Sep 17 00:00:00 2001
From: tonis ormisson <tonis@andmemasin.eu>
Date: Tue, 10 Jan 2023 19:22:59 +0200
Subject: [PATCH 07/10] floats

---
 resources/views/admin/_session-history.php   | 2 +-
 resources/views/settings/_menu.php           | 2 +-
 resources/views/settings/gdpr-consent.php    | 2 +-
 resources/views/settings/session-history.php | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/admin/_session-history.php b/resources/views/admin/_session-history.php
index 3def03c3..c86f647b 100755
--- a/resources/views/admin/_session-history.php
+++ b/resources/views/admin/_session-history.php
@@ -34,7 +34,7 @@
                 Yii::t('usuario', 'Terminate all sessions'),
                 ['/user/admin/terminate-sessions', 'id' => $user->id],
                 [
-                    'class' => 'btn btn-danger btn-xs float-right',
+                    'class' => 'btn btn-danger btn-sm float-end',
                     'data-method' => 'post'
                 ]
             ) ?>
diff --git a/resources/views/settings/_menu.php b/resources/views/settings/_menu.php
index 1fbd8974..07a293ee 100755
--- a/resources/views/settings/_menu.php
+++ b/resources/views/settings/_menu.php
@@ -36,7 +36,7 @@
         </h3>
     </div>
     <div class="card-body">
-        <?= Menu::widget(
+        <?= \yii\bootstrap5\Nav::widget(
             [
                 'options' => [
                     'class' => 'nav-pills nav-stacked flex-column',
diff --git a/resources/views/settings/gdpr-consent.php b/resources/views/settings/gdpr-consent.php
index 34730dfc..b1262984 100644
--- a/resources/views/settings/gdpr-consent.php
+++ b/resources/views/settings/gdpr-consent.php
@@ -27,7 +27,7 @@
             <div class="card-footer">
                 <?= Html::submitButton(Yii::t('usuario', 'Submit'), ['class' => 'btn btn-success']) ?>
                 <small><?= Html::a(Yii::t('usuario', 'Account details'), ['/user/settings'],
-                        ['class' => "float-right"]) ?></small>
+                        ['class' => "float-end"]) ?></small>
             </div>
         </div>
         <?php ActiveForm::end(); ?>
diff --git a/resources/views/settings/session-history.php b/resources/views/settings/session-history.php
index 6fe7de8a..6f566a99 100755
--- a/resources/views/settings/session-history.php
+++ b/resources/views/settings/session-history.php
@@ -37,15 +37,15 @@
     <div class="col-md-9">
         <div class="card">
             <div class="card-header">
-                <?= Html::encode($this->title) ?>
+                <h3 class="m-0 "><?= Html::encode($this->title) ?>
                 <?= Html::a(
                     Yii::t('usuario', 'Terminate all sessions'),
                     ['/user/settings/terminate-sessions'],
                     [
-                        'class' => 'btn btn-danger btn-xs pull-right',
+                        'class' => 'btn btn-danger btn-sm float-end',
                         'data-method' => 'post'
                     ]
-                ) ?>
+                ) ?></h3>
             </div>
             <div class="card-body">
 

From d1400214334fdfb625b42fa135350c83bfab411e Mon Sep 17 00:00:00 2001
From: tonis ormisson <tonis@andmemasin.eu>
Date: Tue, 10 Jan 2023 20:03:46 +0200
Subject: [PATCH 08/10] fix tests?

---
 resources/views/settings/gdpr-consent.php             | 2 +-
 src/User/Service/TwoFactorSmsCodeGeneratorService.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/resources/views/settings/gdpr-consent.php b/resources/views/settings/gdpr-consent.php
index b1262984..7b03bdfa 100644
--- a/resources/views/settings/gdpr-consent.php
+++ b/resources/views/settings/gdpr-consent.php
@@ -12,7 +12,7 @@
                 'id' => $model->formName(),
             ]
         ); ?>
-            <div class="card bg-info give-consent-panel">
+            <div class="card bg-info give-consent-card">
                 <div class="card-header">
                 <h1 class="m-0"><?= Yii::t('usuario', 'Data privacy') ?></h1>
             </div>
diff --git a/src/User/Service/TwoFactorSmsCodeGeneratorService.php b/src/User/Service/TwoFactorSmsCodeGeneratorService.php
index 9fd92ac4..c541fad2 100644
--- a/src/User/Service/TwoFactorSmsCodeGeneratorService.php
+++ b/src/User/Service/TwoFactorSmsCodeGeneratorService.php
@@ -11,9 +11,7 @@
 
 namespace Da\User\Service;
 
-use Da\TwoFA\Manager;
 use Da\User\Contracts\ServiceInterface;
-use Da\User\Factory\MailFactory;
 use Da\User\Model\User;
 use yetopen\smssender\SmsSenderInterface;
 use Yii;

From 44a8c0ef80539b6a005987750ff580394a3bae61 Mon Sep 17 00:00:00 2001
From: tonis ormisson <tonis@andmemasin.eu>
Date: Wed, 11 Jan 2023 15:27:26 +0200
Subject: [PATCH 09/10] fixed i18n path

---
 src/User/Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/User/Bootstrap.php b/src/User/Bootstrap.php
index 1b92e446..625ae8ac 100755
--- a/src/User/Bootstrap.php
+++ b/src/User/Bootstrap.php
@@ -228,7 +228,7 @@ protected function initTranslations(Application $app)
         if (!isset($app->get('i18n')->translations['usuario*'])) {
             $app->get('i18n')->translations['usuario*'] = [
                 'class' => PhpMessageSource::class,
-                'basePath' => __DIR__ . '/resources/i18n',
+                'basePath' => __DIR__ . '/../../resources/i18n',
                 'sourceLanguage' => 'en-US',
             ];
         }

From d67baffc995ce13268d2440a1c666dc993834cf1 Mon Sep 17 00:00:00 2001
From: tonis ormisson <tonis@andmemasin.eu>
Date: Wed, 11 Jan 2023 16:48:05 +0200
Subject: [PATCH 10/10] move resources back to src for i18n message-collection
 from one source

---
 src/User/Bootstrap.php                                          | 2 +-
 src/User/Module.php                                             | 2 +-
 {resources => src/User/resources}/i18n/ca/usuario.php           | 0
 {resources => src/User/resources}/i18n/config.php               | 0
 {resources => src/User/resources}/i18n/da/usuario.php           | 0
 {resources => src/User/resources}/i18n/de-DU/usuario.php        | 0
 {resources => src/User/resources}/i18n/de/usuario.php           | 0
 {resources => src/User/resources}/i18n/es/usuario.php           | 0
 {resources => src/User/resources}/i18n/et/usuario.php           | 0
 {resources => src/User/resources}/i18n/fa-IR/usuario.php        | 0
 {resources => src/User/resources}/i18n/fi/usuario.php           | 0
 {resources => src/User/resources}/i18n/fr/usuario.php           | 0
 {resources => src/User/resources}/i18n/hr/usuario.php           | 0
 {resources => src/User/resources}/i18n/hu/usuario.php           | 0
 {resources => src/User/resources}/i18n/it/usuario.php           | 0
 {resources => src/User/resources}/i18n/kk/usuario.php           | 0
 {resources => src/User/resources}/i18n/lt/usuario.php           | 0
 {resources => src/User/resources}/i18n/nl/usuario.php           | 0
 {resources => src/User/resources}/i18n/pl/usuario.php           | 0
 {resources => src/User/resources}/i18n/pt-BR/usuario.php        | 0
 {resources => src/User/resources}/i18n/pt-PT/usuario.php        | 0
 {resources => src/User/resources}/i18n/ro/usuario.php           | 0
 {resources => src/User/resources}/i18n/ru/usuario.php           | 0
 {resources => src/User/resources}/i18n/sk/usuario.php           | 0
 {resources => src/User/resources}/i18n/th/usuario.php           | 0
 {resources => src/User/resources}/i18n/tr-TR/usuario.php        | 0
 {resources => src/User/resources}/i18n/uk/usuario.php           | 0
 {resources => src/User/resources}/i18n/vi/usuario.php           | 0
 {resources => src/User/resources}/i18n/zh-CN/usuario.php        | 0
 {resources => src/User/resources}/views/admin/_account.php      | 0
 {resources => src/User/resources}/views/admin/_assignments.php  | 0
 {resources => src/User/resources}/views/admin/_info.php         | 0
 {resources => src/User/resources}/views/admin/_profile.php      | 0
 .../User/resources}/views/admin/_session-history.php            | 0
 {resources => src/User/resources}/views/admin/_user.php         | 0
 {resources => src/User/resources}/views/admin/create.php        | 0
 {resources => src/User/resources}/views/admin/index.php         | 0
 {resources => src/User/resources}/views/admin/update.php        | 0
 {resources => src/User/resources}/views/mail/confirmation.php   | 0
 {resources => src/User/resources}/views/mail/layouts/html.php   | 0
 {resources => src/User/resources}/views/mail/layouts/text.php   | 0
 {resources => src/User/resources}/views/mail/reconfirmation.php | 0
 {resources => src/User/resources}/views/mail/recovery.php       | 0
 .../User/resources}/views/mail/text/confirmation.php            | 0
 .../User/resources}/views/mail/text/reconfirmation.php          | 0
 {resources => src/User/resources}/views/mail/text/recovery.php  | 0
 .../User/resources}/views/mail/text/twofactorcode.php           | 0
 {resources => src/User/resources}/views/mail/text/welcome.php   | 0
 {resources => src/User/resources}/views/mail/twofactorcode.php  | 0
 {resources => src/User/resources}/views/mail/welcome.php        | 0
 {resources => src/User/resources}/views/permission/_form.php    | 0
 {resources => src/User/resources}/views/permission/create.php   | 0
 {resources => src/User/resources}/views/permission/index.php    | 0
 {resources => src/User/resources}/views/permission/update.php   | 0
 {resources => src/User/resources}/views/profile/show.php        | 0
 {resources => src/User/resources}/views/recovery/request.php    | 0
 {resources => src/User/resources}/views/recovery/reset.php      | 0
 .../User/resources}/views/registration/connect.php              | 0
 .../User/resources}/views/registration/register.php             | 0
 {resources => src/User/resources}/views/registration/resend.php | 0
 {resources => src/User/resources}/views/role/_form.php          | 0
 {resources => src/User/resources}/views/role/create.php         | 0
 {resources => src/User/resources}/views/role/index.php          | 0
 {resources => src/User/resources}/views/role/update.php         | 0
 {resources => src/User/resources}/views/rule/_form.php          | 0
 {resources => src/User/resources}/views/rule/create.php         | 0
 {resources => src/User/resources}/views/rule/index.php          | 0
 {resources => src/User/resources}/views/rule/update.php         | 0
 {resources => src/User/resources}/views/security/confirm.php    | 0
 {resources => src/User/resources}/views/security/login.php      | 0
 {resources => src/User/resources}/views/settings/_menu.php      | 0
 {resources => src/User/resources}/views/settings/account.php    | 0
 .../User/resources}/views/settings/gdpr-consent.php             | 0
 .../User/resources}/views/settings/gdpr-delete.php              | 0
 {resources => src/User/resources}/views/settings/networks.php   | 0
 {resources => src/User/resources}/views/settings/privacy.php    | 0
 {resources => src/User/resources}/views/settings/profile.php    | 0
 .../User/resources}/views/settings/session-history.php          | 0
 .../User/resources}/views/settings/two-factor-email.php         | 0
 .../User/resources}/views/settings/two-factor-sms.php           | 0
 {resources => src/User/resources}/views/settings/two-factor.php | 0
 {resources => src/User/resources}/views/shared/_alert.php       | 0
 {resources => src/User/resources}/views/shared/_menu.php        | 0
 {resources => src/User/resources}/views/shared/admin_layout.php | 0
 {resources => src/User/resources}/views/shared/message.php      | 0
 .../User/resources}/views/widgets/assignments/form.php          | 0
 {resources => src/User/resources}/views/widgets/login/form.php  | 0
 87 files changed, 2 insertions(+), 2 deletions(-)
 rename {resources => src/User/resources}/i18n/ca/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/config.php (100%)
 rename {resources => src/User/resources}/i18n/da/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/de-DU/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/de/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/es/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/et/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/fa-IR/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/fi/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/fr/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/hr/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/hu/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/it/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/kk/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/lt/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/nl/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/pl/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/pt-BR/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/pt-PT/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/ro/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/ru/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/sk/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/th/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/tr-TR/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/uk/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/vi/usuario.php (100%)
 rename {resources => src/User/resources}/i18n/zh-CN/usuario.php (100%)
 rename {resources => src/User/resources}/views/admin/_account.php (100%)
 rename {resources => src/User/resources}/views/admin/_assignments.php (100%)
 rename {resources => src/User/resources}/views/admin/_info.php (100%)
 rename {resources => src/User/resources}/views/admin/_profile.php (100%)
 rename {resources => src/User/resources}/views/admin/_session-history.php (100%)
 rename {resources => src/User/resources}/views/admin/_user.php (100%)
 rename {resources => src/User/resources}/views/admin/create.php (100%)
 rename {resources => src/User/resources}/views/admin/index.php (100%)
 rename {resources => src/User/resources}/views/admin/update.php (100%)
 rename {resources => src/User/resources}/views/mail/confirmation.php (100%)
 rename {resources => src/User/resources}/views/mail/layouts/html.php (100%)
 rename {resources => src/User/resources}/views/mail/layouts/text.php (100%)
 rename {resources => src/User/resources}/views/mail/reconfirmation.php (100%)
 rename {resources => src/User/resources}/views/mail/recovery.php (100%)
 rename {resources => src/User/resources}/views/mail/text/confirmation.php (100%)
 rename {resources => src/User/resources}/views/mail/text/reconfirmation.php (100%)
 rename {resources => src/User/resources}/views/mail/text/recovery.php (100%)
 rename {resources => src/User/resources}/views/mail/text/twofactorcode.php (100%)
 rename {resources => src/User/resources}/views/mail/text/welcome.php (100%)
 rename {resources => src/User/resources}/views/mail/twofactorcode.php (100%)
 rename {resources => src/User/resources}/views/mail/welcome.php (100%)
 rename {resources => src/User/resources}/views/permission/_form.php (100%)
 rename {resources => src/User/resources}/views/permission/create.php (100%)
 rename {resources => src/User/resources}/views/permission/index.php (100%)
 rename {resources => src/User/resources}/views/permission/update.php (100%)
 rename {resources => src/User/resources}/views/profile/show.php (100%)
 rename {resources => src/User/resources}/views/recovery/request.php (100%)
 rename {resources => src/User/resources}/views/recovery/reset.php (100%)
 rename {resources => src/User/resources}/views/registration/connect.php (100%)
 rename {resources => src/User/resources}/views/registration/register.php (100%)
 rename {resources => src/User/resources}/views/registration/resend.php (100%)
 rename {resources => src/User/resources}/views/role/_form.php (100%)
 rename {resources => src/User/resources}/views/role/create.php (100%)
 rename {resources => src/User/resources}/views/role/index.php (100%)
 rename {resources => src/User/resources}/views/role/update.php (100%)
 rename {resources => src/User/resources}/views/rule/_form.php (100%)
 rename {resources => src/User/resources}/views/rule/create.php (100%)
 rename {resources => src/User/resources}/views/rule/index.php (100%)
 rename {resources => src/User/resources}/views/rule/update.php (100%)
 rename {resources => src/User/resources}/views/security/confirm.php (100%)
 rename {resources => src/User/resources}/views/security/login.php (100%)
 rename {resources => src/User/resources}/views/settings/_menu.php (100%)
 rename {resources => src/User/resources}/views/settings/account.php (100%)
 rename {resources => src/User/resources}/views/settings/gdpr-consent.php (100%)
 rename {resources => src/User/resources}/views/settings/gdpr-delete.php (100%)
 rename {resources => src/User/resources}/views/settings/networks.php (100%)
 rename {resources => src/User/resources}/views/settings/privacy.php (100%)
 rename {resources => src/User/resources}/views/settings/profile.php (100%)
 rename {resources => src/User/resources}/views/settings/session-history.php (100%)
 rename {resources => src/User/resources}/views/settings/two-factor-email.php (100%)
 rename {resources => src/User/resources}/views/settings/two-factor-sms.php (100%)
 rename {resources => src/User/resources}/views/settings/two-factor.php (100%)
 rename {resources => src/User/resources}/views/shared/_alert.php (100%)
 rename {resources => src/User/resources}/views/shared/_menu.php (100%)
 rename {resources => src/User/resources}/views/shared/admin_layout.php (100%)
 rename {resources => src/User/resources}/views/shared/message.php (100%)
 rename {resources => src/User/resources}/views/widgets/assignments/form.php (100%)
 rename {resources => src/User/resources}/views/widgets/login/form.php (100%)

diff --git a/src/User/Bootstrap.php b/src/User/Bootstrap.php
index 625ae8ac..1b92e446 100755
--- a/src/User/Bootstrap.php
+++ b/src/User/Bootstrap.php
@@ -228,7 +228,7 @@ protected function initTranslations(Application $app)
         if (!isset($app->get('i18n')->translations['usuario*'])) {
             $app->get('i18n')->translations['usuario*'] = [
                 'class' => PhpMessageSource::class,
-                'basePath' => __DIR__ . '/../../resources/i18n',
+                'basePath' => __DIR__ . '/resources/i18n',
                 'sourceLanguage' => 'en-US',
             ];
         }
diff --git a/src/User/Module.php b/src/User/Module.php
index a9463405..0e00f587 100755
--- a/src/User/Module.php
+++ b/src/User/Module.php
@@ -216,7 +216,7 @@ class Module extends BaseModule
     /**
      * @var string
      */
-    public $viewPath = '@Da/User/../../resources/views';
+    public $viewPath = '@Da/User/resources/views';
     /**
      * @var string the session key name to impersonate users. Please, modify it for security reasons!
      */
diff --git a/resources/i18n/ca/usuario.php b/src/User/resources/i18n/ca/usuario.php
similarity index 100%
rename from resources/i18n/ca/usuario.php
rename to src/User/resources/i18n/ca/usuario.php
diff --git a/resources/i18n/config.php b/src/User/resources/i18n/config.php
similarity index 100%
rename from resources/i18n/config.php
rename to src/User/resources/i18n/config.php
diff --git a/resources/i18n/da/usuario.php b/src/User/resources/i18n/da/usuario.php
similarity index 100%
rename from resources/i18n/da/usuario.php
rename to src/User/resources/i18n/da/usuario.php
diff --git a/resources/i18n/de-DU/usuario.php b/src/User/resources/i18n/de-DU/usuario.php
similarity index 100%
rename from resources/i18n/de-DU/usuario.php
rename to src/User/resources/i18n/de-DU/usuario.php
diff --git a/resources/i18n/de/usuario.php b/src/User/resources/i18n/de/usuario.php
similarity index 100%
rename from resources/i18n/de/usuario.php
rename to src/User/resources/i18n/de/usuario.php
diff --git a/resources/i18n/es/usuario.php b/src/User/resources/i18n/es/usuario.php
similarity index 100%
rename from resources/i18n/es/usuario.php
rename to src/User/resources/i18n/es/usuario.php
diff --git a/resources/i18n/et/usuario.php b/src/User/resources/i18n/et/usuario.php
similarity index 100%
rename from resources/i18n/et/usuario.php
rename to src/User/resources/i18n/et/usuario.php
diff --git a/resources/i18n/fa-IR/usuario.php b/src/User/resources/i18n/fa-IR/usuario.php
similarity index 100%
rename from resources/i18n/fa-IR/usuario.php
rename to src/User/resources/i18n/fa-IR/usuario.php
diff --git a/resources/i18n/fi/usuario.php b/src/User/resources/i18n/fi/usuario.php
similarity index 100%
rename from resources/i18n/fi/usuario.php
rename to src/User/resources/i18n/fi/usuario.php
diff --git a/resources/i18n/fr/usuario.php b/src/User/resources/i18n/fr/usuario.php
similarity index 100%
rename from resources/i18n/fr/usuario.php
rename to src/User/resources/i18n/fr/usuario.php
diff --git a/resources/i18n/hr/usuario.php b/src/User/resources/i18n/hr/usuario.php
similarity index 100%
rename from resources/i18n/hr/usuario.php
rename to src/User/resources/i18n/hr/usuario.php
diff --git a/resources/i18n/hu/usuario.php b/src/User/resources/i18n/hu/usuario.php
similarity index 100%
rename from resources/i18n/hu/usuario.php
rename to src/User/resources/i18n/hu/usuario.php
diff --git a/resources/i18n/it/usuario.php b/src/User/resources/i18n/it/usuario.php
similarity index 100%
rename from resources/i18n/it/usuario.php
rename to src/User/resources/i18n/it/usuario.php
diff --git a/resources/i18n/kk/usuario.php b/src/User/resources/i18n/kk/usuario.php
similarity index 100%
rename from resources/i18n/kk/usuario.php
rename to src/User/resources/i18n/kk/usuario.php
diff --git a/resources/i18n/lt/usuario.php b/src/User/resources/i18n/lt/usuario.php
similarity index 100%
rename from resources/i18n/lt/usuario.php
rename to src/User/resources/i18n/lt/usuario.php
diff --git a/resources/i18n/nl/usuario.php b/src/User/resources/i18n/nl/usuario.php
similarity index 100%
rename from resources/i18n/nl/usuario.php
rename to src/User/resources/i18n/nl/usuario.php
diff --git a/resources/i18n/pl/usuario.php b/src/User/resources/i18n/pl/usuario.php
similarity index 100%
rename from resources/i18n/pl/usuario.php
rename to src/User/resources/i18n/pl/usuario.php
diff --git a/resources/i18n/pt-BR/usuario.php b/src/User/resources/i18n/pt-BR/usuario.php
similarity index 100%
rename from resources/i18n/pt-BR/usuario.php
rename to src/User/resources/i18n/pt-BR/usuario.php
diff --git a/resources/i18n/pt-PT/usuario.php b/src/User/resources/i18n/pt-PT/usuario.php
similarity index 100%
rename from resources/i18n/pt-PT/usuario.php
rename to src/User/resources/i18n/pt-PT/usuario.php
diff --git a/resources/i18n/ro/usuario.php b/src/User/resources/i18n/ro/usuario.php
similarity index 100%
rename from resources/i18n/ro/usuario.php
rename to src/User/resources/i18n/ro/usuario.php
diff --git a/resources/i18n/ru/usuario.php b/src/User/resources/i18n/ru/usuario.php
similarity index 100%
rename from resources/i18n/ru/usuario.php
rename to src/User/resources/i18n/ru/usuario.php
diff --git a/resources/i18n/sk/usuario.php b/src/User/resources/i18n/sk/usuario.php
similarity index 100%
rename from resources/i18n/sk/usuario.php
rename to src/User/resources/i18n/sk/usuario.php
diff --git a/resources/i18n/th/usuario.php b/src/User/resources/i18n/th/usuario.php
similarity index 100%
rename from resources/i18n/th/usuario.php
rename to src/User/resources/i18n/th/usuario.php
diff --git a/resources/i18n/tr-TR/usuario.php b/src/User/resources/i18n/tr-TR/usuario.php
similarity index 100%
rename from resources/i18n/tr-TR/usuario.php
rename to src/User/resources/i18n/tr-TR/usuario.php
diff --git a/resources/i18n/uk/usuario.php b/src/User/resources/i18n/uk/usuario.php
similarity index 100%
rename from resources/i18n/uk/usuario.php
rename to src/User/resources/i18n/uk/usuario.php
diff --git a/resources/i18n/vi/usuario.php b/src/User/resources/i18n/vi/usuario.php
similarity index 100%
rename from resources/i18n/vi/usuario.php
rename to src/User/resources/i18n/vi/usuario.php
diff --git a/resources/i18n/zh-CN/usuario.php b/src/User/resources/i18n/zh-CN/usuario.php
similarity index 100%
rename from resources/i18n/zh-CN/usuario.php
rename to src/User/resources/i18n/zh-CN/usuario.php
diff --git a/resources/views/admin/_account.php b/src/User/resources/views/admin/_account.php
similarity index 100%
rename from resources/views/admin/_account.php
rename to src/User/resources/views/admin/_account.php
diff --git a/resources/views/admin/_assignments.php b/src/User/resources/views/admin/_assignments.php
similarity index 100%
rename from resources/views/admin/_assignments.php
rename to src/User/resources/views/admin/_assignments.php
diff --git a/resources/views/admin/_info.php b/src/User/resources/views/admin/_info.php
similarity index 100%
rename from resources/views/admin/_info.php
rename to src/User/resources/views/admin/_info.php
diff --git a/resources/views/admin/_profile.php b/src/User/resources/views/admin/_profile.php
similarity index 100%
rename from resources/views/admin/_profile.php
rename to src/User/resources/views/admin/_profile.php
diff --git a/resources/views/admin/_session-history.php b/src/User/resources/views/admin/_session-history.php
similarity index 100%
rename from resources/views/admin/_session-history.php
rename to src/User/resources/views/admin/_session-history.php
diff --git a/resources/views/admin/_user.php b/src/User/resources/views/admin/_user.php
similarity index 100%
rename from resources/views/admin/_user.php
rename to src/User/resources/views/admin/_user.php
diff --git a/resources/views/admin/create.php b/src/User/resources/views/admin/create.php
similarity index 100%
rename from resources/views/admin/create.php
rename to src/User/resources/views/admin/create.php
diff --git a/resources/views/admin/index.php b/src/User/resources/views/admin/index.php
similarity index 100%
rename from resources/views/admin/index.php
rename to src/User/resources/views/admin/index.php
diff --git a/resources/views/admin/update.php b/src/User/resources/views/admin/update.php
similarity index 100%
rename from resources/views/admin/update.php
rename to src/User/resources/views/admin/update.php
diff --git a/resources/views/mail/confirmation.php b/src/User/resources/views/mail/confirmation.php
similarity index 100%
rename from resources/views/mail/confirmation.php
rename to src/User/resources/views/mail/confirmation.php
diff --git a/resources/views/mail/layouts/html.php b/src/User/resources/views/mail/layouts/html.php
similarity index 100%
rename from resources/views/mail/layouts/html.php
rename to src/User/resources/views/mail/layouts/html.php
diff --git a/resources/views/mail/layouts/text.php b/src/User/resources/views/mail/layouts/text.php
similarity index 100%
rename from resources/views/mail/layouts/text.php
rename to src/User/resources/views/mail/layouts/text.php
diff --git a/resources/views/mail/reconfirmation.php b/src/User/resources/views/mail/reconfirmation.php
similarity index 100%
rename from resources/views/mail/reconfirmation.php
rename to src/User/resources/views/mail/reconfirmation.php
diff --git a/resources/views/mail/recovery.php b/src/User/resources/views/mail/recovery.php
similarity index 100%
rename from resources/views/mail/recovery.php
rename to src/User/resources/views/mail/recovery.php
diff --git a/resources/views/mail/text/confirmation.php b/src/User/resources/views/mail/text/confirmation.php
similarity index 100%
rename from resources/views/mail/text/confirmation.php
rename to src/User/resources/views/mail/text/confirmation.php
diff --git a/resources/views/mail/text/reconfirmation.php b/src/User/resources/views/mail/text/reconfirmation.php
similarity index 100%
rename from resources/views/mail/text/reconfirmation.php
rename to src/User/resources/views/mail/text/reconfirmation.php
diff --git a/resources/views/mail/text/recovery.php b/src/User/resources/views/mail/text/recovery.php
similarity index 100%
rename from resources/views/mail/text/recovery.php
rename to src/User/resources/views/mail/text/recovery.php
diff --git a/resources/views/mail/text/twofactorcode.php b/src/User/resources/views/mail/text/twofactorcode.php
similarity index 100%
rename from resources/views/mail/text/twofactorcode.php
rename to src/User/resources/views/mail/text/twofactorcode.php
diff --git a/resources/views/mail/text/welcome.php b/src/User/resources/views/mail/text/welcome.php
similarity index 100%
rename from resources/views/mail/text/welcome.php
rename to src/User/resources/views/mail/text/welcome.php
diff --git a/resources/views/mail/twofactorcode.php b/src/User/resources/views/mail/twofactorcode.php
similarity index 100%
rename from resources/views/mail/twofactorcode.php
rename to src/User/resources/views/mail/twofactorcode.php
diff --git a/resources/views/mail/welcome.php b/src/User/resources/views/mail/welcome.php
similarity index 100%
rename from resources/views/mail/welcome.php
rename to src/User/resources/views/mail/welcome.php
diff --git a/resources/views/permission/_form.php b/src/User/resources/views/permission/_form.php
similarity index 100%
rename from resources/views/permission/_form.php
rename to src/User/resources/views/permission/_form.php
diff --git a/resources/views/permission/create.php b/src/User/resources/views/permission/create.php
similarity index 100%
rename from resources/views/permission/create.php
rename to src/User/resources/views/permission/create.php
diff --git a/resources/views/permission/index.php b/src/User/resources/views/permission/index.php
similarity index 100%
rename from resources/views/permission/index.php
rename to src/User/resources/views/permission/index.php
diff --git a/resources/views/permission/update.php b/src/User/resources/views/permission/update.php
similarity index 100%
rename from resources/views/permission/update.php
rename to src/User/resources/views/permission/update.php
diff --git a/resources/views/profile/show.php b/src/User/resources/views/profile/show.php
similarity index 100%
rename from resources/views/profile/show.php
rename to src/User/resources/views/profile/show.php
diff --git a/resources/views/recovery/request.php b/src/User/resources/views/recovery/request.php
similarity index 100%
rename from resources/views/recovery/request.php
rename to src/User/resources/views/recovery/request.php
diff --git a/resources/views/recovery/reset.php b/src/User/resources/views/recovery/reset.php
similarity index 100%
rename from resources/views/recovery/reset.php
rename to src/User/resources/views/recovery/reset.php
diff --git a/resources/views/registration/connect.php b/src/User/resources/views/registration/connect.php
similarity index 100%
rename from resources/views/registration/connect.php
rename to src/User/resources/views/registration/connect.php
diff --git a/resources/views/registration/register.php b/src/User/resources/views/registration/register.php
similarity index 100%
rename from resources/views/registration/register.php
rename to src/User/resources/views/registration/register.php
diff --git a/resources/views/registration/resend.php b/src/User/resources/views/registration/resend.php
similarity index 100%
rename from resources/views/registration/resend.php
rename to src/User/resources/views/registration/resend.php
diff --git a/resources/views/role/_form.php b/src/User/resources/views/role/_form.php
similarity index 100%
rename from resources/views/role/_form.php
rename to src/User/resources/views/role/_form.php
diff --git a/resources/views/role/create.php b/src/User/resources/views/role/create.php
similarity index 100%
rename from resources/views/role/create.php
rename to src/User/resources/views/role/create.php
diff --git a/resources/views/role/index.php b/src/User/resources/views/role/index.php
similarity index 100%
rename from resources/views/role/index.php
rename to src/User/resources/views/role/index.php
diff --git a/resources/views/role/update.php b/src/User/resources/views/role/update.php
similarity index 100%
rename from resources/views/role/update.php
rename to src/User/resources/views/role/update.php
diff --git a/resources/views/rule/_form.php b/src/User/resources/views/rule/_form.php
similarity index 100%
rename from resources/views/rule/_form.php
rename to src/User/resources/views/rule/_form.php
diff --git a/resources/views/rule/create.php b/src/User/resources/views/rule/create.php
similarity index 100%
rename from resources/views/rule/create.php
rename to src/User/resources/views/rule/create.php
diff --git a/resources/views/rule/index.php b/src/User/resources/views/rule/index.php
similarity index 100%
rename from resources/views/rule/index.php
rename to src/User/resources/views/rule/index.php
diff --git a/resources/views/rule/update.php b/src/User/resources/views/rule/update.php
similarity index 100%
rename from resources/views/rule/update.php
rename to src/User/resources/views/rule/update.php
diff --git a/resources/views/security/confirm.php b/src/User/resources/views/security/confirm.php
similarity index 100%
rename from resources/views/security/confirm.php
rename to src/User/resources/views/security/confirm.php
diff --git a/resources/views/security/login.php b/src/User/resources/views/security/login.php
similarity index 100%
rename from resources/views/security/login.php
rename to src/User/resources/views/security/login.php
diff --git a/resources/views/settings/_menu.php b/src/User/resources/views/settings/_menu.php
similarity index 100%
rename from resources/views/settings/_menu.php
rename to src/User/resources/views/settings/_menu.php
diff --git a/resources/views/settings/account.php b/src/User/resources/views/settings/account.php
similarity index 100%
rename from resources/views/settings/account.php
rename to src/User/resources/views/settings/account.php
diff --git a/resources/views/settings/gdpr-consent.php b/src/User/resources/views/settings/gdpr-consent.php
similarity index 100%
rename from resources/views/settings/gdpr-consent.php
rename to src/User/resources/views/settings/gdpr-consent.php
diff --git a/resources/views/settings/gdpr-delete.php b/src/User/resources/views/settings/gdpr-delete.php
similarity index 100%
rename from resources/views/settings/gdpr-delete.php
rename to src/User/resources/views/settings/gdpr-delete.php
diff --git a/resources/views/settings/networks.php b/src/User/resources/views/settings/networks.php
similarity index 100%
rename from resources/views/settings/networks.php
rename to src/User/resources/views/settings/networks.php
diff --git a/resources/views/settings/privacy.php b/src/User/resources/views/settings/privacy.php
similarity index 100%
rename from resources/views/settings/privacy.php
rename to src/User/resources/views/settings/privacy.php
diff --git a/resources/views/settings/profile.php b/src/User/resources/views/settings/profile.php
similarity index 100%
rename from resources/views/settings/profile.php
rename to src/User/resources/views/settings/profile.php
diff --git a/resources/views/settings/session-history.php b/src/User/resources/views/settings/session-history.php
similarity index 100%
rename from resources/views/settings/session-history.php
rename to src/User/resources/views/settings/session-history.php
diff --git a/resources/views/settings/two-factor-email.php b/src/User/resources/views/settings/two-factor-email.php
similarity index 100%
rename from resources/views/settings/two-factor-email.php
rename to src/User/resources/views/settings/two-factor-email.php
diff --git a/resources/views/settings/two-factor-sms.php b/src/User/resources/views/settings/two-factor-sms.php
similarity index 100%
rename from resources/views/settings/two-factor-sms.php
rename to src/User/resources/views/settings/two-factor-sms.php
diff --git a/resources/views/settings/two-factor.php b/src/User/resources/views/settings/two-factor.php
similarity index 100%
rename from resources/views/settings/two-factor.php
rename to src/User/resources/views/settings/two-factor.php
diff --git a/resources/views/shared/_alert.php b/src/User/resources/views/shared/_alert.php
similarity index 100%
rename from resources/views/shared/_alert.php
rename to src/User/resources/views/shared/_alert.php
diff --git a/resources/views/shared/_menu.php b/src/User/resources/views/shared/_menu.php
similarity index 100%
rename from resources/views/shared/_menu.php
rename to src/User/resources/views/shared/_menu.php
diff --git a/resources/views/shared/admin_layout.php b/src/User/resources/views/shared/admin_layout.php
similarity index 100%
rename from resources/views/shared/admin_layout.php
rename to src/User/resources/views/shared/admin_layout.php
diff --git a/resources/views/shared/message.php b/src/User/resources/views/shared/message.php
similarity index 100%
rename from resources/views/shared/message.php
rename to src/User/resources/views/shared/message.php
diff --git a/resources/views/widgets/assignments/form.php b/src/User/resources/views/widgets/assignments/form.php
similarity index 100%
rename from resources/views/widgets/assignments/form.php
rename to src/User/resources/views/widgets/assignments/form.php
diff --git a/resources/views/widgets/login/form.php b/src/User/resources/views/widgets/login/form.php
similarity index 100%
rename from resources/views/widgets/login/form.php
rename to src/User/resources/views/widgets/login/form.php