Skip to content

Commit

Permalink
Move views directory into resources (#537)
Browse files Browse the repository at this point in the history
  • Loading branch information
@xepozz
xepozz committed Nov 4, 2022
1 parent b56eea6 commit 23647cd
Show file tree
Hide file tree
Showing 19 changed files with 127 additions and 65 deletions.
4 changes: 2 additions & 2 deletions config/params.php
View file
Expand Up @@ -62,8 +62,8 @@
'@runtime' => '@root/runtime',
'@src' => '@root/src',
'@vendor' => '@root/vendor',
'@layout' => '@root/views/layout',
'@views' => '@root/views',
'@layout' => '@views/layout',
'@views' => '@resources/views',
],
],

Expand Down
12 changes: 8 additions & 4 deletions views/auth/login.php → resources/views/auth/login.php
View file
Expand Up @@ -2,16 +2,20 @@

declare(strict_types=1);

use App\Auth\Form\LoginForm;
use Yiisoft\Form\Field;
use Yiisoft\Html\Html;
use Yiisoft\Html\Tag\Form;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;

/**
* @var \Yiisoft\View\WebView $this
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var \Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var WebView $this
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var string $csrf
* @var \App\Auth\Form\LoginForm $formModel
* @var LoginForm $formModel
*/

$this->setTitle($translator->translate('layout.login'));
Expand Down
12 changes: 8 additions & 4 deletions views/blog/_archive.php → resources/views/blog/_archive.php
View file
Expand Up @@ -3,13 +3,17 @@
declare(strict_types=1);

/**
* @var \Yiisoft\Data\Reader\DataReaderInterface|string[][] $archive
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var \Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var \Yiisoft\View\WebView $this
* @var DataReaderInterface|string[][] $archive
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var WebView $this
*/

use Yiisoft\Data\Reader\DataReaderInterface;
use Yiisoft\Html\Html;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;

?>
<h4 class="text-muted mb-3"><?= $translator->translate('layout.archive') ?></h4>
Expand Down
12 changes: 8 additions & 4 deletions views/blog/_topTags.php → resources/views/blog/_topTags.php
View file
Expand Up @@ -3,13 +3,17 @@
declare(strict_types=1);

/**
* @var \Yiisoft\Data\Reader\DataReaderInterface|string[][] $tags
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var \Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var \Yiisoft\View\WebView $this
* @var DataReaderInterface|string[][] $tags
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var WebView $this
*/

use Yiisoft\Data\Reader\DataReaderInterface;
use Yiisoft\Html\Html;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;

?>
<h4 class="text-muted mb-3">
Expand Down
12 changes: 8 additions & 4 deletions views/blog/archive/index.php → resources/views/blog/archive/index.php
View file
Expand Up @@ -3,13 +3,17 @@
declare(strict_types=1);

/**
* @var \Yiisoft\Data\Reader\DataReaderInterface|string[][] $archive
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var \Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var \Yiisoft\View\WebView $this
* @var DataReaderInterface|string[][] $archive
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var WebView $this
*/

use Yiisoft\Data\Reader\DataReaderInterface;
use Yiisoft\Html\Html;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;

$this->setTitle($translator->translate('layout.archive'));

Expand Down
12 changes: 8 additions & 4 deletions views/blog/archive/monthly-archive.php → ...es/views/blog/archive/monthly-archive.php
View file
Expand Up @@ -5,16 +5,20 @@
/**
* @var int $year
* @var int $month
* @var \Yiisoft\Data\Paginator\OffsetPaginator $paginator
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var \Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var \Yiisoft\View\WebView $this
* @var OffsetPaginator $paginator
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var WebView $this
*/

use App\Blog\Entity\Post;
use App\Blog\Widget\PostCard;
use App\Widget\OffsetPagination;
use Yiisoft\Data\Paginator\OffsetPaginator;
use Yiisoft\Html\Html;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;

$monthName = DateTime::createFromFormat('!m', (string) $month)->format('F');
$this->setTitle("Archive for $monthName $year");
Expand Down
12 changes: 8 additions & 4 deletions views/blog/archive/yearly-archive.php → ...ces/views/blog/archive/yearly-archive.php
View file
Expand Up @@ -4,14 +4,18 @@

/**
* @var int $year
* @var Post[]|\Yiisoft\Data\Reader\DataReaderInterface $items
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var \Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var \Yiisoft\View\WebView $this
* @var Post[]|DataReaderInterface $items
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var WebView $this
*/

use App\Blog\Entity\Post;
use Yiisoft\Data\Reader\DataReaderInterface;
use Yiisoft\Html\Html;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;

$this->setTitle($translator->translate('layout.archive.for-year', ['year' => $year]));

Expand Down
3 changes: 2 additions & 1 deletion views/blog/comments/_comments.php → resources/views/blog/comments/_comments.php
View file
Expand Up @@ -6,10 +6,11 @@
use Yiisoft\Data\Paginator\KeysetPaginator;
use Yiisoft\Html\Html;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;

/**
* @var KeysetPaginator $data
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var AssetManager $assetManager
*/
Expand Down
3 changes: 2 additions & 1 deletion views/blog/comments/index.php → resources/views/blog/comments/index.php
View file
Expand Up @@ -6,11 +6,12 @@
use Yiisoft\Data\Paginator\KeysetPaginator;
use Yiisoft\Html\Html;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;

/**
* @var KeysetPaginator $data
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var AssetManager $assetManager
* @var WebView $this
Expand Down
17 changes: 11 additions & 6 deletions views/blog/index.php → resources/views/blog/index.php
View file
Expand Up @@ -3,19 +3,24 @@
declare(strict_types=1);

/**
* @var \Yiisoft\Data\Paginator\OffsetPaginator $paginator;
* @var \Yiisoft\Data\Reader\DataReaderInterface|string[][] $archive
* @var \Yiisoft\Data\Reader\DataReaderInterface|string[][] $tags
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var \Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var \Yiisoft\View\WebView $this
* @var OffsetPaginator $paginator;
* @var DataReaderInterface|string[][] $archive
* @var DataReaderInterface|string[][] $tags
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var WebView $this
* @var bool $isGuest
*/

use App\Blog\Entity\Post;
use App\Blog\Widget\PostCard;
use App\Widget\OffsetPagination;
use Yiisoft\Data\Paginator\OffsetPaginator;
use Yiisoft\Data\Reader\DataReaderInterface;
use Yiisoft\Html\Html;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;

$this->setTitle($translator->translate('layout.blog'));
$pagination = OffsetPagination::widget()
Expand Down
9 changes: 6 additions & 3 deletions views/blog/post/__form.php → resources/views/blog/post/__form.php
View file
Expand Up @@ -3,9 +3,9 @@
declare(strict_types=1);

/**
* @var \Yiisoft\View\View $this
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var \Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var View $this
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var array $body
* @var string $csrf
* @var string $action
Expand All @@ -14,6 +14,9 @@
*/

use Yiisoft\Html\Html;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\View;
use Yiisoft\Yii\Bootstrap5\Alert;

if (!empty($errors)) {
Expand Down
12 changes: 8 additions & 4 deletions views/blog/post/index.php → resources/views/blog/post/index.php
View file
Expand Up @@ -3,15 +3,19 @@
declare(strict_types=1);

/**
* @var \App\Blog\Entity\Post $item
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var \Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var \Yiisoft\View\WebView $this
* @var Post $item
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var WebView $this
* @var bool $canEdit
* @var string $slug
*/

use App\Blog\Entity\Post;
use Yiisoft\Html\Html;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;

$this->setTitle($item->getTitle());

Expand Down
18 changes: 12 additions & 6 deletions views/blog/tag/index.php → resources/views/blog/tag/index.php
View file
Expand Up @@ -3,15 +3,21 @@
declare(strict_types=1);

/**
* @var \Yiisoft\Data\Paginator\OffsetPaginator $paginator;
* @var \App\Blog\Entity\Tag $item
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var \Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var \Yiisoft\View\WebView $this
* @var OffsetPaginator $paginator;
* @var Tag $item
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var WebView $this
*/

use App\Blog\Entity\Post;
use App\Blog\Entity\Tag;
use App\Widget\OffsetPagination;
use Yiisoft\Data\Paginator\OffsetPaginator;
use Yiisoft\Html\Html;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;

$this->setTitle($item->getLabel());

Expand All @@ -23,7 +29,7 @@
));
echo Html::tag('h1', Html::encode($item->getLabel()));
echo Html::openTag('ul');
/** @var \App\Blog\Entity\Post $post */
/** @var Post $post */
foreach ($paginator->read() as $post) {
echo Html::openTag('li', ['class' => 'text-muted']);
echo Html::a(Html::encode($post->getTitle()), $urlGenerator->generate('blog/post', ['slug' => $post->getSlug()]));
Expand Down
18 changes: 12 additions & 6 deletions views/layout/main.php → resources/views/layout/main.php
View file
Expand Up @@ -3,24 +3,30 @@
declare(strict_types=1);

use App\Asset\AppAsset;
use App\User\User;
use App\Widget\PerformanceMetrics;
use Yiisoft\Assets\AssetManager;
use Yiisoft\Html\Html;
use Yiisoft\Html\Tag\Button;
use Yiisoft\Html\Tag\Form;
use Yiisoft\Router\CurrentRoute;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Strings\StringHelper;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;
use Yiisoft\Yii\Bootstrap5\Nav;
use Yiisoft\Yii\Bootstrap5\NavBar;

/**
* @var \Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var \Yiisoft\Router\CurrentRoute $currentRoute
* @var \Yiisoft\View\WebView $this
* @var \Yiisoft\Assets\AssetManager $assetManager
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var CurrentRoute $currentRoute
* @var WebView $this
* @var AssetManager $assetManager
* @var TranslatorInterface $translator
* @var string $content
*
* @see \App\ApplicationViewInjection
* @var \App\User\User|null $user
* @var User|null $user
* @var string $csrf
* @var string $brandLabel
*/
Expand Down
12 changes: 8 additions & 4 deletions views/signup/signup.php → resources/views/signup/signup.php
View file
Expand Up @@ -2,16 +2,20 @@

declare(strict_types=1);

use App\Auth\Form\SignupForm;
use Yiisoft\Form\Field;
use Yiisoft\Html\Html;
use Yiisoft\Html\Tag\Form;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;

/**
* @var \Yiisoft\View\WebView $this
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var \Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var WebView $this
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var string $csrf
* @var \App\Auth\Form\SignupForm $formModel
* @var SignupForm $formModel
*/

$this->setTitle($translator->translate('signup'));
Expand Down
12 changes: 8 additions & 4 deletions views/site/404.php → resources/views/site/404.php
View file
Expand Up @@ -3,12 +3,16 @@
declare(strict_types=1);

use Yiisoft\Html\Html;
use Yiisoft\Router\CurrentRoute;
use Yiisoft\Router\UrlGeneratorInterface;
use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;

/**
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var \Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var \Yiisoft\Router\CurrentRoute $currentRoute
* @var \Yiisoft\View\WebView $this
* @var TranslatorInterface $translator
* @var UrlGeneratorInterface $urlGenerator
* @var CurrentRoute $currentRoute
* @var WebView $this
*/

$this->setTitle($translator->translate('layout.not-found'));
Expand Down
6 changes: 4 additions & 2 deletions views/site/index.php → resources/views/site/index.php
View file
Expand Up @@ -2,11 +2,13 @@

declare(strict_types=1);

use Yiisoft\Translator\TranslatorInterface;
use Yiisoft\View\WebView;
use Yiisoft\Yii\Bootstrap5\Carousel;

/**
* @var \Yiisoft\Translator\TranslatorInterface $translator
* @var \Yiisoft\View\WebView $this
* @var TranslatorInterface $translator
* @var WebView $this
*/

$this->setTitle('Home');
Expand Down
0 views/user/index.php → resources/views/user/index.php
View file
File renamed without changes.

0 comments on commit 23647cd

Please sign in to comment.