From b2ace9d1dd66111de75b717cc3628bd3926479fa Mon Sep 17 00:00:00 2001 From: zhetic <> Date: Sat, 22 May 2021 12:47:51 +0300 Subject: [PATCH 1/5] set appropriate thumbnail resolution --- css/title_list.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/title_list.css b/css/title_list.css index 35bd113..06795b9 100644 --- a/css/title_list.css +++ b/css/title_list.css @@ -43,7 +43,7 @@ th { #title_list img.thumbnail { height: 100px; - width: 85px; + width: 70px; padding-left: 0; padding-right: 0; padding-top: 2px; From 929dc38c9b6348bd7113247ae52c2eef435ce8ae Mon Sep 17 00:00:00 2001 From: zhetic <> Date: Sat, 22 May 2021 13:12:38 +0300 Subject: [PATCH 2/5] made search_bar into form and fixed styling --- about.html | 7 ++++--- catalog.html | 9 +++++---- css/stylesheet.css | 13 +++++++------ js/search_bar.js | 22 ---------------------- search.html | 15 +-------------- title.html | 7 ++++--- 6 files changed, 21 insertions(+), 52 deletions(-) delete mode 100644 js/search_bar.js diff --git a/about.html b/about.html index e4a8f60..2f39832 100644 --- a/about.html +++ b/about.html @@ -9,8 +9,10 @@ @@ -19,6 +21,5 @@ - diff --git a/catalog.html b/catalog.html index 9d78528..cadcd00 100644 --- a/catalog.html +++ b/catalog.html @@ -10,9 +10,11 @@
@@ -39,7 +41,6 @@
- diff --git a/css/stylesheet.css b/css/stylesheet.css index 965b9c0..a1eccd2 100644 --- a/css/stylesheet.css +++ b/css/stylesheet.css @@ -50,10 +50,10 @@ a:visited { #header { position: fixed; - top: 0%; - left: 0%; width: 100%; height: 5em; + top: 0%; + left: 0%; background-color: var(--medium-grey); z-index: 100; overflow: hidden; @@ -61,34 +61,35 @@ a:visited { #header #home { position: relative; - top: 30%; height: 40%; + top: 30%; left: 2em; } #header #search_bar { position: absolute; - transform: translateY(50%); background-color: white; border: none; padding: 1em; border-radius: 1em; - left: 10em; width: 50%; height: 50%; + top: 30%; + left: 10em; } #header #search_button { position: absolute; height: 50%; + top: 30%; left: calc(10em + 50% + 1em); - transform: translateY(50%); } #header #logo { position: absolute; height: 180%; right: 5%; + top: 5%; } #content { diff --git a/js/search_bar.js b/js/search_bar.js deleted file mode 100644 index 1b8b2ca..0000000 --- a/js/search_bar.js +++ /dev/null @@ -1,22 +0,0 @@ -// ------------------------------------------------------------- -// Search bar function -// ------------------------------------------------------------- - -function search_bar() { - var query = document.querySelector("#header #search_bar").value; - if(query != ""){ - query = query.toLowerCase().replaceAll(" ", "+"); - var url = "https://amangathing.ddns.net/search.html?title=" + query; - console.log(query); - window.location.href = url; - } -} - -document.querySelector("#header #search_bar").addEventListener("keydown", function (e) { - e = e || window.event; - if(e.keyCode == 13){ - search_bar(); - e.preventDefault(); - } -}); - diff --git a/search.html b/search.html index 9fe4544..7f03551 100644 --- a/search.html +++ b/search.html @@ -75,7 +75,7 @@ diff --git a/title.html b/title.html index 1a6b594..b72d70b 100644 --- a/title.html +++ b/title.html @@ -11,8 +11,10 @@ @@ -46,7 +48,6 @@ - From 8ce251758ea7b7e8c87de294fc4bdc61ee69769e Mon Sep 17 00:00:00 2001 From: zhetic <> Date: Sat, 22 May 2021 14:10:07 +0300 Subject: [PATCH 3/5] advanced search is form --- js/search.js | 52 ------------------------------------------------ search.html | 56 +++++++++++++++++++++++++++------------------------- 2 files changed, 29 insertions(+), 79 deletions(-) delete mode 100644 js/search.js diff --git a/js/search.js b/js/search.js deleted file mode 100644 index e1da4d9..0000000 --- a/js/search.js +++ /dev/null @@ -1,52 +0,0 @@ -// ---------------------------------------------------- -// Search function -// ---------------------------------------------------- - -function search_full() { - var parameter = []; - //get search string - var title = document.querySelector("#search input.title").value; - if(title != ""){ - title = title.toLowerCase().replaceAll(" ", "+"); - parameter.push("title="+title); - } - //get author - var author = document.querySelector("#search input.author").value; - if(author != ""){ - author = author.toLowerCase().split(",").map(s => s.trim()).map(s => s.replaceAll(" ", "+")); - parameter.push("authors="+author.join(",")); - } - //get artist - var artist = document.querySelector("#search input.artist").value; - if(artist != ""){ - artist = artist.toLowerCase().split(",").map(s => s.trim()).map(s => s.replaceAll(" ", "+")); - parameter.push("artists="+artist.join(",")); - } - //get tags - var tag = document.querySelector("#search input.tags").value; - if(tag != ""){ - tag = tag.toLowerCase().split(/(?=\+|\-)/).map(s => s.trim()).map(s => s.replaceAll(" ", "+")); - parameter.push("tags="+tag.join(",")); - } - //sort - var sort = document.querySelector("#content select.sort").value; - if(sort != ""){ - parameter.push("sortby="+sort); - } - var query = parameter.join("&"); - return query; -} - -// ---------------------------------------------------- -// Event handlers -// ---------------------------------------------------- - -var fields = document.getElementsByTagName("input"); -Array.from(fields).map(field => field.addEventListener("keydown", function (e) { - e = e || window.event; - if(e.keyCode == 13){ - e.preventDefault(); - search_full(); - } -})); - diff --git a/search.html b/search.html index 7f03551..3e97da9 100644 --- a/search.html +++ b/search.html @@ -15,35 +15,37 @@
- +

@@ -70,15 +72,15 @@
- + diff --git a/css/stylesheet.css b/css/stylesheet.css index a1eccd2..5d23aaa 100644 --- a/css/stylesheet.css +++ b/css/stylesheet.css @@ -95,6 +95,7 @@ a:visited { #content { position: absolute; width: 80%; + height: auto; left: 10%; top: 5em; bottom: 0em; diff --git a/js/title_list.js b/js/title_list.js index a52f94a..65ead02 100644 --- a/js/title_list.js +++ b/js/title_list.js @@ -6,8 +6,6 @@ function load_titles(remote) { if(remote == ""){ return; } - base = remote; - remote += "/manga/search?title=a"; fetch(remote) .then(res => res.json()) .then(function (res) { @@ -25,11 +23,11 @@ function load_titles(remote) { )) .appendChild(Object.assign( document.createElement("a"), - {href: "./title.html?id="+manga["id"]} + {href: "/title.html?id="+manga["id"]} )) .appendChild(Object.assign( document.createElement("img"), - {className: "thumbnail", src: base+"/thumbnail/"+manga["id"]+".webp"} + {className: "thumbnail", src: "/instance/thumbnail/"+manga["id"]+".webp"} )); //title first_row.appendChild(Object.assign( @@ -38,7 +36,7 @@ function load_titles(remote) { )) .appendChild(Object.assign( document.createElement("a"), - {href: "./title.html?id="+manga["id"]} + {href: "/title.html?id="+manga["id"]} )) .appendChild(Object.assign( document.createElement("b"), diff --git a/search.html b/search.html index 3e97da9..16f405f 100644 --- a/search.html +++ b/search.html @@ -75,16 +75,11 @@ From b91c43f186414c87cd93ead9d8111707b3ac9565 Mon Sep 17 00:00:00 2001 From: zhetic <> Date: Sat, 22 May 2021 14:49:06 +0300 Subject: [PATCH 5/5] removed search script --- js/chapter_list.js | 4 ++-- search.html | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/js/chapter_list.js b/js/chapter_list.js index e3cc920..fbc2638 100644 --- a/js/chapter_list.js +++ b/js/chapter_list.js @@ -36,10 +36,10 @@ function load_info(remote, id) { document.createElement("p"), {textContent: "Status: " + manga["publication_status"]} )); - + var date = new Date(1000 * manga["last_updated"]) text.appendChild(Object.assign( document.createElement("p"), - {textContent: "Last Updated: " + manga["last_updated"]} + {textContent: "Last Updated: "+date.toLocaleTimeString("en-US")+" "+date.toLocaleDateString("en-US")} )); var tags = document.createElement("p"); diff --git a/search.html b/search.html index 16f405f..74fba1b 100644 --- a/search.html +++ b/search.html @@ -71,15 +71,15 @@ - -