13 files changed, 43 insertions, 13 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
index 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
index 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
index 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
index 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
index 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
index 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
index 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
index 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 &nbsp;&nbsp;<span id="rolliNimi"></span>&nbsp;&nbsp; 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 {