diff options
| author | Rasmus <rasmus.luha@gmail.com> | 2023-03-31 19:41:34 +0300 |
|---|---|---|
| committer | Rasmus <rasmus.luha@gmail.com> | 2023-03-31 19:41:34 +0300 |
| commit | 760e8fff4d4fd71350ddc9b17e85e95a17d4ce8e (patch) | |
| tree | c7ea657fe7d99852ff3c5ea19ca386d69bd9af55 /rannak | |
| parent | c40293acd3a00b20d74cf37823b7efb1b75dec9b (diff) | |
oops
Diffstat (limited to 'rannak')
229 files changed, 719 insertions, 1445 deletions
diff --git a/rannak/endPage/fonts/fontDos/OFL.txt b/rannak/endPage/fonts/fontDos/OFL.txt index 2a6f4a8..2a6f4a8 100755..100644 --- a/rannak/endPage/fonts/fontDos/OFL.txt +++ b/rannak/endPage/fonts/fontDos/OFL.txt diff --git a/rannak/endPage/fonts/fontDos/PressStart2P-Regular.ttf b/rannak/endPage/fonts/fontDos/PressStart2P-Regular.ttf Binary files differindex 1098ed2..1098ed2 100755..100644 --- a/rannak/endPage/fonts/fontDos/PressStart2P-Regular.ttf +++ b/rannak/endPage/fonts/fontDos/PressStart2P-Regular.ttf diff --git a/rannak/endPage/fonts/fontUno/Monoton-Regular.ttf b/rannak/endPage/fonts/fontUno/Monoton-Regular.ttf Binary files differindex 944605a..944605a 100755..100644 --- a/rannak/endPage/fonts/fontUno/Monoton-Regular.ttf +++ b/rannak/endPage/fonts/fontUno/Monoton-Regular.ttf diff --git a/rannak/endPage/fonts/fontUno/OFL.txt b/rannak/endPage/fonts/fontUno/OFL.txt index 736e86f..736e86f 100755..100644 --- a/rannak/endPage/fonts/fontUno/OFL.txt +++ b/rannak/endPage/fonts/fontUno/OFL.txt diff --git a/rannak/endPage/img/798916.jpg b/rannak/endPage/img/798916.jpg Binary files differindex 0e4fe4e..0e4fe4e 100755..100644 --- a/rannak/endPage/img/798916.jpg +++ b/rannak/endPage/img/798916.jpg diff --git a/rannak/endPage/img/798919.jpg b/rannak/endPage/img/798919.jpg Binary files differindex ebd88da..ebd88da 100755..100644 --- a/rannak/endPage/img/798919.jpg +++ b/rannak/endPage/img/798919.jpg diff --git a/rannak/endPage/img/798923.png b/rannak/endPage/img/798923.png Binary files differindex 6028f84..6028f84 100755..100644 --- a/rannak/endPage/img/798923.png +++ b/rannak/endPage/img/798923.png diff --git a/rannak/endPage/img/dos.png b/rannak/endPage/img/dos.png Binary files differindex e6b321b..e6b321b 100755..100644 --- a/rannak/endPage/img/dos.png +++ b/rannak/endPage/img/dos.png diff --git a/rannak/endPage/img/tres.png b/rannak/endPage/img/tres.png Binary files differindex d6177a9..d6177a9 100755..100644 --- a/rannak/endPage/img/tres.png +++ b/rannak/endPage/img/tres.png diff --git a/rannak/endPage/img/uno.jpg b/rannak/endPage/img/uno.jpg Binary files differindex ffe887b..ffe887b 100755..100644 --- a/rannak/endPage/img/uno.jpg +++ b/rannak/endPage/img/uno.jpg diff --git a/rannak/endPage/index.html b/rannak/endPage/index.html index 3dcb9df..24b42a7 100755..100644 --- a/rannak/endPage/index.html +++ b/rannak/endPage/index.html @@ -13,6 +13,18 @@ <div class="wrapper"> <div class="innerDiv"> <h1>TUBLI! <br/> Läbisid <span id="rolliNimi"></span> Rolli</h1> + + <div class="info"> + <h3></h3> + <span id="span1"></span> + <span id="span2"></span> + <span id="span3"></span> + <span id="span4"></span> + <span id="span5"></span> + <span id="span6"></span> + <span id="span7"></span> + </div> + <p>Nüüd võid valida uue Rolli või minna tagasi avalehele</p> <a href="../rolliValik"> diff --git a/rannak/endPage/main.js b/rannak/endPage/main.js index 1f4a3c5..2813fc0 100755..100644 --- a/rannak/endPage/main.js +++ b/rannak/endPage/main.js @@ -1,7 +1,18 @@ -let rollSpan = document.querySelector("span"); ; +const spans = document.querySelectorAll("span"); if (localStorage.roll != undefined){ - rollSpan.innerHTML = localStorage.roll; + + let roll = localStorage.roll; + spans[0].innerHTML = roll; delete localStorage.roll; -} + if (roll == 'Kaitseliitlase'){ + console.log(span1); + document.querySelector('h3').innerHTML = 'Baltiketti andmed:'; + spans[1].innerHTML = 'Asula: ' + localStorage.asula; + spans[2].innerHTML = 'Kaugus: ' + localStorage.kaugus; + + delete localStorage.asula; + delete localStorage.kaugus; + } +} diff --git a/rannak/endPage/style.css b/rannak/endPage/style.css index 0132b61..c9fa274 100755..100644 --- a/rannak/endPage/style.css +++ b/rannak/endPage/style.css @@ -3,17 +3,10 @@ src: url('fonts/fontUno/Monoton-Regular.ttf'); } -@font-face { - font-family: 'fontDos'; - src: url('fonts/fontDos/PressStart2P-Regular.ttf'); -} - - - body { padding: 0; margin: 0; - box-sixing: border-box; + box-sizing: border-box; background-image: url("img/tres.png"); background-size:100%; } @@ -27,6 +20,7 @@ body { text-align: center; } + .innerDiv { padding: 15px; margin-left: 20%; @@ -34,11 +28,25 @@ body { color: black; } + + +.info{ + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; +} + +p{ + border-top: solid 3px black; + padding-top: 2rem; +} + + h1 { color: rgba(0,136,169,1); font-family:'fontUno'; } -p {font-family:'fontDos';} button { background-color: rgba(0,136,169,1); @@ -48,7 +56,6 @@ button { cursor: pointer; text-decoration: none; font-size: 1.3rem; - font-family:'fontDos'; } a { diff --git a/rannak/kaart/index.html b/rannak/kaart/index.html index bde14a3..4ef027f 100755..100644 --- a/rannak/kaart/index.html +++ b/rannak/kaart/index.html @@ -4,18 +4,24 @@ <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <title>Rännak</title> - <link rel="stylesheet" href="css/kaart.css" type="text/css"/> - <!-- Bootstrap - CSS only --> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous"> + + <link rel="stylesheet" href="kaart.css" type="text/css"/> </head> <body class="bg-dark"> <div class="upperContainer text-white"> - <div> + <div class="upperTextWrap"> <h1>Eesti Vabariigi tunnustamine 1991</h1> - <p>Leia esimesed seitse riiki, kes tunnustasid Eesti iseseisvust + <p> + Leia esimesed seitse riiki, kes tunnustasid Eesti iseseisvust: + <br/> + Island - 22.august 1991, Leedu - 22.august, Läti - 23.august, + Vene NFSV - 24.august, Ungari - 24.august, Prantsusmaa - 25.august, + Ukraina - 26.august. + </p> </div> <div> @@ -1012,6 +1018,6 @@ </div> <!-- javascript --> - <script src="js/kaart.js"></script> + <script src="kaart.js"></script> </body> </html> diff --git a/rannak/kaart/css/kaart.css b/rannak/kaart/kaart.css index 1329303..f941739 100755..100644 --- a/rannak/kaart/css/kaart.css +++ b/rannak/kaart/kaart.css @@ -1,12 +1,13 @@ body { display: flex; flex-direction: column; - max-height: 100vh; } /* Upper Container Stuff*/ .upperContainer{ text-align: center; + width: 70%; + margin-left: 15%; } @@ -21,8 +22,6 @@ body { } - - /* Move On Stuff*/ .moveOn{ @@ -55,6 +54,7 @@ button:disabled{ border-radius: 10px; margin: 1.5%; background-color: #434854; + max-height: 75vh; } /* #00394f, #006284 */ diff --git a/rannak/kaart/js/kaart.js b/rannak/kaart/kaart.js index e905fb5..e905fb5 100755..100644 --- a/rannak/kaart/js/kaart.js +++ b/rannak/kaart/kaart.js diff --git a/rannak/mangud/arimees/baks/pood.bak/fonts/1001fonts-eutemia-i-eula.txt b/rannak/mangud/arimees/baks/pood.bak/fonts/1001fonts-eutemia-i-eula.txt deleted file mode 100755 index b3cf91f..0000000 --- a/rannak/mangud/arimees/baks/pood.bak/fonts/1001fonts-eutemia-i-eula.txt +++ /dev/null @@ -1,31 +0,0 @@ -1001Fonts Free For Commercial Use License (FFC) - -Preamble
-In this license, 'Eutemia I' refers to the given .zip file, which may contain one or numerous fonts. These fonts can be of any type (.ttf, .otf, ...) and together they form a 'font family' or in short a 'typeface'.
-
-1. Copyright
-Eutemia I is the intellectual property of its respective author, provided it is original, and is protected by copyright laws in many parts of the world.
-
-2. Usage
-Eutemia I may be downloaded and used free of charge for both personal and commercial use. Personal use refers to all usage that does not generate financial income in a business manner, for instance:
-
- - personal scrapbooking for yourself
- - recreational websites and blogs for friends and family
- - prints such as flyers, posters, t-shirts for churches, charities, and non-profit organizations
-
-Commercial use refers to usage in a business environment, including:
-
- - business cards, logos, advertising, websites for companies
- - t-shirts, books, apparel that will be sold for money
- - flyers, posters for events that charge admission
- - freelance graphic design work
- - anything that will generate direct or indirect income
-
-3. Modification
-Eutemia I may not be modified, altered, adapted or built upon without written permission by its respective author. This pertains all files within the downloadable font zip-file.
-
-4. Distribution
-While Eutemia I may freely be copied and passed along to other individuals for private use as its original downloadable zip-file, it may not be sold or published without written permission by its respective author.
-
-5. Disclaimer
-Eutemia I is offered 'as is' without any warranty. 1001fonts.com and the respective author of Eutemia I shall not be liable for any damage derived from using this typeface. By using Eutemia I you agree to the terms of this license.
\ No newline at end of file diff --git a/rannak/mangud/arimees/baks/pood.bak/fonts/Eutemia.ttf b/rannak/mangud/arimees/baks/pood.bak/fonts/Eutemia.ttf Binary files differdeleted file mode 100755 index c575e59..0000000 --- a/rannak/mangud/arimees/baks/pood.bak/fonts/Eutemia.ttf +++ /dev/null diff --git a/rannak/mangud/arimees/baks/pood.bak/index.html b/rannak/mangud/arimees/baks/pood.bak/index.html deleted file mode 100755 index 5b01902..0000000 --- a/rannak/mangud/arimees/baks/pood.bak/index.html +++ /dev/null @@ -1,223 +0,0 @@ -<html lang="en"> -<head> - <meta charset="UTF-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <title> Hinnad </title> - <!-- Bootstrap - CSS only --> - <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous"> - <link rel="stylesheet" href="styles.css"> -</head> - -<body class="text-white"> - - <div class="container text-center text-white align-items-center pb-1"> - <h1 class="pb-1 pt-2"> Hinnad </h1> - <p> Leia toodete tolleaegne hind Eesti Markades, kasutades Rubla ja Marga vahelist kurssi.</p> - <div class="row"> - <div> - <button class="moveOn" disabled>Liigu Edasi</button> - </div> - - </div> - - <!-- Button trigger modal --> - <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> - Sissejuhatus - </button> - </div> - - - <!-- Modal --> - <div class="modal fade text-black" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> - <div class="modal-dialog" role="document"> - <div class="modal-content"> - - <div class="modal-header"> - <div class="modalHeaderWrapper"> - <h3 class="modal-title" id="myModalLabel">Sissejuhatus</h5> - </div> - <img class="avatar" alt="avatar" src="pildid/avatar.png"/> - </div> - - <div class="modal-body"> - Lähen siin varsti Georg Otsaga Helsinki ostoksille. - <br/> - <strong> - Äkki saate vähe aidata mul plaani pidada, mida kõige kasulikum oleks 10 000 rutsiga ära tuua? Äkki tahate ise ka midagi, võin soodsalt tuua! - </strong> - </div> - - </div> - </div> - </div> - - - - <h3>Kurss: 1 Mark = 15.6 Rubla</h3> - <h5 class="infoTxt"></h5> - - - <!-- Main stuff --> - <div class="main"> - - <div class="card text-center"> - <img class="card-img-top" src="pildid/tugitool.png" alt="Tugitool"> - <div class="card-body"> - <h3 class="card-title">Tugitool</h5> - - <div class="cardInnerWrapper"> - <div class="uno"> - <h4>Rublades</h4> - <span class="rublaHind">109.2</span> - <span class="symbol" >₽</span> - </div> - <div class="dos"> - <h4>Markades</h4> - <input name="" type="text" value=""/> - </div> - </div> - - <button class="kontrolliKaarti">Kontrolli</button> - - </div> - </div> - - - - - <div class="card text-center"> - <img class="card-img-top" src="pildid/laud.png" alt="Laud"> - <div class="card-body"> - <h3 class="card-title">Laud</h5> - - <div class="cardInnerWrapper"> - <div class="uno"> - <h4>Rublades</h4> - <span class="rublaHind">62.4</span> - <span class="symbol" >₽</span> - </div> - <div class="dos"> - <h4>Markades</h4> - <input name="" type="text" value=""/> - </div> - </div> - - <button class="kontrolliKaarti">Kontrolli</button> - - </div> - </div> - - - - - - <div class="card text-center"> - <img class="card-img-top" src="pildid/kupsis.png" alt="Küpsised"> - <div class="card-body"> - <h3 class="card-title">Küpsised</h5> - - <div class="cardInnerWrapper"> - <div class="uno"> - <h4>Rublades</h4> - <span class="rublaHind">140.4</span> - <span class="symbol" >₽</span> - </div> - <div class="dos"> - <h4>Markades</h4> - <input name="" type="text" value=""/> - </div> - </div> - - <button class="kontrolliKaarti">Kontrolli</button> - - </div> - </div> - - - - - <div class="card text-center"> - <img class="card-img-top" src="pildid/sai.png" alt="Sai"> - <div class="card-body"> - <h3 class="card-title">Saiapäts</h5> - - <div class="cardInnerWrapper"> - <div class="uno"> - <h4>Rublades</h4> - <span class="rublaHind">78</span> - <span class="symbol" >₽</span> - </div> - <div class="dos"> - <h4>Markades</h4> - <input name="" type="text" value=""/> - </div> - </div> - - <button class="kontrolliKaarti">Kontrolli</button> - - </div> - </div> - - - - - <div class="card text-center"> - <img class="card-img-top" src="pildid/kohver.png" alt="Kohver"> - <div class="card-body"> - <h3 class="card-title">Kohver</h5> - - <div class="cardInnerWrapper"> - <div class="uno"> - <h4>Rublades</h4> - <span class="rublaHind">156</span> - <span class="symbol" >₽</span> - </div> - <div class="dos"> - <h4>Markades</h4> - <input name="" type="text" value=""/> - </div> - </div> - - <button class="kontrolliKaarti">Kontrolli</button> - - </div> - </div> - - - - - - <div class="card text-center"> - <img class="card-img-top" src="pildid/kingad.png" alt="Kingad"> - <div class="card-body"> - <h3 class="card-title">Kingad</h5> - - <div class="cardInnerWrapper"> - <div class="uno"> - <h4>Rublades</h4> - <span class="rublaHind">312</span> - <span class="symbol" >₽</span> - </div> - <div class="dos"> - <h4>Markades</h4> - <input name="" type="text" value=""/> - </div> - </div> - - <button class="kontrolliKaarti">Kontrolli</button> - - </div> - </div> - - - </div> - - - - <script src="script.js"></script> - - <!-- JavaScript Bundle with Popper --> - <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script> -</body> -</html> diff --git a/rannak/mangud/arimees/baks/pood.bak/pildid/avatar.png b/rannak/mangud/arimees/baks/pood.bak/pildid/avatar.png Binary files differdeleted file mode 100755 index 3cb21cf..0000000 --- a/rannak/mangud/arimees/baks/pood.bak/pildid/avatar.png +++ /dev/null diff --git a/rannak/mangud/arimees/baks/pood.bak/pildid/kingad.png b/rannak/mangud/arimees/baks/pood.bak/pildid/kingad.png Binary files differdeleted file mode 100755 index ef106ae..0000000 --- a/rannak/mangud/arimees/baks/pood.bak/pildid/kingad.png +++ /dev/null diff --git a/rannak/mangud/arimees/baks/pood.bak/pildid/kohver.png b/rannak/mangud/arimees/baks/pood.bak/pildid/kohver.png Binary files differdeleted file mode 100755 index 485b6db..0000000 --- a/rannak/mangud/arimees/baks/pood.bak/pildid/kohver.png +++ /dev/null diff --git a/rannak/mangud/arimees/baks/pood.bak/pildid/kupsis.png b/rannak/mangud/arimees/baks/pood.bak/pildid/kupsis.png Binary files differdeleted file mode 100755 index 2419f89..0000000 --- a/rannak/mangud/arimees/baks/pood.bak/pildid/kupsis.png +++ /dev/null diff --git a/rannak/mangud/arimees/baks/pood.bak/pildid/laud.png b/rannak/mangud/arimees/baks/pood.bak/pildid/laud.png Binary files differdeleted file mode 100755 index e3036dc..0000000 --- a/rannak/mangud/arimees/baks/pood.bak/pildid/laud.png +++ /dev/null diff --git a/rannak/mangud/arimees/baks/pood.bak/pildid/sai.png b/rannak/mangud/arimees/baks/pood.bak/pildid/sai.png Binary files differdeleted file mode 100755 index 8add13c..0000000 --- a/rannak/mangud/arimees/baks/pood.bak/pildid/sai.png +++ /dev/null diff --git a/rannak/mangud/arimees/baks/pood.bak/pildid/tugitool.png b/rannak/mangud/arimees/baks/pood.bak/pildid/tugitool.png Binary files differdeleted file mode 100755 index c48bd50..0000000 --- a/rannak/mangud/arimees/baks/pood.bak/pildid/tugitool.png +++ /dev/null diff --git a/rannak/mangud/arimees/baks/pood.bak/script.js b/rannak/mangud/arimees/baks/pood.bak/script.js deleted file mode 100755 index 3b3e67b..0000000 --- a/rannak/mangud/arimees/baks/pood.bak/script.js +++ /dev/null @@ -1,69 +0,0 @@ -document.addEventListener('DOMContentLoaded', () => { - let btn = document.querySelector('.modalButton'); - btn.click(); -}); - - - -const kurss = 15.6; -doneCounter = 0; - - -const kontrollBtns = document.querySelectorAll(".kontrolliKaarti"); -for (let nupp of kontrollBtns){ - nupp.addEventListener("click", (e) => { - let rublaHind = e.target.previousElementSibling.children[0].children[1].innerHTML; - let pakkumine = e.target.previousElementSibling.children[1].children[1].value; - - if (pakkumine*kurss == rublaHind){ - - //Change color - e.target.offsetParent.style.background = "#288654"; - e.target.previousElementSibling.children[0].style.borderRight = ".5rem solid #288654"; - e.target.previousElementSibling.children[1].style.borderLeft = ".5rem solid #288654"; - - //Change Element - - (e.target.previousElementSibling.children[1].children[1]).remove(); - const newEl = document.createElement("span"); - newEl.classList.add("symbol"); - newEl.innerHTML = pakkumine + " M"; - e.target.previousElementSibling.children[1].appendChild(newEl); - - e.target.remove(); - doneCounter++; - - - // InfoTxt - let infoTxt = document.querySelector(".infoTxt") - infoTxt.innerHTML = ""; - - if (doneCounter >= 6){ - enableAllGood(); - } - } - - - else{ - // Inputvalue Reset - e.target.previousElementSibling.children[1].children[1].value = ""; - - // InfoTxt - let infoTxt = document.querySelector(".infoTxt") - infoTxt.style.color = "red"; - infoTxt.innerHTML = "Proovi Uuesti!"; - - } - - - - }) -} - - - -function enableAllGood(){ - const btn = document.querySelector(".moveOn"); - btn.disabled = false; - btn.onclick = () => location.href = ""; -} diff --git a/rannak/mangud/arimees/baks/pood.bak/styles.css b/rannak/mangud/arimees/baks/pood.bak/styles.css deleted file mode 100755 index 58bc290..0000000 --- a/rannak/mangud/arimees/baks/pood.bak/styles.css +++ /dev/null @@ -1,167 +0,0 @@ -* {box-sizing: border-box;} - -body{ - background-color: #43464b; -} -h1{ - color: #2FF924; - font-weight: bold; -} - -/* Modal Stuff */ - -.avatar { - border-radius: 20px; - width: 100%; -} - -.modalHeaderWrapper{ - text-align: center; - margin: 0; - width: 100%; -} - -.closeModalButton { - border-radius: 50px; -} - -.modalButton{ - position: absolute; - top: 0; - right: 0; - padding: 6px; - padding: 9px 25px; - background-color: rgba(0,136,169,1); - border: none; - border-radius: 50px; - cursor: pointer; - transition: all 0.3 ease 0; - margin: 3%; - font-size: 1.2rem; -} - -.modalButton:hover{ - background-color: rgba(0,136,169,0.8); -} - -/* To unduck chrome modal pic size */ -.modal-header img { - max-width: 15rem; - height: auto; - padding: .3rem; -} - - - - - -/* Move On */ - -.moveOn{ - display: inline-block; - border: none; - padding: 6px 12px; - margin-botton: 0; - font-size: 1rem; - font-weight: normal; - text-align: center; - cursor: pointer; - border-radius: 4px; - background-color: #4BB543; - color: white; -} - -button:disabled{ - opacity: 0.5; - cursor: not-allowed; -} - - - -/* Pood Itself */ -.main { - padding: 1% 10%; - display: flex; - flex-wrap: wrap; - justify-content: center; -} - -h3, h5 { - text-align: center; -} - - - - - -/* PoeKaart */ - -.card { - margin: 2rem .5rem; - padding: .5rem; - width: calc(20% - 1rem); - color: black; - background-color: #D22730; -} - -.card img { - height: 57%; -} - - -.card-body{ - padding: 0; - margin: 0; -} -.cardInnerWrapper { - background-color: white; - display:flex; - paddig: 0; - margin: 0; -} - -.rublaHind, .symbol{ - font-size: 1.5rem; -} - -.uno { - width: 50%; - border-right: .5rem solid #D22730; -} - -.dos { - border-left: .5rem solid #D22730; - width: 50%; -} - -.dos input { - width: 80%; - margin-bottom: 1rem; -} - -.kontrolliKaarti{ - margin-top: 1rem; - display: inline-block; - border: none; - padding: 3px 6px; - margin-botton: 0; - font-size: 1.07rem; - font-weight: normal; - text-align: center; - cursor: pointer; - border-radius: 4px; - background-color: #006E33; - color: white; -} - - - - - -/* Media Querries*/ - -@media screen and (max-width: 1650px) { - .card{ - width: calc(25% - 1rem); - } -} diff --git a/rannak/mangud/arimees/baks/pood/fonts/1001fonts-eutemia-i-eula.txt b/rannak/mangud/arimees/baks/pood/fonts/1001fonts-eutemia-i-eula.txt index b3cf91f..b3cf91f 100755..100644 --- a/rannak/mangud/arimees/baks/pood/fonts/1001fonts-eutemia-i-eula.txt +++ b/rannak/mangud/arimees/baks/pood/fonts/1001fonts-eutemia-i-eula.txt diff --git a/rannak/mangud/arimees/baks/pood/fonts/Eutemia.ttf b/rannak/mangud/arimees/baks/pood/fonts/Eutemia.ttf Binary files differindex c575e59..c575e59 100755..100644 --- a/rannak/mangud/arimees/baks/pood/fonts/Eutemia.ttf +++ b/rannak/mangud/arimees/baks/pood/fonts/Eutemia.ttf diff --git a/rannak/mangud/arimees/baks/pood/index.html b/rannak/mangud/arimees/baks/pood/index.html index 6c2f7b5..6c2f7b5 100755..100644 --- a/rannak/mangud/arimees/baks/pood/index.html +++ b/rannak/mangud/arimees/baks/pood/index.html diff --git a/rannak/mangud/arimees/baks/pood/pildid/avatar.png b/rannak/mangud/arimees/baks/pood/pildid/avatar.png Binary files differindex 3cb21cf..3cb21cf 100755..100644 --- a/rannak/mangud/arimees/baks/pood/pildid/avatar.png +++ b/rannak/mangud/arimees/baks/pood/pildid/avatar.png diff --git a/rannak/mangud/arimees/baks/pood/pildid/kingad.png b/rannak/mangud/arimees/baks/pood/pildid/kingad.png Binary files differindex ef106ae..ef106ae 100755..100644 --- a/rannak/mangud/arimees/baks/pood/pildid/kingad.png +++ b/rannak/mangud/arimees/baks/pood/pildid/kingad.png diff --git a/rannak/mangud/arimees/baks/pood/pildid/kohver.png b/rannak/mangud/arimees/baks/pood/pildid/kohver.png Binary files differindex 485b6db..485b6db 100755..100644 --- a/rannak/mangud/arimees/baks/pood/pildid/kohver.png +++ b/rannak/mangud/arimees/baks/pood/pildid/kohver.png diff --git a/rannak/mangud/arimees/baks/pood/pildid/kupsis.png b/rannak/mangud/arimees/baks/pood/pildid/kupsis.png Binary files differindex 2419f89..2419f89 100755..100644 --- a/rannak/mangud/arimees/baks/pood/pildid/kupsis.png +++ b/rannak/mangud/arimees/baks/pood/pildid/kupsis.png diff --git a/rannak/mangud/arimees/baks/pood/pildid/laud.png b/rannak/mangud/arimees/baks/pood/pildid/laud.png Binary files differindex e3036dc..e3036dc 100755..100644 --- a/rannak/mangud/arimees/baks/pood/pildid/laud.png +++ b/rannak/mangud/arimees/baks/pood/pildid/laud.png diff --git a/rannak/mangud/arimees/baks/pood/pildid/sai.png b/rannak/mangud/arimees/baks/pood/pildid/sai.png Binary files differindex 8add13c..8add13c 100755..100644 --- a/rannak/mangud/arimees/baks/pood/pildid/sai.png +++ b/rannak/mangud/arimees/baks/pood/pildid/sai.png diff --git a/rannak/mangud/arimees/baks/pood/pildid/tugitool.png b/rannak/mangud/arimees/baks/pood/pildid/tugitool.png Binary files differindex c48bd50..c48bd50 100755..100644 --- a/rannak/mangud/arimees/baks/pood/pildid/tugitool.png +++ b/rannak/mangud/arimees/baks/pood/pildid/tugitool.png diff --git a/rannak/mangud/arimees/baks/pood/script.js b/rannak/mangud/arimees/baks/pood/script.js index 3b3e67b..3b3e67b 100755..100644 --- a/rannak/mangud/arimees/baks/pood/script.js +++ b/rannak/mangud/arimees/baks/pood/script.js diff --git a/rannak/mangud/arimees/baks/pood/styles.css b/rannak/mangud/arimees/baks/pood/styles.css index 58bc290..58bc290 100755..100644 --- a/rannak/mangud/arimees/baks/pood/styles.css +++ b/rannak/mangud/arimees/baks/pood/styles.css diff --git a/rannak/mangud/arimees/muusika/index.html b/rannak/mangud/arimees/muusika/index.html index e1e80ab..e1e80ab 100755..100644 --- a/rannak/mangud/arimees/muusika/index.html +++ b/rannak/mangud/arimees/muusika/index.html diff --git a/rannak/mangud/arimees/muusika/pildid/avatar.png b/rannak/mangud/arimees/muusika/pildid/avatar.png Binary files differindex 3cb21cf..3cb21cf 100755..100644 --- a/rannak/mangud/arimees/muusika/pildid/avatar.png +++ b/rannak/mangud/arimees/muusika/pildid/avatar.png diff --git a/rannak/mangud/arimees/muusika/script.js b/rannak/mangud/arimees/muusika/script.js index 8803bbe..8803bbe 100755..100644 --- a/rannak/mangud/arimees/muusika/script.js +++ b/rannak/mangud/arimees/muusika/script.js diff --git a/rannak/mangud/arimees/muusika/style.css b/rannak/mangud/arimees/muusika/style.css index 3b7e248..3b7e248 100755..100644 --- a/rannak/mangud/arimees/muusika/style.css +++ b/rannak/mangud/arimees/muusika/style.css diff --git a/rannak/mangud/arimees/pood/index.html b/rannak/mangud/arimees/pood/index.html index 1e83723..f52a103 100755..100644 --- a/rannak/mangud/arimees/pood/index.html +++ b/rannak/mangud/arimees/pood/index.html @@ -128,9 +128,35 @@ <button class="nav-link" id="tab11" data-bs-toggle="tab" data-bs-target="#tab-pane11" type="button" role="tab" aria-controls="tab-pane11" aria-selected="false" >11</button> </li> - </ul> + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab12" data-bs-toggle="tab" data-bs-target="#tab-pane12" type="button" role="tab" aria-controls="tab-pane12" aria-selected="false" >12</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab13" data-bs-toggle="tab" data-bs-target="#tab-pane13" type="button" role="tab" aria-controls="tab-pane13" aria-selected="false" >13</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab14" data-bs-toggle="tab" data-bs-target="#tab-pane14" type="button" role="tab" aria-controls="tab-pane14" aria-selected="false" >14</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab15" data-bs-toggle="tab" data-bs-target="#tab-pane15" type="button" role="tab" aria-controls="tab-pane15" aria-selected="false" >15</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab16" data-bs-toggle="tab" data-bs-target="#tab-pane16" type="button" role="tab" aria-controls="tab-pane16" aria-selected="false" >16</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab17" data-bs-toggle="tab" data-bs-target="#tab-pane17" type="button" role="tab" aria-controls="tab-pane17" aria-selected="false" >17</button> + </li> + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab18" data-bs-toggle="tab" data-bs-target="#tab-pane18" type="button" role="tab" aria-controls="tab-pane18" aria-selected="false" >18</button> + </li> + </ul> @@ -180,10 +206,35 @@ <img alt="Ajakirja lehekülg" src="pildid/11.jpg"/> </div> - </div> + <div class="tab-pane fade" id="tab-pane12" role="tabpanel" aria-labelledby="12-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/12.jpg"/> + </div> + <div class="tab-pane fade" id="tab-pane13" role="tabpanel" aria-labelledby="13-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/13.jpg"/> + </div> + <div class="tab-pane fade" id="tab-pane14" role="tabpanel" aria-labelledby="14-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/14.jpg"/> + </div> + <div class="tab-pane fade" id="tab-pane15" role="tabpanel" aria-labelledby="15-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/15.jpg"/> + </div> + + <div class="tab-pane fade" id="tab-pane16" role="tabpanel" aria-labelledby="16-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/16.jpg"/> + </div> + + <div class="tab-pane fade" id="tab-pane17" role="tabpanel" aria-labelledby="17-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/17.jpg"/> + </div> + + <div class="tab-pane fade" id="tab-pane18" role="tabpanel" aria-labelledby="18-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/18.jpg"/> + </div> + + </div> </div> <!-- Ajakirja Wrapper End --> @@ -191,6 +242,7 @@ <!-- Tabel --> <h3>Ostunimekiri</h3> + <p>Täitmiseks vajuta soovitud kohale ja sisesta andmed.</p> <div class="tabelWrapper"> <table class="table table-dark table-striped"> diff --git a/rannak/mangud/arimees/pood/pildid/12.jpg b/rannak/mangud/arimees/pood/pildid/12.jpg Binary files differnew file mode 100644 index 0000000..6cc8de1 --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/12.jpg diff --git a/rannak/mangud/arimees/pood/pildid/13.jpg b/rannak/mangud/arimees/pood/pildid/13.jpg Binary files differnew file mode 100644 index 0000000..dd4121e --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/13.jpg diff --git a/rannak/mangud/arimees/pood/pildid/14.jpg b/rannak/mangud/arimees/pood/pildid/14.jpg Binary files differnew file mode 100644 index 0000000..f9bb4be --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/14.jpg diff --git a/rannak/mangud/arimees/pood/pildid/15.jpg b/rannak/mangud/arimees/pood/pildid/15.jpg Binary files differnew file mode 100644 index 0000000..5522a85 --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/15.jpg diff --git a/rannak/mangud/arimees/pood/pildid/16.jpg b/rannak/mangud/arimees/pood/pildid/16.jpg Binary files differnew file mode 100644 index 0000000..f981ab5 --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/16.jpg diff --git a/rannak/mangud/arimees/pood/pildid/17.jpg b/rannak/mangud/arimees/pood/pildid/17.jpg Binary files differnew file mode 100644 index 0000000..e87ebfe --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/17.jpg diff --git a/rannak/mangud/arimees/pood/pildid/18.jpg b/rannak/mangud/arimees/pood/pildid/18.jpg Binary files differnew file mode 100644 index 0000000..1de7aa5 --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/18.jpg diff --git a/rannak/mangud/arimees/pood/pildid/avatar.png b/rannak/mangud/arimees/pood/pildid/avatar.png Binary files differindex 3cb21cf..3cb21cf 100755..100644 --- a/rannak/mangud/arimees/pood/pildid/avatar.png +++ b/rannak/mangud/arimees/pood/pildid/avatar.png diff --git a/rannak/mangud/arimees/pood/script.js b/rannak/mangud/arimees/pood/script.js index 8803bbe..5a48c84 100755..100644 --- a/rannak/mangud/arimees/pood/script.js +++ b/rannak/mangud/arimees/pood/script.js @@ -4,25 +4,84 @@ document.addEventListener('DOMContentLoaded', () => { }); -const selectors = document.querySelectorAll('select'); -for(el of selectors){ - el.addEventListener('change', () => { - let selected = new Array(); - for (el of selectors){ - if (!selected.includes(el.value) && el.value != 'Vali') - selected.push(el.value); +const cells = document.querySelectorAll("td"); + +for (let i=0;i < cells.length; i++){ + cells[i].onclick = function(){ + + if (this.hasAttribute('data-clicked')) + return; + + this.setAttribute('data-clicked', 'yes') + this.setAttribute('data-text', this.innerHTML) + + let input = document.createElement('input'); + input.setAttribute('type', 'text'); + input.value = this.innerHTML; + input.style.width = this.offsetWidth - (this.clientLeft * 2) + 'px'; + input.style.height = this.offsetHeight - (this.clientTop * 2) + 'px'; + input.style.border = '0px'; + input.fontFamily = 'inherit'; + input.fontSize = 'inherit'; + input.textAlign = 'inherit'; + input.style.backgroundColor = 'LightGoldenRodYellow'; + + + // On offclick + input.onblur = function(){ + let td = input.parentElement; + let origText = input.parentElement.getAttribute('data-text'); + let curText = this.value; + + if (origText != curText){ + td.removeAttribute('data-clicked'); + td.removeAttribute('data-text'); + td.innerHTML = curText; + td.style.cssText = 'padding: .5rem .5rem'; + + + // Can move on? + for (cell of cells){ + if (cell.textContent == '') + return; + } + moveOnEnable(); + } + else { + td.removeAttribute('data-clicked'); + td.removeAttribute('data-text'); + td.innerHTML = origText; + td.style.cssText = 'padding: .5rem .5rem'; + } + + + // Here Check if Done + //TODO + + + + } // onblur func end + + + input.onkeypress = function (){ + if (event.keyCode == 13) + this.onblur(); } - if (selected.length == 6) - moveOnEnable(); + this.innerHTML = ''; + this.style.cssText = 'padding: 0px'; + this.append(input); + this.firstElementChild.select(); - }); -} + + } // OnClick Loop +} //ForLoop + -// If All Else Done +// If All Done function moveOnEnable(){ const btn = document.querySelector(".moveOn"); diff --git a/rannak/mangud/arimees/pood/style.css b/rannak/mangud/arimees/pood/style.css index e4de8d1..61bdfe7 100755..100644 --- a/rannak/mangud/arimees/pood/style.css +++ b/rannak/mangud/arimees/pood/style.css @@ -3,6 +3,7 @@ body{ background-color: #43464b; + color: white; } @@ -78,6 +79,12 @@ button:disabled{ /* Main */ + +.tab-pane { + text-align: center; +} + + .main { display: flex; align-items: center; @@ -85,14 +92,12 @@ button:disabled{ flex-direction: column; } -.main h3 { - padding-top: 1rem; - color: white; +h3{ + padding-top: 3rem; } .tab-content img{ - max-width : 50vw; - heigth: auto; + max-height: 87vh; } @@ -100,3 +105,7 @@ table { padding-top: 1rem; font-size: 1.1rem; } + +img:hover{ + scale: 1.37; +} diff --git a/rannak/mangud/arimees/soome/fonts/OFL.txt b/rannak/mangud/arimees/soome/fonts/OFL.txt index cdb3773..cdb3773 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/OFL.txt +++ b/rannak/mangud/arimees/soome/fonts/OFL.txt diff --git a/rannak/mangud/arimees/soome/fonts/README.txt b/rannak/mangud/arimees/soome/fonts/README.txt index c5792a2..c5792a2 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/README.txt +++ b/rannak/mangud/arimees/soome/fonts/README.txt diff --git a/rannak/mangud/arimees/soome/fonts/Rubik-Italic-VariableFont_wght.ttf b/rannak/mangud/arimees/soome/fonts/Rubik-Italic-VariableFont_wght.ttf Binary files differindex 58d5f50..58d5f50 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/Rubik-Italic-VariableFont_wght.ttf +++ b/rannak/mangud/arimees/soome/fonts/Rubik-Italic-VariableFont_wght.ttf diff --git a/rannak/mangud/arimees/soome/fonts/Rubik-VariableFont_wght.ttf b/rannak/mangud/arimees/soome/fonts/Rubik-VariableFont_wght.ttf Binary files differindex fa161b9..fa161b9 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/Rubik-VariableFont_wght.ttf +++ b/rannak/mangud/arimees/soome/fonts/Rubik-VariableFont_wght.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-Black.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-Black.ttf Binary files differindex 1613299..1613299 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-Black.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-Black.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-BlackItalic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-BlackItalic.ttf Binary files differindex fc12676..fc12676 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-BlackItalic.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-BlackItalic.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-Bold.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-Bold.ttf Binary files differindex 7ec66a6..7ec66a6 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-Bold.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-Bold.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-BoldItalic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-BoldItalic.ttf Binary files differindex f6e0780..f6e0780 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-BoldItalic.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-BoldItalic.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBold.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBold.ttf Binary files differindex 1ca9932..1ca9932 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBold.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBold.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBoldItalic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBoldItalic.ttf Binary files differindex 598f72a..598f72a 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBoldItalic.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBoldItalic.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-Italic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-Italic.ttf Binary files differindex 0c6d991..0c6d991 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-Italic.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-Italic.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-Light.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-Light.ttf Binary files differindex 9229768..9229768 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-Light.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-Light.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-LightItalic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-LightItalic.ttf Binary files differindex d3bba74..d3bba74 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-LightItalic.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-LightItalic.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-Medium.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-Medium.ttf Binary files differindex 0895d3e..0895d3e 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-Medium.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-Medium.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-MediumItalic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-MediumItalic.ttf Binary files differindex e839613..e839613 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-MediumItalic.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-MediumItalic.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-Regular.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-Regular.ttf Binary files differindex 0967c8c..0967c8c 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-Regular.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-Regular.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBold.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBold.ttf Binary files differindex b631487..b631487 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBold.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBold.ttf diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBoldItalic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBoldItalic.ttf Binary files differindex f9eb73b..f9eb73b 100755..100644 --- a/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBoldItalic.ttf +++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBoldItalic.ttf diff --git a/rannak/mangud/arimees/soome/index.html b/rannak/mangud/arimees/soome/index.html index 824a450..824a450 100755..100644 --- a/rannak/mangud/arimees/soome/index.html +++ b/rannak/mangud/arimees/soome/index.html diff --git a/rannak/mangud/arimees/soome/pildid/avatar.png b/rannak/mangud/arimees/soome/pildid/avatar.png Binary files differindex 3cb21cf..3cb21cf 100755..100644 --- a/rannak/mangud/arimees/soome/pildid/avatar.png +++ b/rannak/mangud/arimees/soome/pildid/avatar.png diff --git a/rannak/mangud/arimees/soome/script.js b/rannak/mangud/arimees/soome/script.js index 946f029..946f029 100755..100644 --- a/rannak/mangud/arimees/soome/script.js +++ b/rannak/mangud/arimees/soome/script.js diff --git a/rannak/mangud/arimees/soome/style.css b/rannak/mangud/arimees/soome/style.css index cb70806..cb70806 100755..100644 --- a/rannak/mangud/arimees/soome/style.css +++ b/rannak/mangud/arimees/soome/style.css diff --git a/rannak/mangud/direktor/kone/index.html b/rannak/mangud/direktor/kone/index.html new file mode 100644 index 0000000..b00a94b --- /dev/null +++ b/rannak/mangud/direktor/kone/index.html @@ -0,0 +1,135 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="UTF-8"> + + <title>Koosta Kõne</title> + <!-- Bootstrap - CSS only --> + <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous"> + + <link rel="stylesheet" href="style.css"> +</head> + +<body> + + + <div class="container text-white text-center"> + <h1>Koosta Kõne</h1> + + <p> + Loe 1984. aasta kõne, ning kirjuta see ümber, nii, et see sobituks tänapäeva. + </p> + + <div class="text-center"> + + <div class="col"> + <button class="moveOn" disabled>Liigu Edasi</button> + + <!-- Button trigger modal --> + <button id="testModal" type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> + </div> + + </div> + </div> + + + + + <!-- Modal --> + <div class="modal fade text-black" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> + <div class="modal-dialog" role="document"> + <div class="modal-content"> + + <div class="modal-header"> + <div class="modalHeaderWrapper"> + <h3 class="modal-title" id="myModalLabel">Sissejuhatus</h5> + </div> + <img class="avatar" alt="avatar" src="pildid/avatar.png"/> + </div> + + <div class="modal-body"> + <p> + Head ja usinad õpilased! 1. september on tähtis päev, mil pean alati sütitava kõne kooliaasta alguseks. + Olen ajast-aega kasutanud üht kõnepõhja, mille põhjal on igal aastal hea uut kõnet üles ehitada. + Ent sel aastal seisab meil ees täiesti teistsugune 1. september! Esimene aktus, mis toimub vabas Eestis! + Eesti Vabariigis ei saa ju õppeaastat alustada nii, kuis varem! + </p> + <p> + <strong> + Palun aidake mul kõne ümber teha! Võtke välja kõik, mis on tagurlik, + asendage kommunistlikud pöördumised eestimeelsetega ja leidke õiged sõnad, + mis sobivad uude ajastusse - esitamiseks 1. septembril 1991. + </strong> + </p> + </div> + + </div> + </div> + </div> + + + + + <!-- Mainy --> + + <div class="main"> + + + <div class="vasak"> + <h3>Kõne aastast 1984</h2> + + <p> + <strong>Seltsimehed lapsed, meie eluõied, kommunismiehitajad! </strong> + Täna, sellel kuldsel sügispäeval, on kogu meie töökal + kollektiivil hea meel, et taas on särasilmsed nõukogude + noored kogunenud meie ühisesse koju, V. I. Lenini nimelise + kolhoosi keskkooli punalippudega kaunistatud aulasse! + <br/><br/> + Loodan, et olete veetnud suvevaheaja, mis oli täis timurlust, + lõbusaid õhtuid lõkke ääres ning põnevaid lugemiselamusi meie + suure kodumaa parimate poegade ja tütarde kirjutatud teostest. + <br/><br/> + Meie suur juht V.I .Lenin on öelnud: “Õppida, õppida, õppida!”. + On suur rõõm, et saame taas üheskoos asuda tarkust taga nõudma. + <br/> + Käesolev õppeaasta on pühendatud NLKP 27. kongressile. + <br/><br/> + ”Teie kui tulevased kommunistid, peate koondama peatähelepanu sellele, + et põhjalikult omandada teaduste alused, kujundada endas kindlaid + kommunistlikke veendumusi, tööarmastust, kõlbelist puhtust, et te + kasvaksite meie sotsialistliku paljurahvuselise kodumaa armastamise + ja tema kaitseks valmisoleku vaimus, proletaarse internatsionalismi + vaimus”. Nii tervitas teid, meie poolt palavalt armastatud, + 1984. aastal uus NLKP peasekretäri Konstantin Tšernenko. + Ja nende kuldsete sõnadega ongi paslik meie selleaastast + uut õppeaastat alustada ja ikka julgelt edasi, seltsimehed õpilased! + <br/><br/> + Olge valmis usinaks tööks ja kodumaa kaitseks! + </p> + + </div> + + + + <div class="parem"> + <h3>Sinu kõne</h2> + <div class="kone" contenteditable="true"> + Sinu kõne siia... + </div> + </div> + + + + </div> <!-- End of main class--> + + + + <script src="script.js"></script> + + <!-- JavaScript Bundle with Popper --> + <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script> + +</body> +</html> diff --git a/rannak/mangud/direktor/kone/pildid/avatar.png b/rannak/mangud/direktor/kone/pildid/avatar.png Binary files differnew file mode 100644 index 0000000..94d7a31 --- /dev/null +++ b/rannak/mangud/direktor/kone/pildid/avatar.png diff --git a/rannak/mangud/direktor/kone/script.js b/rannak/mangud/direktor/kone/script.js new file mode 100644 index 0000000..ba1d77b --- /dev/null +++ b/rannak/mangud/direktor/kone/script.js @@ -0,0 +1,25 @@ +document.addEventListener('DOMContentLoaded', () => { + let btn = document.querySelector('.modalButton'); + btn.click(); +}); + + + +const kone = document.querySelector(".kone"); +kone.addEventListener('input', () => { + let koneWordCount = document.querySelector(".kone").innerHTML.split(' ').length; + + if (koneWordCount > 100) + moveOnEnable(); +}) + + + +// If Done + +function moveOnEnable(){ + const btn = document.querySelector(".moveOn"); + btn.disabled = false; + btn.onclick = () => location.href = ""; +} + diff --git a/rannak/mangud/direktor/kone/style.css b/rannak/mangud/direktor/kone/style.css new file mode 100644 index 0000000..fa58e1d --- /dev/null +++ b/rannak/mangud/direktor/kone/style.css @@ -0,0 +1,95 @@ +* { + box-sizing: border-box; +} + +body{ + background-color: #43464b; + color: white; +} + +h1 { + color: #ED8B00; + font-weight: bold; +} + +.moveOn{ + display: inline-block; + border: none; + padding: 6px 12px; + margin-botton: 0; + font-size: 1rem; + font-weight: normal; + text-align: center; + cursor: pointer; + border-radius: 4px; + background-color: #4BB543; + color: white; +} + +button:disabled{ + opacity: 0.5; + cursor: not-allowed; +} + + + +/* Modal Stuff */ + +.avatar { + border-radius: 20px; + width: 100%; + max-width: 15rem; +} + +.modalHeaderWrapper{ + text-align: center; + margin: 0; + width: 100%; +} + +.modalButton{ + display: inline-block; + padding: 6px 12px; + margin-left: 30px; + background-color: rgba(0,136,169,1); + border: none; + border-radius: 50px; + cursor: pointer; + transition: all 0.3 ease 0; + font-size: 1rem; +} + +.modalButton:hover{ + background-color: rgba(0,136,169,0.8); +} + + + +/* Main styles*/ + +.main{ + display: flex; + margin: 3% 0; + justify-content: center; + text-align: center; +} + +.vasak{ + margin: 1rem; + width: 45%; + +} + +.parem{ + margin: 1rem; + width: 45% +} + +.kone{ + width: 100%; + height: 90%; + color: white; + background-color: #43464b; + border: none; + text-align: left; +} diff --git a/rannak/mangud/index.html b/rannak/mangud/index.html index 7060351..526809b 100755..100644 --- a/rannak/mangud/index.html +++ b/rannak/mangud/index.html @@ -20,7 +20,7 @@ <ol> <li><a href="kaitseliitlane/sundmused">Sündmused</a></li> <li><a href="kaitseliitlane/salakood">Salakood</a></li> - <li></li> + <li><a href="kaitseliitlane/soomusmasinad">Soomusmasinad</a></li> </ol> </div> @@ -47,7 +47,7 @@ <ol> <li><a href="partorg/kuulsused">Kuulsused</a></li> <li><a href="partorg/sonaragastik">Sõnarägastik</a></li> - <li><a href="partorg/plakat">Plakat</a></li> + <li></li> </ol> </div> @@ -56,14 +56,14 @@ <ol> <li><a href="arimees/soome">Soome</a></li> <li><a href="arimees/muusika">Muusika</a></li> - <li></li> + <li><a href="arimees/pood">Pood</a></li> </ol> </div> <div> <h3>Direktor</h3> <ol> - <li></li> + <li><a href="direktor/kone">Kõne</a></li> <li></li> <li></li> </ol> diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/28DaysLater.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/28DaysLater.ttf Binary files differindex 0f8869b..0f8869b 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/28DaysLater.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/28DaysLater.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrs-monster.zip b/rannak/mangud/kaitseliitlane/salakood/fonts/mrs-monster.zip Binary files differindex 2addc91..2addc91 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrs-monster.zip +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrs-monster.zip diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.ttf Binary files differindex 1d91c69..1d91c69 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.txt b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.txt index 822341c..822341c 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.txt +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.txt diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3d.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3d.ttf Binary files differindex 475464a..475464a 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3d.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3d.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3dital.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3dital.ttf Binary files differindex 81a1270..81a1270 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3dital.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3dital.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteracad.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteracad.ttf Binary files differindex 0dcc133..0dcc133 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteracad.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteracad.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldout.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldout.ttf Binary files differindex 78c7b2a..78c7b2a 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldout.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldout.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldoutital.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldoutital.ttf Binary files differindex d020cdb..d020cdb 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldoutital.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldoutital.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercond.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercond.ttf Binary files differindex ee09ea5..ee09ea5 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercond.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercond.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercondital.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercondital.ttf Binary files differindex 4df768e..4df768e 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercondital.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercondital.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpand.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpand.ttf Binary files differindex 71d0c61..71d0c61 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpand.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpand.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpandital.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpandital.ttf Binary files differindex 9595754..9595754 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpandital.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpandital.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterital.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterital.ttf Binary files differindex 1926ba8..1926ba8 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterital.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterital.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterleft.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterleft.ttf Binary files differindex 1ad20b9..1ad20b9 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterleft.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterleft.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterout.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterout.ttf Binary files differindex 7c8b324..7c8b324 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterout.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterout.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteroutital.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteroutital.ttf Binary files differindex bb3b52f..bb3b52f 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteroutital.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteroutital.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotal.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotal.ttf Binary files differindex f6aa01c..f6aa01c 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotal.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotal.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate.ttf Binary files differindex b58d711..b58d711 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate2.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate2.ttf Binary files differindex 48ad7e7..48ad7e7 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate2.ttf +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate2.ttf diff --git a/rannak/mangud/kaitseliitlane/salakood/index.html b/rannak/mangud/kaitseliitlane/salakood/index.html index 798c802..798c802 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/index.html +++ b/rannak/mangud/kaitseliitlane/salakood/index.html diff --git a/rannak/mangud/kaitseliitlane/salakood/pildid/avatar.jpg b/rannak/mangud/kaitseliitlane/salakood/pildid/avatar.jpg Binary files differindex 37ae271..37ae271 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/pildid/avatar.jpg +++ b/rannak/mangud/kaitseliitlane/salakood/pildid/avatar.jpg diff --git a/rannak/mangud/kaitseliitlane/salakood/pildid/bk.jpg b/rannak/mangud/kaitseliitlane/salakood/pildid/bk.jpg Binary files differindex 622516a..622516a 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/pildid/bk.jpg +++ b/rannak/mangud/kaitseliitlane/salakood/pildid/bk.jpg diff --git a/rannak/mangud/kaitseliitlane/salakood/script.js b/rannak/mangud/kaitseliitlane/salakood/script.js index 3fe29b3..3fe29b3 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/script.js +++ b/rannak/mangud/kaitseliitlane/salakood/script.js diff --git a/rannak/mangud/kaitseliitlane/salakood/style.css b/rannak/mangud/kaitseliitlane/salakood/style.css index 13630f5..13630f5 100755..100644 --- a/rannak/mangud/kaitseliitlane/salakood/style.css +++ b/rannak/mangud/kaitseliitlane/salakood/style.css diff --git a/rannak/mangud/kaitseliitlane/soomusmasinad/index.html b/rannak/mangud/kaitseliitlane/soomusmasinad/index.html new file mode 100644 index 0000000..c94ad66 --- /dev/null +++ b/rannak/mangud/kaitseliitlane/soomusmasinad/index.html @@ -0,0 +1,111 @@ +<html lang="en"> +<head> + <meta charset="UTF-8"> + <meta name="viewport" content="width=, initial-scale=1.0"> + <title>Soomusmasinad</title> + <!-- Bootstrap - CSS only --> + <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous"> + + <link rel="stylesheet" href="styles.css"> +</head> + +<body class="text-white"> + + <div class="container text-center text-white align-items-center"> + <h1 class="pb-1 pt-2">Soomusmasinad</h1> + <p> + Joonlauaga (vali parempoolsest menüüst joonlaua ikoon + (vasakpoolse paneeli võid ruumi tegemiseks sulgeda)) + saab mitme klikiga mööda joont kaugust mõõta. Selleks, + et saada võimalikult täpne tulemus, zoomi kaardile lähemale + ning liigu hiirega klõpsates mööda valitud teekonda baltiketini. + </p> + + <div class="row"> + <div> + <button class="moveOn" disabled>Liigu Edasi</button> + + <!-- Button trigger modal --> + <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> + </div> + + + </div> + + + </div> + + + <!-- Modal --> + <div class="modal fade text-black" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> + <div class="modal-dialog" role="document"> + <div class="modal-content"> + + <div class="modal-header"> + <div class="modalHeaderWrapper"> + <h3 class="modal-title" id="myModalLabel">Sissejuhatus</h5> + </div> + <img class="avatar" alt="avatar" src="pildid/avatar.jpg"/> + </div> + + <div class="modal-body"> + <strong>Tähelepanu! Tähelepanu! Erakorraline teadaanne!</strong> + Üleeile, 19. augusti varahommikul kuulutati Moskvas välja + erakorraline olukord. Vanameelsed kommunistid andsid teada, + et võtavad võimu üle "riigi juhtimiseks ja erakorralise seisukorra + režiimi tõhusaks elluviimiseks", kuna Mihhail Gorbatšovi tervislik + seisund ei võimalda enam riiki juhtida. Algas putš. + <br/> + Samal päeval jõudsid Nõukogude soomusmasinad Eestisse, + eesmärgiks jõuda Tallinnasse ja võtta võim üle. Masinad + liikusid Pihkvast Tallinna suunas, paljud neist + peatusid Tondi kasarmutes. + <br/><br/> + <strong> + Vaprad Eesti noored! Soomusmasinad on Eestis! Kui kaugelt + need sinu koolist möödusid? Nimeta kõige lähem geograafiline + koht või asula. Mõõda kilomeetrites. Ootan vastust! Side lõpp. + </strong> + </div> + + </div> + </div> + </div> + + + + + <div class="inputWrapper"> + <div> + <label for="asula">Asula:</label> + <input class="asulaInput" name="asula" type="text" value="" placeholder="Sinu valitud asula"/> + </div> + + <div> + <label class="rightWrapper" for="kaugus">Kaugus:</label> + <input class="kaugusInput" name="kaugus" type="text" value="" placeholder="kaugus (km)"/> + </div> + </div> + + + + + + <!-- Mainer --> + <div class="main"> + + <iframe width="100%" height="95%" src="https://xgis.maaamet.ee/xgis2/page/link/NrUC2-U"></iframe> + + </div> + + + + + <script src="script.js"></script> + + <!-- JavaScript Bundle with Popper --> + <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script> +</body> +</html> diff --git a/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/EVkuulutamine.jpg b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/EVkuulutamine.jpg Binary files differnew file mode 100644 index 0000000..f462f69 --- /dev/null +++ b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/EVkuulutamine.jpg diff --git a/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/avatar.jpg b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/avatar.jpg Binary files differnew file mode 100644 index 0000000..37ae271 --- /dev/null +++ b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/avatar.jpg diff --git a/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/baltikett.jpg b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/baltikett.jpg Binary files differnew file mode 100644 index 0000000..f395c65 --- /dev/null +++ b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/baltikett.jpg diff --git a/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/hirvepark.jpg b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/hirvepark.jpg Binary files differnew file mode 100644 index 0000000..b94f2b0 --- /dev/null +++ b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/hirvepark.jpg diff --git a/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/interrinne.jpg b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/interrinne.jpg Binary files differnew file mode 100644 index 0000000..3d6d386 --- /dev/null +++ b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/interrinne.jpg diff --git a/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/laulupidu.jpg b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/laulupidu.jpg Binary files differnew file mode 100644 index 0000000..6ad8ad9 --- /dev/null +++ b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/laulupidu.jpg diff --git a/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/teletorn.jpg b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/teletorn.jpg Binary files differnew file mode 100644 index 0000000..c539324 --- /dev/null +++ b/rannak/mangud/kaitseliitlane/soomusmasinad/pildid/teletorn.jpg diff --git a/rannak/mangud/kaitseliitlane/soomusmasinad/script.js b/rannak/mangud/kaitseliitlane/soomusmasinad/script.js new file mode 100644 index 0000000..ca18bfe --- /dev/null +++ b/rannak/mangud/kaitseliitlane/soomusmasinad/script.js @@ -0,0 +1,43 @@ +document.addEventListener('DOMContentLoaded', () => { + let btn = document.querySelector('.modalButton'); + btn.click(); +}); + + + +const inputs = document.querySelectorAll('input'); +let asulaVal; +let kaugusVal; + +for (input of inputs){ + input.addEventListener('input', () => { + getInputs() + }); +} + + +function getInputs(){ + let asula = document.querySelector('.asulaInput'); + let kaugus = document.querySelector('.kaugusInput'); + + asulaVal = asula.value; + kaugusVal = kaugus.value; + + if (asulaVal != '' && kaugusVal != '') + allGood(); +} + + + +/// All Done /// + + + +function allGood(){ + const btn = document.querySelector(".moveOn"); + btn.disabled = false; + localStorage.setItem("roll", "Kaitseliitlase"); + localStorage.setItem("asula", asulaVal); + localStorage.setItem("kaugus", kaugusVal); + btn.onclick = () => location.href = "../../../endPage"; +} diff --git a/rannak/mangud/kaitseliitlane/soomusmasinad/styles.css b/rannak/mangud/kaitseliitlane/soomusmasinad/styles.css new file mode 100644 index 0000000..cc1f6ec --- /dev/null +++ b/rannak/mangud/kaitseliitlane/soomusmasinad/styles.css @@ -0,0 +1,98 @@ +* { + box-sizing: border-box; +} +h1 { + color: #154734; + font-weight: bold; +} +body{ + background-color: #4D5157; +} + +.moveOn{ + display: inline-block; + border: none; + padding: 6px 12px; + margin-botton: 0; + font-size: 1rem; + font-weight: normal; + text-align: center; + cursor: pointer; + border-radius: 4px; + background-color: #4BB543; + color: white; +} + +button:disabled{ + opacity: 0.5; + cursor: not-allowed; +} + + + + +/* Modal Stuff */ + +.avatar { + border-radius: 20px; + width: 100%; + max-width: 15rem; +} + +.modalHeaderWrapper{ + text-align: center; + margin: 0; + width: 100%; +} + + + + +.closeModalButton { + border-radius: 50px; +} + + +.modalButton{ + display: inline-block; + padding: 6px 12px; + margin-left: 30px; + background-color: rgba(0,136,169,1); + border: none; + border-radius: 50px; + cursor: pointer; + transition: all 0.3 ease 0; + font-size: 1rem; +} + + + +.modalButton:hover{ + background-color: rgba(0,136,169,0.8); +} + +span{ + font-size: .1rem; +} + + +/* Mainer */ +.inputWrapper{ + margin-top: 1rem; + display: flex; + items-align: center; + justify-content: center; +} + +.rightWrapper{ + margin-left: 2rem; +} + + +input{margin: .3rem;} + +.main{padding: 2.5%;} +iframe{ + border: solid .5rem black; + border-radius: 10px; +} diff --git a/rannak/mangud/kaitseliitlane/sundmused/index.html b/rannak/mangud/kaitseliitlane/sundmused/index.html index 7418239..7418239 100755..100644 --- a/rannak/mangud/kaitseliitlane/sundmused/index.html +++ b/rannak/mangud/kaitseliitlane/sundmused/index.html diff --git a/rannak/mangud/kaitseliitlane/sundmused/pildid/EVkuulutamine.jpg b/rannak/mangud/kaitseliitlane/sundmused/pildid/EVkuulutamine.jpg Binary files differindex f462f69..f462f69 100755..100644 --- a/rannak/mangud/kaitseliitlane/sundmused/pildid/EVkuulutamine.jpg +++ b/rannak/mangud/kaitseliitlane/sundmused/pildid/EVkuulutamine.jpg diff --git a/rannak/mangud/kaitseliitlane/sundmused/pildid/avatar.jpg b/rannak/mangud/kaitseliitlane/sundmused/pildid/avatar.jpg Binary files differindex 37ae271..37ae271 100755..100644 --- a/rannak/mangud/kaitseliitlane/sundmused/pildid/avatar.jpg +++ b/rannak/mangud/kaitseliitlane/sundmused/pildid/avatar.jpg diff --git a/rannak/mangud/kaitseliitlane/sundmused/pildid/baltikett.jpg b/rannak/mangud/kaitseliitlane/sundmused/pildid/baltikett.jpg Binary files differindex f395c65..f395c65 100755..100644 --- a/rannak/mangud/kaitseliitlane/sundmused/pildid/baltikett.jpg +++ b/rannak/mangud/kaitseliitlane/sundmused/pildid/baltikett.jpg diff --git a/rannak/mangud/kaitseliitlane/sundmused/pildid/hirvepark.jpg b/rannak/mangud/kaitseliitlane/sundmused/pildid/hirvepark.jpg Binary files differindex b94f2b0..b94f2b0 100755..100644 --- a/rannak/mangud/kaitseliitlane/sundmused/pildid/hirvepark.jpg +++ b/rannak/mangud/kaitseliitlane/sundmused/pildid/hirvepark.jpg diff --git a/rannak/mangud/kaitseliitlane/sundmused/pildid/interrinne.jpg b/rannak/mangud/kaitseliitlane/sundmused/pildid/interrinne.jpg Binary files differindex 3d6d386..3d6d386 100755..100644 --- a/rannak/mangud/kaitseliitlane/sundmused/pildid/interrinne.jpg +++ b/rannak/mangud/kaitseliitlane/sundmused/pildid/interrinne.jpg diff --git a/rannak/mangud/kaitseliitlane/sundmused/pildid/laulupidu.jpg b/rannak/mangud/kaitseliitlane/sundmused/pildid/laulupidu.jpg Binary files differindex 6ad8ad9..6ad8ad9 100755..100644 --- a/rannak/mangud/kaitseliitlane/sundmused/pildid/laulupidu.jpg +++ b/rannak/mangud/kaitseliitlane/sundmused/pildid/laulupidu.jpg diff --git a/rannak/mangud/kaitseliitlane/sundmused/pildid/teletorn.jpg b/rannak/mangud/kaitseliitlane/sundmused/pildid/teletorn.jpg Binary files differindex c539324..c539324 100755..100644 --- a/rannak/mangud/kaitseliitlane/sundmused/pildid/teletorn.jpg +++ b/rannak/mangud/kaitseliitlane/sundmused/pildid/teletorn.jpg diff --git a/rannak/mangud/kaitseliitlane/sundmused/script.js b/rannak/mangud/kaitseliitlane/sundmused/script.js index 3b92b1d..3b92b1d 100755..100644 --- a/rannak/mangud/kaitseliitlane/sundmused/script.js +++ b/rannak/mangud/kaitseliitlane/sundmused/script.js diff --git a/rannak/mangud/kaitseliitlane/sundmused/styles.css b/rannak/mangud/kaitseliitlane/sundmused/styles.css index 546c8c3..546c8c3 100755..100644 --- a/rannak/mangud/kaitseliitlane/sundmused/styles.css +++ b/rannak/mangud/kaitseliitlane/sundmused/styles.css diff --git a/rannak/mangud/partorg/kuulsused.bak/index.html b/rannak/mangud/partorg/kuulsused.bak/index.html deleted file mode 100755 index 52a5245..0000000 --- a/rannak/mangud/partorg/kuulsused.bak/index.html +++ /dev/null @@ -1,139 +0,0 @@ -<html lang="en"> -<head> - <meta charset="UTF-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=, initial-scale=1.0"> - <title>Kuulsused</title> - <link rel="stylesheet" href="styles.css"> - <!-- Bootstrap - CSS only --> - <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous"> -</head> - -<body class="bg-dark text-white"> - - <div class="container text-center text-white align-items-center pb-5"> - <h1 class="pb-1 pt-2">Olulised isikud</h1> - <p>Vii kokku inimese nimi ja nägu.</p> - - <div class="row"> - <div> - <button class="moveOn" disabled>Liigu Edasi</button> - </div> - - </div> - - <!-- Button trigger modal --> - <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> - Sissejuhatus - </button> - - - </div> - - - <!-- Modal --> - <div class="modal fade text-black" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> - <div class="modal-dialog" role="document"> - <div class="modal-content"> - - <div class="modal-header"> - <div class="modalHeaderWrapper"> - <h3 class="modal-title" id="myModalLabel">Sissejuhatus</h5> - </div> - <img class="avatar" alt="avatar" src="pildid/avatar.png"/> - </div> - - <div class="modal-body"> - Seltsimehed noored, olen meie ajakirjandusest, mis kahjuks ei ole enam maailma eesrindlikum, - välja lõiganud mitmete tänapäeva ENSV elus üht või teistpidi silma paistnud inimeste pildid. - <br/> - Mõned neist inimestest mulle ei meeldi, natsionalistid! Kas ka teie tunnete neid inimesi? - <br/> - Teeme proovi, <strong>ühendage nimi ja talle sobiv foto.</strong> - <br/> <br/> - Huvitav kas neid inimesi mäletatakse ka aastate pärast? - </div> - - </div> - </div> - </div> - - - <!-- Esimene rida --> - <div class="lists"> - <div class="row"> - - <div class="col imgBox text-center"> - <img src="pildid/laar.jpg" alt="Mart Laar img"> - <p> - 1990-1992 Eesti Vabariigi Ülemnõukogu liige. Eesti muinsuskaitse seltsi, Eesti komitee, Eesti kongressi liige. - </p> - <div id="laar" class="list"></div> - </div> - - <div class="list col startBasket text-center"> - <div id="laar" class="list-item" draggable="true">Mart Laar</div> - <div id="lauristin" class="list-item" draggable="true">Marju Lauristin</div> - <div id="ruutel" class="list-item" draggable="true">Arnold Rüütel</div> - <div id="savisaar" class="list-item" draggable="true">Edgar Savisaar</div> - <div id="kogan" class="list-item" draggable="true">Jevgeni Kogan</div> - <div id="valk" class="list-item" draggable="true">Heinz Valk</div> - </div> - - <div class="col imgBox text-center"> - <img src="pildid/lauristin.jpg" alt="Marju Lauristin img"> - <p> - 1990-1992 EV Ülemnõukogu liige, juhataja asetäitja, 1990 Eesti Komitee liige - </p> - <div id="lauristin" class="list"></div> - </div> - - </div> - </div> - - <!-- Teine rida --> - - <div class="lists"> - <div class="row"> - - <div class="col-3 imgBox text-center"> - <img src="pildid/ruutel.jpg" alt="Arnold Rüütel img"> - <p> - 1990-1992 ENSV/ EV Ülemnõukogu esimees. - </p> - <div id="ruutel" class="list"></div> - </div> - - <div class="col-3 imgBox text-center"> - <img src="pildid/savisaar.jpg" alt="Savisaar img"> - <p> - Üks Rahvarinde loojatest, 1990 Eesti NSV Valitsuse esimees, 20.08.1991 Eesti Vabariigi peaministri kohusetäitja. - </p> - <div id="savisaar" class="list"></div> - </div> - - <div class="col-3 imgBox text-center"> - <img src="pildid/valk.jpg" alt="Heniz img"> - <p> - Kunstnik, Rahvarinde üks asutajaliikmeid, suurepärane kõnepidaja, andis meie revolutsioonile nime. - </p> - <div id="valk" class="list"></div> - </div> - - <div class="col imgBox text-center"> - <img src="pildid/kogan.jpg" alt="Kogan img"> - <p> - Interrinde üks loojatest (1988) ning hiljem selle esimees. NSVL Rahvasaadikute kongressi liige, osales impeeriumimeelse saadikuterühma “Sojuz” tegevuses. - </p> - <div id="kogan" class="list"></div> - </div> - - </div> - </div> - - <script src="script.js"></script> - - <!-- JavaScript Bundle with Popper --> - <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script> -</body> -</html> diff --git a/rannak/mangud/partorg/kuulsused.bak/pildid/avatar.png b/rannak/mangud/partorg/kuulsused.bak/pildid/avatar.png Binary files differdeleted file mode 100755 index 485a70c..0000000 --- a/rannak/mangud/partorg/kuulsused.bak/pildid/avatar.png +++ /dev/null diff --git a/rannak/mangud/partorg/kuulsused.bak/pildid/kogan.jpg b/rannak/mangud/partorg/kuulsused.bak/pildid/kogan.jpg Binary files differdeleted file mode 100755 index 9c592f3..0000000 --- a/rannak/mangud/partorg/kuulsused.bak/pildid/kogan.jpg +++ /dev/null diff --git a/rannak/mangud/partorg/kuulsused.bak/pildid/laar.jpg b/rannak/mangud/partorg/kuulsused.bak/pildid/laar.jpg Binary files differdeleted file mode 100755 index a7cea18..0000000 --- a/rannak/mangud/partorg/kuulsused.bak/pildid/laar.jpg +++ /dev/null diff --git a/rannak/mangud/partorg/kuulsused.bak/pildid/lauristin.jpg b/rannak/mangud/partorg/kuulsused.bak/pildid/lauristin.jpg Binary files differdeleted file mode 100755 index 67c788d..0000000 --- a/rannak/mangud/partorg/kuulsused.bak/pildid/lauristin.jpg +++ /dev/null diff --git a/rannak/mangud/partorg/kuulsused.bak/pildid/ruutel.jpg b/rannak/mangud/partorg/kuulsused.bak/pildid/ruutel.jpg Binary files differdeleted file mode 100755 index 389287d..0000000 --- a/rannak/mangud/partorg/kuulsused.bak/pildid/ruutel.jpg +++ /dev/null diff --git a/rannak/mangud/partorg/kuulsused.bak/pildid/savisaar.jpg b/rannak/mangud/partorg/kuulsused.bak/pildid/savisaar.jpg Binary files differdeleted file mode 100755 index 57815c8..0000000 --- a/rannak/mangud/partorg/kuulsused.bak/pildid/savisaar.jpg +++ /dev/null diff --git a/rannak/mangud/partorg/kuulsused.bak/pildid/valk.jpg b/rannak/mangud/partorg/kuulsused.bak/pildid/valk.jpg Binary files differdeleted file mode 100755 index c7afa8c..0000000 --- a/rannak/mangud/partorg/kuulsused.bak/pildid/valk.jpg +++ /dev/null diff --git a/rannak/mangud/partorg/kuulsused.bak/script.js b/rannak/mangud/partorg/kuulsused.bak/script.js deleted file mode 100755 index aa054dd..0000000 --- a/rannak/mangud/partorg/kuulsused.bak/script.js +++ /dev/null @@ -1,133 +0,0 @@ -document.addEventListener('DOMContentLoaded', () => { - let btn = document.querySelector('.modalButton'); - btn.click(); -}); - - - -const list_items = document.querySelectorAll(".list-item"); -const lists = document.querySelectorAll(".list"); - -let draggedItem = null; - - -// Draggable Items - -for (let i=0; i < list_items.length; i++){ - const item = list_items[i]; - - /* Event Listeners */ - item.addEventListener("dragstart", e => { - draggedItem = item; - setTimeout(() => (item.style.display = "none"), 0); - - }); - - - item.addEventListener("dragend", e => { - - setTimeout(() => { - draggedItem.style.display = "block"; - draggedItem = null}, 0); - checkIfAllGood(); - }); - - -} - - - - -// Dropping spots - -for (let j=0; j < lists.length; j++){ - const list = lists[j]; - - /* Event Listeners */ - - list.addEventListener("dragenter",e => (e.preventDefault())); - - list.addEventListener("dragover",e => { - e.preventDefault(); - list.style.backgroundColor = "rgba(0,0,0,0.9)"; - list.style.transform = "scale(1.3)"; - }); - - - list.addEventListener("dragleave",e => { - list.style.backgroundColor = "rgba(0,0,0,0.3)"; - list.style.transform = "scale(1)"; - }); - - - list.addEventListener("drop",e => { - if (list.children.length == 0 || list.className.includes("startBasket")) - list.append(draggedItem); - list.style.backgroundColor = "rgba(0,0,0,0.3)"; - list.style.transform = "scale(1)"; - - }) -} - - - -// Smooth scroll stuff - -// const ekraaniPikkus = window.innerHeight; -// let d; -// if (ekraaniPikkus > 800) -// d = ekraaniPikkus / 8; -// else -// d = ekraaniPikkus / 4; -// -// console.log(ekraaniPikkus); -// console.log(document.body.scrollHeight); -// const maxScroll = document.body.scrollHeight; -// -// window.ondragover = function(e){ -// console.log("Pos: ",e.clientY); -// console.log(d); -// console.log("X: ", e.y); -// //console.log(e); -// -// if (e.clientY > (ekraaniPikkus - d)){ -// console.log("Should scroll down"); -// if (maxScroll > e.y+d) -// window.scrollTo(0, e.y + d); -// else -// window.scrollTo(0, maxScroll); -// } -// else if (e.clientY < (d)) -// window.scrollTo(0, e.y - d); -// } - - - - - -function checkIfAllGood(){ - let rightDone = []; - - for (let j=0; j < lists.length; j++){ - const list = lists[j]; - if (list.className.includes("startBasket")) - continue; - else if (list.children.length == 1){ - if (list.id == list.children[0].id){ - if (!rightDone.includes(list.id)) - rightDone.push(list.id); - } - } - } // For loop end - - if (rightDone.length == 6) { - const btn = document.querySelector(".moveOn"); - btn.disabled = false; - btn.onclick = () => location.href = "../plakat"; - } -} - - - -/* The Scrolling on thing while dragging */ -// window.scrollTo(0, 500); diff --git a/rannak/mangud/partorg/kuulsused.bak/styles.css b/rannak/mangud/partorg/kuulsused.bak/styles.css deleted file mode 100755 index f4fb4c8..0000000 --- a/rannak/mangud/partorg/kuulsused.bak/styles.css +++ /dev/null @@ -1,101 +0,0 @@ -* { - box-sizing: border-box !important; -} - -.lists{ - margin-bottom: 20px !important; -} -/* Modal Stuff */ - - -.avatar { - border-radius: 20px; - width: 100% !important; -} - -.modalHeaderWrapper{ - text-align: center; - margin: 0 !important; - width: 100% !important; -} - -.closeModalButton { - border-radius: 50px; -} - -.modalButton{ - position: absolute; - top: 0; - right: 0; - padding: 6px; - padding: 9px 25px; - background-color: rgba(0,136,169,1) !important; - border: none !important; - border-radius: 50px !important; - cursor: pointer !important; - transition: all 0.3 ease 0 !important; - margin: 3% !important; - font-size: 1.2rem !important; -} - -.modalButton:hover{ - background-color: rgba(0,136,169,0.8) !important; -} - - -/* Move On */ - -.moveOn{ - display: inline-block; - border: none; - padding: 6px 12px; - margin-botton: 0; - font-size: 1rem; - font-weight: normal; - text-align: center; - cursor: pointer; - border-radius: 4px; - background-color: #4BB543; - color: white; -} - -button:disabled{ - opacity: 0.5; - cursor: not-allowed; -} - - -/* Other */ - - -.row { - margin: 0 5% !important; -} - -img { - max-width: 15rem !important; - height: auto !important; - padding: .3rem; -} - - -.lists .list .list-item { - background-color: #b2beb5 !important; - color: #21201E; - margin: 0.5rem 0; - height: 2.5rem; - border-radius: 8px !important; - cursor: pointer; -} - -.lists .list { - background-color: rgba(0, 0, 0, 0.3); - min-height: 2.5rem; - margin: .5rem; - border-radius: 8px !important; -} - -.startBasket { - height: 100% !important; - min-height: 2rem; -} diff --git a/rannak/mangud/partorg/kuulsused/index.html b/rannak/mangud/partorg/kuulsused/index.html index 94f952e..94f952e 100755..100644 --- a/rannak/mangud/partorg/kuulsused/index.html +++ b/rannak/mangud/partorg/kuulsused/index.html diff --git a/rannak/mangud/partorg/kuulsused/pildid/avatar.png b/rannak/mangud/partorg/kuulsused/pildid/avatar.png Binary files differindex 485a70c..485a70c 100755..100644 --- a/rannak/mangud/partorg/kuulsused/pildid/avatar.png +++ b/rannak/mangud/partorg/kuulsused/pildid/avatar.png diff --git a/rannak/mangud/partorg/kuulsused/pildid/kogan.jpg b/rannak/mangud/partorg/kuulsused/pildid/kogan.jpg Binary files differindex 9c592f3..9c592f3 100755..100644 --- a/rannak/mangud/partorg/kuulsused/pildid/kogan.jpg +++ b/rannak/mangud/partorg/kuulsused/pildid/kogan.jpg diff --git a/rannak/mangud/partorg/kuulsused/pildid/laar.jpg b/rannak/mangud/partorg/kuulsused/pildid/laar.jpg Binary files differindex a7cea18..a7cea18 100755..100644 --- a/rannak/mangud/partorg/kuulsused/pildid/laar.jpg +++ b/rannak/mangud/partorg/kuulsused/pildid/laar.jpg diff --git a/rannak/mangud/partorg/kuulsused/pildid/lauristin.jpg b/rannak/mangud/partorg/kuulsused/pildid/lauristin.jpg Binary files differindex 67c788d..67c788d 100755..100644 --- a/rannak/mangud/partorg/kuulsused/pildid/lauristin.jpg +++ b/rannak/mangud/partorg/kuulsused/pildid/lauristin.jpg diff --git a/rannak/mangud/partorg/kuulsused/pildid/ruutel.jpg b/rannak/mangud/partorg/kuulsused/pildid/ruutel.jpg Binary files differindex 389287d..389287d 100755..100644 --- a/rannak/mangud/partorg/kuulsused/pildid/ruutel.jpg +++ b/rannak/mangud/partorg/kuulsused/pildid/ruutel.jpg diff --git a/rannak/mangud/partorg/kuulsused/pildid/savisaar.jpg b/rannak/mangud/partorg/kuulsused/pildid/savisaar.jpg Binary files differindex 57815c8..57815c8 100755..100644 --- a/rannak/mangud/partorg/kuulsused/pildid/savisaar.jpg +++ b/rannak/mangud/partorg/kuulsused/pildid/savisaar.jpg diff --git a/rannak/mangud/partorg/kuulsused/pildid/valk.jpg b/rannak/mangud/partorg/kuulsused/pildid/valk.jpg Binary files differindex c7afa8c..c7afa8c 100755..100644 --- a/rannak/mangud/partorg/kuulsused/pildid/valk.jpg +++ b/rannak/mangud/partorg/kuulsused/pildid/valk.jpg diff --git a/rannak/mangud/partorg/kuulsused/script.js b/rannak/mangud/partorg/kuulsused/script.js index 1ab5cef..1ab5cef 100755..100644 --- a/rannak/mangud/partorg/kuulsused/script.js +++ b/rannak/mangud/partorg/kuulsused/script.js diff --git a/rannak/mangud/partorg/kuulsused/styles.css b/rannak/mangud/partorg/kuulsused/styles.css index 66f005c..66f005c 100755..100644 --- a/rannak/mangud/partorg/kuulsused/styles.css +++ b/rannak/mangud/partorg/kuulsused/styles.css diff --git a/rannak/mangud/partorg/plakat.bak/img/avatar.png b/rannak/mangud/partorg/plakat.bak/img/avatar.png Binary files differindex 485a70c..485a70c 100755..100644 --- a/rannak/mangud/partorg/plakat.bak/img/avatar.png +++ b/rannak/mangud/partorg/plakat.bak/img/avatar.png diff --git a/rannak/mangud/partorg/plakat.bak/img/lenin.png b/rannak/mangud/partorg/plakat.bak/img/lenin.png Binary files differindex e36df3d..e36df3d 100755..100644 --- a/rannak/mangud/partorg/plakat.bak/img/lenin.png +++ b/rannak/mangud/partorg/plakat.bak/img/lenin.png diff --git a/rannak/mangud/partorg/plakat.bak/img/nazi.png b/rannak/mangud/partorg/plakat.bak/img/nazi.png Binary files differindex 87e616e..87e616e 100755..100644 --- a/rannak/mangud/partorg/plakat.bak/img/nazi.png +++ b/rannak/mangud/partorg/plakat.bak/img/nazi.png diff --git a/rannak/mangud/partorg/plakat.bak/img/normalSelect.cur b/rannak/mangud/partorg/plakat.bak/img/normalSelect.cur Binary files differindex fdd943c..fdd943c 100755..100644 --- a/rannak/mangud/partorg/plakat.bak/img/normalSelect.cur +++ b/rannak/mangud/partorg/plakat.bak/img/normalSelect.cur diff --git a/rannak/mangud/partorg/plakat.bak/img/redStar.png b/rannak/mangud/partorg/plakat.bak/img/redStar.png Binary files differindex b6eee79..b6eee79 100755..100644 --- a/rannak/mangud/partorg/plakat.bak/img/redStar.png +++ b/rannak/mangud/partorg/plakat.bak/img/redStar.png diff --git a/rannak/mangud/partorg/plakat.bak/img/stalin.jpg b/rannak/mangud/partorg/plakat.bak/img/stalin.jpg Binary files differindex bc0a3a5..bc0a3a5 100755..100644 --- a/rannak/mangud/partorg/plakat.bak/img/stalin.jpg +++ b/rannak/mangud/partorg/plakat.bak/img/stalin.jpg diff --git a/rannak/mangud/partorg/plakat.bak/img/stalinAddOn.png b/rannak/mangud/partorg/plakat.bak/img/stalinAddOn.png Binary files differindex d3e05fd..d3e05fd 100755..100644 --- a/rannak/mangud/partorg/plakat.bak/img/stalinAddOn.png +++ b/rannak/mangud/partorg/plakat.bak/img/stalinAddOn.png diff --git a/rannak/mangud/partorg/plakat.bak/img/testImg.jpg b/rannak/mangud/partorg/plakat.bak/img/testImg.jpg Binary files differindex d88d950..d88d950 100755..100644 --- a/rannak/mangud/partorg/plakat.bak/img/testImg.jpg +++ b/rannak/mangud/partorg/plakat.bak/img/testImg.jpg diff --git a/rannak/mangud/partorg/plakat.bak/img/veekogud.jpg b/rannak/mangud/partorg/plakat.bak/img/veekogud.jpg Binary files differindex 23f04ab..23f04ab 100755..100644 --- a/rannak/mangud/partorg/plakat.bak/img/veekogud.jpg +++ b/rannak/mangud/partorg/plakat.bak/img/veekogud.jpg diff --git a/rannak/mangud/partorg/plakat.bak/index.html b/rannak/mangud/partorg/plakat.bak/index.html index 4754c9b..4754c9b 100755..100644 --- a/rannak/mangud/partorg/plakat.bak/index.html +++ b/rannak/mangud/partorg/plakat.bak/index.html diff --git a/rannak/mangud/partorg/plakat.bak/main.js b/rannak/mangud/partorg/plakat.bak/main.js index 11809cb..11809cb 100755..100644 --- a/rannak/mangud/partorg/plakat.bak/main.js +++ b/rannak/mangud/partorg/plakat.bak/main.js diff --git a/rannak/mangud/partorg/plakat.bak/style.css b/rannak/mangud/partorg/plakat.bak/style.css index 215c073..215c073 100755..100644 --- a/rannak/mangud/partorg/plakat.bak/style.css +++ b/rannak/mangud/partorg/plakat.bak/style.css diff --git a/rannak/mangud/partorg/plakat/img/avatar.png b/rannak/mangud/partorg/plakat/img/avatar.png Binary files differindex 485a70c..485a70c 100755..100644 --- a/rannak/mangud/partorg/plakat/img/avatar.png +++ b/rannak/mangud/partorg/plakat/img/avatar.png diff --git a/rannak/mangud/partorg/plakat/img/malev.jpg b/rannak/mangud/partorg/plakat/img/malev.jpg Binary files differindex d88d950..d88d950 100755..100644 --- a/rannak/mangud/partorg/plakat/img/malev.jpg +++ b/rannak/mangud/partorg/plakat/img/malev.jpg diff --git a/rannak/mangud/partorg/plakat/img/stalin.jpg b/rannak/mangud/partorg/plakat/img/stalin.jpg Binary files differindex bc0a3a5..bc0a3a5 100755..100644 --- a/rannak/mangud/partorg/plakat/img/stalin.jpg +++ b/rannak/mangud/partorg/plakat/img/stalin.jpg diff --git a/rannak/mangud/partorg/plakat/img/veekogud.jpg b/rannak/mangud/partorg/plakat/img/veekogud.jpg Binary files differindex 23f04ab..23f04ab 100755..100644 --- a/rannak/mangud/partorg/plakat/img/veekogud.jpg +++ b/rannak/mangud/partorg/plakat/img/veekogud.jpg diff --git a/rannak/mangud/partorg/plakat/img/viisAastak.jpg b/rannak/mangud/partorg/plakat/img/viisAastak.jpg Binary files differindex 20be6ed..20be6ed 100755..100644 --- a/rannak/mangud/partorg/plakat/img/viisAastak.jpg +++ b/rannak/mangud/partorg/plakat/img/viisAastak.jpg diff --git a/rannak/mangud/partorg/plakat/index.html b/rannak/mangud/partorg/plakat/index.html index 85bb6bc..85bb6bc 100755..100644 --- a/rannak/mangud/partorg/plakat/index.html +++ b/rannak/mangud/partorg/plakat/index.html diff --git a/rannak/mangud/partorg/plakat/script.js b/rannak/mangud/partorg/plakat/script.js index 4d4ee36..4d4ee36 100755..100644 --- a/rannak/mangud/partorg/plakat/script.js +++ b/rannak/mangud/partorg/plakat/script.js diff --git a/rannak/mangud/partorg/plakat/styles.css b/rannak/mangud/partorg/plakat/styles.css index 67f8bbe..67f8bbe 100755..100644 --- a/rannak/mangud/partorg/plakat/styles.css +++ b/rannak/mangud/partorg/plakat/styles.css diff --git a/rannak/mangud/partorg/sonaragastik/index.html b/rannak/mangud/partorg/sonaragastik/index.html index f955058..f955058 100755..100644 --- a/rannak/mangud/partorg/sonaragastik/index.html +++ b/rannak/mangud/partorg/sonaragastik/index.html diff --git a/rannak/mangud/partorg/sonaragastik/pildid/avatar.png b/rannak/mangud/partorg/sonaragastik/pildid/avatar.png Binary files differindex 485a70c..485a70c 100755..100644 --- a/rannak/mangud/partorg/sonaragastik/pildid/avatar.png +++ b/rannak/mangud/partorg/sonaragastik/pildid/avatar.png diff --git a/rannak/mangud/partorg/sonaragastik/script.js b/rannak/mangud/partorg/sonaragastik/script.js index 2e6ffb4..2e6ffb4 100755..100644 --- a/rannak/mangud/partorg/sonaragastik/script.js +++ b/rannak/mangud/partorg/sonaragastik/script.js diff --git a/rannak/mangud/partorg/sonaragastik/style.css b/rannak/mangud/partorg/sonaragastik/style.css index 4b003d9..4b003d9 100755..100644 --- a/rannak/mangud/partorg/sonaragastik/style.css +++ b/rannak/mangud/partorg/sonaragastik/style.css diff --git a/rannak/mangud/perenaine/kuulamine/index.html b/rannak/mangud/perenaine/kuulamine/index.html index 4e44139..4823f03 100755..100644 --- a/rannak/mangud/perenaine/kuulamine/index.html +++ b/rannak/mangud/perenaine/kuulamine/index.html @@ -230,7 +230,7 @@ <td class="toBeEdited">Mille</td> <td class="toBeEdited">Mille</td> <td class="toBeEdited">Mille</td> - <td><strong>Käes</strong></td> + <td><strong>Käes!</strong></td> </tr> </table> </div> diff --git a/rannak/mangud/perenaine/kuulamine/pildid/avatar.png b/rannak/mangud/perenaine/kuulamine/pildid/avatar.png Binary files differindex 60987d3..60987d3 100755..100644 --- a/rannak/mangud/perenaine/kuulamine/pildid/avatar.png +++ b/rannak/mangud/perenaine/kuulamine/pildid/avatar.png diff --git a/rannak/mangud/perenaine/kuulamine/script.js b/rannak/mangud/perenaine/kuulamine/script.js index 19debea..680c6fd 100755..100644 --- a/rannak/mangud/perenaine/kuulamine/script.js +++ b/rannak/mangud/perenaine/kuulamine/script.js @@ -80,6 +80,17 @@ for (let i=0;i < cells.length; i++){ +/// Chekers Funcers /// + + + + + + + + + + // If Done diff --git a/rannak/mangud/perenaine/kuulamine/style.css b/rannak/mangud/perenaine/kuulamine/style.css index effe5f9..effe5f9 100755..100644 --- a/rannak/mangud/perenaine/kuulamine/style.css +++ b/rannak/mangud/perenaine/kuulamine/style.css diff --git a/rannak/mangud/perenaine/memori/img/alko.svg b/rannak/mangud/perenaine/memori/img/alko.svg index 6d54db5..6d54db5 100755..100644 --- a/rannak/mangud/perenaine/memori/img/alko.svg +++ b/rannak/mangud/perenaine/memori/img/alko.svg diff --git a/rannak/mangud/perenaine/memori/img/alko.svg.bak b/rannak/mangud/perenaine/memori/img/alko.svg.bak index e7bcc31..e7bcc31 100755..100644 --- a/rannak/mangud/perenaine/memori/img/alko.svg.bak +++ b/rannak/mangud/perenaine/memori/img/alko.svg.bak diff --git a/rannak/mangud/perenaine/memori/img/avatar.png b/rannak/mangud/perenaine/memori/img/avatar.png Binary files differindex 60987d3..60987d3 100755..100644 --- a/rannak/mangud/perenaine/memori/img/avatar.png +++ b/rannak/mangud/perenaine/memori/img/avatar.png diff --git a/rannak/mangud/perenaine/memori/img/butter.svg b/rannak/mangud/perenaine/memori/img/butter.svg index 48aeb4c..48aeb4c 100755..100644 --- a/rannak/mangud/perenaine/memori/img/butter.svg +++ b/rannak/mangud/perenaine/memori/img/butter.svg diff --git a/rannak/mangud/perenaine/memori/img/image.svg b/rannak/mangud/perenaine/memori/img/image.svg index f3b93be..f3b93be 100755..100644 --- a/rannak/mangud/perenaine/memori/img/image.svg +++ b/rannak/mangud/perenaine/memori/img/image.svg diff --git a/rannak/mangud/perenaine/memori/img/jahu.svg b/rannak/mangud/perenaine/memori/img/jahu.svg index 1bb651a..1bb651a 100755..100644 --- a/rannak/mangud/perenaine/memori/img/jahu.svg +++ b/rannak/mangud/perenaine/memori/img/jahu.svg diff --git a/rannak/mangud/perenaine/memori/img/pasta.svg b/rannak/mangud/perenaine/memori/img/pasta.svg index d46b576..d46b576 100755..100644 --- a/rannak/mangud/perenaine/memori/img/pasta.svg +++ b/rannak/mangud/perenaine/memori/img/pasta.svg diff --git a/rannak/mangud/perenaine/memori/img/pesupulber.svg b/rannak/mangud/perenaine/memori/img/pesupulber.svg index b796327..b796327 100755..100644 --- a/rannak/mangud/perenaine/memori/img/pesupulber.svg +++ b/rannak/mangud/perenaine/memori/img/pesupulber.svg diff --git a/rannak/mangud/perenaine/memori/img/sool.svg b/rannak/mangud/perenaine/memori/img/sool.svg index 524cda1..524cda1 100755..100644 --- a/rannak/mangud/perenaine/memori/img/sool.svg +++ b/rannak/mangud/perenaine/memori/img/sool.svg diff --git a/rannak/mangud/perenaine/memori/img/suhkur.svg b/rannak/mangud/perenaine/memori/img/suhkur.svg index 58d4846..58d4846 100755..100644 --- a/rannak/mangud/perenaine/memori/img/suhkur.svg +++ b/rannak/mangud/perenaine/memori/img/suhkur.svg diff --git a/rannak/mangud/perenaine/memori/img/taga.svg b/rannak/mangud/perenaine/memori/img/taga.svg index e7be8cb..e7be8cb 100755..100644 --- a/rannak/mangud/perenaine/memori/img/taga.svg +++ b/rannak/mangud/perenaine/memori/img/taga.svg diff --git a/rannak/mangud/perenaine/memori/img/tang.svg b/rannak/mangud/perenaine/memori/img/tang.svg index ceac219..ceac219 100755..100644 --- a/rannak/mangud/perenaine/memori/img/tang.svg +++ b/rannak/mangud/perenaine/memori/img/tang.svg diff --git a/rannak/mangud/perenaine/memori/img/tikud.svg b/rannak/mangud/perenaine/memori/img/tikud.svg index 12be82c..12be82c 100755..100644 --- a/rannak/mangud/perenaine/memori/img/tikud.svg +++ b/rannak/mangud/perenaine/memori/img/tikud.svg diff --git a/rannak/mangud/perenaine/memori/img/wcpaber.svg b/rannak/mangud/perenaine/memori/img/wcpaber.svg index dbfade1..dbfade1 100755..100644 --- a/rannak/mangud/perenaine/memori/img/wcpaber.svg +++ b/rannak/mangud/perenaine/memori/img/wcpaber.svg diff --git a/rannak/mangud/perenaine/memori/index.html b/rannak/mangud/perenaine/memori/index.html index ea507dd..ea507dd 100755..100644 --- a/rannak/mangud/perenaine/memori/index.html +++ b/rannak/mangud/perenaine/memori/index.html diff --git a/rannak/mangud/perenaine/memori/script.js b/rannak/mangud/perenaine/memori/script.js index 8d74ec9..8d74ec9 100755..100644 --- a/rannak/mangud/perenaine/memori/script.js +++ b/rannak/mangud/perenaine/memori/script.js diff --git a/rannak/mangud/perenaine/memori/style.css b/rannak/mangud/perenaine/memori/style.css index eebb566..eebb566 100755..100644 --- a/rannak/mangud/perenaine/memori/style.css +++ b/rannak/mangud/perenaine/memori/style.css diff --git a/rannak/mangud/perenaine/ristsona/index.html b/rannak/mangud/perenaine/ristsona/index.html index 0200a88..0200a88 100755..100644 --- a/rannak/mangud/perenaine/ristsona/index.html +++ b/rannak/mangud/perenaine/ristsona/index.html diff --git a/rannak/mangud/perenaine/ristsona/pildid/avatar.png b/rannak/mangud/perenaine/ristsona/pildid/avatar.png Binary files differindex 60987d3..60987d3 100755..100644 --- a/rannak/mangud/perenaine/ristsona/pildid/avatar.png +++ b/rannak/mangud/perenaine/ristsona/pildid/avatar.png diff --git a/rannak/mangud/perenaine/ristsona/script.js b/rannak/mangud/perenaine/ristsona/script.js index a76eda3..a76eda3 100755..100644 --- a/rannak/mangud/perenaine/ristsona/script.js +++ b/rannak/mangud/perenaine/ristsona/script.js diff --git a/rannak/mangud/perenaine/ristsona/style.css b/rannak/mangud/perenaine/ristsona/style.css index dea1b5e..dea1b5e 100755..100644 --- a/rannak/mangud/perenaine/ristsona/style.css +++ b/rannak/mangud/perenaine/ristsona/style.css diff --git a/rannak/mangud/style.css b/rannak/mangud/style.css index 0b11a79..0b11a79 100755..100644 --- a/rannak/mangud/style.css +++ b/rannak/mangud/style.css diff --git a/rannak/mangud/uliopilane/ajatelg/index.html b/rannak/mangud/uliopilane/ajatelg/index.html index 1f7244d..1f7244d 100755..100644 --- a/rannak/mangud/uliopilane/ajatelg/index.html +++ b/rannak/mangud/uliopilane/ajatelg/index.html diff --git a/rannak/mangud/uliopilane/ajatelg/pildid/avatar.png b/rannak/mangud/uliopilane/ajatelg/pildid/avatar.png Binary files differindex dd044fd..dd044fd 100755..100644 --- a/rannak/mangud/uliopilane/ajatelg/pildid/avatar.png +++ b/rannak/mangud/uliopilane/ajatelg/pildid/avatar.png diff --git a/rannak/mangud/uliopilane/ajatelg/script.js b/rannak/mangud/uliopilane/ajatelg/script.js index ffea3d9..ffea3d9 100755..100644 --- a/rannak/mangud/uliopilane/ajatelg/script.js +++ b/rannak/mangud/uliopilane/ajatelg/script.js diff --git a/rannak/mangud/uliopilane/ajatelg/styles.css b/rannak/mangud/uliopilane/ajatelg/styles.css index 3c13c27..3c13c27 100755..100644 --- a/rannak/mangud/uliopilane/ajatelg/styles.css +++ b/rannak/mangud/uliopilane/ajatelg/styles.css diff --git a/rannak/mangud/uliopilane/tSark/img/avatar.png b/rannak/mangud/uliopilane/tSark/img/avatar.png Binary files differindex dd044fd..dd044fd 100755..100644 --- a/rannak/mangud/uliopilane/tSark/img/avatar.png +++ b/rannak/mangud/uliopilane/tSark/img/avatar.png diff --git a/rannak/mangud/uliopilane/tSark/img/picLink.txt b/rannak/mangud/uliopilane/tSark/img/picLink.txt index 091d2df..091d2df 100755..100644 --- a/rannak/mangud/uliopilane/tSark/img/picLink.txt +++ b/rannak/mangud/uliopilane/tSark/img/picLink.txt diff --git a/rannak/mangud/uliopilane/tSark/img/shirtImg.jpg b/rannak/mangud/uliopilane/tSark/img/shirtImg.jpg Binary files differindex 93f10de..93f10de 100755..100644 --- a/rannak/mangud/uliopilane/tSark/img/shirtImg.jpg +++ b/rannak/mangud/uliopilane/tSark/img/shirtImg.jpg diff --git a/rannak/mangud/uliopilane/tSark/img/tshirt.svg b/rannak/mangud/uliopilane/tSark/img/tshirt.svg index 19a7205..19a7205 100755..100644 --- a/rannak/mangud/uliopilane/tSark/img/tshirt.svg +++ b/rannak/mangud/uliopilane/tSark/img/tshirt.svg diff --git a/rannak/mangud/uliopilane/tSark/index.html b/rannak/mangud/uliopilane/tSark/index.html index 2d8bb52..2d8bb52 100755..100644 --- a/rannak/mangud/uliopilane/tSark/index.html +++ b/rannak/mangud/uliopilane/tSark/index.html diff --git a/rannak/mangud/uliopilane/tSark/main.js b/rannak/mangud/uliopilane/tSark/main.js index a91fbec..a91fbec 100755..100644 --- a/rannak/mangud/uliopilane/tSark/main.js +++ b/rannak/mangud/uliopilane/tSark/main.js diff --git a/rannak/mangud/uliopilane/tSark/main.js.bak b/rannak/mangud/uliopilane/tSark/main.js.bak deleted file mode 100755 index 2685ad4..0000000 --- a/rannak/mangud/uliopilane/tSark/main.js.bak +++ /dev/null @@ -1,537 +0,0 @@ -document.addEventListener('DOMContentLoaded', () => { - let btn = document.querySelector('.modalButton'); - btn.click(); -}); - - - -/*Muutused Stuff*/ - -// Särgi color - -let colorFill = document.querySelector("#colorFiller"); -let colorStroke = document.querySelector("#colorStroke"); - -colorFill.addEventListener("input", () => { - let color = colorFill.value; - document.querySelector("#sark").style.fill = color; - - if (!stuffDone.includes("sarkColor")) - stuffDone.push("sarkColor"); -}) - -colorStroke.addEventListener("input", () => { - let color = colorStroke.value; - document.querySelector("#sark").style.stroke = color; - - if (!stuffDone.includes("sarkColor")) - stuffDone.push("sarkColor"); -}) - - -// Img upload - -const image_input = document.querySelector("#image_input"); -let uploadedImg = ""; - -image_input.addEventListener("change", () => { - const reader = new FileReader(); - reader.readAsDataURL(image_input.files[0]) - reader.addEventListener("load", () => { - uploadedImg = reader.result; - document.querySelector(".item").style.backgroundImage = `url(${uploadedImg})` - }); - - if (!stuffDone.includes("newImg")) - stuffDone.push("newImg"); -}) - - -/* Teksti Teema */ - -// Uus Tekst - -function nextText() { - document.querySelector("#sargiText").value = ""; - - let curText = document.querySelector(".sarkTekst") - let newText = curText.cloneNode(true); - curText.classList.remove("sarkTekst") - - //Reset Stuff - let angle=0; - let sarkFontSize = 20; - - let gi6 = document.querySelector("g") - newText.classList.add("sarkTekst") - newText.innerHTML = "Uus Tekst"; - gi6.appendChild(newText); -} - - - -// Input - -function chgTxt() { - - let tekstVali = document.querySelector("#sargiText"); - tekstVali.addEventListener("keyup", () => { - let sarkTekst = document.querySelector(".sarkTekst"); - sarkTekst.innerHTML = tekstVali.value; - - if (!stuffDone.includes("txt")) - stuffDone.push("txt"); - }); -} - -chgTxt() - - -/* -function getInputValue() { - // Selecting the input element and get its value - - //Btn - let inputVal = document.getElementById("sargiText").value; - //Txt - let sarkTekst = document.querySelector(".sarkTekst"); - sarkTekst.innerHTML = inputVal; - - if (!stuffDone.includes("newTxt")) - stuffDone.push("newTxt"); -} - -function enterSubmit(){ - document.getElementById('sargiText') - .addEventListener('keyup', event => { - if (event.code === 'Enter') - { - event.preventDefault(); - getInputValue(); - } - }); -} -enterSubmit() -*/ - - -// Color - -let colorText = document.querySelector("#colorText"); -colorText.addEventListener("input", () => { - let color = colorText.value; - document.querySelector(".sarkTekst").style.fill = color; - - if (!stuffDone.includes("txt")) - stuffDone.push("txt"); -}) - -// Position -const ules = document.querySelector(".ules"); -const alla = document.querySelector(".alla"); -const vasak = document.querySelector(".vasak"); -const parem = document.querySelector(".parem"); - -ules.addEventListener("click" , () => { - let tmpX = document.querySelector(".sarkTekst").x; - let tmpY = document.querySelector(".sarkTekst").y; - - tmpY.baseVal[0].value-=10; - - if (!stuffDone.includes("txt")) - stuffDone.push("txt"); -}); - -alla.addEventListener("click" , () => { - let tmpX = document.querySelector(".sarkTekst").x; - let tmpY = document.querySelector(".sarkTekst").y; - - tmpY.baseVal[0].value+=10; - - if (!stuffDone.includes("txt")) - stuffDone.push("txt"); -}); - -vasak.addEventListener("click", () => { - let tmpX = document.querySelector(".sarkTekst").x; - let tmpY = document.querySelector(".sarkTekst").y; - - tmpX.baseVal[0].value-=10; - - if (!stuffDone.includes("txt")) - stuffDone.push("txt"); -}); - -parem.addEventListener("click", () => { - let tmpX = document.querySelector(".sarkTekst").x; - let tmpY = document.querySelector(".sarkTekst").y; - - tmpX.baseVal[0].value+=10; - - if (!stuffDone.includes("txt")) - stuffDone.push("txt"); -}); - - -// Vertical Pos -const vasakule = document.querySelector(".vertVasak"); -const paremale = document.querySelector(".vertParem"); -let angle=0; - -vasakule.addEventListener("click" , () => { - let testing = document.querySelector(".sarkTekst"); - - angle -=5 - testing.setAttribute("transform", "rotate("+angle+")"); - - if (!stuffDone.includes("txt")) - stuffDone.push("txt"); -}); - -paremale.addEventListener("click" , () => { - let testing = document.querySelector(".sarkTekst"); - - angle +=5 - testing.setAttribute("transform", "rotate("+angle+")"); - - if (!stuffDone.includes("txt")) - stuffDone.push("txt"); -}); - - - -// FontZise - -const plus = document.querySelector(".plus"); -const minus = document.querySelector(".minus"); -let sarkFontSize = 20; - -plus.addEventListener("click" , () => { - let sarkForText = document.querySelector(".sarkTekst"); - - sarkFontSize +=2; - sarkForText.setAttributeNS(null,"font-size",""+sarkFontSize+""); - - if (!stuffDone.includes("txt")) - stuffDone.push("txt"); -}); - -minus.addEventListener("click" , () => { - let sarkForText = document.querySelector(".sarkTekst"); - - sarkFontSize-=2; - sarkForText.setAttributeNS(null,"font-size",""+sarkFontSize+""); - - if (!stuffDone.includes("txt")) - stuffDone.push("txt"); -}); - - - - -// https://stackoverflow.com/questions/54076532/how-to-test-if-a-point-is-inside-an-svg-closed-path - - -// Funcs to check whether draggable el inside Svg path - -function oMousePos(elmt, evt) { - let ClientRect = elmt.getBoundingClientRect(); - return { - //object - x: Math.round(evt.clientX - ClientRect.left), - y: Math.round(evt.clientY - ClientRect.top) - }; -} - -function draggablePoints(m) { - //top left - draggable.p0s[0][0] = m.x - draggable.delta.x - 1; - draggable.p0s[0][1] = m.y - draggable.delta.y - 1; - //top right - draggable.p0s[1][0] = m.x - draggable.delta.x + draggable.w + 1; - draggable.p0s[1][1] = m.y - draggable.delta.y + 1; - //bottom right - draggable.p0s[2][0] = m.x - draggable.delta.x + draggable.w + 1; - draggable.p0s[2][1] = m.y - draggable.delta.y + draggable.h + 1; - //bottom left - draggable.p0s[3][0] = m.x - draggable.delta.x + 1; - draggable.p0s[3][1] = m.y - draggable.delta.y + draggable.h + 1; -} - - -m = {},// the mouse position -thePath = document.querySelector("path"), - -/* Rezisable Image Stuff */ -draggable = document.querySelector(".item"); - -draggable.addEventListener("mousedown", mousedown); - -// NEw stuff -draggable.w = draggable.getBoundingClientRect().width; -draggable.h = draggable.getBoundingClientRect().height; -draggable.p0s = [[], [], [], []];//one array for every corner -draggable.delta = {};// distance between the click point and the left upper corner - - - -function mousedown(e) { - window.addEventListener("mousemove", mousemove); - window.addEventListener("mouseup", mouseup); - - // NEw stuff - draggable.delta = oMousePos(draggable, e); - // - - - let prevX = e.clientX; - let prevY = e.clientY; - - function mousemove(e) { - if (!isResizing) { - - let item = document.querySelector(".item"); - //item.style.pointerEvents = "none"; - - /* - let posers = document.elementFromPoint(e.x, e.y).id; - item.style.pointerEvents = ""; - - if (posers != "sark"){ - console.log(posers); - - let newX = prevX - e.clientX; - let newY = prevY - e.clientY; - - const rect = el.getBoundingClientRect(); - - el.style.left = rect.left - newX + "px"; - el.style.top = rect.top - newY + "px"; - - prevX = e.clientX; - prevY = e.clientY; - - mouseup() - } - */ - - let counter = 0;// how many corners are in path - //m = oMousePos(drag_parent, e); - m = oMousePos(thePath, e); - draggablePoints(m); - draggable.style.left = draggable.p0s[0][0] + 1 + "px"; - draggable.style.top = draggable.p0s[0][1] + 1 + "px"; - - draggable.p0s.map(p => { - if (document.elementFromPoint(p[0], p[1]) && document.elementFromPoint(p[0], p[1]).id == "sark") { - counter++; - } - console.log(counter, document.elementFromPoint(p[0], p[1]).id == "sark"); - }); - - if (counter == 4){ - console.log("moving"); - let newX = prevX - e.clientX; - let newY = prevY - e.clientY; - - const rect = draggable.getBoundingClientRect(); - - draggable.style.left = rect.left - newX + "px"; - draggable.style.top = rect.top - newY + "px"; - - prevX = e.clientX; - prevY = e.clientY; - } - - else { - console.log("Out of Bounds!"); - //console.log(counter); - // Set it to init pos; from downtown - // it.style.left = brr.left + 200; - console.log(draggable.p0s); - } - - } - } - - function mouseup() { - window.removeEventListener("mousemove", mousemove); - window.removeEventListener("mouseup", mouseup); - //D = false; - } - -} - - - - -// Resizing Pic - - -let isResizing = false; -const resizers = document.querySelectorAll(".resizer"); -let currentResizer; - -for (let resizer of resizers) { - resizer.addEventListener("mousedown", mousedown); - - function mousedown(e) { - currentResizer = e.target; - isResizing = true; - - let prevX = e.clientX; - let prevY = e.clientY; - - window.addEventListener("mousemove", mousemove); - window.addEventListener("mouseup", mouseup); - - function mousemove(e) { - - const rect = draggable.getBoundingClientRect(); - - if (currentResizer.classList.contains("se")) { - draggable.style.width = rect.width - (prevX - e.clientX) + "px"; - draggable.style.height = rect.height - (prevY - e.clientY) + "px"; - } - - else if (currentResizer.classList.contains("sw")) { - draggable.style.width = rect.width + (prevX - e.clientX) + "px"; - draggable.style.height = rect.height - (prevY - e.clientY) + "px"; - draggable.style.left = rect.left - (prevX - e.clientX) + "px"; - } - - else if (currentResizer.classList.contains("ne")) { - draggable.style.width = rect.width - (prevX - e.clientX) + "px"; - draggable.style.height = rect.height + (prevY - e.clientY) + "px"; - draggable.style.top = rect.top - (prevY - e.clientY) + "px"; - } - - else { - draggable.style.width = rect.width + (prevX - e.clientX) + "px"; - draggable.style.height = rect.height + (prevY - e.clientY) + "px"; - draggable.style.top = rect.top - (prevY - e.clientY) + "px"; - draggable.style.left = rect.left - (prevX - e.clientX) + "px"; - } - - prevX = e.clientX; - prevY = e.clientY; - } - - function mouseup() { - window.removeEventListener("mousemove", mousemove); - window.removeEventListener("mouseup", mouseup); - isResizing = false; - } - - } // Resizing mousedown end - -} - -// Seting up resize Pic Pos -let brr = document.querySelector("#sark").getBoundingClientRect(); -let it = document.querySelector(".item"); -it.style.left = brr.left + 200; -//it.style.top = brr.top + 300; - - - - - - - -/* Ending stuff + Reset */ - - -// Move on Button -function message(msg, color){ - messageBox = document.querySelector(".messageBox"); - messageBox.innerHTML = msg; - messageBox.style.color = color; -} - - -let stuffDone = new Array(); - -const chkBtn = document.querySelector(".checkMoveOn"); - -chkBtn.addEventListener("click", (e) => { - - if (stuffDone.length >= 3){ - message("Korras! Soovi korral tee screenshot (Win+Shift+S)", "#4BB543"); - moveOnEnable(); - } - else - message("valikuid kasutatud " + stuffDone.length + "/" + "3.", "Red"); -}); - -function moveOnEnable(){ - const btn = document.querySelector(".moveOn"); - btn.disabled = false; - btn.onclick = () => location.href = "../utlused"; - - let tst = document.querySelectorAll(".resizer"); - for (elinjo of tst){ - elinjo.style.height = 0; - elinjo.style.width = 0; - } - -} - -// 6 - - - -// Reset Everything - -const nulliBtn = document.querySelector(".nulliBtn"); -nulliBtn.addEventListener("click", () => { - - stuffDone = new Array(); - - //SarkColor - document.querySelector("#sark").style.fill = "white"; - - document.querySelector("#sark").style.stroke = "black"; - - - - // Tekstid - document.querySelector("#sargiText").value = ""; - - curText = document.querySelector(".sarkTekst"); - newText = curText.cloneNode(true); - curText.classList.remove("sarkTekst"); - - let koikTekstid = document.querySelectorAll(".doneTekst"); - - for (let i = 0; i < koikTekstid.length; i++) { - koikTekstid[i].innerHTML = ""; - } - - //Reset Stuff - angle=0; - sarkFontSize = 20; - - let brro = document.querySelector("g") - newText.classList.add("sarkTekst") - newText.innerHTML = "Tekst"; - - brro.appendChild(newText); - document.querySelector(".sarkTekst").style.fill = "black"; - - - // Seting up resize Pic Pos - let brr = document.querySelector("#sark").getBoundingClientRect(); - let it = document.querySelector(".item"); - it.style.left = brr.left + 200; - //it.style.top = brr.top + 300; - - - // Moving IMg Corners - let tst = document.querySelectorAll(".resizer"); - for (elinjo of tst){ - elinjo.style.height = "7px"; - elinjo.style.width = "7px"; - } - -}) diff --git a/rannak/mangud/uliopilane/tSark/style.css b/rannak/mangud/uliopilane/tSark/style.css index 4da8d25..4da8d25 100755..100644 --- a/rannak/mangud/uliopilane/tSark/style.css +++ b/rannak/mangud/uliopilane/tSark/style.css diff --git a/rannak/mangud/uliopilane/utlused/index.html b/rannak/mangud/uliopilane/utlused/index.html index 9eefd7b..9eefd7b 100755..100644 --- a/rannak/mangud/uliopilane/utlused/index.html +++ b/rannak/mangud/uliopilane/utlused/index.html diff --git a/rannak/mangud/uliopilane/utlused/main.js b/rannak/mangud/uliopilane/utlused/main.js index 653fb54..653fb54 100755..100644 --- a/rannak/mangud/uliopilane/utlused/main.js +++ b/rannak/mangud/uliopilane/utlused/main.js diff --git a/rannak/mangud/uliopilane/utlused/pildid/avatar.png b/rannak/mangud/uliopilane/utlused/pildid/avatar.png Binary files differindex dd044fd..dd044fd 100755..100644 --- a/rannak/mangud/uliopilane/utlused/pildid/avatar.png +++ b/rannak/mangud/uliopilane/utlused/pildid/avatar.png diff --git a/rannak/mangud/uliopilane/utlused/utlused.css b/rannak/mangud/uliopilane/utlused/utlused.css index 178efea..178efea 100755..100644 --- a/rannak/mangud/uliopilane/utlused/utlused.css +++ b/rannak/mangud/uliopilane/utlused/utlused.css diff --git a/rannak/noMobiles/index.html b/rannak/noMobiles/index.html index de64f39..de64f39 100755..100644 --- a/rannak/noMobiles/index.html +++ b/rannak/noMobiles/index.html diff --git a/rannak/noMobiles/style.css b/rannak/noMobiles/style.css index 78daa4c..78daa4c 100755..100644 --- a/rannak/noMobiles/style.css +++ b/rannak/noMobiles/style.css diff --git a/rannak/rolliValik/index.html b/rannak/rolliValik/index.html index 509e296..509e296 100755..100644 --- a/rannak/rolliValik/index.html +++ b/rannak/rolliValik/index.html diff --git a/rannak/rolliValik/pildid/direktor.png b/rannak/rolliValik/pildid/direktor.png Binary files differindex 94d7a31..94d7a31 100755..100644 --- a/rannak/rolliValik/pildid/direktor.png +++ b/rannak/rolliValik/pildid/direktor.png diff --git a/rannak/rolliValik/pildid/partorg.png b/rannak/rolliValik/pildid/partorg.png Binary files differindex 485a70c..485a70c 100755..100644 --- a/rannak/rolliValik/pildid/partorg.png +++ b/rannak/rolliValik/pildid/partorg.png diff --git a/rannak/rolliValik/pildid/perenaine.png b/rannak/rolliValik/pildid/perenaine.png Binary files differindex 60987d3..60987d3 100755..100644 --- a/rannak/rolliValik/pildid/perenaine.png +++ b/rannak/rolliValik/pildid/perenaine.png diff --git a/rannak/rolliValik/pildid/tmp/arimees.jpg b/rannak/rolliValik/pildid/tmp/arimees.jpg Binary files differindex 3cb21cf..3cb21cf 100755..100644 --- a/rannak/rolliValik/pildid/tmp/arimees.jpg +++ b/rannak/rolliValik/pildid/tmp/arimees.jpg diff --git a/rannak/rolliValik/pildid/tmp/direktor.jpg b/rannak/rolliValik/pildid/tmp/direktor.jpg Binary files differindex 74f2cf5..74f2cf5 100755..100644 --- a/rannak/rolliValik/pildid/tmp/direktor.jpg +++ b/rannak/rolliValik/pildid/tmp/direktor.jpg diff --git a/rannak/rolliValik/pildid/tmp/kaitseliitlane.jpg b/rannak/rolliValik/pildid/tmp/kaitseliitlane.jpg Binary files differindex 37ae271..37ae271 100755..100644 --- a/rannak/rolliValik/pildid/tmp/kaitseliitlane.jpg +++ b/rannak/rolliValik/pildid/tmp/kaitseliitlane.jpg diff --git a/rannak/rolliValik/pildid/tmp/partorg.jpg b/rannak/rolliValik/pildid/tmp/partorg.jpg Binary files differindex 2df392c..2df392c 100755..100644 --- a/rannak/rolliValik/pildid/tmp/partorg.jpg +++ b/rannak/rolliValik/pildid/tmp/partorg.jpg diff --git a/rannak/rolliValik/pildid/tmp/perenaine.jpg b/rannak/rolliValik/pildid/tmp/perenaine.jpg Binary files differindex 94c5b54..94c5b54 100755..100644 --- a/rannak/rolliValik/pildid/tmp/perenaine.jpg +++ b/rannak/rolliValik/pildid/tmp/perenaine.jpg diff --git a/rannak/rolliValik/pildid/tmp/uliopilane.jpg b/rannak/rolliValik/pildid/tmp/uliopilane.jpg Binary files differindex 7e42755..7e42755 100755..100644 --- a/rannak/rolliValik/pildid/tmp/uliopilane.jpg +++ b/rannak/rolliValik/pildid/tmp/uliopilane.jpg diff --git a/rannak/rolliValik/pildid/uliopilane.png b/rannak/rolliValik/pildid/uliopilane.png Binary files differindex dd044fd..dd044fd 100755..100644 --- a/rannak/rolliValik/pildid/uliopilane.png +++ b/rannak/rolliValik/pildid/uliopilane.png diff --git a/rannak/rolliValik/rolliValik.css b/rannak/rolliValik/rolliValik.css index cadb5b6..cadb5b6 100755..100644 --- a/rannak/rolliValik/rolliValik.css +++ b/rannak/rolliValik/rolliValik.css diff --git a/rannak/rolliValik/rolliValik.js b/rannak/rolliValik/rolliValik.js index e69de29..e69de29 100755..100644 --- a/rannak/rolliValik/rolliValik.js +++ b/rannak/rolliValik/rolliValik.js diff --git a/rannak/rolliValik/vids/partorg.mp4 b/rannak/rolliValik/vids/partorg.mp4 Binary files differindex 7ca12fd..7ca12fd 100755..100644 --- a/rannak/rolliValik/vids/partorg.mp4 +++ b/rannak/rolliValik/vids/partorg.mp4 |
