Merge branch 'master' of https://github.com/zhet1c/frontend

js/title_list.js

@@ -26,7 +26,7 @@ function load_titles(remote) {
             ))
             .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(

search.html

@@ -75,11 +75,18 @@
     <script>
         document.onreadystatechange = function () {
 		if(document.readyState == "interactive") {
+<<<<<<< HEAD
 		    var addr = decodeURIComponent(document.cookie).split(";")[0].split("=")[1];
 		    console.log("loading from "+addr);
 		    load_titles("https://"+addr+"/manga/search"+window.location.search);
 		    document.querySelector("#title_list").style.visibility = "visible";
 		    document.querySelector("#label").textContent = "Result";
+=======
+			console.log("on load");
+			load_titles("https://amangathing.ddns.net/instance/manga/search"+window.location.search);
+			document.querySelector("#title_list").style.visibility = "visible";
+			document.querySelector("#label").textContent = "Result";
+>>>>>>> b91c43f186414c87cd93ead9d8111707b3ac9565
 		}
         }
     </script>