diff --git a/public/img/Schneider_2020_10.jpg b/public/img/Schneider_2020_10.jpg new file mode 100644 index 0000000000000000000000000000000000000000..966cbaa89b03a9a4fa6efc3f410e0b39b0709775 Binary files /dev/null and b/public/img/Schneider_2020_10.jpg differ diff --git a/public/js/add_content.js b/public/js/add_content.js index faf8731126ff6190246d4bfe5dd5797de96a1402..e98bf1e026344eb1592abedf962be457cf5d933a 100644 --- a/public/js/add_content.js +++ b/public/js/add_content.js @@ -1,12 +1,16 @@ +var urlKeyword, urlParams; +urlParams = new URLSearchParams(window.location.search); +urlKeyword = urlParams.get('keyword'); function addcontent(item) { var lang_cont_person = "" var lang_keywords = "" var new_row = document.getElementById("row_main") + if (item === undefined) { - } else { - + } else if (urlKeyword == null || (item.item.keywords.includes(urlKeyword))) { + // Prepare YouTube Link // var array_contains_youtube = true diff --git a/public/js/search.js b/public/js/search.js index 6f164bac5f493bdc3a1c9de87d1a78d557000e15..5b15d8f1b6f2ab4e022cddac2649b737f46b9c89 100644 --- a/public/js/search.js +++ b/public/js/search.js @@ -70,69 +70,19 @@ var stuff_paper = [] -$(document).ready(function () { - console.log("document ready") - $.getJSON("./content/content.json", function (result) { - console.log("content.json ==> HTML") - stuff = result; - var new_row = document.getElementById("row_main") - new_row.innerHTML = ""; - var arrayLength = stuff.length; - for (var i = 0; i < arrayLength; i++) { - addcontent(stuff[i]); - //Do something - } - $.getJSON("./content/team.json", function(result){ - console.log("team.json ==> HTML") - team = result; - var new_row = document.getElementById("team-section") - new_row.innerHTML = ""; - var arrayLength = team.length; - for (var i = 0; i < arrayLength; i++) { - addTeam(team[i]); - //Do something - } - }); - changeLang(); - }); - var currentYear = new Date().getFullYear(); - document.getElementById('current-year').innerHTML = currentYear; - - // get paper content is commented out for back up - // $.getJSON("./content/paper2.json", function (result) { - // stuff_paper = result; - // var new_row = document.getElementById("cont_paper") - // new_row.innerHTML = ""; - // var arrayLength = stuff_paper.length; - // for (var i = 0; i < arrayLength; i++) { - - // if (Math.abs(arrayLength - i) <= max_paper_list) { - // console.log("close to " + i) - // addpaper(stuff_paper[i]); - // } - // //Do something - // } - // }); - - - - - - -}); function changeLang () { var userLang = navigator.language || navigator.userLanguage; console.log("The language is: " + userLang); if (userLang.includes("de")) { console.log(true) var select1 = document.getElementById('selectpicker1'); - console.log(select1) + // console.log(select1) select1.value = "2"; select1.dispatchEvent(new Event('change')); } else { var select1 = document.getElementById('selectpicker1'); - console.log(select1) + // console.log(select1) select1.value = "1"; select1.dispatchEvent(new Event('change')); } @@ -225,4 +175,70 @@ input2.addEventListener("keyup", function (event) { document.getElementById("search-button_paper").click(); } +}); +$(document).ready(function () { + console.log("document ready") + $.getJSON("./content/content.json", function (result) { + console.log("content.json ==> HTML") + stuff = result; + var new_row = document.getElementById("row_main") + new_row.innerHTML = ""; + var arrayLength = stuff.length; + for (var i = 0; i < arrayLength; i++) { + addcontent(stuff[i]); + //Do something + } + + $.getJSON("./content/team.json", function(result){ + console.log("team.json ==> HTML") + team = result; + var new_row = document.getElementById("team-section") + new_row.innerHTML = ""; + var arrayLength = team.length; + for (var i = 0; i < arrayLength; i++) { + addTeam(team[i]); + //Do something + } + }); + changeLang(); + }); + var currentYear = new Date().getFullYear(); + document.getElementById('current-year').innerHTML = currentYear; + + // get the keyword parameter + + if (urlKeyword !== null) { + console.log(`url Keyword: ${urlKeyword}`) + // insert keyword parameter + $("#search-input").val(urlKeyword, function(){ + console.log("trigger the search") + document.getElementById("search-button").click(); + }); + $("#search-input_paper").val(urlKeyword); + // apply keyword parameter + } + + + + // get paper content is commented out for back up + // $.getJSON("./content/paper2.json", function (result) { + // stuff_paper = result; + // var new_row = document.getElementById("cont_paper") + // new_row.innerHTML = ""; + // var arrayLength = stuff_paper.length; + // for (var i = 0; i < arrayLength; i++) { + + // if (Math.abs(arrayLength - i) <= max_paper_list) { + // console.log("close to " + i) + // addpaper(stuff_paper[i]); + // } + // //Do something + // } + // }); + + + + + + }); \ No newline at end of file