Ristsõna done ja global button Fix

6 files changed, 49 insertions, 16 deletions

diff --git a/rannak/algus/kaart/css/kaart.css b/rannak/algus/kaart/css/kaart.css
index e395b95..60bb1f9 100644
--- a/rannak/algus/kaart/css/kaart.css
+++ b/rannak/algus/kaart/css/kaart.css
@@ -9,4 +9,23 @@ svg path:hover {
     transition: 0.6s !important;
     cursor: pointer !important;
     
-}
\ No newline at end of file
+}
+
+.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;
+}
+
diff --git a/rannak/algus/kaart/index.html b/rannak/algus/kaart/index.html
index 880ab8a..9160fd4 100644
--- a/rannak/algus/kaart/index.html
+++ b/rannak/algus/kaart/index.html
@@ -21,7 +21,7 @@
             </div>
 
             <div class="col-4">
-		      <a href="../utlused" class="btn-success btn disabled" role="button" aria-disabled="true">Liigu Edasi</a>
+              <button class="moveOn" disabled>Liigu Edasi</button>
             </div>
         </div>
     </div>
diff --git a/rannak/algus/kaart/js/kaart.js b/rannak/algus/kaart/js/kaart.js
index 5d1a1a3..5224d79 100644
--- a/rannak/algus/kaart/js/kaart.js
+++ b/rannak/algus/kaart/js/kaart.js
@@ -24,10 +24,7 @@ for (let i = 0; i < riigid.length; i++){
 }
 
 function moveOnEnable(){
-	const button = document.querySelector(".btn");
-	button.classList.remove('disabled');
-	button.setAttribute('aria-disabled', false);
-	console.log("done");
-
-	counter = 0;
+    const btn = document.querySelector(".moveOn");
+    btn.disabled = false;
+    btn.onclick = () => location.href = "../utlused";
 }
diff --git a/rannak/algus/utlused/css/utlused.css b/rannak/algus/utlused/css/utlused.css
index 4f63f54..e7c5277 100644
--- a/rannak/algus/utlused/css/utlused.css
+++ b/rannak/algus/utlused/css/utlused.css
@@ -14,6 +14,24 @@ body {
   touch-action: none;
 }
 
+.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;
+}
+
 /* later added stuff here */ 
 
 .wrapper {
diff --git a/rannak/algus/utlused/index.html b/rannak/algus/utlused/index.html
index dbde986..f3e80f9 100644
--- a/rannak/algus/utlused/index.html
+++ b/rannak/algus/utlused/index.html
@@ -45,7 +45,7 @@
 
 	  <div class="row">
 		<div>
-		  <a href="../../rolliValik" class="btn-success btn disabled" role="button" aria-disabled="true">Liigu Edasi</a>
+              <button class="moveOn" disabled>Liigu Edasi</button>
 		</div>
       </div> <!-- Row End -->
 
diff --git a/rannak/algus/utlused/js/main.js b/rannak/algus/utlused/js/main.js
index a67b6bd..4262d41 100644
--- a/rannak/algus/utlused/js/main.js
+++ b/rannak/algus/utlused/js/main.js
@@ -76,10 +76,9 @@ if (`${isMobile() ? 'mobile' : 'not mobile'}` == 'not mobile') {
 	    counter++;
 		console.log("counter:", counter)
 	    if (counter == 6){
-			const button = document.querySelector(".btn");
-			button.classList.remove('disabled');
-			button.setAttribute('aria-disabled', false);
-			console.log("done");
+            const btn = document.querySelector(".moveOn");
+            btn.disabled = false;
+            btn.onclick = () => location.href = "../../rolliValik";
 	    }
 	} // If isCorrectMatchingEnd
   }  // Drop Func End
@@ -179,9 +178,9 @@ else{
 				counter++;
 				console.log("counter:", counter)
 				if (counter == 6){
-					const button = document.querySelector(".btn");
-				    button.parentElement.classList.remove('btn');
-					button.setAttribute('aria-disabled', false);
+                    const btn = document.querySelector(".moveOn");
+                    btn.disabled = false;
+                    btn.onclick = () => location.href = "../../rolliValik";
 				}
 				
 			}