From 28da32f2ac88923a8e89618bb27853a2bfd62aa6 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Thu, 13 Apr 2017 11:44:03 -0400
Subject: [PATCH] Get images from proxy or cache for Manga views, and Add views

---
 app/views/manga/cover.php                          | 2 +-
 app/views/manga/details.php                        | 6 +++---
 app/views/manga/edit.php                           | 2 +-
 public/templates/anime-ajax-search-results.html    | 3 ++-
 public/templates/manga-ajax-search-results.html    | 3 ++-
 src/API/Kitsu/Transformer/MangaListTransformer.php | 1 +
 src/API/Kitsu/Transformer/MangaTransformer.php     | 7 ++++---
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/views/manga/cover.php b/app/views/manga/cover.php
index fc4fa9ad..e334ba74 100644
--- a/app/views/manga/cover.php
+++ b/app/views/manga/cover.php
@@ -17,7 +17,7 @@
 						<?php /* <button class="plus_one_volume">+1 Volume</button> */ ?>
 					</div>
 					<?php endif ?>
-					<img src="<?= $escape->attr($item['manga']['image']) ?>" />
+					<img src="<?= $urlGenerator->assetUrl('images/manga', "{$item['manga']['id']}.jpg") ?>" />
 					<div class="name">
 						<a href="<?= $url->generate('manga.details', ['id' => $item['manga']['slug']]) ?>">
 						<?= $escape->html(array_shift($item['manga']['titles'])) ?>
diff --git a/app/views/manga/details.php b/app/views/manga/details.php
index a4dbf48d..7faeb5d6 100644
--- a/app/views/manga/details.php
+++ b/app/views/manga/details.php
@@ -1,7 +1,7 @@
 <main class="details fixed">
 	<section class="flex flex-no-wrap">
 		<div>
-			<img class="cover" src="<?= $data['cover_image'] ?>" alt="<?= $data['title'] ?> cover image" />
+			<img class="cover" src="<?= $urlGenerator->assetUrl('images/manga', "{$data['id']}.jpg") ?>" alt="<?= $data['title'] ?> cover image" />
 			<br />
 			<br />
 			<table>
@@ -39,7 +39,7 @@
 	<?php if (count($characters) > 0): ?>
 	<h2>Characters</h2>
 	<section class="media-wrap">
-	<?php foreach($characters as $char): ?>
+	<?php foreach($characters as $id => $char): ?>
 		<?php if ( ! empty($char['image']['original'])): ?>
 		<article class="character">
 			<?php $link = $url->generate('character', ['slug' => $char['slug']]) ?>
@@ -47,7 +47,7 @@
 				<?= $helper->a($link, $char['name']); ?>
 			</div>
 			<a href="<?= $link ?>">
-			<?= $helper->img($char['image']['original'], [
+			<?= $helper->img($urlGenerator->assetUrl('images/characters', "{$id}.jpg"), [
 				'width' => '225'
 			]) ?>
 			</a>
diff --git a/app/views/manga/edit.php b/app/views/manga/edit.php
index 22bf95ca..14105b2e 100644
--- a/app/views/manga/edit.php
+++ b/app/views/manga/edit.php
@@ -15,7 +15,7 @@
                     </th>
 					<th>
 						<article class="media">
-							<?= $helper->img($item['manga']['image']); ?>
+							<?= $helper->img($urlGenerator->assetUrl('images/manga', "{$item['manga']['id']}.jpg")); ?>
 						</article>
 					</th>
 				</tr>
diff --git a/public/templates/anime-ajax-search-results.html b/public/templates/anime-ajax-search-results.html
index c5a64562..3e9f5682 100644
--- a/public/templates/anime-ajax-search-results.html
+++ b/public/templates/anime-ajax-search-results.html
@@ -1,8 +1,9 @@
 {{#data}}
 <article class="media search">
-	<div class="name" style="background-image:url({{attributes.posterImage.small}})">
+	<div class="name">
 		<input type="radio" class="big-check" id="{{attributes.slug}}" name="id" value="{{id}}" />
 		<label for="{{attributes.slug}}">
+			<img src="/public/images/anime/{{id}}.jpg" alt="" width="220" />
 			<span class="name">
 				{{attributes.canonicalTitle}}
 				<br />
diff --git a/public/templates/manga-ajax-search-results.html b/public/templates/manga-ajax-search-results.html
index c5a64562..346772c7 100644
--- a/public/templates/manga-ajax-search-results.html
+++ b/public/templates/manga-ajax-search-results.html
@@ -1,8 +1,9 @@
 {{#data}}
 <article class="media search">
-	<div class="name" style="background-image:url({{attributes.posterImage.small}})">
+	<div class="name">
 		<input type="radio" class="big-check" id="{{attributes.slug}}" name="id" value="{{id}}" />
 		<label for="{{attributes.slug}}">
+			<img src="/public/images/manga/{{id}}.jpg" alt="" width="220" />
 			<span class="name">
 				{{attributes.canonicalTitle}}
 				<br />
diff --git a/src/API/Kitsu/Transformer/MangaListTransformer.php b/src/API/Kitsu/Transformer/MangaListTransformer.php
index d241c4a4..54106f63 100644
--- a/src/API/Kitsu/Transformer/MangaListTransformer.php
+++ b/src/API/Kitsu/Transformer/MangaListTransformer.php
@@ -84,6 +84,7 @@ class MangaListTransformer extends AbstractTransformer {
 				'total' => $totalVolumes
 			],
 			'manga' => [
+				'id' => $mangaId,
 				'titles' => Kitsu::filterTitles($manga),
 				'alternate_title' => NULL,
 				'slug' => $manga['slug'],
diff --git a/src/API/Kitsu/Transformer/MangaTransformer.php b/src/API/Kitsu/Transformer/MangaTransformer.php
index 94de2ca8..2b466c1b 100644
--- a/src/API/Kitsu/Transformer/MangaTransformer.php
+++ b/src/API/Kitsu/Transformer/MangaTransformer.php
@@ -33,7 +33,7 @@ class MangaTransformer extends AbstractTransformer {
 	public function transform($item)
 	{
 		$genres = [];
-		
+
 		foreach($item['included'] as $included)
 		{
 			if ($included['type'] === 'genres')
@@ -41,10 +41,11 @@ class MangaTransformer extends AbstractTransformer {
 				$genres[] = $included['attributes']['name'];
 			}
 		}
-		
+
 		sort($genres);
-		
+
 		return [
+			'id' => $item['id'],
 			'title' => $item['canonicalTitle'],
 			'en_title' => $item['titles']['en'],
 			'jp_title' => $item['titles']['en_jp'],