Skip to content

Commit

Permalink
UI bugs fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@rajinderpalsingh2001
rajinderpalsingh2001 committed Jun 15, 2021
1 parent 0715379 commit 390e070
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 18,412 deletions.
93 changes: 36 additions & 57 deletions appjs/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,97 +534,78 @@ 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();
}
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];
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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');
});
3 changes: 2 additions & 1 deletion css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
22 changes: 11 additions & 11 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@

::-webkit-scrollbar-button:single-button {
display: block;
background-color: var(--appimage);
background-color: var(--apppink);
height: 1.25rem;
}

Expand Down Expand Up @@ -299,14 +299,20 @@
closenav();
}
</script>
<script src="js/jquery.min.js"></script>
<script src="js/popper.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/materialize.min.js"></script>
<script src="appjs/index.js"></script>
</head>


<body class="readonlybody hidescroll" onload="bodyload()">
<body class="readonlybody hidescroll">
<script>
window.onload = function () {
var preloader = document.getElementById("preloader")
preloader.style.display = 'none';
bodyload();
}
</script>
<!-- preloader starts -->
Expand Down Expand Up @@ -2766,8 +2772,8 @@ <h4>Makes Math Easy</h4>
</td>
<td style="float:right;border-top: none;">
<span
onclick="addtofavourite('Operations on Fraction','#fractions','c','facimgfrac')"><img
id="facimgfrac" src="images/unfavourite.png"
onclick="addtofavourite('Solve Fraction','calculators/solveFraction.html','solvefacimgfrac')"><img
id="solvefacimgfrac" src="images/unfavourite.png"
style="height:1.5625rem;filter: none;"></span>
</td>
</tr>
Expand Down Expand Up @@ -34708,13 +34714,7 @@ <h5 class="modal-title">Roman/Arabic Numeral</h5>
<script src="appjs/speechreco.js"></script>
<!-- speech recognition ends-->

<!--script files-->
<script src="js/jquery.min.js"></script>
<script src="js/popper.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/materialize.min.js"></script>

<script src="appjs/index.js"></script>
<!--script files-->
<script>
$(document).ready(function () {
$('.sidenav').sidenav();
Expand Down
Loading

0 comments on commit 390e070

Please sign in to comment.