From 740cc07f0445df1f5e5759f7fe6325ed4474d7ca Mon Sep 17 00:00:00 2001
From: Pooya Parsa Dadashi <Pooya_parsa_dadashi@yahoo.com>
Date: Sat, 13 Aug 2022 11:08:10 +0330
Subject: [PATCH 1/4] refactor: moving email views to `src/Views/Email/`

---
 src/Views/Email/email_2fa_email.php      | 1 +
 src/Views/Email/email_activate_email.php | 3 +++
 src/Views/Email/magic_link_email.php     | 5 +++++
 3 files changed, 9 insertions(+)
 create mode 100644 src/Views/Email/email_2fa_email.php
 create mode 100644 src/Views/Email/email_activate_email.php
 create mode 100644 src/Views/Email/magic_link_email.php

diff --git a/src/Views/Email/email_2fa_email.php b/src/Views/Email/email_2fa_email.php
new file mode 100644
index 000000000..bbc010c57
--- /dev/null
+++ b/src/Views/Email/email_2fa_email.php
@@ -0,0 +1 @@
+<p><?= lang('Auth.email2FAMailBody') ?> <b><?= $code ?></b></p>
diff --git a/src/Views/Email/email_activate_email.php b/src/Views/Email/email_activate_email.php
new file mode 100644
index 000000000..9686df46c
--- /dev/null
+++ b/src/Views/Email/email_activate_email.php
@@ -0,0 +1,3 @@
+<p><?= lang('Auth.emailActivateMailBody') ?></p>
+
+<p><?= $code ?></p>
diff --git a/src/Views/Email/magic_link_email.php b/src/Views/Email/magic_link_email.php
new file mode 100644
index 000000000..d6f6a9432
--- /dev/null
+++ b/src/Views/Email/magic_link_email.php
@@ -0,0 +1,5 @@
+<p>
+    <a href="<?= url_to('verify-magic-link') ?>?token=<?= $token ?>">
+        <?= lang('Auth.login') ?>
+    </a>
+</p>

From d58eeed005fd6982a8bd1d5db6ca1ee2e1a6077f Mon Sep 17 00:00:00 2001
From: Pooya Parsa Dadashi <Pooya_parsa_dadashi@yahoo.com>
Date: Sat, 13 Aug 2022 11:13:58 +0330
Subject: [PATCH 2/4] refactor: update new dir for email views

---
 src/Config/Auth.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Config/Auth.php b/src/Config/Auth.php
index d0452fa73..85a6d92c5 100644
--- a/src/Config/Auth.php
+++ b/src/Config/Auth.php
@@ -23,12 +23,12 @@ class Auth extends BaseConfig
         'layout'                      => '\CodeIgniter\Shield\Views\layout',
         'action_email_2fa'            => '\CodeIgniter\Shield\Views\email_2fa_show',
         'action_email_2fa_verify'     => '\CodeIgniter\Shield\Views\email_2fa_verify',
-        'action_email_2fa_email'      => '\CodeIgniter\Shield\Views\email_2fa_email',
-        'action_email_activate_email' => '\CodeIgniter\Shield\Views\email_activate_email',
+        'action_email_2fa_email'      => '\CodeIgniter\Shield\Views\Email\email_2fa_email',
+        'action_email_activate_email' => '\CodeIgniter\Shield\Views\Email\email_activate_email',
         'action_email_activate_show'  => '\CodeIgniter\Shield\Views\email_activate_show',
         'magic-link-login'            => '\CodeIgniter\Shield\Views\magic_link_form',
         'magic-link-message'          => '\CodeIgniter\Shield\Views\magic_link_message',
-        'magic-link-email'            => '\CodeIgniter\Shield\Views\magic_link_email',
+        'magic-link-email'            => '\CodeIgniter\Shield\Views\Email\magic_link_email',
     ];
 
     /**

From 264b95897b92615b688d6b34d5534286c37e3c84 Mon Sep 17 00:00:00 2001
From: Pooya Parsa Dadashi <Pooya_parsa_dadashi@yahoo.com>
Date: Sat, 13 Aug 2022 11:17:37 +0330
Subject: [PATCH 3/4] delete: old email view files

---
 src/Views/email_2fa_email.php      | 1 -
 src/Views/email_activate_email.php | 3 ---
 src/Views/magic_link_email.php     | 5 -----
 3 files changed, 9 deletions(-)
 delete mode 100644 src/Views/email_2fa_email.php
 delete mode 100644 src/Views/email_activate_email.php
 delete mode 100644 src/Views/magic_link_email.php

diff --git a/src/Views/email_2fa_email.php b/src/Views/email_2fa_email.php
deleted file mode 100644
index bbc010c57..000000000
--- a/src/Views/email_2fa_email.php
+++ /dev/null
@@ -1 +0,0 @@
-<p><?= lang('Auth.email2FAMailBody') ?> <b><?= $code ?></b></p>
diff --git a/src/Views/email_activate_email.php b/src/Views/email_activate_email.php
deleted file mode 100644
index 9686df46c..000000000
--- a/src/Views/email_activate_email.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<p><?= lang('Auth.emailActivateMailBody') ?></p>
-
-<p><?= $code ?></p>
diff --git a/src/Views/magic_link_email.php b/src/Views/magic_link_email.php
deleted file mode 100644
index d6f6a9432..000000000
--- a/src/Views/magic_link_email.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>
-    <a href="<?= url_to('verify-magic-link') ?>?token=<?= $token ?>">
-        <?= lang('Auth.login') ?>
-    </a>
-</p>

From 70408b0c1ad9a4e3673419aed57aa8be54262884 Mon Sep 17 00:00:00 2001
From: Pooya Parsa Dadashi <Pooya_parsa_dadashi@yahoo.com>
Date: Sat, 13 Aug 2022 11:47:21 +0330
Subject: [PATCH 4/4] docs: update new path for email views

---
 docs/auth_actions.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/auth_actions.md b/docs/auth_actions.md
index d1ab92938..8ef25bc4e 100644
--- a/docs/auth_actions.md
+++ b/docs/auth_actions.md
@@ -49,8 +49,8 @@ Views for all of these pages are defined in the `Auth` config file, with the `$v
     public $views = [
         'action_email_2fa'            => '\CodeIgniter\Shield\Views\email_2fa_show',
         'action_email_2fa_verify'     => '\CodeIgniter\Shield\Views\email_2fa_verify',
-        'action_email_2fa_email'      => '\CodeIgniter\Shield\Views\email_2fa_email',
-        'action_email_activate_email' => '\CodeIgniter\Shield\Views\email_activate_email',
+        'action_email_2fa_email'      => '\CodeIgniter\Shield\Views\Email\email_2fa_email',
+        'action_email_activate_email' => '\CodeIgniter\Shield\Views\Email\email_activate_email',
         'action_email_activate_show'  => '\CodeIgniter\Shield\Views\email_activate_show',
     ];
 ```