From d015f8d51192f6ebc328838246fe562ea400d780 Mon Sep 17 00:00:00 2001 From: H1K0 Date: Sat, 26 Sep 2020 15:16:09 +0300 Subject: [PATCH] New design --- index.php | 165 +++++------------------------------------------------- script.js | 75 +++++++++++++++++++++++++ style.css | 73 ++++++++++++++++++++++++ 3 files changed, 163 insertions(+), 150 deletions(-) create mode 100644 script.js create mode 100644 style.css diff --git a/index.php b/index.php index 95e0dd1..175f8d7 100644 --- a/index.php +++ b/index.php @@ -18,180 +18,45 @@ Personal Home Calc - + - + +
0
-
+
diff --git a/script.js b/script.js new file mode 100644 index 0000000..e50af9e --- /dev/null +++ b/script.js @@ -0,0 +1,75 @@ +var p1='0'; +var tp=''; +var p2='0'; +var sol='0'; +var pmt='0'; +var allow=true; +function calc() { + pmt+='='; + document.getElementById('prompt').innerHTML=pmt; + var number1=p1; + var oper=tp; + var number2=p2; + $.ajax({ + url: "calc.php", + type: "GET", + data: {'number1': number1, 'oper': oper, 'number2': number2}, + dataType: "json", + success: function(response) { + if (response.rcode=="0") { + alert(response.result) + cle() + } else { + sol=response.result; + pmt+=sol; + document.getElementById('prompt').innerHTML=pmt; + allow=false; + p1='0'; + tp=''; + p2='0'; + } + } + }); +} +function numb(num) { + if (Number(p1)==0 && (tp=='')) { + p1=num; + pmt=String(p1); + document.getElementById('prompt').innerHTML=pmt; + } else if ((Number(p1)>0) && (tp=='')) { + p1+=num; + pmt=String(p1); + document.getElementById('prompt').innerHTML=pmt; + } else if (Number(p2)==0 && tp!='') { + p2=num; + pmt=String(p1)+tp+String(p2); + document.getElementById('prompt').innerHTML=pmt; + } else if (Number(p2)>0 && tp!='') { + p2+=num; + pmt=String(p1)+tp+String(p2); + document.getElementById('prompt').innerHTML=pmt; + } +} +function oper(op) { + if (tp!='') {alert('За раз можно использовать только одну операцию!');return;} + if (!allow) { + p1=Number(sol); + pmt=sol; + allow=true; + } + // if (p1=='0' && p2=='0' && tp=='' && Number(document.getElementById('prompt').value)>0) { + // p1=document.getElementById('prompt').innerHTML + // } + tp=op; + pmt+=tp; + document.getElementById('prompt').innerHTML=pmt; +} +function clr() { + p1='0'; + tp=''; + p2='0'; + sol='0'; + pmt='0'; + allow=true; + numb(0); +} \ No newline at end of file diff --git a/style.css b/style.css new file mode 100644 index 0000000..d55697e --- /dev/null +++ b/style.css @@ -0,0 +1,73 @@ +body{ + width: 100vw; + height: 100vh; + margin: 0; + padding: 0; + background: #4cdbc4; + display: flex; + justify-content: center; + align-items: center; +} +.calc{ + width: 600px; + height: 600px; + padding: 3vw; + box-sizing: border-box; + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + background: #324a5e; + font-family: "Comic Sans MS"; + /*overflow: hidden;*/ +} +#prompt{ + display: flex; + justify-content: flex-end; + align-items: center; + padding: 0 2%; + box-sizing: border-box; + margin-bottom: 5vh; + width: 100%; + height: 18%; + background: #e6e9ee; + border: 0; + font-size: 60px; + color: #324a5e; + text-shadow: 0 0 5px white; + overflow: hidden; +} +.hidd{ + display: none; +} +.row{ + width: 96%; + display: flex; + justify-content: space-between; +} +.btn{ + display: flex; + justify-content: center; + align-items: center; + width: 20%; + height: 12vh; + margin-bottom: 2px; + border: 0; + border-radius: 10px; + font-size: 60px; + color: #293c4d; + background: white; + cursor: pointer; +} +.btn:hover{ + box-shadow: 0 0 10px white; +} +.btn:active{ + box-shadow: 0 0 20px white; +} +.btn.oper{ + background: #f9b54c; +} +.btn.clr{ + background: #fd8469; +} \ No newline at end of file