From 3098fef20c5f87673896decca34d07af91f9a624 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Fri, 5 Oct 2018 14:27:07 -0400 Subject: [PATCH] Merge config.toml and route_config.toml --- app/appConf/base_config.php | 7 +++++++ app/appConf/route_config.toml | 19 ------------------- app/config/cache.toml.example | 2 +- app/config/config.toml.example | 18 ++++++++++++++++++ app/config/database.toml.example | 1 - app/config/route_config.toml.example | 17 ----------------- src/Command/SyncLists.php | 1 - 7 files changed, 26 insertions(+), 39 deletions(-) delete mode 100644 app/appConf/route_config.toml delete mode 100644 app/config/route_config.toml.example diff --git a/app/appConf/base_config.php b/app/appConf/base_config.php index 5811421c..8106dbd4 100644 --- a/app/appConf/base_config.php +++ b/app/appConf/base_config.php @@ -31,6 +31,13 @@ return array_merge($tomlConfig, [ 'base_config_dir' => __DIR__, 'config_dir' => "{$APP_DIR}/config", + // Routing defaults + 'asset_path' => '/public', + 'default_list' => 'anime', + '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_view_type' => 'cover_view', // cover_view|list_view + // Template file path 'view_path' => "{$APP_DIR}/views", diff --git a/app/appConf/route_config.toml b/app/appConf/route_config.toml deleted file mode 100644 index 74191a89..00000000 --- a/app/appConf/route_config.toml +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# Route config -# -# Default views and paths -################################################################################ - -# Path to public directory, where images/css/javascript are located, -# appended to the url -asset_path = "/public" - -# Which list should be the default? -default_list = "anime" # anime or manga - -# Default pages for anime/manga -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 view type (cover_view/list_view) -default_view_type = "cover_view" \ No newline at end of file diff --git a/app/config/cache.toml.example b/app/config/cache.toml.example index 50e19777..7efacce5 100644 --- a/app/config/cache.toml.example +++ b/app/config/cache.toml.example @@ -2,7 +2,7 @@ # Cache Setup # ################################################################################ -# See https://git.timshomepage.net/timw4mail/banker for more information +# See https://git.timshomepage.net/aviat/banker for more information # Available drivers are apcu, memcache, memcached, redis or null # Null cache driver means no caching diff --git a/app/config/config.toml.example b/app/config/config.toml.example index d70bb34a..92626f73 100644 --- a/app/config/config.toml.example +++ b/app/config/config.toml.example @@ -10,3 +10,21 @@ whose_list = "Tim" # do you wish to show the anime collection? show_anime_collection = true + +# do you wish to show the manga collection? +show_manga_collection = false + +################################################################################ +# Default views and paths +################################################################################ + +# Path to public directory, where images/css/javascript are located, +# appended to the url +asset_path = "/public" + +# Which list should be the default? +default_list = "anime" # anime or manga + +# Default pages for anime/manga +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 \ No newline at end of file diff --git a/app/config/database.toml.example b/app/config/database.toml.example index d80fcf05..d71eb9fb 100644 --- a/app/config/database.toml.example +++ b/app/config/database.toml.example @@ -2,7 +2,6 @@ # Database Configuration # ################################################################################ -[collection] type = "sqlite" host = "" user = "" diff --git a/app/config/route_config.toml.example b/app/config/route_config.toml.example deleted file mode 100644 index e5fabdfe..00000000 --- a/app/config/route_config.toml.example +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# Route config -# -# Default views and paths -################################################################################ - -# Path to public directory, where images/css/javascript are located, -# appended to the url -asset_path = "/public" - -# Which list should be the default? -default_list = "anime" # anime or manga - -# Default pages for anime/manga -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 - diff --git a/src/Command/SyncLists.php b/src/Command/SyncLists.php index 68a84d95..96affa8f 100644 --- a/src/Command/SyncLists.php +++ b/src/Command/SyncLists.php @@ -19,7 +19,6 @@ namespace Aviat\AnimeClient\Command; use Aviat\AnimeClient\API\{ FailedResponseException, JsonAPI, - Kitsu\Transformer\MangaListTransformer, ParallelAPIRequest }; use Aviat\AnimeClient\API\Anilist\Transformer\{