From 3c64a840a69b2685722765feadf0fec6e571b157 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Sat, 6 May 2023 12:09:56 +0300 Subject: fixed vids and else Former-commit-id: d0b098f6e7522ec2791cb3786f3b7926d9b1aae1 --- lehed/rollid/pildid/arimees.jpg | Bin 73556 -> 0 bytes lehed/rollid/pildid/direktor.jpg | Bin 167483 -> 0 bytes lehed/rollid/pildid/kaitseliitlane.jpg | Bin 137594 -> 0 bytes lehed/rollid/pildid/opilane.jpg | Bin 243242 -> 0 bytes lehed/rollid/pildid/partorg.jpg | Bin 100602 -> 0 bytes lehed/rollid/pildid/perenaine.jpg | Bin 81246 -> 0 bytes lehed/rollid/varupildid/arimees.jpg | Bin 0 -> 73556 bytes lehed/rollid/varupildid/direktor.jpg | Bin 0 -> 167483 bytes lehed/rollid/varupildid/kaitseliitlane.jpg | Bin 0 -> 137594 bytes lehed/rollid/varupildid/opilane.jpg | Bin 0 -> 243242 bytes lehed/rollid/varupildid/partorg.jpg | Bin 0 -> 100602 bytes lehed/rollid/varupildid/perenaine.jpg | Bin 0 -> 81246 bytes lehed/rollid/vids/avatars/direktor.bak.jpg | Bin 0 -> 140129 bytes lehed/rollid/vids/avatars/direktor.jpg | Bin 140129 -> 136813 bytes lehed/rollid/vids/avatars/perenaine.bak.jpg | Bin 0 -> 146346 bytes lehed/rollid/vids/avatars/perenaine.jpg | Bin 146346 -> 135438 bytes lehed/rollid/vids/direktor.mp4 | Bin 88145018 -> 88145018 bytes lehed/rollid/vids/partorg.mp4 | Bin 104366220 -> 104366220 bytes lehed/rollid/vids/perenaine.mp4 | Bin 81051789 -> 81051789 bytes lehed/rollid/vids/uliopilane.mp4 | Bin 68433778 -> 68433778 bytes rannak/mangud/arimees/muusika/index.html | 20 ++++++++++ rannak/mangud/arimees/muusika/script.js | 41 ++++++++++++++++++++- rannak/mangud/arimees/muusika/style.css | 24 ++++++------ rannak/mangud/direktor/baltikett/pildid/avatar.png | Bin 13683369 -> 655553 bytes rannak/mangud/direktor/kone/pildid/avatar.png | Bin 13683369 -> 655553 bytes rannak/mangud/direktor/loosung/pildid/avatar.png | Bin 13683369 -> 655553 bytes rannak/mangud/partorg/plakat/img/stalinBlank.png | Bin 25223827 -> 25149515 bytes rannak/mangud/perenaine/kuulamine/index.html | 17 ++++----- .../mangud/perenaine/kuulamine/pildid/avatar.png | Bin 13560147 -> 641017 bytes rannak/mangud/perenaine/kuulamine/script.js | 33 +++++++++-------- rannak/mangud/perenaine/kuulamine/style.css | 5 +++ rannak/mangud/perenaine/memori/img/avatar.png | Bin 13560147 -> 641017 bytes rannak/mangud/perenaine/ristsona/pildid/avatar.png | Bin 13560147 -> 641017 bytes rannak/rolliValik/pildid/direktor.bak.png | Bin 0 -> 13683369 bytes rannak/rolliValik/pildid/direktor.jpg | Bin 0 -> 136813 bytes rannak/rolliValik/pildid/direktor.png | Bin 13683369 -> 655553 bytes rannak/rolliValik/pildid/perenaine.bak.png | Bin 0 -> 13560147 bytes rannak/rolliValik/pildid/perenaine.jpg | Bin 0 -> 135438 bytes rannak/rolliValik/pildid/perenaine.png | Bin 13560147 -> 641017 bytes rannak/rolliValik/vids/partorg.mp4 | Bin 104366220 -> 0 bytes 40 files changed, 103 insertions(+), 37 deletions(-) delete mode 100644 lehed/rollid/pildid/arimees.jpg delete mode 100644 lehed/rollid/pildid/direktor.jpg delete mode 100644 lehed/rollid/pildid/kaitseliitlane.jpg delete mode 100644 lehed/rollid/pildid/opilane.jpg delete mode 100644 lehed/rollid/pildid/partorg.jpg delete mode 100644 lehed/rollid/pildid/perenaine.jpg create mode 100644 lehed/rollid/varupildid/arimees.jpg create mode 100644 lehed/rollid/varupildid/direktor.jpg create mode 100644 lehed/rollid/varupildid/kaitseliitlane.jpg create mode 100644 lehed/rollid/varupildid/opilane.jpg create mode 100644 lehed/rollid/varupildid/partorg.jpg create mode 100644 lehed/rollid/varupildid/perenaine.jpg create mode 100644 lehed/rollid/vids/avatars/direktor.bak.jpg create mode 100644 lehed/rollid/vids/avatars/perenaine.bak.jpg create mode 100644 rannak/rolliValik/pildid/direktor.bak.png create mode 100644 rannak/rolliValik/pildid/direktor.jpg create mode 100644 rannak/rolliValik/pildid/perenaine.bak.png create mode 100644 rannak/rolliValik/pildid/perenaine.jpg delete mode 100644 rannak/rolliValik/vids/partorg.mp4 diff --git a/lehed/rollid/pildid/arimees.jpg b/lehed/rollid/pildid/arimees.jpg deleted file mode 100644 index 3cb21cf..0000000 Binary files a/lehed/rollid/pildid/arimees.jpg and /dev/null differ diff --git a/lehed/rollid/pildid/direktor.jpg b/lehed/rollid/pildid/direktor.jpg deleted file mode 100644 index 74f2cf5..0000000 Binary files a/lehed/rollid/pildid/direktor.jpg and /dev/null differ diff --git a/lehed/rollid/pildid/kaitseliitlane.jpg b/lehed/rollid/pildid/kaitseliitlane.jpg deleted file mode 100644 index 37ae271..0000000 Binary files a/lehed/rollid/pildid/kaitseliitlane.jpg and /dev/null differ diff --git a/lehed/rollid/pildid/opilane.jpg b/lehed/rollid/pildid/opilane.jpg deleted file mode 100644 index 7e42755..0000000 Binary files a/lehed/rollid/pildid/opilane.jpg and /dev/null differ diff --git a/lehed/rollid/pildid/partorg.jpg b/lehed/rollid/pildid/partorg.jpg deleted file mode 100644 index 2df392c..0000000 Binary files a/lehed/rollid/pildid/partorg.jpg and /dev/null differ diff --git a/lehed/rollid/pildid/perenaine.jpg b/lehed/rollid/pildid/perenaine.jpg deleted file mode 100644 index 94c5b54..0000000 Binary files a/lehed/rollid/pildid/perenaine.jpg and /dev/null differ diff --git a/lehed/rollid/varupildid/arimees.jpg b/lehed/rollid/varupildid/arimees.jpg new file mode 100644 index 0000000..3cb21cf Binary files /dev/null and b/lehed/rollid/varupildid/arimees.jpg differ diff --git a/lehed/rollid/varupildid/direktor.jpg b/lehed/rollid/varupildid/direktor.jpg new file mode 100644 index 0000000..74f2cf5 Binary files /dev/null and b/lehed/rollid/varupildid/direktor.jpg differ diff --git a/lehed/rollid/varupildid/kaitseliitlane.jpg b/lehed/rollid/varupildid/kaitseliitlane.jpg new file mode 100644 index 0000000..37ae271 Binary files /dev/null and b/lehed/rollid/varupildid/kaitseliitlane.jpg differ diff --git a/lehed/rollid/varupildid/opilane.jpg b/lehed/rollid/varupildid/opilane.jpg new file mode 100644 index 0000000..7e42755 Binary files /dev/null and b/lehed/rollid/varupildid/opilane.jpg differ diff --git a/lehed/rollid/varupildid/partorg.jpg b/lehed/rollid/varupildid/partorg.jpg new file mode 100644 index 0000000..2df392c Binary files /dev/null and b/lehed/rollid/varupildid/partorg.jpg differ diff --git a/lehed/rollid/varupildid/perenaine.jpg b/lehed/rollid/varupildid/perenaine.jpg new file mode 100644 index 0000000..94c5b54 Binary files /dev/null and b/lehed/rollid/varupildid/perenaine.jpg differ diff --git a/lehed/rollid/vids/avatars/direktor.bak.jpg b/lehed/rollid/vids/avatars/direktor.bak.jpg new file mode 100644 index 0000000..b89268d Binary files /dev/null and b/lehed/rollid/vids/avatars/direktor.bak.jpg differ diff --git a/lehed/rollid/vids/avatars/direktor.jpg b/lehed/rollid/vids/avatars/direktor.jpg index b89268d..2a0d71c 100644 Binary files a/lehed/rollid/vids/avatars/direktor.jpg and b/lehed/rollid/vids/avatars/direktor.jpg differ diff --git a/lehed/rollid/vids/avatars/perenaine.bak.jpg b/lehed/rollid/vids/avatars/perenaine.bak.jpg new file mode 100644 index 0000000..481db36 Binary files /dev/null and b/lehed/rollid/vids/avatars/perenaine.bak.jpg differ diff --git a/lehed/rollid/vids/avatars/perenaine.jpg b/lehed/rollid/vids/avatars/perenaine.jpg index 481db36..4f74a65 100644 Binary files a/lehed/rollid/vids/avatars/perenaine.jpg and b/lehed/rollid/vids/avatars/perenaine.jpg differ diff --git a/lehed/rollid/vids/direktor.mp4 b/lehed/rollid/vids/direktor.mp4 index c7ded51..c878738 100644 Binary files a/lehed/rollid/vids/direktor.mp4 and b/lehed/rollid/vids/direktor.mp4 differ diff --git a/lehed/rollid/vids/partorg.mp4 b/lehed/rollid/vids/partorg.mp4 index 10c43d8..da82768 100644 Binary files a/lehed/rollid/vids/partorg.mp4 and b/lehed/rollid/vids/partorg.mp4 differ diff --git a/lehed/rollid/vids/perenaine.mp4 b/lehed/rollid/vids/perenaine.mp4 index acf785a..fa66536 100644 Binary files a/lehed/rollid/vids/perenaine.mp4 and b/lehed/rollid/vids/perenaine.mp4 differ diff --git a/lehed/rollid/vids/uliopilane.mp4 b/lehed/rollid/vids/uliopilane.mp4 index 13d54f0..8a5c7f1 100644 Binary files a/lehed/rollid/vids/uliopilane.mp4 and b/lehed/rollid/vids/uliopilane.mp4 differ diff --git a/rannak/mangud/arimees/muusika/index.html b/rannak/mangud/arimees/muusika/index.html index 6a1e1ce..ef453ec 100644 --- a/rannak/mangud/arimees/muusika/index.html +++ b/rannak/mangud/arimees/muusika/index.html @@ -19,6 +19,7 @@

Vajuta lingile ja vaata muusikavideosid youtubes ning seejärel järjesta vastavalt oma eelistustele. +
Põhjenda oma esikohta tekstiväljal.

@@ -97,10 +98,14 @@ + + + @@ -127,10 +132,13 @@ + + @@ -157,10 +165,13 @@ + + @@ -187,10 +198,13 @@ + + @@ -217,10 +231,13 @@ + + @@ -247,10 +264,13 @@ + + diff --git a/rannak/mangud/arimees/muusika/script.js b/rannak/mangud/arimees/muusika/script.js index 0bcaae0..85d0292 100644 --- a/rannak/mangud/arimees/muusika/script.js +++ b/rannak/mangud/arimees/muusika/script.js @@ -4,8 +4,12 @@ document.addEventListener('DOMContentLoaded', () => { }); -const selectors = document.querySelectorAll('select'); +allPohjendatud = false; +allSelected = false; + +// EventListenres +const selectors = document.querySelectorAll('select'); for(el of selectors){ el.addEventListener('change', () => { @@ -16,13 +20,46 @@ for(el of selectors){ } if (selected.length == 6) + allSelected = true; + else + allSelected = false; + + if (allPohjendatud && allSelected) + moveOnEnable(); + }); +} + + + +const pohjendused = document.querySelectorAll('textarea'); +for(el of pohjendused){ + el.addEventListener('input', () => { + + let pohjendatud = new Array(); + for (el of pohjendused){ + if (!pohjendatud.includes(el) && el.value != '') + pohjendatud.push(el); + } + + if (pohjendatud.length == 6) + allPohjendatud = true; + else + allPohjendatud = false; + + if (allPohjendatud && allSelected) moveOnEnable(); }); } -// If All Else Done + + + + + + +// If All Done function moveOnEnable(){ const btn = document.querySelector(".moveOn"); diff --git a/rannak/mangud/arimees/muusika/style.css b/rannak/mangud/arimees/muusika/style.css index 3b7e248..cbc77a9 100644 --- a/rannak/mangud/arimees/muusika/style.css +++ b/rannak/mangud/arimees/muusika/style.css @@ -101,6 +101,12 @@ li:nth-child(even){background-color: #eee8;} li:hover{transform: scale(1.03);} +textarea{ + width: 80%; + margin: 0 .7rem; +} + + .laul{ display: flex; align-items: center; @@ -108,13 +114,6 @@ li:hover{transform: scale(1.03);} min-width: 100%; } -.laulInner { - display: flex; - justify-content: space-between; - -} - - .info { padding-left: 1rem; @@ -123,19 +122,22 @@ li:hover{transform: scale(1.03);} width: 50%; } -.audioWrap{ - width: 50%; -} - .info a { text-decoration: underline; font-weight: bold; color: #000; } + + + .info h2{font-size: 1.2rem;} select{margin-right: 1rem;} + + + + select { -webkit-appearance: menulist-button; height: 3rem; diff --git a/rannak/mangud/direktor/baltikett/pildid/avatar.png b/rannak/mangud/direktor/baltikett/pildid/avatar.png index 7b13556..d643367 100644 Binary files a/rannak/mangud/direktor/baltikett/pildid/avatar.png and b/rannak/mangud/direktor/baltikett/pildid/avatar.png differ diff --git a/rannak/mangud/direktor/kone/pildid/avatar.png b/rannak/mangud/direktor/kone/pildid/avatar.png index 7b13556..d643367 100644 Binary files a/rannak/mangud/direktor/kone/pildid/avatar.png and b/rannak/mangud/direktor/kone/pildid/avatar.png differ diff --git a/rannak/mangud/direktor/loosung/pildid/avatar.png b/rannak/mangud/direktor/loosung/pildid/avatar.png index 7b13556..d643367 100644 Binary files a/rannak/mangud/direktor/loosung/pildid/avatar.png and b/rannak/mangud/direktor/loosung/pildid/avatar.png differ diff --git a/rannak/mangud/partorg/plakat/img/stalinBlank.png b/rannak/mangud/partorg/plakat/img/stalinBlank.png index 7efdc4e..1f5183e 100644 Binary files a/rannak/mangud/partorg/plakat/img/stalinBlank.png and b/rannak/mangud/partorg/plakat/img/stalinBlank.png differ diff --git a/rannak/mangud/perenaine/kuulamine/index.html b/rannak/mangud/perenaine/kuulamine/index.html index 8b2cd6f..21a3a6e 100644 --- a/rannak/mangud/perenaine/kuulamine/index.html +++ b/rannak/mangud/perenaine/kuulamine/index.html @@ -2,11 +2,10 @@ - Kuulamine + - @@ -165,7 +164,7 @@

MINU SUKKPÜKSTE HANKIMISE PLAAN:

-

NB: Sisesta vastused nimetavas käänetes. Kui veerg on korrektne, muutub see roheliseks.

+

NB: Sisesta vastused nimetavas käänetes.

@@ -196,7 +195,7 @@ - +
Kellele
Mida Mida
@@ -207,7 +206,7 @@ Kellele - Mida + Mida @@ -218,7 +217,7 @@ Kellele - Mida + Mida @@ -227,9 +226,9 @@ Saan - Mille - Mille - Mille + Mille + Mille + Mille Käes! diff --git a/rannak/mangud/perenaine/kuulamine/pildid/avatar.png b/rannak/mangud/perenaine/kuulamine/pildid/avatar.png index 41c1bb9..b0cd3a1 100644 Binary files a/rannak/mangud/perenaine/kuulamine/pildid/avatar.png and b/rannak/mangud/perenaine/kuulamine/pildid/avatar.png differ diff --git a/rannak/mangud/perenaine/kuulamine/script.js b/rannak/mangud/perenaine/kuulamine/script.js index 680c6fd..72b8e70 100644 --- a/rannak/mangud/perenaine/kuulamine/script.js +++ b/rannak/mangud/perenaine/kuulamine/script.js @@ -6,11 +6,18 @@ document.addEventListener('DOMContentLoaded', () => { const cells = document.querySelectorAll(".toBeEdited"); -console.log(cells); + +// For Checking +firsts = document.querySelectorAll(".firstCheck"); +secs = document.querySelectorAll(".secCheck"); +thirds = document.querySelectorAll(".thirdCheck"); + + + + for (let i=0;i < cells.length; i++){ cells[i].onclick = function(){ - console.log('Clicked'); if (this.hasAttribute('data-clicked')) return; @@ -41,7 +48,6 @@ for (let i=0;i < cells.length; i++){ td.removeAttribute('data-text'); td.innerHTML = curText; td.style.cssText = 'padding: .5rem .5rem'; - console.log('Sth Change'); } else { td.removeAttribute('data-clicked'); @@ -52,7 +58,15 @@ for (let i=0;i < cells.length; i++){ // Here Check if Done - //TODO + if (firsts[0].textContent != '' && firsts[0].textContent == firsts[1].textContent){ + if (secs[0].textContent != '' && secs[0].textContent == secs[1].textContent){ + + if (thirds[0].textContent != '' && thirds[0].textContent == thirds[1].textContent) + moveOnEnable(); + + } + } + @@ -80,17 +94,6 @@ 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..5ae01a5 100644 --- a/rannak/mangud/perenaine/kuulamine/style.css +++ b/rannak/mangud/perenaine/kuulamine/style.css @@ -83,3 +83,8 @@ strong{font-size: 1.1rem;} border-top: 4px solid white; color: #FEDD00; } + + + + + diff --git a/rannak/mangud/perenaine/memori/img/avatar.png b/rannak/mangud/perenaine/memori/img/avatar.png index 41c1bb9..b0cd3a1 100644 Binary files a/rannak/mangud/perenaine/memori/img/avatar.png and b/rannak/mangud/perenaine/memori/img/avatar.png differ diff --git a/rannak/mangud/perenaine/ristsona/pildid/avatar.png b/rannak/mangud/perenaine/ristsona/pildid/avatar.png index 41c1bb9..b0cd3a1 100644 Binary files a/rannak/mangud/perenaine/ristsona/pildid/avatar.png and b/rannak/mangud/perenaine/ristsona/pildid/avatar.png differ diff --git a/rannak/rolliValik/pildid/direktor.bak.png b/rannak/rolliValik/pildid/direktor.bak.png new file mode 100644 index 0000000..7b13556 Binary files /dev/null and b/rannak/rolliValik/pildid/direktor.bak.png differ diff --git a/rannak/rolliValik/pildid/direktor.jpg b/rannak/rolliValik/pildid/direktor.jpg new file mode 100644 index 0000000..2a0d71c Binary files /dev/null and b/rannak/rolliValik/pildid/direktor.jpg differ diff --git a/rannak/rolliValik/pildid/direktor.png b/rannak/rolliValik/pildid/direktor.png index 7b13556..d643367 100644 Binary files a/rannak/rolliValik/pildid/direktor.png and b/rannak/rolliValik/pildid/direktor.png differ diff --git a/rannak/rolliValik/pildid/perenaine.bak.png b/rannak/rolliValik/pildid/perenaine.bak.png new file mode 100644 index 0000000..41c1bb9 Binary files /dev/null and b/rannak/rolliValik/pildid/perenaine.bak.png differ diff --git a/rannak/rolliValik/pildid/perenaine.jpg b/rannak/rolliValik/pildid/perenaine.jpg new file mode 100644 index 0000000..4f74a65 Binary files /dev/null and b/rannak/rolliValik/pildid/perenaine.jpg differ diff --git a/rannak/rolliValik/pildid/perenaine.png b/rannak/rolliValik/pildid/perenaine.png index 41c1bb9..b0cd3a1 100644 Binary files a/rannak/rolliValik/pildid/perenaine.png and b/rannak/rolliValik/pildid/perenaine.png differ diff --git a/rannak/rolliValik/vids/partorg.mp4 b/rannak/rolliValik/vids/partorg.mp4 deleted file mode 100644 index 7ca12fd..0000000 Binary files a/rannak/rolliValik/vids/partorg.mp4 and /dev/null differ -- cgit v1.2.3