').html(response.replace(rscript, "")).find(selector)
+ : response)
+ callback && callback.apply(self, arguments)
+ }
+ $.ajax(options)
+ return this
+ }
+
+ var escape = encodeURIComponent
+
+ function serialize(params, obj, traditional, scope){
+ var type, array = $.isArray(obj), hash = $.isPlainObject(obj)
+ $.each(obj, function(key, value) {
+ type = $.type(value)
+ if (scope) key = traditional ? scope :
+ scope + '[' + (hash || type == 'object' || type == 'array' ? key : '') + ']'
+ // handle data in serializeArray() format
+ if (!scope && array) params.add(value.name, value.value)
+ // recurse into nested objects
+ else if (type == "array" || (!traditional && type == "object"))
+ serialize(params, value, traditional, key)
+ else params.add(key, value)
+ })
+ }
+
+ $.param = function(obj, traditional){
+ var params = []
+ params.add = function(key, value) {
+ if ($.isFunction(value)) value = value()
+ if (value == null) value = ""
+ this.push(escape(key) + '=' + escape(value))
+ }
+ serialize(params, obj, traditional)
+ return params.join('&').replace(/%20/g, '+')
+ }
+})(Zepto)
+
+;(function($){
+ $.fn.serializeArray = function() {
+ var name, type, result = [],
+ add = function(value) {
+ if (value.forEach) return value.forEach(add)
+ result.push({ name: name, value: value })
+ }
+ if (this[0]) $.each(this[0].elements, function(_, field){
+ type = field.type, name = field.name
+ if (name && field.nodeName.toLowerCase() != 'fieldset' &&
+ !field.disabled && type != 'submit' && type != 'reset' && type != 'button' && type != 'file' &&
+ ((type != 'radio' && type != 'checkbox') || field.checked))
+ add($(field).val())
+ })
+ return result
+ }
+
+ $.fn.serialize = function(){
+ var result = []
+ this.serializeArray().forEach(function(elm){
+ result.push(encodeURIComponent(elm.name) + '=' + encodeURIComponent(elm.value))
+ })
+ return result.join('&')
+ }
+
+ $.fn.submit = function(callback) {
+ if (0 in arguments) this.bind('submit', callback)
+ else if (this.length) {
+ var event = $.Event('submit')
+ this.eq(0).trigger(event)
+ if (!event.isDefaultPrevented()) this.get(0).submit()
+ }
+ return this
+ }
+
+})(Zepto)
diff --git a/public/js/manga_collection.js b/public/js/manga_collection.js
new file mode 100644
index 00000000..94614874
--- /dev/null
+++ b/public/js/manga_collection.js
@@ -0,0 +1,26 @@
+(($, AnimeClient) => {
+
+ 'use strict';
+
+ const search = (tempHtml, query) => {
+ $('.cssload-loader').removeAttr('hidden');
+ $.get(AnimeClient.url('/manga/search'), {'query':query,}, (searchResults, status) => {
+ $('.cssload-loader').attr('hidden', 'hidden');
+
+ Mustache.parse(tempHtml);
+ $('#series_list').html(Mustache.render(tempHtml, searchResults));
+ });
+ };
+
+ $.get('/public/templates/manga-ajax-search-results.html', tempHtml => {
+ $('#search').on('keyup', AnimeClient.throttle(250, function(e) {
+ let query = encodeURIComponent($(this).val());
+ if (query === '') {
+ return;
+ }
+
+ search(tempHtml, query);
+ }));
+ });
+
+})(Zepto, AnimeClient);
\ No newline at end of file
diff --git a/public/js/manga_edit.js b/public/js/manga_edit.js
index bd67089e..e943b1f9 100755
--- a/public/js/manga_edit.js
+++ b/public/js/manga_edit.js
@@ -1,20 +1,20 @@
/**
* Javascript for editing manga, if logged in
*/
-(($, AnimeClient, w) => {
+(($, AnimeClient) => {
'use strict';
- $('body.manga.list').on('click', '.edit_buttons button', function(e) {
+ $('.manga.list').on('click', '.edit_buttons button', function(e) {
let this_sel = $(this);
let parent_sel = $(this).closest("article");
let manga_id = parent_sel.attr("id").replace("manga-", "");
let type = this_sel.is(".plus_one_chapter") ? 'chapter' : 'volume';
let completed = parseInt(parent_sel.find(`.${type}s_read`).text(), 10);
let total = parseInt(parent_sel.find(`.${type}_count`).text(), 10);
+ let manga_name = parent_sel.find('.name').html();
- if (isNaN(completed))
- {
+ if (isNaN(completed)) {
completed = 0;
}
@@ -28,18 +28,20 @@
$.ajax({
data: data,
dataType: 'json',
- method: 'POST',
+ type: 'POST',
mimeType: 'application/json',
url: AnimeClient.url('/manga/update'),
- }).done((res) => {
- parent_sel.find(`.${type}s_read`).text(completed);
- AnimeClient.showMessage('success', `Sucessfully updated ${res.body.manga[0].romaji_title}`);
-
- // scroll to top
- w.scroll(0,0);
- }).fail(() => {
- AnimeClient.showMessage('error', `Failed to updated ${res.body.manga[0].romaji_title}`);
+ success: (res, status) => {
+ parent_sel.find(`.${type}s_read`).text(completed);
+ AnimeClient.showMessage('success', `Sucessfully updated ${manga_name}`);
+ AnimeClient.scrollToTop();
+ },
+ error: (xhr, errorType, error) => {
+ console.error(error);
+ AnimeClient.showMessage('error', `Failed to updated ${manga_name}`);
+ AnimeClient.scrollToTop();
+ }
});
});
-})(jQuery, AnimeClient, window);
\ No newline at end of file
+})(Zepto, AnimeClient);
\ No newline at end of file
diff --git a/public/templates/ajax-search-results.html b/public/templates/anime-ajax-search-results.html
similarity index 100%
rename from public/templates/ajax-search-results.html
rename to public/templates/anime-ajax-search-results.html
diff --git a/public/templates/manga-ajax-search-results.html b/public/templates/manga-ajax-search-results.html
new file mode 100644
index 00000000..25594c2b
--- /dev/null
+++ b/public/templates/manga-ajax-search-results.html
@@ -0,0 +1,10 @@
+{{#search}}
+
+
+
+
+
+
+{{/search}}
\ No newline at end of file
diff --git a/src/Aviat/AnimeClient/Controller.php b/src/Aviat/AnimeClient/Controller.php
index 5344e75b..3651d0e0 100644
--- a/src/Aviat/AnimeClient/Controller.php
+++ b/src/Aviat/AnimeClient/Controller.php
@@ -382,11 +382,13 @@ class Controller {
* Output a JSON Response
*
* @param mixed $data
+ * @param int $code - the http status code
* @return void
*/
- protected function outputJSON($data = [])
+ protected function outputJSON($data = [], $code = 200)
{
$view = new JsonView($this->container);
+ $view->setStatusCode($code);
$view->setOutput($data);
}
diff --git a/src/Aviat/AnimeClient/Controller/Anime.php b/src/Aviat/AnimeClient/Controller/Anime.php
index 9ac478df..c1084185 100644
--- a/src/Aviat/AnimeClient/Controller/Anime.php
+++ b/src/Aviat/AnimeClient/Controller/Anime.php
@@ -249,11 +249,8 @@ class Anime extends BaseController {
*/
public function update()
{
- $this->outputJSON(
- $this->model->update(
- $this->request->post->get()
- )
- );
+ $response = $this->model->update($this->request->post->get());
+ $this->outputJSON($response['body'], $response['statusCode']);
}
/**
diff --git a/src/Aviat/AnimeClient/Controller/Manga.php b/src/Aviat/AnimeClient/Controller/Manga.php
index 8ddfb69d..c893ca8c 100644
--- a/src/Aviat/AnimeClient/Controller/Manga.php
+++ b/src/Aviat/AnimeClient/Controller/Manga.php
@@ -91,6 +91,61 @@ class Manga extends Controller {
]);
}
+ /**
+ * Form to add an manga
+ *
+ * @return void
+ */
+ public function add_form()
+ {
+ $raw_status_list = MangaReadingStatus::getConstList();
+
+ $statuses = [];
+
+ foreach ($raw_status_list as $status_item)
+ {
+ $statuses[$status_item] = (string)$this->string($status_item)
+ ->underscored()
+ ->humanize()
+ ->titleize();
+ }
+
+ $this->set_session_redirect();
+ $this->outputHTML('manga/add', [
+ 'title' => $this->config->get('whose_list') .
+ "'s Manga List · Add",
+ 'action_url' => $this->urlGenerator->url('manga/add'),
+ 'status_list' => $statuses
+ ]);
+ }
+
+ /**
+ * Add an manga to the list
+ *
+ * @return void
+ */
+ public function add()
+ {
+ $data = $this->request->post->get();
+ if ( ! array_key_exists('id', $data))
+ {
+ $this->redirect("manga/add", 303);
+ }
+
+ $result = $this->model->add($data);
+
+ if ($result['statusCode'] >= 200 && $result['statusCode'] < 300)
+ {
+ $this->set_flash_message('Added new manga to list', 'success');
+ }
+ else
+ {
+ $this->set_flash_message('Failed to add new manga to list' . $result['body'] , 'error');
+ }
+
+ $this->session_redirect();
+ }
+
/**
* Show the manga edit form
*
@@ -113,6 +168,18 @@ class Manga extends Controller {
]);
}
+ /**
+ * Search for a manga to add to the list
+ *
+ * @param string $query
+ * @return void
+ */
+ public function search()
+ {
+ $query = $this->request->query->get('query');
+ $this->outputJSON($this->model->search($query));
+ }
+
/**
* Update an anime item via a form submission
*
@@ -141,7 +208,7 @@ class Manga extends Controller {
}
else
{
- $this->set_flash_message('Failed to update anime.', 'error');
+ $this->set_flash_message('Failed to update manga.', 'error');
}
$this->session_redirect();
@@ -154,7 +221,8 @@ class Manga extends Controller {
*/
public function update()
{
- $this->outputJSON($this->model->update($this->request->post->get()));
+ $result = $this->model->update($this->request->post->get());
+ $this->outputJSON($result['body'], $result['statusCode']);
}
}
// End of MangaController.php
\ No newline at end of file
diff --git a/src/Aviat/AnimeClient/Model/Manga.php b/src/Aviat/AnimeClient/Model/Manga.php
index a34475c1..7f6f44fe 100644
--- a/src/Aviat/AnimeClient/Model/Manga.php
+++ b/src/Aviat/AnimeClient/Model/Manga.php
@@ -50,6 +50,49 @@ class Manga extends API {
*/
protected $base_url = "https://hummingbird.me/";
+ protected function _auth_json_call($type, $url, $json)
+ {
+ $token = $this->container->get('auth')
+ ->get_auth_token();
+
+ // Set the token cookie, with the authentication token
+ // from the auth class.
+ $cookieJar = $this->cookieJar;
+ $cookie_data = new SetCookie([
+ 'Name' => 'token',
+ 'Value' => $token,
+ 'Domain' => 'hummingbird.me'
+ ]);
+ $cookieJar->setCookie($cookie_data);
+
+ $result = $this->client->request(strtoupper($type), $url, [
+ 'cookies' => $cookieJar,
+ 'json' => $json
+ ]);
+
+ return [
+ 'statusCode' => $result->getStatusCode(),
+ 'body' => $result->getBody()
+ ];
+ }
+
+ /**
+ * Add a manga to the list
+ *
+ * @param array $data
+ */
+ public function add($data)
+ {
+ $object = [
+ 'manga_library_entry' => [
+ 'status' => $data['status'],
+ 'manga_id' => $data['id']
+ ]
+ ];
+
+ return $this->_auth_json_call('post', 'manga_library_entries', $object);
+ }
+
/**
* Update the selected manga
*
@@ -60,6 +103,23 @@ class Manga extends API {
{
$id = $data['id'];
+ return $this->_auth_json_call(
+ 'put',
+ "manga_library_entries/{$id}",
+ ['manga_library_entry' => $data]
+ );
+ }
+
+ /**
+ * Delete a manga entry
+ *
+ * @param array $data
+ * @return array
+ */
+ public function delete($data)
+ {
+ $id = $data['id'];
+
$token = $this->container->get('auth')
->get_auth_token();
@@ -73,17 +133,47 @@ class Manga extends API {
]);
$cookieJar->setCookie($cookie_data);
- $result = $this->put("manga_library_entries/{$id}", [
+ $result = $this->delete("manga_library_entries/{$id}", [
'cookies' => $cookieJar,
- 'json' => ['manga_library_entry' => $data]
]);
return [
'statusCode' => $result->getStatusCode(),
- 'body' => Json::decode($result->getBody(), TRUE)
+ 'body' => $result->getBody()
];
}
+ /**
+ * Search for manga by name
+ *
+ * @param string $name
+ * @return array
+ */
+ public function search($name)
+ {
+ $logger = $this->container->getLogger('default');
+
+ $config = [
+ 'query' => [
+ 'scope' => 'manga',
+ 'depth' => 'full',
+ 'query' => $name
+ ]
+ ];
+
+ $response = $this->get('search.json', $config);
+
+ if ($response->getStatusCode() != 200)
+ {
+ $logger->warning("Non 200 response for search api call");
+ $logger->warning($response->getBody());
+
+ throw new RuntimeException($response->getEffectiveUrl());
+ }
+
+ return Json::decode($response->getBody(), TRUE);
+ }
+
/**
* Get the full set of anime lists
*