diff --git a/app/base/BaseApiModel.php b/app/base/BaseApiModel.php index f8ddda9f..89e15e5a 100644 --- a/app/base/BaseApiModel.php +++ b/app/base/BaseApiModel.php @@ -44,5 +44,30 @@ class BaseApiModel extends BaseModel { ] ]); } + + /** + * Attempt login via the api + * + * @param string $username + * @param string $password + * @return bool + */ + public function authenticate($username, $password) + { + $result = $this->client->post('https://hummingbird.me/api/v1/users/authenticate', [ + 'body' => [ + 'username' => $this->config->hummingbird_username, + 'password' => $password + ] + ]); + + if ($result->getStatusCode() === 201) + { + $_SESSION['hummingbird_anime_token'] = $result->json(); + return TRUE; + } + + return FALSE; + } } // End of BaseApiModel.php \ No newline at end of file diff --git a/app/base/BaseController.php b/app/base/BaseController.php index 73c7d48b..22418802 100644 --- a/app/base/BaseController.php +++ b/app/base/BaseController.php @@ -3,6 +3,8 @@ * Base Controller */ +use Aura\Web\WebFactory; + /** * Base class for controllers, defines output methods */ @@ -14,6 +16,18 @@ class BaseController { */ protected $config; + /** + * Request object + * @var object $request + */ + protected $request; + + /** + * Response object + * @var object $response + */ + protected $response; + /** * Constructor */ @@ -21,17 +35,37 @@ class BaseController { { global $config; $this->config = $config; + + $web_factory = new WebFactory([ + '_GET' => $_GET, + '_POST' => $_POST, + '_COOKIE' => $_COOKIE, + '_SERVER' => $_SERVER, + '_FILES' => $_FILES + ]); + $this->request = $web_factory->newRequest(); + $this->response = $web_factory->newResponse(); + } + + public function __destruct() + { + $this->output(); } /** - * Output a template to HTML, using the provided data + * Get the string output of a partial template * * @param string $template * @param array|object $data - * @return void + * @return string */ - public function outputHTML($template, $data=[]) + public function load_partial($template, $data=[]) { + if (isset($this->base_data)) + { + $data = array_merge($this->base_data, $data); + } + global $router, $defaultHandler; $route = $router->get_route(); $data['route_path'] = ($route) ? $router->get_route()->path : ""; @@ -54,9 +88,22 @@ class BaseController { $buffer = ob_get_contents(); ob_end_clean(); - header("Content-type: text/html;charset=utf-8"); - echo $buffer; - die(); + return $buffer; + } + + /** + * Output a template to HTML, using the provided data + * + * @param string $template + * @param array|object $data + * @return void + */ + public function outputHTML($template, $data=[]) + { + $buffer = $this->load_partial($template, $data); + + $this->response->content->setType('text/html'); + $this->response->content->set($buffer); } /** @@ -72,8 +119,8 @@ class BaseController { $data = json_encode($data); } - header("Content-type: application/json"); - echo $data; + $this->response->content->setType('application/json'); + $this->response->content->set($data); } /** @@ -95,7 +142,21 @@ class BaseController { header("HTTP/1.1 {$code} {$codes[$code]}"); header("Location: {$url}"); - die(); + } + + /** + * Add a message box to the page + * + * @param string $type + * @param string $message + * @return string + */ + public function show_message($type, $message) + { + return $this->load_partial('message', [ + 'stat_class' => $type, + 'message' => $message + ]); } /** @@ -106,7 +167,71 @@ class BaseController { public function logout() { session_destroy(); - $this->redirect(''); + $this->response->redirect->seeOther(full_url('')); + } + + /** + * Show the login form + * + * @param string $status + * @return void + */ + public function login($status="") + { + $message = ""; + + if ($status != "") + { + $message = $this->show_message('error', $status); + } + + $this->outputHTML('login', [ + 'title' => 'Api login', + 'message' => $message + ]); + } + + /** + * Attempt to log in with the api + * + * @return void + */ + public function login_action() + { + if ($this->model->authenticate($this->config->hummingbird_username, $this->request->post->get('password'))) + { + $this->response->redirect->afterPost(full_url('', $this->base_data['url_type'])); + $this->output(); + return; + } + + $this->login("Invalid username or password."); + } + + /** + * Send the appropriate response + * + * @return void + */ + private function output() + { + // send status + header($this->response->status->get(), true, $this->response->status->getCode()); + + // headers + foreach($this->response->headers->get() as $label => $value) + { + header("{$label}: {$value}"); + } + + // cookies + foreach($this->response->cookies->get() as $name => $cookie) + { + setcookie($name, $cookie['value'], $cookie['expire'], $cookie['path'], $cookie['domain'], $cookie['secure'], $cookie['httponly']); + } + + // send the actual response + echo $this->response->content->get(); } } // End of BaseController.php \ No newline at end of file diff --git a/app/base/Router.php b/app/base/Router.php index f9179550..f6bbdb10 100644 --- a/app/base/Router.php +++ b/app/base/Router.php @@ -119,6 +119,10 @@ class Router { */ private function _setup_routes() { + $route_map = [ + 'anime' => 'AnimeController', + 'manga' => 'MangaController', + ]; $route_type = "anime"; if ($this->config->manga_host !== "" && strpos($_SERVER['HTTP_HOST'], $this->config->manga_host) !== FALSE) @@ -132,39 +136,33 @@ class Router { $routes = $this->config->routes; - // Add routes for the current controller - foreach($routes[$route_type] as $name => $route) + // Add routes + foreach(['common', $route_type] as $key) { - $path = $route['path']; - unset($route['path']); - - if ( ! array_key_exists('tokens', $route)) - { - $this->router->add($name, $path)->addValues($route); - } - else - { - $tokens = $route['tokens']; - unset($route['tokens']); - - $this->router->add($name, $path) - ->addValues($route) - ->addTokens($tokens); - } - } - - // Add routes by required http verb - foreach(['get', 'post'] as $verb) - { - $add = "add" . ucfirst($verb); - - foreach($routes[$verb] as $name => $route) + foreach($routes[$key] as $name => &$route) { $path = $route['path']; unset($route['path']); - $this->router->$add($name, $path) - ->addValues($route); + // Prepend the controller to the route parameters + array_unshift($route['action'], $route_map[$route_type]); + + // Select the appropriate router method based on the http verb + $add = (array_key_exists('verb', $route)) ? "add" . ucfirst(strtolower($route['verb'])) : "addGet"; + + if ( ! array_key_exists('tokens', $route)) + { + $this->router->$add($name, $path)->addValues($route); + } + else + { + $tokens = $route['tokens']; + unset($route['tokens']); + + $this->router->$add($name, $path) + ->addValues($route) + ->addTokens($tokens); + } } } } diff --git a/app/base/functions.php b/app/base/functions.php index bc326bd6..3d96fcdd 100644 --- a/app/base/functions.php +++ b/app/base/functions.php @@ -4,6 +4,16 @@ * Global functions */ +/** + * Check if the user is currently logged in + * + * @return bool + */ +function is_logged_in() +{ + return array_key_exists('hummingbird_anime_token', $_SESSION); +} + /** * HTML selection helper function * @@ -28,6 +38,44 @@ function is_not_selected($a, $b) return ($a !== $b) ? 'selected' : ''; } +/** + * Get the base url for css/js/images + * + * @param string $type - (optional) The controller + * @return string + */ + function asset_url(/*$type="anime"*,...*/) + { + global $config; + + $args = func_get_args(); + $base_url = rtrim($config->asset_path, '/'); + + array_unshift($args, $base_url); + + return implode("/", $args); + } + +/** + * Get the base url from the config + * + * @param string $type - (optional) The controller + * @return string + */ +function base_url($type="anime") +{ + global $config; + + $config_path = trim($config->{"{$type}_path"}, "/"); + $config_host = $config->{"{$type}_host"}; + + // Set the appropriate HTTP host + $host = ($config_host !== '') ? $config_host : $_SERVER['HTTP_HOST']; + $path = ($config_path !== '') ? $config_path : ""; + + return implode("/", ['/', $host, $path]); +} + /** * Generate full url path from the route path based on config * @@ -39,7 +87,7 @@ function full_url($path="", $type="anime") { global $config; - $config_path = $config->{"{$type}_path"}; + $config_path = trim($config->{"{$type}_path"}, "/"); $config_host = $config->{"{$type}_host"}; $config_default_route = $config->{"default_{$type}_path"}; @@ -50,6 +98,9 @@ function full_url($path="", $type="anime") // Remove any optional parameters from the route $path = preg_replace('`{/.*?}`i', '', $path); + // Set the appropriate HTTP host + $host = ($config_host !== '') ? $config_host : $_SERVER['HTTP_HOST']; + // Set the default view if ($path === '') { @@ -57,9 +108,6 @@ function full_url($path="", $type="anime") if ($config->default_to_list_view) $path .= '/list'; } - // Set the appropriate HTTP host - $host = ($config_host !== '') ? $config_host : $_SERVER['HTTP_HOST']; - // Set an leading folder if ($config_path !== '') { diff --git a/app/config/config.php b/app/config/config.php index 931be018..ef17b1e8 100644 --- a/app/config/config.php +++ b/app/config/config.php @@ -12,6 +12,9 @@ return (object)[ // do you wish to show the anime collection tab? 'show_anime_collection' => TRUE, + // path to public directory + 'asset_path' => '//' . $_SERVER['HTTP_HOST'] . '/public', + // ---------------------------------------------------------------------------- // Routing // diff --git a/app/config/routes.php b/app/config/routes.php index e2e201d5..3dac08b8 100644 --- a/app/config/routes.php +++ b/app/config/routes.php @@ -1,10 +1,33 @@ [ + 'update' => [ + 'path' => '/update', + 'action' => ['update'], + 'verb' => 'post' + ], + 'login_form' => [ + 'path' => '/login', + 'action' => ['login'], + 'verb' => 'get' + ], + 'login_action' => [ + 'path' => '/login', + 'action' => ['login_action'], + 'verb' => 'post' + ], + 'logout' => [ + 'path' => '/logout', + 'action' => ['logout'] + ], + ], + // Routes on anime controller 'anime' => [ 'index' => [ 'path' => '/', - 'action' => ['AnimeController', 'redirect'], + 'action' => ['redirect'], 'params' => [ 'url' => '', // Determined by config 'code' => '301' @@ -12,7 +35,7 @@ return [ ], 'all' => [ 'path' => '/all{/view}', - 'action' => ['AnimeController', 'anime_list'], + 'action' => ['anime_list'], 'params' => [ 'type' => 'all', 'title' => WHOSE . " Anime List · All" @@ -23,7 +46,7 @@ return [ ], 'watching' => [ 'path' => '/watching{/view}', - 'action' => ['AnimeController', 'anime_list'], + 'action' => ['anime_list'], 'params' => [ 'type' => 'currently-watching', 'title' => WHOSE . " Anime List · Watching" @@ -34,7 +57,7 @@ return [ ], 'plan_to_watch' => [ 'path' => '/plan_to_watch{/view}', - 'action' => ['AnimeController', 'anime_list'], + 'action' => ['anime_list'], 'params' => [ 'type' => 'plan-to-watch', 'title' => WHOSE . " Anime List · Plan to Watch" @@ -45,7 +68,7 @@ return [ ], 'on_hold' => [ 'path' => '/on_hold{/view}', - 'action' => ['AnimeController', 'anime_list'], + 'action' => ['anime_list'], 'params' => [ 'type' => 'on-hold', 'title' => WHOSE . " Anime List · On Hold" @@ -56,7 +79,7 @@ return [ ], 'dropped' => [ 'path' => '/dropped{/view}', - 'action' => ['AnimeController', 'anime_list'], + 'action' => ['anime_list'], 'params' => [ 'type' => 'dropped', 'title' => WHOSE . " Anime List · Dropped" @@ -67,7 +90,7 @@ return [ ], 'completed' => [ 'path' => '/completed{/view}', - 'action' => ['AnimeController', 'anime_list'], + 'action' => ['anime_list'], 'params' => [ 'type' => 'completed', 'title' => WHOSE . " Anime List · Completed" @@ -78,7 +101,7 @@ return [ ], 'collection' => [ 'path' => '/collection{/view}', - 'action' => ['AnimeController', 'collection'], + 'action' => ['collection'], 'params' => [], 'tokens' => [ 'view' => '[a-z_]+' @@ -88,7 +111,7 @@ return [ 'manga' => [ 'index' => [ 'path' => '/', - 'action' => ['MangaController', 'redirect'], + 'action' => ['redirect'], 'params' => [ 'url' => '', // Determined by config 'code' => '301', @@ -97,7 +120,7 @@ return [ ], 'all' => [ 'path' => '/all{/view}', - 'action' => ['MangaController', 'manga_list'], + 'action' => ['manga_list'], 'params' => [ 'type' => 'all', 'title' => WHOSE . " Manga List · All" @@ -108,7 +131,7 @@ return [ ], 'reading' => [ 'path' => '/reading{/view}', - 'action' => ['MangaController', 'manga_list'], + 'action' => ['manga_list'], 'params' => [ 'type' => 'Reading', 'title' => WHOSE . " Manga List · Reading" @@ -119,7 +142,7 @@ return [ ], 'plan_to_read' => [ 'path' => '/plan_to_read{/view}', - 'action' => ['MangaController', 'manga_list'], + 'action' => ['manga_list'], 'params' => [ 'type' => 'Plan to Read', 'title' => WHOSE . " Manga List · Plan to Read" @@ -130,7 +153,7 @@ return [ ], 'on_hold' => [ 'path' => '/on_hold{/view}', - 'action' => ['MangaController', 'manga_list'], + 'action' => ['manga_list'], 'params' => [ 'type' => 'On Hold', 'title' => WHOSE . " Manga List · On Hold" @@ -141,7 +164,7 @@ return [ ], 'dropped' => [ 'path' => '/dropped{/view}', - 'action' => ['MangaController', 'manga_list'], + 'action' => ['manga_list'], 'params' => [ 'type' => 'Dropped', 'title' => WHOSE . " Manga List · Dropped" @@ -152,7 +175,7 @@ return [ ], 'completed' => [ 'path' => '/completed{/view}', - 'action' => ['MangaController', 'manga_list'], + 'action' => ['manga_list'], 'params' => [ 'type' => 'Completed', 'title' => WHOSE . " Manga List · Completed" @@ -160,23 +183,6 @@ return [ 'tokens' => [ 'view' => '[a-z_]+' ] - ], - ], - // These routes are limited to a specific HTTP verb - 'get' => [ - 'login_form' => [ - 'path' => '/login', - 'action' => ['AnimeController', 'login'], - ], - 'logout' => [ - 'path' => '/logout', - 'action' => ['BaseController', 'logout'] - ] - ], - 'post' => [ - 'login_action' => [ - 'path' => '/login', - 'action' => ['AnimeController', 'login_action'], ] ] ]; \ No newline at end of file diff --git a/app/controllers/AnimeController.php b/app/controllers/AnimeController.php index bbd5505d..bf28264e 100644 --- a/app/controllers/AnimeController.php +++ b/app/controllers/AnimeController.php @@ -24,7 +24,7 @@ class AnimeController extends BaseController { * Data to ve sent to all routes in this controller * @var array $base_data */ - private $base_data; + protected $base_data; /** * Route mapping for main navigation @@ -55,6 +55,7 @@ class AnimeController extends BaseController { $this->model = new AnimeModel(); $this->collection_model = new AnimeCollectionModel(); $this->base_data = [ + 'message' => '', 'url_type' => 'anime', 'other_type' => 'manga', 'nav_routes' => $this->nav_routes, @@ -79,10 +80,10 @@ class AnimeController extends BaseController { ? $this->model->get_list($type) : $this->model->get_all_lists(); - $this->outputHTML('anime/' . $view_map[$view], array_merge($this->base_data, [ + $this->outputHTML('anime/' . $view_map[$view], [ 'title' => $title, 'sections' => $data - ])); + ]); } /** @@ -99,35 +100,20 @@ class AnimeController extends BaseController { $data = $this->collection_model->get_collection(); - $this->outputHTML('anime/' . $view_map[$view], array_merge($this->base_data, [ + $this->outputHTML('anime/' . $view_map[$view], [ 'title' => WHOSE . " Anime Collection", 'sections' => $data - ])); + ]); } /** - * Show the login form + * Update an anime item * - * @return void + * @return bool */ - public function login() + public function update() { - $this->outputHTML('login', array_merge($this->base_data, [ - 'title' => 'Api login' - ])); - } - - /** - * Attempt to log in with the api - * - * @return void - */ - public function login_action() - { - if ($this->model->authenticate($this->config->hummingbird_username, $_POST['password'])) - { - $this->redirect(''); - } + print_r($this->model->update($this->request->post->get())); } } // End of AnimeController.php \ No newline at end of file diff --git a/app/controllers/MangaController.php b/app/controllers/MangaController.php index 8039fd07..cd7f6c8f 100644 --- a/app/controllers/MangaController.php +++ b/app/controllers/MangaController.php @@ -12,7 +12,14 @@ class MangaController extends BaseController { * The manga model * @var object $model */ - private $model; + protected $model; + + /** + * Data to ve sent to all routes in this controller + * @var array $base_data + */ + protected $base_data; + /** * Route mapping for main navigation @@ -34,6 +41,21 @@ class MangaController extends BaseController { { parent::__construct(); $this->model = new MangaModel(); + $this->base_data = [ + 'url_type' => 'manga', + 'other_type' => 'anime', + 'nav_routes' => $this->nav_routes + ]; + } + + /** + * Update an anime item + * + * @return bool + */ + public function update() + { + $this->outputJSON($this->model->update($this->request->post->get())); } /** @@ -56,10 +78,7 @@ class MangaController extends BaseController { : $this->model->get_all_lists(); $this->outputHTML('manga/' . $view_map[$view], [ - 'url_type' => 'manga', - 'other_type' => 'anime', 'title' => $title, - 'nav_routes' => $this->nav_routes, 'sections' => $data ]); } diff --git a/app/models/AnimeModel.php b/app/models/AnimeModel.php index dc6499a7..af0221d7 100644 --- a/app/models/AnimeModel.php +++ b/app/models/AnimeModel.php @@ -22,28 +22,20 @@ class AnimeModel extends BaseApiModel { } /** - * Attempt login via the api + * Update the selected anime * - * @param string $username - * @param string $password - * @return bool + * @param array $data + * @return array */ - public function authenticate($username, $password) + public function update($data) { - $result = $this->client->post('users/authenticate', [ - 'form_params' => [ - 'username' => $this->config->hummingbird_username, - 'password' => $password - ] + $data['auth_token'] = $_SESSION['hummingbird_anime_token']; + + $result = $this->client->post("libraries/{$data['id']}", [ + 'body' => $data ]); - if ($response->getStatusCode() === 201) - { - $_SESSION['hummingbird_anime_token'] = $response->json(); - return TRUE; - } - - return FALSE; + return $result->json(); } /** @@ -123,6 +115,52 @@ class AnimeModel extends BaseApiModel { return $output; } + /** + * Get information about an anime from its id + * + * @param string $anime_id + * @return array + */ + public function get_anime($anime_id) + { + $config = [ + 'query' => [ + 'id' => $anime_id + ] + ]; + + $response = $this->client->get("anime/{$anime_id}", $config); + + return $response->json(); + } + + /** + * Search for anime by name + * + * @param string $name + * @return array + */ + public function search($name) + { + global $defaultHandler; + + $config = [ + 'query' => [ + 'query' => $name + ] + ]; + + $response = $this->client->get('search/anime', $config); + $defaultHandler->addDataTable('anime_search_response', (array)$response); + + if ($response->getStatusCode() != 200) + { + throw new Exception($response->getEffectiveUrl()); + } + + return $response->json(); + } + /** * Actually retreive the data from the api * @@ -182,52 +220,6 @@ class AnimeModel extends BaseApiModel { return $output; } - /** - * Get information about an anime from its id - * - * @param string $anime_id - * @return array - */ - public function get_anime($anime_id) - { - $config = [ - 'query' => [ - 'id' => $anime_id - ] - ]; - - $response = $this->client->get("anime/{$anime_id}", $config); - - return $response->json(); - } - - /** - * Search for anime by name - * - * @param string $name - * @return array - */ - public function search($name) - { - global $defaultHandler; - - $config = [ - 'query' => [ - 'query' => $name - ] - ]; - - $response = $this->client->get('search/anime', $config); - $defaultHandler->addDataTable('anime_search_response', (array)$response); - - if ($response->getStatusCode() != 200) - { - throw new Exception($response->getEffectiveUrl()); - } - - return $response->json(); - } - /** * Sort the list by title * diff --git a/app/models/MangaModel.php b/app/models/MangaModel.php index 9d00b629..05dfa1f6 100644 --- a/app/models/MangaModel.php +++ b/app/models/MangaModel.php @@ -21,6 +21,25 @@ class MangaModel extends BaseApiModel { parent::__construct(); } + /** + * Update the selected manga + * + * @param array $data + * @return array + */ + public function update($data) + { + $id = $data['id']; + unset($data['id']); + + $result = $this->client->put("manga_library_entries/{$id}", [ + 'cookies' => ['token' => $_SESSION['hummingbird_anime_token']], + 'json' => ['manga_library_entry' => $data] + ]); + + return $result->json(); + } + /** * Get the full set of anime lists * @@ -144,6 +163,8 @@ class MangaModel extends BaseApiModel { } } + //file_put_contents(_dir($this->config->data_cache_path, "manga-processed.json"), json_encode($data, JSON_PRETTY_PRINT)); + return (array_key_exists($status, $data)) ? $data[$status] : $data; } diff --git a/app/views/anime/cover.php b/app/views/anime/cover.php index 6d0de01d..e0ede9e5 100644 --- a/app/views/anime/cover.php +++ b/app/views/anime/cover.php @@ -4,17 +4,24 @@

-
+ + +
+ ({$item['anime']['alternate_title']})" : ""; ?> +
Rating: 0) ? (int)($item['rating']['value'] * 2) : " - " ?> / 10
-
Episodes:  / 
+
Episodes: + / + +
@@ -23,9 +30,11 @@
-
+ + + diff --git a/app/views/anime/list.php b/app/views/anime/list.php index 1594c85f..4a1c13ea 100644 --- a/app/views/anime/list.php +++ b/app/views/anime/list.php @@ -33,10 +33,4 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/views/header.php b/app/views/header.php index ce5e8e27..cf35cee6 100644 --- a/app/views/header.php +++ b/app/views/header.php @@ -2,8 +2,12 @@ <?= $title ?> - - + + +

["> List]

diff --git a/app/views/login.php b/app/views/login.php index fe3f5f7f..488f2a95 100644 --- a/app/views/login.php +++ b/app/views/login.php @@ -1,4 +1,5 @@
+
\ No newline at end of file + + + + \ No newline at end of file diff --git a/app/views/manga/list.php b/app/views/manga/list.php index 15c9ebf4..594a35df 100644 --- a/app/views/manga/list.php +++ b/app/views/manga/list.php @@ -31,10 +31,4 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/views/message.php b/app/views/message.php new file mode 100644 index 00000000..f77682fc --- /dev/null +++ b/app/views/message.php @@ -0,0 +1,5 @@ +
+ + + x +
\ No newline at end of file diff --git a/composer.json b/composer.json index 0e781e3d..49ee5c41 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,7 @@ "guzzlehttp/guzzle": "5.3.*", "filp/whoops": "1.1.*", "aura/router": "2.2.*", + "aura/web": "2.0.*", "aviat4ion/query": "2.0.*", "robmorgan/phinx": "*", "abeautifulsite/simpleimage": "*" diff --git a/public/config/config.php b/public/config/config.php new file mode 100644 index 00000000..0b3d3de4 --- /dev/null +++ b/public/config/config.php @@ -0,0 +1,71 @@ + array( + 'path/to/css/file1.css', + 'path/to/css/file2.css' + ), + */ + 'base' => [ + 'marx.css', + 'base.css' + ] +]; +// End of css_groups.php \ No newline at end of file diff --git a/public/config/js_groups.php b/public/config/js_groups.php new file mode 100644 index 00000000..3df263a4 --- /dev/null +++ b/public/config/js_groups.php @@ -0,0 +1,40 @@ + array( + 'path/to/js/file1.js', + 'path/to/js/file2.js' + ), + */ + 'table' => [ + 'lib/jquery.min.js', + 'lib/table_sorter/jquery.tablesorter.min.js', + 'sort_tables.js' + ], + 'edit' => [ + 'lib/jquery.min.js', + 'show_message.js', + 'anime_edit.js', + 'manga_edit.js' + ] +]; + +// End of js_groups.php \ No newline at end of file diff --git a/public/css.php b/public/css.php new file mode 100644 index 00000000..3e9f8a11 --- /dev/null +++ b/public/css.php @@ -0,0 +1,138 @@ + ')', + ') ' => ')', + ' }' => '}', + '} ' => '}', + ' {' => '{', + '{ ' => '{', + ', ' => ',', + ': ' => ':', + '; ' => ';', + ); + + //Eradicate every last space! + $buffer = trim(strtr($buffer, $replace)); + $buffer = str_replace('{ ', '{', $buffer); + $buffer = str_replace('} ', '}', $buffer); + + return $buffer; +} + +function get_last_modifed() +{ + global $groups, $css_root; + + $modified = array(); + + // Get all the css files, and concatenate them together + if(isset($groups[$_GET['g']])) + { + foreach($groups[$_GET['g']] as $file) + { + $new_file = realpath($css_root.$file); + $modified[] = filemtime($new_file); + } + } + + //Add myth css file for last modified check + $modified[] = filemtime(realpath("css/base.myth.css")); + + //Add this page for last modified check + $modified[] = filemtime(__FILE__); + + //Get the latest modified date + rsort($modified); + $last_modified = $modified[0]; + + return $last_modified; +} + +function get_css() +{ + global $groups, $path_from, $path_to, $css_root; + + $css = ''; + + if(isset($groups[$_GET['g']])) + { + foreach($groups[$_GET['g']] as $file) + { + $new_file = realpath($css_root.$file); + $css .= file_get_contents($new_file); + $modified[] = filemtime($new_file); + } + } + + // If not in debug mode, minify the css + if( ! isset($_GET['debug'])) + { + $css = compress($css); + } + + // Correct paths that have changed due to concatenation + // based on rules in the config file + $css = strtr($css, $path_from, $path_to); + + return $css; +} + +// -------------------------------------------------------------------------- +$last_modified = get_last_modifed(); + +$requested_time=(isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) + ? strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) + : 0; + +// Send 304 when not modified for faster response +if($last_modified === $requested_time) +{ + header("HTTP/1.1 304 Not Modified"); + exit(); +} +else // Re-compress after running myth +{ + $cmd = "/usr/bin/myth -c {$css_root}base.myth.css {$css_root}base.css"; + exec($cmd); +} + +//This GZIPs the CSS for transmission to the user +//making file size smaller and transfer rate quicker +ob_start("ob_gzhandler"); + +header("Content-Type: text/css; charset=utf8"); +header("Cache-control: public, max-age=691200, must-revalidate"); +header("Last-Modified: ".gmdate('D, d M Y H:i:s', $last_modified)." GMT"); +header("Expires: ".gmdate('D, d M Y H:i:s', (filemtime(basename(__FILE__)) + 691200))." GMT"); + +echo get_css(); + +ob_end_flush(); +//End of css.php \ No newline at end of file diff --git a/public/css/base.css b/public/css/base.css index 59acd785..b26ec005 100644 --- a/public/css/base.css +++ b/public/css/base.css @@ -1,187 +1,2 @@ -body { - margin: 0.5em; -} - -table { - width: 85%; - margin: 0 auto; -} - -tbody > tr:nth-child(odd) { - background: #ddd; -} - -.align_left { - text-align: left; -} - -.align_right { - text-align: right; -} - -.round_all { - border-radius: 0.5em; -} - -.round_top { - border-radius: 0; - border-top-right-radius: 0.5em; - border-top-left-radius: 0.5em; -} - -.round_bottom { - border-radius: 0; - border-bottom-right-radius: 0.5em; - border-bottom-left-radius: 0.5em; -} - -.media-wrap { - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-justify-content: center; - -ms-flex-pack: center; - justify-content: center; - -webkit-align-content: space-around; - -ms-flex-line-pack: distribute; - align-content: space-around; - -webkit-align-items: center; - -ms-flex-align: center; - align-items: center; - -webkit-flex-wrap: wrap; - -ms-flex-wrap: wrap; - flex-wrap: wrap; - text-align: center; - margin: 0 auto; -} - -.media { - position: relative; - vertical-align: top; - display: inline-block; - text-align: center; - width: 220px; - height: 319px; - margin: 0.25em; -} - -.name, -.media_metadata > div, -.medium_metadata > div, -.row { - text-shadow: 1px 2px 1px rgba(0, 0, 0, 0.85); - background: rgba(0, 0, 0, 0.45); - color: #ffffff; - padding: 0.25em; - text-align: right; -} - -.media_type, -.age_rating { - text-align: left; -} - -.media > .media_metadata { - position: absolute; - bottom: 0; - right: 0; -} - -.media > .medium_metadata { - position: absolute; - bottom: 0; - left: 0; -} - -.media > .name { - position: absolute; - top: 0; -} - -.media:hover > .name, -.media:hover > .media_metadata > div, -.media:hover > .medium_metadata > div, -.media:hover > .table .row { - background: rgba(0,0,0,0.75); -} - -.media > .name > a { - text-align: justify; - background: none; - color: #fff; - text-shadow: 1px 2px 1px rgba(0, 0, 0, 0.85); -} - -/* ----------------------------------------------------------------------------- - Anime-list-specific styles -------------------------------------------------------------------------------*/ - -.anime .name { - text-align: center; - width: 100%; - padding: 0.5em 0.6em; -} - -.anime .media_type, -.anime .airing_status, -.anime .user_rating, -.anime .completion, -.anime .age_rating { - background: none; - text-align: center; -} - -.anime .table { - position: absolute; - bottom: 0; - left: 0; - width: 100%; -} - -.anime .row { - width: 100%; - background: rgba(0, 0, 0, 0.45); - display: table; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-align-content: center; - -ms-flex-line-pack: center; - align-content: center; - -webkit-justify-content: space-around; - -ms-flex-pack: distribute; - justify-content: space-around; - text-align: center; - padding: 0 inherit; -} - -.anime .row > div { - font-size: 0.8em; - display: flex-item; - -webkit-align-self: center; - -ms-flex-item-align: center; - align-self: center; - text-align: center; - vertical-align: middle; -} - -/* ----------------------------------------------------------------------------- - Manga-list-specific styles -------------------------------------------------------------------------------*/ - -.manga .media > .name { - padding: 0.5em; - margin: 1em; -} - -.manga .media { - border: 1px solid #ddd; - width: 200px; - height: 290px; - margin: 0.25em; -} - -.manga .media_metadata { - padding: 0.25em; - margin: 0.75em; -} \ No newline at end of file +body{margin:0.5em;}table{width:85%;margin:0 auto;}tbody > tr:nth-child(odd){background:#ddd;}.align_left{text-align:left;}.align_right{text-align:right;}.round_all{border-radius:0.5em;}.round_top{border-radius:0;border-top-right-radius:0.5em;border-top-left-radius:0.5em;}.round_bottom{border-radius:0;border-bottom-right-radius:0.5em;border-bottom-left-radius:0.5em;}.media-wrap{text-align:center;margin:0 auto;}.media{position:relative;vertical-align:top;display:inline-block;text-align:center;width:220px;height:319px;margin:0.25em;}button{background:rgba(255,255,255,0.65);margin:0;}.name,.media_metadata > div,.medium_metadata > div,.row{text-shadow:1px 2px 1px rgba(0, 0, 0, 0.85);background:rgba(0, 0, 0, 0.45);color:#ffffff;padding:0.25em;text-align:right;}.media_type,.age_rating{text-align:left;}.media > .media_metadata{position:absolute;bottom:0;right:0;}.media > .medium_metadata{position:absolute;bottom:0;left:0;}.media > .name{position:absolute;top:0;}.media:hover > .name,.media:hover > .media_metadata > div,.media:hover > .medium_metadata > div,.media:hover > .table .row{background:rgba(0,0,0,0.75);}.media:hover > button[hidden],.media:hover > .edit_buttons[hidden]{display:block;}.media > .name > a{text-align:justify;background:none;color:#fff;text-shadow:1px 2px 1px rgba(0, 0, 0, 0.85);}.message{position:relative;margin:0.5em auto;padding:0.5em;width:95%;}.message .close{width:1em;height:1em;position:absolute;right:0.5em;top:0.5em;text-align:center;vertical-align:middle;line-height:1em;}.message .close:hover{cursor:pointer;}.message .icon{left:0.5em;top:0.5em;margin-right:1em;}.message.error{border:1px solid #924949;background:#f3e6e6;}.message.success{border:1px solid #1f8454;background:#70dda9;}.message.info{border:1px solid #bfbe3a;background:#FFFFCC;}.anime .name,.manga .name{text-align:center;width:100%;padding:0.5em 0;}.anime .name > a{text-align:center;width:100%;padding:0.5em 1em;}.anime .media_type,.anime .airing_status,.anime .user_rating,.anime .completion,.anime .age_rating{background:none;text-align:center;}.anime .table,.manga .table{position:absolute;bottom:0;left:0;width:100%;}.anime .row,.manga .row{width:100%;background:rgba(0, 0, 0, 0.45);display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-content:space-around;-ms-flex-line-pack:distribute;align-content:space-around;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around;text-align:center;padding:0 inherit;}.anime .row > div,.manga .row > div{font-size:0.8em;display:flex-item;-webkit-align-self:center;-ms-flex-item-align:center;align-self:center;text-align:center;vertical-align:middle;}.anime .media > button.plus_one{position:absolute;top:calc(50% - 21.5px);left:calc(50% - 66.5px);}.manga .media{border:1px solid #ddd;width:200px;height:290px;margin:0.25em;}.manga .media > .edit_buttons{position:absolute;top:calc(50% - 42.5px);left:calc(50% - 81.5px);} +/*# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["/var/www/htdocs/anime.timshomepage.net/public/css/base.myth.css","source.css"],"names":[],"mappings":"AAQA,KACC,cAGD,MACC,UACA,eAGD,0BACC,iBAGD,YACC,iBAAA,aAIA,kBAAA,WAIA,qBAGD,WACC,gBACA,8BACA,8BAAA,cAIA,gBACA,iCACA,iCAAA,YAIA,kBACA,eAGD,OACC,kBACA,mBACA,qBACA,kBACA,YACA,aACA,eAGD,OACC,kCACA,UAAA,wDAOC,4CACA,+BACA,cACA,eACA,kBAGD,wBACC,iBAGD,yBACC,kBACA,SACA,SAAA,0BAIA,kBACA,SACA,QAGD,eACC,kBACA,OAAA,2HAQC,6BAAA,mEAMA,eAGD,mBACC,mBACA,gBACA,WACA,6CAAA,SAQF,kBACA,kBACA,cACA,WAGD,gBACC,UACA,WACA,kBACA,YACA,UACA,kBACA,sBACA,iBAGD,sBACC,gBAGD,eACC,WACA,UACA,kBAAA,eAIA,yBACA,oBAGD,iBACC,yBACA,oBAAA,cAIA,yBACA,oBAAA,0BAOA,kBACA,WACA,iBAGA,iBACC,kBACA,WACA,mBAAA,mGAQD,gBACA,mBAID,4BACC,kBACA,SACA,OACA,YAAA,wBAIA,WACA,+BACA,qBAAA,oBAAA,aACA,mCAAA,8BAAA,2BACA,qCAAA,yBAAA,6BACA,kBACA,mBAGD,oCACC,gBACA,kBACA,0BAAA,2BAAA,kBACA,kBACA,uBAGD,gCACC,kBACA,uBACA,yBAAA,cAOA,sBACA,YACA,aACA,eAGD,8BACC,kBACA,uBACA,yBCzOD","sourcesContent":[":root {\n\t--shadow: 1px 2px 1px rgba(0, 0, 0, 0.85);\n\t--title-overlay: rgba(0, 0, 0, 0.45);\n\t--text-color: #ffffff;\n\t--normal-padding: 0.25em;\n\t--radius: 0.5em;\n}\n\nbody {\n\tmargin: 0.5em;\n}\n\ntable {\n\twidth:85%;\n\tmargin: 0 auto;\n}\n\ntbody > tr:nth-child(odd) {\n\tbackground: #ddd;\n}\n\n.align_left {\n\ttext-align:left;\n}\n\n.align_right {\n\ttext-align:right;\n}\n\n.round_all {\n\tborder-radius:var(--radius);\n}\n\n.round_top {\n\tborder-radius: 0;\n\tborder-top-right-radius:var(--radius);\n\tborder-top-left-radius:var(--radius);\n}\n\n.round_bottom {\n\tborder-radius: 0;\n\tborder-bottom-right-radius:var(--radius);\n\tborder-bottom-left-radius:var(--radius);\n}\n\n.media-wrap {\n\ttext-align:center;\n\tmargin:0 auto;\n}\n\n.media {\n\tposition:relative;\n\tvertical-align:top;\n\tdisplay:inline-block;\n\ttext-align:center;\n\twidth:220px;\n\theight:319px;\n\tmargin: var(--normal-padding);\n}\n\nbutton {\n\tbackground:rgba(255,255,255,0.65);\n\tmargin: 0;\n}\n\n\t.name,\n\t.media_metadata > div,\n\t.medium_metadata > div,\n\t.row {\n\t\ttext-shadow: var(--shadow);\n\t\tbackground: var(--title-overlay);\n\t\tcolor: var(--text-color);\n\t\tpadding: var(--normal-padding);\n\t\ttext-align:right;\n\t}\n\n\t.media_type, .age_rating {\n\t\ttext-align:left;\n\t}\n\n\t.media > .media_metadata {\n\t\tposition:absolute;\n\t\tbottom:0;\n\t\tright:0;\n\t}\n\n\t.media > .medium_metadata {\n\t\tposition:absolute;\n\t\tbottom: 0;\n\t\tleft:0;\n\t}\n\n\t.media > .name {\n\t\tposition:absolute;\n\t\ttop: 0;\n\t}\n\n\t\t.media:hover > .name,\n\t\t.media:hover > .media_metadata > div,\n\t\t.media:hover > .medium_metadata > div,\n\t\t.media:hover > .table .row\n\t\t{\n\t\t\tbackground:rgba(0,0,0,0.75);\n\t\t}\n\n\t\t.media:hover > button[hidden],\n\t\t.media:hover > .edit_buttons[hidden]\n\t\t{\n\t\t\tdisplay:block;\n\t\t}\n\n\t\t.media > .name > a {\n\t\t\ttext-align:justify;\n\t\t\tbackground:none;\n\t\t\tcolor:#fff;\n\t\t\ttext-shadow: var(--shadow);\n\t\t}\n\n/* -----------------------------------------------------------------------------\n\tMessage boxes\n------------------------------------------------------------------------------*/\n\n.message{\n\tposition:relative;\n\tmargin:0.5em auto;\n\tpadding:0.5em;\n\twidth:95%;\n}\n\n.message .close{\n\twidth:1em;\n\theight:1em;\n\tposition:absolute;\n\tright:0.5em;\n\ttop:0.5em;\n\ttext-align:center;\n\tvertical-align:middle;\n\tline-height:1em;\n}\n\n.message .close:hover {\n\tcursor:pointer;\n}\n\n.message .icon{\n\tleft:0.5em;\n\ttop:0.5em;\n\tmargin-right:1em;\n}\n\n.message.error{\n\tborder:1px solid #924949;\n\tbackground: #f3e6e6;\n}\n\n.message.success{\n\tborder:1px solid #1f8454;\n\tbackground: #70dda9;\n}\n\n.message.info{\n\tborder:1px solid #bfbe3a;\n\tbackground: #FFFFCC;\n}\n\n/* -----------------------------------------------------------------------------\n\tAnime-list-specific styles\n------------------------------------------------------------------------------*/\n.anime .name, .manga .name {\n\ttext-align:center;\n\twidth:100%;\n\tpadding:0.5em 0;\n}\n\n\t.anime .name > a {\n\t\ttext-align:center;\n\t\twidth:100%;\n\t\tpadding:0.5em 1em;\n\t}\n\n.anime .media_type,\n.anime .airing_status,\n.anime .user_rating,\n.anime .completion,\n.anime .age_rating {\n\tbackground: none;\n\ttext-align:center;\n}\n\n\n.anime .table, .manga .table {\n\tposition:absolute;\n\tbottom:0;\n\tleft:0;\n\twidth:100%;\n}\n\n.anime .row, .manga .row {\n\twidth:100%;\n\tbackground: var(--title-overlay);\n\tdisplay: flex;\n\talign-content: space-around;\n\tjustify-content: space-around;\n\ttext-align:center;\n\tpadding:0 inherit;\n}\n\n.anime .row > div, .manga .row > div {\n\tfont-size:0.8em;\n\tdisplay:flex-item;\n\talign-self:center;\n\ttext-align:center;\n\tvertical-align:middle;\n}\n\n.anime .media > button.plus_one {\n\tposition:absolute;\n\ttop: calc(50% - (43px / 2));\n\tleft: calc(50% - (97px / 2 + 18));\n}\n\n/* -----------------------------------------------------------------------------\n\tManga-list-specific styles\n------------------------------------------------------------------------------*/\n.manga .media {\n\tborder:1px solid #ddd;\n\twidth:200px;\n\theight:290px;\n\tmargin:0.25em;\n}\n\n.manga .media > .edit_buttons {\n\tposition:absolute;\n\ttop: calc(50% - (85px / 2));\n\tleft: calc(50% - (163px / 2));\n}\n","body{margin:0.5em;}table{width:85%;margin:0 auto;}tbody > tr:nth-child(odd){background:#ddd;}.align_left{text-align:left;}.align_right{text-align:right;}.round_all{border-radius:0.5em;}.round_top{border-radius:0;border-top-right-radius:0.5em;border-top-left-radius:0.5em;}.round_bottom{border-radius:0;border-bottom-right-radius:0.5em;border-bottom-left-radius:0.5em;}.media-wrap{text-align:center;margin:0 auto;}.media{position:relative;vertical-align:top;display:inline-block;text-align:center;width:220px;height:319px;margin:0.25em;}button{background:rgba(255,255,255,0.65);margin:0;}.name,.media_metadata > div,.medium_metadata > div,.row{text-shadow:1px 2px 1px rgba(0, 0, 0, 0.85);background:rgba(0, 0, 0, 0.45);color:#ffffff;padding:0.25em;text-align:right;}.media_type,.age_rating{text-align:left;}.media > .media_metadata{position:absolute;bottom:0;right:0;}.media > .medium_metadata{position:absolute;bottom:0;left:0;}.media > .name{position:absolute;top:0;}.media:hover > .name,.media:hover > .media_metadata > div,.media:hover > .medium_metadata > div,.media:hover > .table .row{background:rgba(0,0,0,0.75);}.media:hover > button[hidden],.media:hover > .edit_buttons[hidden]{display:block;}.media > .name > a{text-align:justify;background:none;color:#fff;text-shadow:1px 2px 1px rgba(0, 0, 0, 0.85);}.message{position:relative;margin:0.5em auto;padding:0.5em;width:95%;}.message .close{width:1em;height:1em;position:absolute;right:0.5em;top:0.5em;text-align:center;vertical-align:middle;line-height:1em;}.message .close:hover{cursor:pointer;}.message .icon{left:0.5em;top:0.5em;margin-right:1em;}.message.error{border:1px solid #924949;background:#f3e6e6;}.message.success{border:1px solid #1f8454;background:#70dda9;}.message.info{border:1px solid #bfbe3a;background:#FFFFCC;}.anime .name,.manga .name{text-align:center;width:100%;padding:0.5em 0;}.anime .name > a{text-align:center;width:100%;padding:0.5em 1em;}.anime .media_type,.anime .airing_status,.anime .user_rating,.anime .completion,.anime .age_rating{background:none;text-align:center;}.anime .table,.manga .table{position:absolute;bottom:0;left:0;width:100%;}.anime .row,.manga .row{width:100%;background:rgba(0, 0, 0, 0.45);display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-content:space-around;-ms-flex-line-pack:distribute;align-content:space-around;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around;text-align:center;padding:0 inherit;}.anime .row > div,.manga .row > div{font-size:0.8em;display:flex-item;-webkit-align-self:center;-ms-flex-item-align:center;align-self:center;text-align:center;vertical-align:middle;}.anime .media > button.plus_one{position:absolute;top:calc(50% - 21.5px);left:calc(50% - 66.5px);}.manga .media{border:1px solid #ddd;width:200px;height:290px;margin:0.25em;}.manga .media > .edit_buttons{position:absolute;top:calc(50% - 42.5px);left:calc(50% - 81.5px);}\n/*# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["/var/www/htdocs/anime.timshomepage.net/public/css/base.myth.css"],"names":[],"mappings":"AAQA,KACC,cAAA,AAGD,CAAA,KACC,UACA,CAAA,cAAA,AAGD,CAAA,yBACC,iBAAA,AAGD,CAAA,WACC,iBAAA,AAGD,CAAA,YACC,kBAAA,AAGD,CAAA,UACC,qBAAA,AAGD,CAAA,UACC,gBACA,CAAA,6BACA,CAAA,6BAAA,AAGD,CAAA,aACC,gBACA,CAAA,gCACA,CAAA,gCAAA,AAGD,CAAA,WACC,kBACA,CAAA,cAAA,AAGD,CAAA,MACC,kBACA,CAAA,kBACA,CAAA,oBACA,CAAA,iBACA,CAAA,WACA,CAAA,YACA,CAAA,cAAA,AAGD,CAAA,MACC,kCACA,CAAA,SAAA,AAGA,CAAA,uDAIC,4CACA,CAAA,8BACA,CAAA,aACA,CAAA,cACA,CAAA,iBAAA,AAGD,CAAA,uBACC,iBAAA,AAGD,CAAA,wBACC,kBACA,CAAA,QACA,CAAA,QAAA,AAGD,CAAA,yBACC,kBACA,CAAA,QACA,CAAA,OAAA,AAGD,CAAA,cACC,kBACA,CAAA,MAAA,AAGA,CAAA,0HAKC,6BAAA,AAGD,CAAA,kEAGC,eAAA,AAGD,CAAA,kBACC,mBACA,CAAA,eACA,CAAA,UACA,CAAA,4CAAA,AAGH,CAAA,QAKC,kBACA,CAAA,iBACA,CAAA,aACA,CAAA,UAAA,AAGD,CAAA,eACC,UACA,CAAA,UACA,CAAA,iBACA,CAAA,WACA,CAAA,SACA,CAAA,iBACA,CAAA,qBACA,CAAA,gBAAA,AAGD,CAAA,qBACC,gBAAA,AAGD,CAAA,cACC,WACA,CAAA,SACA,CAAA,iBAAA,AAGD,CAAA,cACC,yBACA,CAAA,mBAAA,AAGD,CAAA,gBACC,yBACA,CAAA,mBAAA,AAGD,CAAA,aACC,yBACA,CAAA,mBAAA,AAMD,CAAA,yBACC,kBACA,CAAA,UACA,CAAA,gBAAA,AAGA,CAAA,gBACC,kBACA,CAAA,UACA,CAAA,kBAAA,AAGF,CAAA,kGAKC,gBACA,CAAA,kBAAA,AAID,CAAA,2BACC,kBACA,CAAA,QACA,CAAA,MACA,CAAA,WAAA,AAGD,CAAA,uBACC,WACA,CAAA,8BACA,CAAA,oBAAA,CACA,mBADA,CACA,YAAA,CAAA,kCAAA,CACA,6BADA,CACA,0BAAA,CAAA,oCAAA,CACA,wBADA,CACA,4BAAA,CAAA,iBACA,CAAA,kBAAA,AAGD,CAAA,mCACC,gBACA,CAAA,iBACA,CAAA,yBAAA,CACA,0BADA,CACA,iBAAA,CAAA,iBACA,CAAA,sBAAA,AAGD,CAAA,+BACC,kBACA,CAAA,sBACA,CAAA,wBAAA,AAMD,CAAA,aACC,sBACA,CAAA,WACA,CAAA,YACA,CAAA,cAAA,AAGD,CAAA,6BACC,kBACA,CAAA,sBACA,CAAA,wBAAA,CAAA","file":"base.myth.css","sourcesContent":[":root {\n\t--shadow: 1px 2px 1px rgba(0, 0, 0, 0.85);\n\t--title-overlay: rgba(0, 0, 0, 0.45);\n\t--text-color: #ffffff;\n\t--normal-padding: 0.25em;\n\t--radius: 0.5em;\n}\n\nbody {\n\tmargin: 0.5em;\n}\n\ntable {\n\twidth:85%;\n\tmargin: 0 auto;\n}\n\ntbody > tr:nth-child(odd) {\n\tbackground: #ddd;\n}\n\n.align_left {\n\ttext-align:left;\n}\n\n.align_right {\n\ttext-align:right;\n}\n\n.round_all {\n\tborder-radius:var(--radius);\n}\n\n.round_top {\n\tborder-radius: 0;\n\tborder-top-right-radius:var(--radius);\n\tborder-top-left-radius:var(--radius);\n}\n\n.round_bottom {\n\tborder-radius: 0;\n\tborder-bottom-right-radius:var(--radius);\n\tborder-bottom-left-radius:var(--radius);\n}\n\n.media-wrap {\n\ttext-align:center;\n\tmargin:0 auto;\n}\n\n.media {\n\tposition:relative;\n\tvertical-align:top;\n\tdisplay:inline-block;\n\ttext-align:center;\n\twidth:220px;\n\theight:319px;\n\tmargin: var(--normal-padding);\n}\n\nbutton {\n\tbackground:rgba(255,255,255,0.65);\n\tmargin: 0;\n}\n\n\t.name,\n\t.media_metadata > div,\n\t.medium_metadata > div,\n\t.row {\n\t\ttext-shadow: var(--shadow);\n\t\tbackground: var(--title-overlay);\n\t\tcolor: var(--text-color);\n\t\tpadding: var(--normal-padding);\n\t\ttext-align:right;\n\t}\n\n\t.media_type, .age_rating {\n\t\ttext-align:left;\n\t}\n\n\t.media > .media_metadata {\n\t\tposition:absolute;\n\t\tbottom:0;\n\t\tright:0;\n\t}\n\n\t.media > .medium_metadata {\n\t\tposition:absolute;\n\t\tbottom: 0;\n\t\tleft:0;\n\t}\n\n\t.media > .name {\n\t\tposition:absolute;\n\t\ttop: 0;\n\t}\n\n\t\t.media:hover > .name,\n\t\t.media:hover > .media_metadata > div,\n\t\t.media:hover > .medium_metadata > div,\n\t\t.media:hover > .table .row\n\t\t{\n\t\t\tbackground:rgba(0,0,0,0.75);\n\t\t}\n\n\t\t.media:hover > button[hidden],\n\t\t.media:hover > .edit_buttons[hidden]\n\t\t{\n\t\t\tdisplay:block;\n\t\t}\n\n\t\t.media > .name > a {\n\t\t\ttext-align:justify;\n\t\t\tbackground:none;\n\t\t\tcolor:#fff;\n\t\t\ttext-shadow: var(--shadow);\n\t\t}\n\n/* -----------------------------------------------------------------------------\n\tMessage boxes\n------------------------------------------------------------------------------*/\n\n.message{\n\tposition:relative;\n\tmargin:0.5em auto;\n\tpadding:0.5em;\n\twidth:95%;\n}\n\n.message .close{\n\twidth:1em;\n\theight:1em;\n\tposition:absolute;\n\tright:0.5em;\n\ttop:0.5em;\n\ttext-align:center;\n\tvertical-align:middle;\n\tline-height:1em;\n}\n\n.message .close:hover {\n\tcursor:pointer;\n}\n\n.message .icon{\n\tleft:0.5em;\n\ttop:0.5em;\n\tmargin-right:1em;\n}\n\n.message.error{\n\tborder:1px solid #924949;\n\tbackground: #f3e6e6;\n}\n\n.message.success{\n\tborder:1px solid #1f8454;\n\tbackground: #70dda9;\n}\n\n.message.info{\n\tborder:1px solid #bfbe3a;\n\tbackground: #FFFFCC;\n}\n\n/* -----------------------------------------------------------------------------\n\tAnime-list-specific styles\n------------------------------------------------------------------------------*/\n.anime .name, .manga .name {\n\ttext-align:center;\n\twidth:100%;\n\tpadding:0.5em 0;\n}\n\n\t.anime .name > a {\n\t\ttext-align:center;\n\t\twidth:100%;\n\t\tpadding:0.5em 1em;\n\t}\n\n.anime .media_type,\n.anime .airing_status,\n.anime .user_rating,\n.anime .completion,\n.anime .age_rating {\n\tbackground: none;\n\ttext-align:center;\n}\n\n\n.anime .table, .manga .table {\n\tposition:absolute;\n\tbottom:0;\n\tleft:0;\n\twidth:100%;\n}\n\n.anime .row, .manga .row {\n\twidth:100%;\n\tbackground: var(--title-overlay);\n\tdisplay: flex;\n\talign-content: space-around;\n\tjustify-content: space-around;\n\ttext-align:center;\n\tpadding:0 inherit;\n}\n\n.anime .row > div, .manga .row > div {\n\tfont-size:0.8em;\n\tdisplay:flex-item;\n\talign-self:center;\n\ttext-align:center;\n\tvertical-align:middle;\n}\n\n.anime .media > button.plus_one {\n\tposition:absolute;\n\ttop: calc(50% - (43px / 2));\n\tleft: calc(50% - (97px / 2 + 18));\n}\n\n/* -----------------------------------------------------------------------------\n\tManga-list-specific styles\n------------------------------------------------------------------------------*/\n.manga .media {\n\tborder:1px solid #ddd;\n\twidth:200px;\n\theight:290px;\n\tmargin:0.25em;\n}\n\n.manga .media > .edit_buttons {\n\tposition:absolute;\n\ttop: calc(50% - (85px / 2));\n\tleft: calc(50% - (163px / 2));\n}\n"]} */"]} */ \ No newline at end of file diff --git a/public/css/base.myth.css b/public/css/base.myth.css index 91862b50..2aa8bd6b 100644 --- a/public/css/base.myth.css +++ b/public/css/base.myth.css @@ -3,6 +3,7 @@ --title-overlay: rgba(0, 0, 0, 0.45); --text-color: #ffffff; --normal-padding: 0.25em; + --radius: 0.5em; } body { @@ -27,27 +28,22 @@ tbody > tr:nth-child(odd) { } .round_all { - border-radius:0.5em; + border-radius:var(--radius); } .round_top { border-radius: 0; - border-top-right-radius:0.5em; - border-top-left-radius:0.5em; + border-top-right-radius:var(--radius); + border-top-left-radius:var(--radius); } .round_bottom { border-radius: 0; - border-bottom-right-radius:0.5em; - border-bottom-left-radius:0.5em; + border-bottom-right-radius:var(--radius); + border-bottom-left-radius:var(--radius); } .media-wrap { - display:flex; - justify-content: center; - align-content: space-around; - align-items: center; - flex-wrap: wrap; text-align:center; margin:0 auto; } @@ -62,6 +58,11 @@ tbody > tr:nth-child(odd) { margin: var(--normal-padding); } +button { + background:rgba(255,255,255,0.65); + margin: 0; +} + .name, .media_metadata > div, .medium_metadata > div, @@ -102,6 +103,12 @@ tbody > tr:nth-child(odd) { background:rgba(0,0,0,0.75); } + .media:hover > button[hidden], + .media:hover > .edit_buttons[hidden] + { + display:block; + } + .media > .name > a { text-align:justify; background:none; @@ -109,16 +116,68 @@ tbody > tr:nth-child(odd) { text-shadow: var(--shadow); } +/* ----------------------------------------------------------------------------- + Message boxes +------------------------------------------------------------------------------*/ + +.message{ + position:relative; + margin:0.5em auto; + padding:0.5em; + width:95%; +} + +.message .close{ + width:1em; + height:1em; + position:absolute; + right:0.5em; + top:0.5em; + text-align:center; + vertical-align:middle; + line-height:1em; +} + +.message .close:hover { + cursor:pointer; +} + +.message .icon{ + left:0.5em; + top:0.5em; + margin-right:1em; +} + +.message.error{ + border:1px solid #924949; + background: #f3e6e6; +} + +.message.success{ + border:1px solid #1f8454; + background: #70dda9; +} + +.message.info{ + border:1px solid #bfbe3a; + background: #FFFFCC; +} /* ----------------------------------------------------------------------------- Anime-list-specific styles ------------------------------------------------------------------------------*/ -.anime .name { +.anime .name, .manga .name { text-align:center; width:100%; - padding:0.5em 0.6em;; + padding:0.5em 0; } + .anime .name > a { + text-align:center; + width:100%; + padding:0.5em 1em; + } + .anime .media_type, .anime .airing_status, .anime .user_rating, @@ -129,25 +188,24 @@ tbody > tr:nth-child(odd) { } -.anime .table { +.anime .table, .manga .table { position:absolute; bottom:0; left:0; width:100%; } -.anime .row { +.anime .row, .manga .row { width:100%; background: var(--title-overlay); - display:table; display: flex; - align-content:center; + align-content: space-around; justify-content: space-around; text-align:center; padding:0 inherit; } -.anime .row > div { +.anime .row > div, .manga .row > div { font-size:0.8em; display:flex-item; align-self:center; @@ -155,15 +213,15 @@ tbody > tr:nth-child(odd) { vertical-align:middle; } +.anime .media > button.plus_one { + position:absolute; + top: calc(50% - (43px / 2)); + left: calc(50% - (97px / 2 + 18)); +} + /* ----------------------------------------------------------------------------- Manga-list-specific styles ------------------------------------------------------------------------------*/ - -.manga .media > .name { - padding:0.5em; - margin:1em; -} - .manga .media { border:1px solid #ddd; width:200px; @@ -171,7 +229,8 @@ tbody > tr:nth-child(odd) { margin:0.25em; } -.manga .media_metadata { - padding: var(--normal-padding); - margin: 0.75em; +.manga .media > .edit_buttons { + position:absolute; + top: calc(50% - (85px / 2)); + left: calc(50% - (163px / 2)); } diff --git a/public/js.php b/public/js.php new file mode 100644 index 00000000..ffacbd43 --- /dev/null +++ b/public/js.php @@ -0,0 +1,182 @@ +c;c++)r.set(a[c],"globalEval",!b||r.get(b[c],"globalEval"))}function Za(a,b){var c,e,f,g,h,k;if(1===b.nodeType){if(r.hasData(a)&&(c=r.access(a),e=r.set(b,c),k=c.events))for(f in delete e.handle, +e.events={},k)for(c=0,e=k[f].length;e>c;c++)d.event.add(b,f,k[f][c]);C.hasData(a)&&(g=C.access(a),h=d.extend({},g),C.set(b,h))}}function A(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&d.nodeName(a,b)?d.merge([a],c):c}function $a(a,b){var c,e=d(b.createElement(a)).appendTo(b.body),f=n.getDefaultComputedStyle&&(c=n.getDefaultComputedStyle(e[0]))?c.display:d.css(e[0],"display");return e.detach(),f}function Ha(a){var b= +u,c=ab[a];return c||(c=$a(a,b),"none"!==c&&c||(sa=(sa||d("