diff --git a/appjs/index.js b/appjs/index.js index ca4196550..ee7327568 100644 --- a/appjs/index.js +++ b/appjs/index.js @@ -534,16 +534,14 @@ function openit(id) { } } -function bodyload() { - var ar = JSON.parse(localStorage.getItem("favouritearray")); - var oid = JSON.parse(localStorage.getItem("openingidarray")); - var tp = JSON.parse(localStorage.getItem("typearray")); +function bodyload() { + var displaynamear = JSON.parse(localStorage.getItem("displaynamearray")); + var filenamenamear = JSON.parse(localStorage.getItem("filenamearray")); var imgar = JSON.parse(localStorage.getItem("imgarray")); var favar = JSON.parse(localStorage.getItem("favarray")); - if (oid != null) { - favouritearray = ar; - openingid = oid; - typearray = tp; + if (filenamenamear != null) { + filename = filenamenamear; + displayname=displaynamear; imgarray = imgar; favarray = favar; checkfavourite(); @@ -551,80 +549,63 @@ function bodyload() { numbersapi(); } -var favouritearray = []; -var openingid = []; -var typearray = []; +var displayname = []; +var filename = []; var imgarray = []; var favarray = []; -function addtofavourite(btnid, openid, type, img) { - var ar = JSON.parse(localStorage.getItem("favouritearray")); - var oid = JSON.parse(localStorage.getItem("openingidarray")); - var imgar = JSON.parse(localStorage.getItem("imgarray")); - var favar = JSON.parse(localStorage.getItem("favarray")); +function addtofavourite(displaynamear, filenamear, img) { + var filenmar=JSON.parse(localStorage.getItem('filenamearray')); var flag = 0; - if (oid != null) { - for (i = 0; i < oid.length; i++) { - if (openid == oid[i]) { + if (filename != null) { + for (i = 0; i < filename.length; i++) { + if (filename == filenmar[i]) { flag = 1; } } } - if (flag == 0) { - favouritearray.push(btnid); - openingid.push(openid); - typearray.push(type); + if (flag == 0) { + displayname.push(displaynamear); + filename.push(filenamear); imgarray.push(img); favarray.push("images/favourite.png"); - localStorage.setItem("favouritearray", JSON.stringify(favouritearray)); - localStorage.setItem("openingidarray", JSON.stringify(openingid)); - localStorage.setItem("typearray", JSON.stringify(typearray)); + localStorage.setItem("displaynamearray", JSON.stringify(displayname)); + localStorage.setItem("filenamearray", JSON.stringify(filename)); localStorage.setItem("imgarray", JSON.stringify(imgarray)); localStorage.setItem("favarray", JSON.stringify(favarray)); checkfavourite(); } if (flag == 1) { - var index = oid.indexOf(openid); + var index = filenamear.indexOf(filename); if (index > -1) { document.getElementById(imgarray[index]).src = "images/unfavourite.png"; - openingid.splice(index, 1); - favouritearray.splice(index, 1); - typearray.splice(index, 1); + displayname.splice(index, 1); + filename.splice(index, 1); imgarray.splice(index, 1); favarray.splice(index, 1); - } - localStorage.setItem("favouritearray", JSON.stringify(favouritearray)); - localStorage.setItem("openingidarray", JSON.stringify(openingid)); - localStorage.setItem("typearray", JSON.stringify(typearray)); + } + localStorage.setItem("displaynamearray", JSON.stringify(displayname)); + localStorage.setItem("filenamearray", JSON.stringify(filename)); localStorage.setItem("imgarray", JSON.stringify(imgarray)); localStorage.setItem("favarray", JSON.stringify(favarray)); - checkfavourite(); + checkfavourite(filenamear); } } -function checkfavourite() { +function checkfavourite(filenamear) { removeall("favourite"); - var ar = JSON.parse(localStorage.getItem("favouritearray")); - var oid = JSON.parse(localStorage.getItem("openingidarray")); - var tp = JSON.parse(localStorage.getItem("typearray")); var imgar = JSON.parse(localStorage.getItem("imgarray")); var favar = JSON.parse(localStorage.getItem("favarray")); - $("#favourite").addClass("favouritecontainer"); - - if (ar.length != 0) { - for (i = 0; i < ar.length; i++) { + $("#favourite").addClass("favouritecontainer"); + if (filename.length != 0) { + for (i = 0; i < filename.length; i++) { var el = document.createElement("li"); - el.textContent = ar[i]; + el.textContent = displayname[i]; el.className = "favourites"; el.style.color = "white"; - var idf = oid[i]; - if (tp[i] == "c") { - el.setAttribute("onclick", 'openit("' + String(idf) + '")'); - } else { - el.setAttribute("data-toggle", "modal"); - el.setAttribute("data-target", idf); - } + + el.setAttribute("onclick", 'loadcalculator("' + String(filename[i]) + '")'); document.getElementById("favourite").appendChild(el); document.getElementById(imgar[i]).src = favar[i]; @@ -660,11 +641,10 @@ document.querySelector(".container").addEventListener('click', function () { }) function removefavourite() { - localStorage.removeItem("favouritearray"); - localStorage.removeItem("openingidarray"); + localStorage.removeItem("filenamearray"); + localStorage.removeItem("displaynamearray"); localStorage.removeItem("imgarray"); - localStorage.removeItem("favarray"); - localStorage.removeItem("typearray"); + localStorage.removeItem("favarray"); $("#favourite").removeClass("headingdiv"); checkfavourite(); } @@ -705,8 +685,7 @@ function numbersapi() { el.innerHTML = val; } -$(document).on('click', ' .list_menu_items ', function () { - // $(this).addClass('home').siblings().removeClass('home'); +$(document).on('click', ' .list_menu_items ', function () { $(this).siblings().removeClass('home'); $(this).addClass('home'); }); \ No newline at end of file diff --git a/css/style.css b/css/style.css index ad78f030b..dee5f0d22 100644 --- a/css/style.css +++ b/css/style.css @@ -18,7 +18,7 @@ body { background-image: url('../images/background_image.png'); - background-repeat: no-repeat; + background-repeat: repeat; background-size:cover; font-family: mainfont; @@ -741,6 +741,7 @@ background: radial-gradient(circle at 30% 107%, #fdf497 0%, #fdf497 5%, #fd5949 place-items: center; position: fixed; z-index: 9999; + top:0; } .center_div { diff --git a/index.html b/index.html index 016e569e0..5622524e9 100644 --- a/index.html +++ b/index.html @@ -163,7 +163,7 @@ ::-webkit-scrollbar-button:single-button { display: block; - background-color: var(--appimage); + background-color: var(--apppink); height: 1.25rem; } @@ -299,14 +299,20 @@ closenav(); } + + + + + -
+ @@ -2766,8 +2772,8 @@