-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #32 from mohitsaini07/mohit-saini
change the UI and add sound functionality on click
- Loading branch information
Showing
5 changed files
with
136 additions
and
134 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,118 +1,136 @@ | ||
| let calculationString = ""; | ||
| let calculationHistory = []; // To store the calculation history | ||
| const maxHistoryItems = 8; | ||
| const input = document.querySelector('.input'); | ||
|
|
||
| const input = document.querySelector(".input"); | ||
|
|
||
| //dark theme functionality: | ||
| const icon = document.getElementById("icon"); | ||
| icon.onclick = function () { | ||
| document.body.classList.toggle("dark-theme"); | ||
| if (document.body.classList.contains("dark-theme")) { | ||
| icon.src = "images/sun.png"; | ||
| } else { | ||
| icon.src = "images/moon.png"; | ||
| } | ||
| } | ||
|
|
||
| document.body.classList.toggle("dark-theme"); | ||
| if (document.body.classList.contains("dark-theme")) { | ||
| icon.src = "images/sun.png"; | ||
| } else { | ||
| icon.src = "images/moon.png"; | ||
| } | ||
| }; | ||
|
|
||
| // Function to update the input field and store history | ||
| function updateInputAndHistory() { | ||
| document.querySelector('input').value = calculationString; | ||
| localStorage.setItem('calculationHistory', JSON.stringify(calculationHistory)); | ||
| updateHistoryList(); // Update the history list | ||
| document.querySelector("input").value = calculationString; | ||
| localStorage.setItem( | ||
| "calculationHistory", | ||
| JSON.stringify(calculationHistory) | ||
| ); | ||
| updateHistoryList(); // Update the history list | ||
| } | ||
|
|
||
| // Load calculation history from local storage if it exists | ||
| const savedCalculationHistory = localStorage.getItem('calculationHistory'); | ||
| const savedCalculationHistory = localStorage.getItem("calculationHistory"); | ||
| if (savedCalculationHistory) { | ||
| calculationHistory = JSON.parse(savedCalculationHistory); | ||
| updateHistoryList(); // Update the history list when the page loads | ||
| calculationHistory = JSON.parse(savedCalculationHistory); | ||
| updateHistoryList(); // Update the history list when the page loads | ||
| } | ||
|
|
||
| function updateHistoryList() { | ||
| const historyList = document.getElementById('history-list'); | ||
| historyList.innerHTML = ""; // Clear the existing list | ||
| const historyList = document.getElementById("history-list"); | ||
| historyList.innerHTML = ""; // Clear the existing list | ||
|
|
||
| calculationHistory.forEach((calculation) => { | ||
| const listItem = document.createElement('li'); | ||
| listItem.textContent = calculation; | ||
| historyList.appendChild(listItem); | ||
| }); | ||
| calculationHistory.forEach((calculation) => { | ||
| const listItem = document.createElement("li"); | ||
| listItem.textContent = calculation; | ||
| historyList.appendChild(listItem); | ||
| }); | ||
| } | ||
|
|
||
| let buttons = document.querySelectorAll('.button'); | ||
| let buttons = document.querySelectorAll(".button"); | ||
| Array.from(buttons).forEach((button) => { | ||
| button.addEventListener('click', (e) => { | ||
| if (e.target.innerHTML == '=') { | ||
| calculate(); | ||
| } else if (e.target.innerHTML == 'C') { | ||
| calculationString = ""; | ||
| updateInputAndHistory(); | ||
| } else if (e.target.innerHTML == '←') { | ||
| calculationString = calculationString.slice(0, calculationString.length - 1); | ||
| updateInputAndHistory(); | ||
| } else { | ||
| calculationString += e.target.innerHTML; | ||
| updateInputAndHistory(); | ||
| } | ||
| }); | ||
| button.addEventListener("click", (e) => { | ||
| if (e.target.innerHTML == "=") { | ||
| calculate(); | ||
| } else if (e.target.innerHTML == "C") { | ||
| calculationString = ""; | ||
| updateInputAndHistory(); | ||
| } else if (e.target.innerHTML == "←") { | ||
| calculationString = calculationString.slice( | ||
| 0, | ||
| calculationString.length - 1 | ||
| ); | ||
| updateInputAndHistory(); | ||
| } else { | ||
| calculationString += e.target.innerHTML; | ||
| updateInputAndHistory(); | ||
| } | ||
| }); | ||
| }); | ||
|
|
||
| function calculate() { | ||
| calculationString = input.value; | ||
| try { | ||
| if (calculationString && calculationString.match(/[+\-*\/]/g)) { | ||
| let result = eval(calculationString); | ||
| calculationHistory.push(`${calculationString} = ${result}`); | ||
| calculationString = result.toString(); | ||
| updateInputAndHistory(); | ||
| } | ||
|
|
||
| } catch (e) { | ||
| input.value = ""; | ||
| input.classList.add('shake'); // Add shake animation class | ||
| setTimeout(() => { | ||
| input.classList.remove('shake'); // Remove shake animation class after animation | ||
| }, 500); | ||
| calculationString = input.value; | ||
| try { | ||
| if (calculationString && calculationString.match(/[+\-*\/]/g)) { | ||
| let result = eval(calculationString); | ||
| calculationHistory.push(`${calculationString} = ${result}`); | ||
| calculationString = result.toString(); | ||
| updateInputAndHistory(); | ||
| } | ||
| } catch (e) { | ||
| input.value = ""; | ||
| input.classList.add("shake"); // Add shake animation class | ||
| setTimeout(() => { | ||
| input.classList.remove("shake"); // Remove shake animation class after animation | ||
| }, 500); | ||
| } | ||
| } | ||
|
|
||
| input.addEventListener('keydown', function (e) { | ||
| if (!isValid(e.key)) { | ||
| input.classList.add('shake'); // Add shake animation class | ||
| setTimeout(() => { | ||
| input.classList.remove('shake'); // Remove shake animation class after animation | ||
| }, 500); | ||
| e.preventDefault(); | ||
| } | ||
| if(e.key=="Enter"){ | ||
| calculate(); | ||
| } | ||
| input.addEventListener("keydown", function (e) { | ||
| if (!isValid(e.key)) { | ||
| input.classList.add("shake"); // Add shake animation class | ||
| setTimeout(() => { | ||
| input.classList.remove("shake"); // Remove shake animation class after animation | ||
| }, 500); | ||
| e.preventDefault(); | ||
| } | ||
| if (e.key == "Enter") { | ||
| calculate(); | ||
| } | ||
| }); | ||
|
|
||
|
|
||
| function isValid(key) { | ||
| return !isNaN(parseFloat(key)) || ['+', '-', '*', '/', '=', 'Enter', 'Backspace','Shift','.'].includes(key); | ||
| return ( | ||
| !isNaN(parseFloat(key)) || | ||
| ["+", "-", "*", "/", "=", "Enter", "Backspace", "Shift", "."].includes(key) | ||
| ); | ||
| } | ||
|
|
||
| /** clear Calculation History **/ | ||
| const clearBtn = document.querySelector('.clearHistory'); | ||
| clearBtn.addEventListener('click', function(e){ | ||
| localStorage.clear(); | ||
| calculationHistory = []; | ||
| clearHistory('history-list'); | ||
| }) | ||
| function clearHistory(parentId){ | ||
| const parent = document.querySelector(`#${parentId}`); | ||
| while (parent.lastChild) { | ||
| parent.removeChild(parent.lastChild); | ||
| } | ||
| if (e.key == "Enter") { | ||
| calculate(); | ||
| } | ||
| }; | ||
| const clearBtn = document.querySelector(".clearHistory"); | ||
| clearBtn.addEventListener("click", function (e) { | ||
| localStorage.clear(); | ||
| calculationHistory = []; | ||
| clearHistory("history-list"); | ||
| }); | ||
| function clearHistory(parentId) { | ||
| const parent = document.querySelector(`#${parentId}`); | ||
| while (parent.lastChild) { | ||
| parent.removeChild(parent.lastChild); | ||
| } | ||
| if (e.key == "Enter") { | ||
| calculate(); | ||
| } | ||
| } | ||
|
|
||
| function isValid(key) { | ||
| return !isNaN(parseFloat(key)) || ['+', '-', '*', '/', '=', 'Enter', 'Backspace', 'Shift', '.'].includes(key); | ||
| return ( | ||
| !isNaN(parseFloat(key)) || | ||
| ["+", "-", "*", "/", "=", "Enter", "Backspace", "Shift", "."].includes(key) | ||
| ); | ||
| } | ||
|
|
||
| //Onclick Sound functionality: | ||
| const click_sound = document.querySelector("#click-sound"); | ||
|
|
||
| buttons.forEach((button) => { | ||
| button.addEventListener("click", () => { | ||
| click_sound.currentTime = 0; | ||
| click_sound.play(); | ||
| }); | ||
| }); |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,6 @@ | |
|
|
||
| .flex{ | ||
| display: flex; | ||
|
|
||
| } | ||
|
|
||
| .flex-col{ | ||
|
|
||