render('component/footer-icons') ?>
render('component/toggle_theme') ?>
- render('component/toggle_language') ?>
diff --git a/src/framework/resource/layout/head.php b/src/framework/resource/layout/head.php
index d56a3f2..948d183 100644
--- a/src/framework/resource/layout/head.php
+++ b/src/framework/resource/layout/head.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-use yii\{helpers\Html, web\View};
+use yii\helpers\Html;
/**
- * @var View $this
+ * @var yii\web\View $this
*/
?>
diff --git a/src/framework/resource/layout/main.php b/src/framework/resource/layout/main.php
index bdd0851..2682a38 100644
--- a/src/framework/resource/layout/main.php
+++ b/src/framework/resource/layout/main.php
@@ -3,11 +3,10 @@
declare(strict_types=1);
use app\framework\asset\AppAsset;
-use yii\web\View;
/**
* @var string $content
- * @var View $this
+ * @var yii\web\View $this
*/
AppAsset::register($this);
?>
@@ -20,7 +19,6 @@
render('component/menu') ?>
- render('component/alert') ?>
render('component/breadcrumbs') ?>
diff --git a/src/framework/resource/message/de/app.basic.php b/src/framework/resource/message/de/app.basic.php
deleted file mode 100644
index 527ccbc..0000000
--- a/src/framework/resource/message/de/app.basic.php
+++ /dev/null
@@ -1,54 +0,0 @@
- 'Über uns',
- 'Because the application is in development mode, the email is not sent but saved as a file under.' => 'Da die Anwendung im Entwicklungsmodus ist, wird die E-Mail nicht gesendet, sondern als Datei gespeichert unter.',
- 'Body' => 'Nachrichtentext',
- 'Captcha Code' => 'Captcha-Code',
- 'Contact us' => 'Kontaktiere uns',
- 'Contact' => 'Kontakt',
- 'Email' => 'E-Mail',
- 'Enter Body Here' => 'Hier Nachricht eingeben',
- 'Enter Captcha Code Here' => 'Hier Captcha-Code eingeben',
- 'Enter Email Here' => 'Hier E-Mail eingeben',
- 'Enter Subject Here' => 'Hier Betreff eingeben',
- 'Enter Username Here' => 'Hier Benutzername eingeben',
- 'If you think this is a problem with us, please tell us.' => 'Wenn Sie denken, dass dies ein Problem bei uns ist, informieren Sie uns bitte.',
- 'Index' => 'Startseite',
- 'Name' => 'Name',
- 'Note that if you turn on the Yii debugger, you should be able to view the mail message on the mail panel of the debugger.' => 'Beachten Sie, dass Sie, wenn Sie den Yii-Debugger aktivieren, die E-Mail-Nachricht im E-Mail-Panel des Debuggers anzeigen können.',
- 'Oops! Looks like you followed a bad link.' => 'Hoppla! Sie sind einem fehlerhaften Link gefolgt.',
- 'Please configure the
useFileTransport property of the
mail application component to be false to enable email sending.' => 'Bitte konfigurieren Sie die Eigenschaft
useFileTransport des
mail-Anwendungsbausteins als falsch, um das Versenden von E-Mails zu ermöglichen.',
- 'Please fill out the following form to contact us.' => 'Bitte füllen Sie das folgende Formular aus, um uns zu kontaktieren.',
- 'site.selector.language.de' => 'Deutsch',
- 'site.selector.language.en' => 'Englisch',
- 'site.selector.language.es' => 'Spanisch',
- 'site.selector.language.fr' => 'Französisch',
- 'site.selector.language.pt' => 'Portugiesisch',
- 'site.selector.language.ru' => 'Russisch',
- 'site.selector.language.zh' => 'Chinesisch',
- 'Subject' => 'Betreff',
- 'Thank you for contacting us. We will respond to you as soon as possible.' => 'Vielen Dank für Ihre Kontaktaufnahme. Wir werden uns so schnell wie möglich bei Ihnen melden.',
- 'This is the About page. You may modify the following file to customize its content.' => 'Dies ist die Über-uns-Seite. Sie können die folgende Datei bearbeiten, um ihren Inhalt anzupassen.',
- 'Username' => 'Benutzername',
- 'Web Application' => 'Webanwendung',
-];
diff --git a/src/framework/resource/message/en/app.basic.php b/src/framework/resource/message/en/app.basic.php
deleted file mode 100644
index 3f8ba94..0000000
--- a/src/framework/resource/message/en/app.basic.php
+++ /dev/null
@@ -1,54 +0,0 @@
- '',
- 'Because the application is in development mode, the email is not sent but saved as a file under.' => '',
- 'Body' => '',
- 'Captcha Code' => '',
- 'Contact' => '',
- 'Contact us' => '',
- 'Email' => '',
- 'Enter Body Here' => '',
- 'Enter Captcha Code Here' => '',
- 'Enter Email Here' => '',
- 'Enter Subject Here' => '',
- 'Enter Username Here' => '',
- 'If you think this is a problem with us, please tell us.' => '',
- 'Index' => '',
- 'Name' => '',
- 'Note that if you turn on the Yii debugger, you should be able to view the mail message on the mail panel of the debugger.' => '',
- 'Oops! Looks like you followed a bad link.' => '',
- 'Please configure the
useFileTransport property of the
mail application component to be false to enable email sending.' => '',
- 'Please fill out the following form to contact us.' => '',
- 'Subject' => '',
- 'Thank you for contacting us. We will respond to you as soon as possible.' => '',
- 'This is the About page. You may modify the following file to customize its content.' => '',
- 'Web Application' => '',
- 'Yii v.22' => '',
- 'site.selector.language.de' => 'German',
- 'site.selector.language.en' => 'English',
- 'site.selector.language.es' => 'Spanish',
- 'site.selector.language.fr' => 'French',
- 'site.selector.language.pt' => 'Portuguese',
- 'site.selector.language.ru' => 'Russian',
- 'site.selector.language.zh' => 'Chinese',
-];
diff --git a/src/framework/resource/message/es/app.basic.php b/src/framework/resource/message/es/app.basic.php
deleted file mode 100644
index c03ab5d..0000000
--- a/src/framework/resource/message/es/app.basic.php
+++ /dev/null
@@ -1,55 +0,0 @@
- 'Acerca de',
- 'Because the application is in development mode, the email is not sent but saved as a file under.' => 'Debido a que la aplicación está en modo de desarrollo, el correo electrónico no se envía, pero se guarda como un archivo en.',
- 'Body' => 'Cuerpo',
- 'Captcha Code' => 'Código Captcha',
- 'Contact us' => 'Contáctanos',
- 'Contact' => 'Contacto',
- 'Email' => 'Correo Electrónico',
- 'Enter Body Here' => 'Ingresa el Cuerpo Aquí',
- 'Enter Captcha Code Here' => 'Ingresa el Código Captcha Aquí',
- 'Enter Email Here' => 'Ingresa el Correo Electrónico Aquí',
- 'Enter Subject Here' => 'Ingresa el Asunto Aquí',
- 'Enter Username Here' => 'Ingresa el Nombre de Usuario Aquí',
- 'If you think this is a problem with us, please tell us.' => 'Si crees que esto es un problema con nosotros, por favor cuéntanos.',
- 'Index' => 'Índice',
- 'Name' => 'Nombre',
- 'Note that if you turn on the Yii debugger, you should be able to view the mail message on the mail panel of the debugger.' => 'Ten en cuenta que si habilitas el depurador de Yii, deberías poder ver el mensaje de correo en el panel de correo del depurador.',
- 'Oops! Looks like you followed a bad link.' => '¡Ups! Parece que has seguido un enlace incorrecto.',
- 'Please configure the
useFileTransport property of the
mail application component to be false to enable email sending.' => '',
- 'Please configure the
useFileTransport property of the
mail application component to be false to enable email sending.' => '@@Por favor configura la propiedad
useFileTransport del componente de aplicación
mail en falso para habilitar el envío de correos electrónicos.@@',
- 'Please fill out the following form to contact us.' => 'Por favor completa el siguiente formulario para contactarnos.',
- 'site.selector.language.de' => 'Alemán',
- 'site.selector.language.en' => 'Inglés',
- 'site.selector.language.es' => 'Español',
- 'site.selector.language.fr' => 'Francés',
- 'site.selector.language.pt' => 'Portugués',
- 'site.selector.language.ru' => 'Ruso',
- 'site.selector.language.zh' => 'Chino',
- 'Subject' => 'Asunto',
- 'Thank you for contacting us. We will respond to you as soon as possible.' => 'Gracias por contactarnos. Te responderemos lo antes posible.',
- 'This is the About page. You may modify the following file to customize its content.' => 'Esta es la página de Acerca de. Puedes modificar el siguiente archivo para personalizar su contenido.',
- 'Username' => 'Nombre de Usuario',
- 'Web Application' => 'Aplicación web',
-];
diff --git a/src/framework/resource/message/fr/app.basic.php b/src/framework/resource/message/fr/app.basic.php
deleted file mode 100644
index 96c9f24..0000000
--- a/src/framework/resource/message/fr/app.basic.php
+++ /dev/null
@@ -1,54 +0,0 @@
- 'À propos',
- 'Because the application is in development mode, the email is not sent but saved as a file under.' => 'Parce que l\'application est en mode de développement, l\'e-mail n\'est pas envoyé mais est enregistré en tant que fichier sous.',
- 'Body' => 'Corps',
- 'Captcha Code' => 'Code Captcha',
- 'Contact us' => 'Contactez-nous',
- 'Contact' => 'Contact',
- 'Email' => 'E-mail',
- 'Enter Body Here' => 'Entrez le corps ici',
- 'Enter Captcha Code Here' => 'Entrez le code Captcha ici',
- 'Enter Email Here' => 'Entrez l\'e-mail ici',
- 'Enter Subject Here' => 'Entrez le sujet ici',
- 'Enter Username Here' => 'Entrez le nom d\'utilisateur ici',
- 'If you think this is a problem with us, please tell us.' => 'Si vous pensez que c\'est un problème avec nous, veuillez nous le dire.',
- 'Index' => 'Index',
- 'Name' => 'Nom',
- 'Note that if you turn on the Yii debugger, you should be able to view the mail message on the mail panel of the debugger.' => 'Notez que si vous activez le débogueur Yii, vous devriez pouvoir voir le message de courrier dans le panneau de courrier du débogueur.',
- 'Oops! Looks like you followed a bad link.' => 'Oups ! On dirait que vous avez suivi un mauvais lien.',
- 'Please configure the
useFileTransport property of the
mail application component to be false to enable email sending.' => 'Veuillez configurer la propriété
useFileTransport du composant d\'application
mail en faux pour activer l\'envoi d\'e-mails.',
- 'Please fill out the following form to contact us.' => 'Veuillez remplir le formulaire suivant pour nous contacter.',
- 'site.selector.language.de' => 'Allemand',
- 'site.selector.language.en' => 'Anglais',
- 'site.selector.language.es' => 'Espagnol',
- 'site.selector.language.fr' => 'Français',
- 'site.selector.language.pt' => 'Portugais',
- 'site.selector.language.ru' => 'Russe',
- 'site.selector.language.zh' => 'Chinois',
- 'Subject' => 'Sujet',
- 'Thank you for contacting us. We will respond to you as soon as possible.' => 'Merci de nous avoir contactés. Nous vous répondrons dès que possible.',
- 'This is the About page. You may modify the following file to customize its content.' => 'Il s\'agit de la page À propos. Vous pouvez modifier le fichier suivant pour personnaliser son contenu.',
- 'Username' => 'Nom d\'utilisateur',
- 'Web Application' => 'Application Web',
-];
diff --git a/src/framework/resource/message/pt/app.basic.php b/src/framework/resource/message/pt/app.basic.php
deleted file mode 100644
index 0fe5067..0000000
--- a/src/framework/resource/message/pt/app.basic.php
+++ /dev/null
@@ -1,54 +0,0 @@
- 'Sobre',
- 'Because the application is in development mode, the email is not sent but saved as a file under.' => 'Como a aplicação está em modo de desenvolvimento, o email não é enviado, mas é salvo como um arquivo em.',
- 'Body' => 'Corpo',
- 'Captcha Code' => 'Código Captcha',
- 'Contact us' => 'Contate-nos',
- 'Contact' => 'Contato',
- 'Email' => 'Email',
- 'Enter Body Here' => 'Digite o corpo aqui',
- 'Enter Captcha Code Here' => 'Digite o código Captcha aqui',
- 'Enter Email Here' => 'Digite o email aqui',
- 'Enter Subject Here' => 'Digite o assunto aqui',
- 'Enter Username Here' => 'Digite o nome de usuário aqui',
- 'If you think this is a problem with us, please tell us.' => 'Se você acha que isso é um problema conosco, por favor, nos avise.',
- 'Index' => 'Índice',
- 'Name' => 'Nome',
- 'Note that if you turn on the Yii debugger, you should be able to view the mail message on the mail panel of the debugger.' => 'Observe que se você ativar o depurador Yii, deverá ser capaz de ver a mensagem de email no painel de email do depurador.',
- 'Oops! Looks like you followed a bad link.' => 'Ops! Parece que você seguiu um link errado.',
- 'Please configure the
useFileTransport property of the
mail application component to be false to enable email sending.' => 'Por favor, configure a propriedade
useFileTransport do componente de aplicação
mail para falso para habilitar o envio de emails.',
- 'Please fill out the following form to contact us.' => 'Por favor, preencha o seguinte formulário para entrar em contato conosco.',
- 'site.selector.language.de' => 'Alemão',
- 'site.selector.language.en' => 'Inglês',
- 'site.selector.language.es' => 'Espanhol',
- 'site.selector.language.fr' => 'Francês',
- 'site.selector.language.pt' => 'Português',
- 'site.selector.language.ru' => 'Russo',
- 'site.selector.language.zh' => 'Chinês',
- 'Subject' => 'Assunto',
- 'Thank you for contacting us. We will respond to you as soon as possible.' => 'Obrigado por entrar em contato conosco. Vamos responder o mais rápido possível.',
- 'This is the About page. You may modify the following file to customize its content.' => 'Esta é a página Sobre. Você pode modificar o arquivo a seguir para personalizar seu conteúdo.',
- 'Username' => 'Nome de usuário',
- 'Web Application' => 'Aplicação Web',
-];
diff --git a/src/framework/resource/message/ru/app.basic.php b/src/framework/resource/message/ru/app.basic.php
deleted file mode 100644
index df815ed..0000000
--- a/src/framework/resource/message/ru/app.basic.php
+++ /dev/null
@@ -1,54 +0,0 @@
- 'О нас',
- 'Because the application is in development mode, the email is not sent but saved as a file under.' => 'Поскольку приложение находится в режиме разработки, электронное письмо не отправляется, а сохраняется как файл под именем.',
- 'Body' => 'Сообщение',
- 'Captcha Code' => 'Код Captcha',
- 'Contact us' => 'Свяжитесь с нами',
- 'Contact' => 'Контакт',
- 'Email' => 'Электронная почта',
- 'Enter Body Here' => 'Введите текст сообщения здесь',
- 'Enter Captcha Code Here' => 'Введите код Captcha здесь',
- 'Enter Email Here' => 'Введите адрес электронной почты здесь',
- 'Enter Subject Here' => 'Введите тему здесь',
- 'Enter Username Here' => 'Введите имя пользователя здесь',
- 'If you think this is a problem with us, please tell us.' => 'Если вы считаете, что это проблема с нами, пожалуйста, сообщите нам.',
- 'Index' => 'Главная',
- 'Name' => 'Имя',
- 'Note that if you turn on the Yii debugger, you should be able to view the mail message on the mail panel of the debugger.' => 'Обратите внимание, что если вы включите отладчик Yii, вы сможете просматривать почтовое сообщение на панели почты отладчика.',
- 'Oops! Looks like you followed a bad link.' => 'Упс! Похоже, вы перешли по неверной ссылке.',
- 'Please configure the
useFileTransport property of the
mail application component to be false to enable email sending.' => 'Пожалуйста, настройте свойство
useFileTransport компонента приложения
mail на значение false, чтобы включить отправку электронной почты.',
- 'Please fill out the following form to contact us.' => 'Пожалуйста, заполните следующую форму, чтобы связаться с нами.',
- 'site.selector.language.de' => 'Немецкий',
- 'site.selector.language.en' => 'Английский',
- 'site.selector.language.es' => 'Испанский',
- 'site.selector.language.fr' => 'Французский',
- 'site.selector.language.pt' => 'Португальский',
- 'site.selector.language.ru' => 'Русский',
- 'site.selector.language.zh' => 'Китайский',
- 'Subject' => 'Тема',
- 'Thank you for contacting us. We will respond to you as soon as possible.' => 'Спасибо, что связались с нами. Мы ответим вам как можно скорее.',
- 'This is the About page. You may modify the following file to customize its content.' => 'Это страница "О нас". Вы можете изменить следующий файл, чтобы настроить ее содержание.',
- 'Username' => 'Имя пользователя',
- 'Web Application' => 'Веб-приложение',
-];
diff --git a/src/framework/resource/message/zh/app.basic.php b/src/framework/resource/message/zh/app.basic.php
deleted file mode 100644
index 2902704..0000000
--- a/src/framework/resource/message/zh/app.basic.php
+++ /dev/null
@@ -1,54 +0,0 @@
- '关于',
- 'Because the application is in development mode, the email is not sent but saved as a file under.' => '因为应用程序处于开发模式，电子邮件不会被发送，而会保存为文件。',
- 'Body' => '正文',
- 'Captcha Code' => '验证码',
- 'Contact us' => '联系我们',
- 'Contact' => '联系',
- 'Email' => '电子邮件',
- 'Enter Body Here' => '在此输入正文',
- 'Enter Captcha Code Here' => '在此输入验证码',
- 'Enter Email Here' => '在此输入电子邮件',
- 'Enter Subject Here' => '在此输入主题',
- 'Enter Username Here' => '在此输入用户名',
- 'If you think this is a problem with us, please tell us.' => '如果您认为这是我们的问题，请告诉我们。',
- 'Index' => '主页',
- 'Name' => '姓名',
- 'Note that if you turn on the Yii debugger, you should be able to view the mail message on the mail panel of the debugger.' => '请注意，如果您启用Yii调试器，您应该能够在调试器的邮件面板上查看邮件消息。',
- 'Oops! Looks like you followed a bad link.' => '糟糕！看起来您跟随了一个错误的链接。',
- 'Please configure the
useFileTransport property of the
mail application component to be false to enable email sending.' => '请配置
mail 应用程序组件的
useFileTransport 属性为false，以启用电子邮件发送。',
- 'Please fill out the following form to contact us.' => '请填写以下表单以与我们联系。',
- 'site.selector.language.de' => '德国的',
- 'site.selector.language.en' => '英语',
- 'site.selector.language.es' => '西班牙语',
- 'site.selector.language.fr' => '法语',
- 'site.selector.language.pt' => '葡萄牙语',
- 'site.selector.language.ru' => '俄语',
- 'site.selector.language.zh' => '中文',
- 'Subject' => '主题',
- 'Thank you for contacting us. We will respond to you as soon as possible.' => '感谢您联系我们。我们将尽快回复您。',
- 'This is the About page. You may modify the following file to customize its content.' => '这是关于页面。您可以修改以下文件来自定义其内容。',
- 'Username' => '用户名',
- 'Web Application' => 'Web应用程序',
-];
diff --git a/src/usecase/contact/ContactController.php b/src/usecase/contact/ContactController.php
deleted file mode 100644
index 2990f0f..0000000
--- a/src/usecase/contact/ContactController.php
+++ /dev/null
@@ -1,53 +0,0 @@
- [
- 'class' => IndexAction::class,
- ],
- 'captcha' => [
- 'class' => CaptchaAction::class,
- 'fixedVerifyCode' => (YII_ENV === 'tests') ? 'testme' : null,
- 'transparent' => true,
- ],
- ],
- parent::actions(),
- );
- }
-
- public function getMailer(): MailerInterface
- {
- return $this->module->get('mailer');
- }
-
- public function getViewPath(): string
- {
- return __DIR__ . '/view';
- }
-
- public function sendEmail(ContactForm $form): bool
- {
- return $this->getMailer()
- ->compose()
- ->setTo($form->email)
- ->setFrom([ApplicationParameters::getMailerSender() => ApplicationParameters::getMailerSenderName()])
- ->setReplyTo([$form->email => $form->name])
- ->setSubject($form->subject)
- ->setTextBody($form->body)
- ->send();
- }
-}
diff --git a/src/usecase/contact/ContactEvent.php b/src/usecase/contact/ContactEvent.php
deleted file mode 100644
index aa97463..0000000
--- a/src/usecase/contact/ContactEvent.php
+++ /dev/null
@@ -1,12 +0,0 @@
- Yii::t('app.basic', 'Name'),
- 'email' => Yii::t('app.basic', 'Email'),
- 'subject' => Yii::t('app.basic', 'Subject'),
- 'body' => Yii::t('app.basic', 'Body'),
- 'verifyCode' => Yii::t('app.basic', 'Captcha Code'),
- ];
- }
-
- public function rules(): array
- {
- return [
- // name, email, subject and body are required
- [['name', 'email', 'subject', 'body'], 'required'],
- // email has to be a valid email address
- ['email', 'email'],
- // verifyCode needs to be entered correctly
- ['verifyCode', CaptchaValidator::class, 'captchaAction' => '/contact/captcha', 'message' => ''],
- ];
- }
-}
diff --git a/src/usecase/contact/IndexAction.php b/src/usecase/contact/IndexAction.php
deleted file mode 100644
index dcf0ce2..0000000
--- a/src/usecase/contact/IndexAction.php
+++ /dev/null
@@ -1,27 +0,0 @@
-
- */
-final class IndexAction extends Action
-{
- public function run(): string
- {
- $form = new ContactForm();
- $post = $this->controller->request->post();
-
- if (is_array($post) && $form->load($post) && $form->validate()) {
- if ($this->controller->sendEmail($form)) {
- $this->trigger(ContactEvent::EVENT_AFTER_SEND, new ContactEvent());
- }
- }
-
- return $this->controller->render('index', ['model' => $form]);
- }
-}
diff --git a/src/usecase/contact/view/index.php b/src/usecase/contact/view/index.php
deleted file mode 100644
index 7651f52..0000000
--- a/src/usecase/contact/view/index.php
+++ /dev/null
@@ -1,219 +0,0 @@
-title = Yii::t('app.basic', 'Contact');
-$this->params['breadcrumbs'] = [$this->title];
-$tabInput = 1;
-?>
-
-
-
-
-
-
-
-
- 'contact-form',
- 'layout' => ActiveForm::LAYOUT_FLOATING,
- 'options' => ['class' => 'needs-validation', 'novalidate' => true],
- ],
- ) ?>
-
-
-
-
- field($model, 'name')->textInput(
- [
- 'autofocus' => true,
- 'class' => 'form-control form-control-lg',
- 'placeholder' => Yii::t(
- 'app.basic',
- 'Your full name',
- ),
- 'required' => true,
- 'tabindex' => $tabInput++,
- ],
- ) ?>
-
-
- field($model, 'email')->textInput(
- [
- 'class' => 'form-control form-control-lg',
- 'placeholder' => Yii::t(
- 'app.basic',
- 'your.email@example.com',
- ),
- 'required' => true,
- 'tabindex' => $tabInput++,
- ],
- ) ?>
-
-
-
-
-
- field($model, 'subject')->textInput(
- [
- 'class' => 'form-control form-control-lg',
- 'placeholder' => Yii::t('app.basic', 'What is this about?'),
- 'required' => true,
- 'tabindex' => $tabInput++,
- ],
- ) ?>
-
-
-
-
- field($model, 'body')->textarea(
- [
- 'class' => 'form-control',
- 'rows' => 6,
- 'placeholder' => Yii::t(
- 'app.basic',
- 'Tell us more about your inquiry...',
- ),
- 'required' => true,
- 'style' => 'resize: vertical; min-height: 150px;',
- 'tabindex' => $tabInput++,
- ],
- ) ?>
-
-
-
-
-
-
Security Verification
-
-
-
- field(
- $model,
- 'verifyCode',
- [
- 'template' => '{input}{error}',
- 'options' => [
- 'class' => 'mb-2',
- ],
- ],
- )->widget(
- Captcha::class,
- [
- 'captchaAction' => 'contact/captcha',
- 'template' => '
Captcha Code:{image}
{input}',
- 'options' => [
- 'class' => 'form-control form-control-lg text-center',
- 'placeholder' => Yii::t(
- 'app.basic',
- 'Enter the code above',
- ),
- 'required' => true,
- 'tabindex' => $tabInput++,
- ],
- ],
- ) ?>
-
-
-
-
-
-
- 'btn btn-primary btn-lg py fw-semibold rounded-3',
- 'name' => 'contact-button',
- 'tabindex' => $tabInput++,
- ],
- ) ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
Get in Touch
-
-
-
-
-
Address
-
123 Main Street
City, State 12345
-
-
-
-
-
-
-
Phone
-
+1 (555) 123-4567
-
-
-
-
-
-
-
Email
-
contact@example.com
-
-
-
-
Business Hours
-
- -
- Monday - Friday
- 9:00 AM to 6:00 PM
-
- -
- Saturday
- 10:00 AM to 4:00 PM
-
- -
- Sunday
- Closed
-
-
-
-
-
-
-
-
diff --git a/src/usecase/security/Identity.php b/src/usecase/security/Identity.php
deleted file mode 100644
index 3f1e8f0..0000000
--- a/src/usecase/security/Identity.php
+++ /dev/null
@@ -1,91 +0,0 @@
-
- */
- private static array $users = [
- '100' => [
- 'id' => '100',
- 'username' => 'admin',
- 'password' => 'admin',
- 'authKey' => 'test100key',
- 'accessToken' => '100-token',
- ],
- '101' => [
- 'id' => '101',
- 'username' => 'demo',
- 'password' => 'demo',
- 'authKey' => 'test101key',
- 'accessToken' => '101-token',
- ],
- ];
-
- public static function findByUsername(string $username): IdentityInterface|null
- {
- foreach (self::$users as $user) {
- if (strcasecmp($user['username'], $username) === 0) {
- return new self($user);
- }
- }
-
- return null;
- }
-
- public static function findIdentity($id): IdentityInterface|null
- {
- return isset(self::$users[$id]) ? new self(self::$users[$id]) : null;
- }
-
- public static function findIdentityByAccessToken($token, $type = null): IdentityInterface|null
- {
- foreach (self::$users as $user) {
- if ($user['accessToken'] === $token) {
- return new self($user);
- }
- }
-
- return null;
- }
-
- public function getAuthKey(): string
- {
- return $this->authKey;
- }
-
- public function getId(): string
- {
- return $this->id;
- }
-
- public function validateAuthKey($authKey): bool
- {
- return $this->authKey === $authKey;
- }
-
- public function validatePassword(string $password): bool
- {
- return $this->password === $password;
- }
-}
diff --git a/src/usecase/security/LoginAction.php b/src/usecase/security/LoginAction.php
deleted file mode 100644
index 4fee2b9..0000000
--- a/src/usecase/security/LoginAction.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- */
-final class LoginAction extends Action
-{
- public function run(): string|Response
- {
- if ($this->controller->getUser()->isGuest === false) {
- return $this->controller->goHome();
- }
-
- $form = new LoginForm();
- $post = $this->controller->request->post();
-
- if (is_array($post) && $form->load($post) && $this->login($form)) {
- return $this->controller->goBack();
- }
-
- return $this->controller->render('login', ['model' => $form]);
- }
-
- private function login(LoginForm $form): bool
- {
- $identity = $form->getIdentity();
-
- if ($identity instanceof Identity && $form->validate()) {
- return $this->controller->getUser()->login($identity, $form->rememberMe ? 3600 * 24 * 30 : 0);
- }
-
- return false;
- }
-}
diff --git a/src/usecase/security/LoginForm.php b/src/usecase/security/LoginForm.php
deleted file mode 100644
index 134c827..0000000
--- a/src/usecase/security/LoginForm.php
+++ /dev/null
@@ -1,73 +0,0 @@
-_identity === false) {
- $this->_identity = Identity::findByUsername($this->username);
- }
-
- return $this->_identity;
- }
-
- /**
- * @phpstan-return array
>
- */
- public function rules(): array
- {
- return [
- // username and password are both required
- [['username', 'password'], 'required'],
- // rememberMe must be a boolean value
- ['rememberMe', 'boolean'],
- // password is validated by validatePassword()
- ['password', 'validatePassword'],
- ];
- }
-
- /**
- * Validates the password.
- *
- * This method serves as the inline validation for password.
- *
- * @param string $attribute the attribute currently being validated
- *
- * @param array $params the additional name-value pairs given in the rule
- *
- * @phpstan-param array $params
- */
- public function validatePassword($attribute, $params): void
- {
- if ($this->hasErrors() === false) {
- $identity = $this->getIdentity();
-
- if ($identity instanceof Identity && $identity->validatePassword($this->password) === false) {
- $this->addError($attribute, 'Incorrect username or password.');
- }
- }
- }
-}
diff --git a/src/usecase/security/LogoutAction.php b/src/usecase/security/LogoutAction.php
deleted file mode 100644
index 5067fc8..0000000
--- a/src/usecase/security/LogoutAction.php
+++ /dev/null
@@ -1,21 +0,0 @@
-
- */
-final class LogoutAction extends Action
-{
- public function run(): Response
- {
- $this->controller->getUser()->logout();
-
- return $this->controller->goHome();
- }
-}
diff --git a/src/usecase/security/SecurityController.php b/src/usecase/security/SecurityController.php
deleted file mode 100644
index 05c31a7..0000000
--- a/src/usecase/security/SecurityController.php
+++ /dev/null
@@ -1,40 +0,0 @@
- [
- 'class' => LogoutAction::class,
- ],
- 'login' => [
- 'class' => LoginAction::class,
- ],
- ],
- parent::actions(),
- );
- }
-
- /**
- * @phpstan-return User
- */
- public function getUser(): User
- {
- return $this->module->get('user');
- }
-
- public function getViewPath(): string
- {
- return __DIR__ . '/view';
- }
-}
diff --git a/src/usecase/security/view/login.php b/src/usecase/security/view/login.php
deleted file mode 100644
index 994a205..0000000
--- a/src/usecase/security/view/login.php
+++ /dev/null
@@ -1,121 +0,0 @@
-title = 'Login';
-$this->params['breadcrumbs'] = [$this->title];
-$tabInput = 1;
-?>
-
-
-
-
-
- title) ?>
-
-
-
-
-
-
-
-
-
-
-
- 'login-form',
- 'layout' => ActiveForm::LAYOUT_FLOATING,
- 'options' => ['class' => 'needs-validation', 'novalidate' => true],
- ],
- ) ?>
-
-
-
- field($model, 'username')->textInput(
- [
- 'autofocus' => true,
- 'class' => 'form-control form-control-lg',
- 'placeholder' => Yii::t('app.basic', 'Enter your username'),
- 'required' => true,
- 'tabindex' => $tabInput++,
- ],
- ) ?>
-
-
-
-
- field($model, 'password')->passwordInput(
- [
- 'class' => 'form-control form-control-lg',
- 'placeholder' => Yii::t('app.basic', 'Enter your password'),
- 'required' => true,
- 'tabindex' => $tabInput++,
- ],
- ) ?>
-
-
-
-
-
- field($model, 'rememberMe')->checkbox(
- [
- 'labelOptions' => [
- 'class' => 'form-check-label fw-medium text-body',
- ],
- 'options' => [
- 'class' => 'form-check-input',
- ],
- ],
- ) ?>
-
-
-
-
-
- 'btn btn-primary btn-lg py-3 fw-semibold rounded-3',
- 'name' => 'login-button',
- ],
- ) ?>
-
-
-
-
-
-
-
Demo Credentials
-
-
-
-
Admin Access
-
admin / admin
-
-
-
-
-
Demo Access
-
demo / demo
-
-
-
-
- To modify credentials, check
-
-
-
-
-
-
diff --git a/src/usecase/site/view/about.php b/src/usecase/site/view/about.php
deleted file mode 100644
index 2ba2595..0000000
--- a/src/usecase/site/view/about.php
+++ /dev/null
@@ -1,15 +0,0 @@
-title = Yii::t('app.basic', 'About');
-$this->params['breadcrumbs'] = [$this->title];
-?>
-
diff --git a/src/usecase/site/view/index.php b/src/usecase/site/view/index.php
index b955590..237e7df 100644
--- a/src/usecase/site/view/index.php
+++ b/src/usecase/site/view/index.php
@@ -6,7 +6,7 @@
use yii\web\View;
/** @var View $this */
-$this->title = Yii::t('app.basic', 'Index');
+$this->title = Yii::t('app.basic', 'Home');
?>
diff --git a/tests/Acceptance/AboutCest.php b/tests/Acceptance/AboutCest.php
deleted file mode 100644
index 353da36..0000000
--- a/tests/Acceptance/AboutCest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-amGoingTo('navigate to the About page.');
- $I->amOnPage('site/about');
-
- $I->wantTo('ensure that About page works.');
-
- $I->expectTo('see page index.');
- $I->see('About');
- $I->see('This is the About page.');
- }
-}
diff --git a/tests/Acceptance/ContactCest.php b/tests/Acceptance/ContactCest.php
deleted file mode 100644
index 617693a..0000000
--- a/tests/Acceptance/ContactCest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-amGoingTo('navigate to the Contact page.');
- $I->amOnPage('contact/index');
-
- $I->wantTo('ensure that Contact page works.');
-
- $I->expectTo('see page index.');
- $I->see('Contact');
- $I->see('Please fill out the following form to contact us.');
- }
-}
diff --git a/tests/Acceptance/SiteCest.php b/tests/Acceptance/SiteCest.php
index 95bf6ff..d975c4e 100644
--- a/tests/Acceptance/SiteCest.php
+++ b/tests/Acceptance/SiteCest.php
@@ -17,6 +17,5 @@ public function homePage(AcceptanceTester $I): void
$I->expectTo('see page index.');
$I->see('Web Application');
- $I->see('English');
}
}
diff --git a/tests/Functional/ContactCest.php b/tests/Functional/ContactCest.php
deleted file mode 100644
index 02e92df..0000000
--- a/tests/Functional/ContactCest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-amGoingTo('navigate to the Contact page.');
- $I->amOnRoute('contact/index');
- }
-
- public function contactFormSubmitFormEmailWrongData(FunctionalTester $I): void
- {
- $I->amGoingTo('contact form submit form with email wrong.');
- $I->submitForm('#contact-form', [
- 'ContactForm[name]' => 'tester',
- 'ContactForm[email]' => 'tester.email',
- 'ContactForm[subject]' => 'test subject',
- 'ContactForm[body]' => 'test content',
- 'ContactForm[verifyCode]' => 'testme',
- ]);
-
- $I->expectTo('Email is not a valid email address');
- $I->dontSee('Name cannot be blank');
- $I->see('Email is not a valid email address.');
- $I->dontSee('Subject cannot be blank');
- $I->dontSee('Body cannot be blank');
- $I->dontSee('The verification code is incorrect');
- }
-
- public function contactFormSubmitFormEmptyData(FunctionalTester $I): void
- {
- $I->amGoingTo('contact form submit form with empty data.');
- $I->submitForm('#contact-form', []);
-
- $I->expectTo('see validations errors.');
- $I->see('Name cannot be blank.');
- $I->see('Email cannot be blank.');
- $I->see('Subject cannot be blank.');
- $I->see('Body cannot be blank.');
- }
-
- public function contactFormSubmitFormSuccessData(FunctionalTester $I): void
- {
- $I->amGoingTo('contact form submit form with success data.');
- $I->submitForm('#contact-form', [
- 'ContactForm[name]' => 'tester',
- 'ContactForm[email]' => 'tester@example.com',
- 'ContactForm[subject]' => 'test subject',
- 'ContactForm[body]' => 'test content',
- 'ContactForm[verifyCode]' => 'testme',
- ]);
-
- $I->expectTo('success.');
- $I->see('Message sent successfully!.');
- $I->see('Thank you for contacting us. We will respond to you as soon as possible.');
- }
-}
diff --git a/tests/Functional/SiteCest.php b/tests/Functional/SiteCest.php
index 39dc2d8..b4e0689 100644
--- a/tests/Functional/SiteCest.php
+++ b/tests/Functional/SiteCest.php
@@ -17,9 +17,8 @@ public function homePage(FunctionalTester $I): void
$I->seeResponseCodeIs(200);
$I->expectTo('see page index.');
- $I->seeInTitle('Index');
+ $I->seeInTitle('Home');
$I->seeElement('body');
$I->see('Web Application', 'h1');
- $I->see('English');
}
}
diff --git a/tests/Unit/ContactControllerTest.php b/tests/Unit/ContactControllerTest.php
deleted file mode 100644
index 89670c5..0000000
--- a/tests/Unit/ContactControllerTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-attributes = [
- 'name' => 'Tester',
- 'email' => 'tester@example.com',
- 'subject' => 'very important letter subject',
- 'body' => 'body of current message',
- 'verifyCode' => 'testme',
- ];
-
- verify($controller->sendEmail($form))->notEmpty();
-
- self::assertNotNull($this->tester, 'Yii2 module is not initialized');
-
- $this->tester->seeEmailIsSent();
- $emailMessage = $this->tester->grabLastSentEmail();
-
- assert(
- $emailMessage instanceof MessageInterface,
- 'Last sent email should be an instance of \'MessageInterface\'',
- );
-
- verify($emailMessage->getTo())->arrayHasKey('tester@example.com');
- verify($emailMessage->getFrom())->arrayHasKey('noreply@example.com');
- verify($emailMessage->getReplyTo())->arrayHasKey('tester@example.com');
- verify($emailMessage->getSubject())->equals('very important letter subject');
- verify($emailMessage->toString())->stringContainsString('body of current message');
- }
-}
diff --git a/tests/Unit/IdentityTest.php b/tests/Unit/IdentityTest.php
deleted file mode 100644
index 6be84c5..0000000
--- a/tests/Unit/IdentityTest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-getId(), "User ID for access token '100-token' should be '100'.");
- self::assertSame('admin', $user->username, "Username property should be 'admin'.");
- }
-
- public function testFindByAccessTokenReturnsNullForInvalidToken(): void
- {
- self::assertNull(
- Identity::findIdentityByAccessToken('invalid-token'),
- "Expected 'null' when finding a user by an invalid access token.",
- );
- }
-
- public function testFindByUsernameReturnsIdentity(): void
- {
- $user = Identity::findByUsername('admin');
-
- self::assertInstanceOf(Identity::class, $user, "Expected an instance of 'Identity' for username 'admin'.");
- self::assertSame('100', $user->getId(), "User ID for 'admin' should be '100'.");
- self::assertSame('admin', $user->username, "Username property should be 'admin'.");
- }
-
- public function testFindByUsernameReturnsNullForNonexistentUser(): void
- {
- self::assertNull(
- Identity::findByUsername('nonexistent'),
- "Expected 'null' when finding a user by a 'nonexistent' username.",
- );
- }
-
- public function testValidateAuthKeyReturnsTrueForCorrectAuthKey(): void
- {
- $user = Identity::findByUsername('admin');
-
- self::assertInstanceOf(
- Identity::class,
- $user,
- "Expected an instance of 'Identity' for username 'admin'.",
- );
- self::assertTrue(
- $user->validateAuthKey('test100key'),
- 'Expected auth key validation to return `true` for correct auth key.',
- );
- }
-
- public function testValidatePasswordReturnsTrueForCorrectPassword(): void
- {
- $user = Identity::findByUsername('admin');
-
- self::assertInstanceOf(
- Identity::class,
- $user,
- "Expected an instance of 'Identity' for username 'admin'.",
- );
- self::assertTrue(
- $user->validatePassword('admin'),
- 'Expected password validation to return `true` for correct password.',
- );
- }
-}
diff --git a/tests/Unit/MenuTest.php b/tests/Unit/MenuTest.php
deleted file mode 100644
index 9f5a0f2..0000000
--- a/tests/Unit/MenuTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-user->login($identity);
-
- self::assertStringContainsString(
- '
Logout',
- $view->render('@resource/layout/component/menu.php'),
- 'Failed asserting that the logout link is rendered for a logged-in user.',
- );
- }
-}
diff --git a/tests/_envs/php-builtin.yml b/tests/_envs/php-builtin.yml
index 929ab08..ce9c804 100644
--- a/tests/_envs/php-builtin.yml
+++ b/tests/_envs/php-builtin.yml
@@ -1,7 +1,7 @@
extensions:
enabled:
- Codeception\Extension\RunProcess:
- 0: php -d variables_order=EGPCS -S localhost:8085 -t public
+ 0: php -d variables_order=EGPCS -S localhost:8085 -t web
sleep: 1
modules:
config:
diff --git a/public/.htaccess b/web/.htaccess
similarity index 100%
rename from public/.htaccess
rename to web/.htaccess
diff --git a/public/assets/.gitignore b/web/assets/.gitignore
similarity index 100%
rename from public/assets/.gitignore
rename to web/assets/.gitignore
diff --git a/public/favicon.ico b/web/favicon.ico
similarity index 100%
rename from public/favicon.ico
rename to web/favicon.ico
diff --git a/public/image/yii.svg b/web/image/yii.svg
similarity index 100%
rename from public/image/yii.svg
rename to web/image/yii.svg
diff --git a/public/image/yiiframework.svg b/web/image/yiiframework.svg
similarity index 100%
rename from public/image/yiiframework.svg
rename to web/image/yiiframework.svg
diff --git a/public/index.php b/web/index.php
similarity index 64%
rename from public/index.php
rename to web/index.php
index e8074db..7d8b560 100644
--- a/public/index.php
+++ b/web/index.php
@@ -2,13 +2,17 @@
declare(strict_types=1);
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
+require_once dirname(__DIR__) . '/vendor/autoload.php';
// Load environment variables from .env file
$dotenv = Dotenv\Dotenv::createImmutable(dirname(__DIR__));
$dotenv->safeLoad();
+define('YII_DEBUG', $_ENV['YII_DEBUG'] ?? false);
+define('YII_ENV', $_ENV['YII_ENV'] ?? 'prod');
+
+require_once dirname(__DIR__) . '/vendor/yiisoft/yii2/Yii.php';
+
if (getenv('YII_C3')) {
$c3 = dirname(__DIR__) . '/c3.php';
diff --git a/public/robots.txt b/web/robots.txt
similarity index 100%
rename from public/robots.txt
rename to web/robots.txt
+