timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

4.1 Beta...ish #12

Merged
timw4mail merged 88 commits from develop into master 2018-11-05 13:15:59 -05:00
Conversation 0 Commits 88 Files Changed 260 +14 -11
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7a2bb1ba05 - Show all commits

2
app/appConf/base_config.php
View File

@ -33,7 +33,7 @@ return array_merge($tomlConfig, [
// Routing defaults // Routing defaults
'asset_path' => '/public', 'asset_path' => '/public',
'default_list' => 'anime', 'default_list' => 'anime', //anime|manga
'default_anime_list_path' => 'watching', // watching|plan_to_watch|on_hold|dropped|completed|all 'default_anime_list_path' => 'watching', // watching|plan_to_watch|on_hold|dropped|completed|all
'default_manga_list_path' => 'reading', // reading|plan_to_read|on_hold|dropped|completed|all 'default_manga_list_path' => 'reading', // reading|plan_to_read|on_hold|dropped|completed|all
'default_view_type' => 'cover_view', // cover_view|list_view 'default_view_type' => 'cover_view', // cover_view|list_view

4
app/views/settings.php
View File

@ -17,7 +17,7 @@ $nestedPrefix = 'config';
?> ?>
<form action="<?= $url->generate('settings-post') ?>" method="POST"> <form action="<?= $url->generate('settings-post') ?>" method="POST">
<main class='form'> <main class='settings form'>
<button type="submit">Save Changes</button> <button type="submit">Save Changes</button>
<div class="tabs"> <div class="tabs">
<?php $i = 0; ?> <?php $i = 0; ?>
@ -33,7 +33,7 @@ $nestedPrefix = 'config';
<?php $i++; ?> <?php $i++; ?>
<?php endforeach ?> <?php endforeach ?>
</div> </div>
<hr /> <br />
<?php foreach ($hiddenFields as $field): ?> <?php foreach ($hiddenFields as $field): ?>
<?= $field ?> <?= $field ?>
<?php endforeach ?> <?php endforeach ?>

2
public/css/app.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
public/css/base.css
View File

@ -921,3 +921,11 @@ CSS Tabs
} }
} }
/* ----------------------------------------------------------------------------
Settings Form
-----------------------------------------------------------------------------*/
.settings.form .content article {
margin: 1em;
display: inline-block;
width: auto;
}

7
src/Command/SyncLists.php
View File

@ -330,7 +330,6 @@ final class SyncLists extends BaseCommand {
if (array_key_exists($malId, $anilistList)) if (array_key_exists($malId, $anilistList))
{ {
$anilistItem = $anilistList[$malId]; $anilistItem = $anilistList[$malId];
// dump($anilistItem);
$item = $this->compareListItems($kitsuItem, $anilistItem); $item = $this->compareListItems($kitsuItem, $anilistItem);
@ -426,7 +425,7 @@ final class SyncLists extends BaseCommand {
$sameNotes = $diff['notes'] === 0; $sameNotes = $diff['notes'] === 0;
$sameStatus = $diff['status'] === 0; $sameStatus = $diff['status'] === 0;
$sameProgress = $diff['progress'] === 0; $sameProgress = $diff['progress'] === 0;
$sameRating = $diff['ratingTwenty'] === 0; $sameRating = $diff['rating'] === 0;
$sameRewatchCount = $diff['reconsumeCount'] === 0; $sameRewatchCount = $diff['reconsumeCount'] === 0;
// If an item is completed, make sure the 'reconsuming' flag is false // If an item is completed, make sure the 'reconsuming' flag is false
@ -538,8 +537,6 @@ final class SyncLists extends BaseCommand {
} }
} }
$return['meta'] = [ $return['meta'] = [
'kitsu' => $kitsuItem['data'], 'kitsu' => $kitsuItem['data'],
'anilist' => $anilistItem['data'], 'anilist' => $anilistItem['data'],
@ -567,8 +564,6 @@ final class SyncLists extends BaseCommand {
$return['data']['data'] = array_merge($prevData, $return['data']['data']); $return['data']['data'] = array_merge($prevData, $return['data']['data']);
} }
dump($return);
return $return; return $return;
} }

2
src/Controller.php
View File

@ -312,7 +312,7 @@ class Controller {
*/ */
public function redirectToDefaultRoute(): void public function redirectToDefaultRoute(): void
{ {
$defaultType = $this->config->get('default_list') ?? 'anime'; $defaultType = $this->config->get('default_list');
$this->redirect($this->urlGenerator->defaultUrl($defaultType), 303); $this->redirect($this->urlGenerator->defaultUrl($defaultType), 303);
} }