From f4ae53338ccc320d391d4e8992ca7acfebac094c Mon Sep 17 00:00:00 2001 From: thewarrior1220 Date: Mon, 11 Apr 2022 09:00:52 +0200 Subject: [PATCH] update --- javascript/clicker counter/index.html | 20 +++++++++ javascript/clicker counter/script.js | 14 +++++++ javascript/ido/index.html | 15 +++++++ javascript/ido/script.js | 30 ++++++++++++++ javascript/jegyzet.txt | 26 ++++++++++++ javascript/masodfoku/index.html | 20 +++++++++ javascript/masodfoku/script.js | 58 +++++++++++++++++++++++++++ javascript/szamok/index.html | 26 ++++++++++++ javascript/szamok/script.js | 12 ++++++ szerkezet/style.css | 30 +++----------- szerkezet/szerkezet.html | 20 +++++---- 11 files changed, 236 insertions(+), 35 deletions(-) create mode 100644 javascript/clicker counter/index.html create mode 100644 javascript/clicker counter/script.js create mode 100644 javascript/ido/index.html create mode 100644 javascript/ido/script.js create mode 100644 javascript/jegyzet.txt create mode 100644 javascript/masodfoku/index.html create mode 100644 javascript/masodfoku/script.js create mode 100644 javascript/szamok/index.html create mode 100644 javascript/szamok/script.js diff --git a/javascript/clicker counter/index.html b/javascript/clicker counter/index.html new file mode 100644 index 0000000..8691ea7 --- /dev/null +++ b/javascript/clicker counter/index.html @@ -0,0 +1,20 @@ + + + + + + Click counter + + +
+ Szamlalo +



+
+ + + +
+
+ + + \ No newline at end of file diff --git a/javascript/clicker counter/script.js b/javascript/clicker counter/script.js new file mode 100644 index 0000000..55ef724 --- /dev/null +++ b/javascript/clicker counter/script.js @@ -0,0 +1,14 @@ +let click_counter = 0; + +function gomb1(){ + document.getElementById("kiiras").innerHTML = "Gomb1 lett megnyomva"; + document.getElementById("counter").innerHTML = ++click_counter; +} +function gomb2(){ + document.getElementById("kiiras").innerHTML = "Gomb2 lett megnyomva"; + document.getElementById("counter").innerHTML = ++click_counter; +} +function gomb3(){ + document.getElementById("kiiras").innerHTML = "Gomb3 lett megnyomva"; + document.getElementById("counter").innerHTML = ++click_counter; +} \ No newline at end of file diff --git a/javascript/ido/index.html b/javascript/ido/index.html new file mode 100644 index 0000000..dcb889a --- /dev/null +++ b/javascript/ido/index.html @@ -0,0 +1,15 @@ + + + + + + + + Idő + + + +
+ + + \ No newline at end of file diff --git a/javascript/ido/script.js b/javascript/ido/script.js new file mode 100644 index 0000000..66bfc75 --- /dev/null +++ b/javascript/ido/script.js @@ -0,0 +1,30 @@ +function time(){ + const d = new Date(); + let year = d.getFullYear(); + let month = d.getMonth() + 1; + let day = d.getDate(); + let day2 =""; + let hour = d.getHours(); + let min = d.getMinutes(); + let sec = d.getSeconds(); + + if(d.getDay() == 0){ + day2 = "hétfő"; + }else if(d.getDay() == 1){ + day2 = "kedd"; + }else if(d.getDay() == 2){ + day2 = "szerda"; + }else if(d.getDay() == 3){ + day2 = "csütörtök"; + }else if(d.getDay() == 4){ + day2 = "péntek"; + }else if(d.getDay() == 5){ + day2 = "szombat"; + }else if(d.getDay() == 6){ + day2 = "vasárnap"; + } + + document.getElementById("ido").innerText = year + "." + month + "." + day + " (" + day2 + ") " + hour + ":" + min + ":" + sec; + + setTimeout("time()", 1000); +} \ No newline at end of file diff --git a/javascript/jegyzet.txt b/javascript/jegyzet.txt new file mode 100644 index 0000000..e83002a --- /dev/null +++ b/javascript/jegyzet.txt @@ -0,0 +1,26 @@ +"use strict"; //Modern js mod + +alert("pop up ablak az oldal tetején") + + + \ No newline at end of file diff --git a/javascript/masodfoku/index.html b/javascript/masodfoku/index.html new file mode 100644 index 0000000..1b0affa --- /dev/null +++ b/javascript/masodfoku/index.html @@ -0,0 +1,20 @@ + + + + + + Masodfoku + + + a + b + c + +
+
+
+
+
+ + + \ No newline at end of file diff --git a/javascript/masodfoku/script.js b/javascript/masodfoku/script.js new file mode 100644 index 0000000..53ec6ae --- /dev/null +++ b/javascript/masodfoku/script.js @@ -0,0 +1,58 @@ +let a,b,c = 0; +function input(){ + a = document.getElementById("a").value; + b = document.getElementById("b").value; + c = document.getElementById("c").value; + + document.getElementById("ertekek").innerText = "a: " + a + " b: " + b + " c: " + c; + + szamolas(); +} + +function diszkriminans(){ + let diszk = (b*b) - (4 * a * c); + if(diszk > 0){ + return 2; + }else if(diszk == 0){ + return 1; + }else{ + return 0; + } +} + +function szamolas(){ + let diszk = diszkriminans(); + console.log("diszk: " + diszk); + if(diszk == 0){ + document.getElementById("hiba").innerText = "Nincs eredmeny"; + return "Nincs eredmeny"; + + } + if(a < 1){ + document.getElementById("hiba").innerText = "Elsofoku egyenlet"; + return "Elsofoku egyenlet"; + } + + let gyok1 = -b + Math.sqrt((b*b) - (4 *a*c)); + gyok1 = gyok1 / (2*a); + document.getElementById("eredmeny1").innerText = "Gyok1: " + gyok1; + let gyok2 = -b - Math.sqrt((b*b) - (4 *a*c)); + gyok2 = gyok2 / (2*a); + document.getElementById("eredmeny2").innerText = "Gyok2: " + gyok2; + + console.log("Gyok1: " + gyok1); + console.log("Gyok2: " + gyok2); + + if(diszk == 1){ + let ell1 = a*gyok1*gyok1 + b*gyok1 + c; + let ell2 = a*gyok2*gyok2 + b*gyok2 + c; + console.log("ELL1: " + ell1); + console.log("ell2: " + ell2); + if(ell1 == 0){ + document.getElementById("hiba").innerText = "Gyök1 jó megoldás"; + } + if(ell2 == 0) { + document.getElementById("hiba").innerText = "Gyök2 jó megoldás"; + } + } +} \ No newline at end of file diff --git a/javascript/szamok/index.html b/javascript/szamok/index.html new file mode 100644 index 0000000..8d94102 --- /dev/null +++ b/javascript/szamok/index.html @@ -0,0 +1,26 @@ + + + + + + Szamok + + +
+ + + + + + + + + + +
+ +
+
+ + + \ No newline at end of file diff --git a/javascript/szamok/script.js b/javascript/szamok/script.js new file mode 100644 index 0000000..90d49c7 --- /dev/null +++ b/javascript/szamok/script.js @@ -0,0 +1,12 @@ +let szamok = ""; + +function szam(element){ + //document.getElementById("eredmeny").innerHTML = element.innerText; + szamok += element.innerText; + document.getElementById("eredmeny2").innerHTML = "Eddigi szam: " + szamok; +} + +function negyzet(){ + let negyzeten = parseInt(szamok) * parseInt(szamok); + document.getElementById("eredmeny").innerHTML = "Eredmeny: " + negyzeten; +} \ No newline at end of file diff --git a/szerkezet/style.css b/szerkezet/style.css index d75f076..0b7cb31 100644 --- a/szerkezet/style.css +++ b/szerkezet/style.css @@ -1,21 +1,6 @@ *{ box-sizing: border-box; } -/*#right{ - background-color: red; - margin-left: 75%; - width: 25%; -} -#left{ - background-color: blueviolet; - float: left; - width: 25%; -} -article{ - background-color: blue; - margin-left: 25%; - width: 50%; -}*/ footer{ background-color: green; @@ -26,19 +11,16 @@ nav{ } ul{ text-align: center; + list-style-type: none; + inline-size: auto; } -#logo1{ - float: left; -} -#logo1 img{ - width: 50%; +.icon{ + } #logo2{ - float: right; -} -#logo2 img{ - width: 50%; + margin-left: 75%; + margin-top: 0%; } .col-1{ diff --git a/szerkezet/szerkezet.html b/szerkezet/szerkezet.html index 50d1c72..9ea79be 100644 --- a/szerkezet/szerkezet.html +++ b/szerkezet/szerkezet.html @@ -9,17 +9,15 @@