diff options
22 files changed, 298 insertions, 16 deletions
diff --git a/rannak/endPage/fonts/fontDos/OFL.txt b/rannak/endPage/fonts/fontDos/OFL.txt new file mode 100644 index 0000000..2a6f4a8 --- /dev/null +++ b/rannak/endPage/fonts/fontDos/OFL.txt @@ -0,0 +1,92 @@ +Copyright (c) 2012, Cody "CodeMan38" Boisclair (cody@zone38.net), with Reserved Font Name "Press Start 2P"
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/rannak/endPage/fonts/fontDos/PressStart2P-Regular.ttf b/rannak/endPage/fonts/fontDos/PressStart2P-Regular.ttf Binary files differnew file mode 100644 index 0000000..1098ed2 --- /dev/null +++ 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 differnew file mode 100644 index 0000000..944605a --- /dev/null +++ b/rannak/endPage/fonts/fontUno/Monoton-Regular.ttf diff --git a/rannak/endPage/fonts/fontUno/OFL.txt b/rannak/endPage/fonts/fontUno/OFL.txt new file mode 100644 index 0000000..736e86f --- /dev/null +++ b/rannak/endPage/fonts/fontUno/OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2011 by vernon adams (vern@newtypography.co.uk),
+with Reserved Font Names "Monoton"
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/rannak/endPage/img/798916.jpg b/rannak/endPage/img/798916.jpg Binary files differnew file mode 100644 index 0000000..0e4fe4e --- /dev/null +++ b/rannak/endPage/img/798916.jpg diff --git a/rannak/endPage/img/798919.jpg b/rannak/endPage/img/798919.jpg Binary files differnew file mode 100644 index 0000000..ebd88da --- /dev/null +++ b/rannak/endPage/img/798919.jpg diff --git a/rannak/endPage/img/798923.png b/rannak/endPage/img/798923.png Binary files differnew file mode 100644 index 0000000..6028f84 --- /dev/null +++ b/rannak/endPage/img/798923.png diff --git a/rannak/endPage/img/dos.png b/rannak/endPage/img/dos.png Binary files differnew file mode 100644 index 0000000..e6b321b --- /dev/null +++ b/rannak/endPage/img/dos.png diff --git a/rannak/endPage/img/tres.png b/rannak/endPage/img/tres.png Binary files differnew file mode 100644 index 0000000..d6177a9 --- /dev/null +++ b/rannak/endPage/img/tres.png diff --git a/rannak/endPage/img/uno.jpg b/rannak/endPage/img/uno.jpg Binary files differnew file mode 100644 index 0000000..ffe887b --- /dev/null +++ b/rannak/endPage/img/uno.jpg diff --git a/rannak/endPage/index.html b/rannak/endPage/index.html new file mode 100644 index 0000000..3dcb9df --- /dev/null +++ b/rannak/endPage/index.html @@ -0,0 +1,32 @@ +<!DOCTYPE html> +<html lang="en"> + +<head> + <meta charset="UTF-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1.0" /> + <title> Tehtud</title> + <link rel="stylesheet" href="style.css" type="text/css"/> +</head> + +<body> + + <div class="wrapper"> + <div class="innerDiv"> + <h1>TUBLI! <br/> Läbisid <span id="rolliNimi"></span> Rolli</h1> + <p>Nüüd võid valida uue Rolli või minna tagasi avalehele</p> + + <a href="../rolliValik"> + <button>Uus Roll</button> + </a> + + <a href="../.."> + <button>Avalehele</button> + </a> + + </div> + </div> + + <script src="main.js"></script> + + </body> +</html> diff --git a/rannak/endPage/main.js b/rannak/endPage/main.js new file mode 100644 index 0000000..c6da3fc --- /dev/null +++ b/rannak/endPage/main.js @@ -0,0 +1,7 @@ +let rollSpan = document.querySelector("span"); ; + +if (rollSpan != undefined){ + rollSpan.innerHTML = localStorage.roll; + delete localStorage.roll; +} + diff --git a/rannak/endPage/style.css b/rannak/endPage/style.css new file mode 100644 index 0000000..0132b61 --- /dev/null +++ b/rannak/endPage/style.css @@ -0,0 +1,57 @@ +@font-face { + font-family: 'fontUno'; + 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; + background-image: url("img/tres.png"); + background-size:100%; +} + +.wrapper { + display: flex; + justify-content: center; + align-items: center; + width: 100%; + height: 100vh; + text-align: center; +} + +.innerDiv { + padding: 15px; + margin-left: 20%; + width: 45%; + color: black; +} + +h1 { + color: rgba(0,136,169,1); + font-family:'fontUno'; +} +p {font-family:'fontDos';} + +button { + background-color: rgba(0,136,169,1); + border-radius: 50px; + padding: 15px; + border: none; + cursor: pointer; + text-decoration: none; + font-size: 1.3rem; + font-family:'fontDos'; +} + +a { + padding: 20px; + text-decoration: none; +} diff --git a/rannak/mangud/index.html b/rannak/mangud/index.html index d0394bd..624823e 100644 --- a/rannak/mangud/index.html +++ b/rannak/mangud/index.html @@ -46,7 +46,6 @@ <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> diff --git a/rannak/mangud/partorg/kuulsused/script.js b/rannak/mangud/partorg/kuulsused/script.js index debb677..e1b994b 100644 --- a/rannak/mangud/partorg/kuulsused/script.js +++ b/rannak/mangud/partorg/kuulsused/script.js @@ -64,6 +64,6 @@ function checkIfAllGood(){ if (rightDone.length == 6) { const btn = document.querySelector(".moveOn"); btn.disabled = false; - btn.onclick = () => location.href = ""; + btn.onclick = () => location.href = "../plakat"; } } diff --git a/rannak/mangud/partorg/plakat/main.js b/rannak/mangud/partorg/plakat/main.js index 6eb9281..925db66 100644 --- a/rannak/mangud/partorg/plakat/main.js +++ b/rannak/mangud/partorg/plakat/main.js @@ -132,7 +132,7 @@ canvas.addEventListener('mousemove', draw); function moveOnEnable(){ const btn = document.querySelector(".moveOn"); btn.disabled = false; - btn.onclick = () => location.href = ""; + btn.onclick = () => location.href = "../sonaragastik"; } function moveOnDisable(){ diff --git a/rannak/mangud/partorg/sonaragastik/script.js b/rannak/mangud/partorg/sonaragastik/script.js index af16488..6151b9e 100644 --- a/rannak/mangud/partorg/sonaragastik/script.js +++ b/rannak/mangud/partorg/sonaragastik/script.js @@ -94,7 +94,8 @@ function proovi(){ function moveOnEnable(){ const btn = document.querySelector(".moveOn"); btn.disabled = false; - btn.onclick = () => location.href = ""; + localStorage.setItem('roll', "Partogi"); + btn.onclick = () => location.href = "../../../endPage"; // submit btn const subButton = document.querySelector(".subBtn"); diff --git a/rannak/mangud/uliopilane/ajatelg/script.js b/rannak/mangud/uliopilane/ajatelg/script.js index 5c667a5..c636836 100644 --- a/rannak/mangud/uliopilane/ajatelg/script.js +++ b/rannak/mangud/uliopilane/ajatelg/script.js @@ -67,6 +67,6 @@ function checkIfAllGood(){ if (rightDone.length == 12) { const btn = document.querySelector(".moveOn"); btn.disabled = false; - btn.onclick = () => location.href = ""; + btn.onclick = () => location.href = "../tSark"; } } diff --git a/rannak/mangud/uliopilane/tSark/main.js b/rannak/mangud/uliopilane/tSark/main.js index 98786f2..e21fb49 100644 --- a/rannak/mangud/uliopilane/tSark/main.js +++ b/rannak/mangud/uliopilane/tSark/main.js @@ -378,7 +378,7 @@ chkBtn.addEventListener("click", (e) => { function moveOnEnable(){ const btn = document.querySelector(".moveOn"); btn.disabled = false; - btn.onclick = () => location.href = ""; + btn.onclick = () => location.href = "../utlused"; } // 6 diff --git a/rannak/mangud/uliopilane/utlused/css/utlused.css b/rannak/mangud/uliopilane/utlused/css/utlused.css index 8a226b9..f4a3728 100644 --- a/rannak/mangud/uliopilane/utlused/css/utlused.css +++ b/rannak/mangud/uliopilane/utlused/css/utlused.css @@ -52,7 +52,8 @@ button:disabled{ cursor: pointer !important; transition: all 0.3 ease 0 !important; margin: 3% !important; - font-size: 1.2rem !important; + font-size: 1.05rem !important; + max-width: 10% !important; } .modalButton:hover{ diff --git a/rannak/mangud/uliopilane/utlused/js/main.js b/rannak/mangud/uliopilane/utlused/js/main.js index 1e19210..31b42da 100644 --- a/rannak/mangud/uliopilane/utlused/js/main.js +++ b/rannak/mangud/uliopilane/utlused/js/main.js @@ -78,7 +78,8 @@ if (`${isMobile() ? 'mobile' : 'not mobile'}` == 'not mobile') { if (counter == 6){ const btn = document.querySelector(".moveOn"); btn.disabled = false; - btn.onclick = () => location.href = ""; + localStorage.setItem("roll", "Üliõpilase"); + btn.onclick = () => location.href = "../../../endPage"; } } // If isCorrectMatchingEnd } // Drop Func End diff --git a/rannak/rolliValik/index.html b/rannak/rolliValik/index.html index 1c33177..9118aae 100644 --- a/rannak/rolliValik/index.html +++ b/rannak/rolliValik/index.html @@ -26,7 +26,7 @@ <div class="card-body"> <h5 class="card-title">Üliõpilane</h5> <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Reiciendis expedita nihil quam possimus quidem iure rerum eius ut, et ducimus tempora, temporibus officia modi. Quas!</p> - <a href="#" class="btn btn-lg btn-dark">Vali!</a> + <a href="../mangud/uliopilane/ajatelg" class="btn btn-lg btn-dark">Vali!</a> </div> </div> </div> @@ -37,19 +37,18 @@ <div class="card-body"> <h5 class="card-title">Partorg</h5> <p class="card-text">Lorem ipsum dolor sit amet consectetur adipisicing elit. Officia debitis dignissimos esse odio quaerat. Neque suscipit asperiores repellendus, quo fugit nam amet vero reprehenderit obcaecati.</p> - <a href="#" class="btn btn-lg btn-dark">Vali!</a> + <a href="../mangud/partorg/kuulsused" class="btn btn-lg btn-dark">Vali!</a> </div> </div> </div> - <div class="col"> <div class="card h-100"> <img src="pildid/direktor.jpg" class="card-img-top" alt="..."> <div class="card-body"> <h5 class="card-title">Direktor</h5> <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Laborum voluptatem fugit minima eum labore. Amet, nobis? Cupiditate inventore quo voluptatem soluta! Sapiente excepturi deleniti assumenda!</p> - <a href="#" class="btn btn-lg btn-dark">Vali!</a> + <!--<a href="#" class="btn btn-lg btn-dark">Vali!</a> --> </div> </div> </div> @@ -60,7 +59,7 @@ <div class="card-body"> <h5 class="card-title">Perenaine</h5> <p class="card-text">Lorem ipsum dolor, sit amet consectetur adipisicing elit. Enim alias officia tempore, veritatis provident consectetur voluptatem ea labore. Maxime porro vero omnis perspiciatis accusantium sint!</p> - <a href="#" class="btn btn-lg btn-dark">Vali!</a> + <!--<a href="#" class="btn btn-lg btn-dark">Vali!</a> --> </div> </div> </div> @@ -71,7 +70,7 @@ <div class="card-body"> <h5 class="card-title">Kaitseliitlane</h5> <p class="card-text">Lorem ipsum dolor sit amet consectetur adipisicing elit. Modi autem voluptatibus aliquid, praesentium, vel aut consequatur expedita laudantium ducimus, saepe laborum a consectetur quas nam?</p> - <a href="#" class="btn btn-lg btn-dark">Vali!</a> + <!--<a href="#" class="btn btn-lg btn-dark">Vali!</a> --> </div> </div> </div> @@ -82,7 +81,7 @@ <div class="card-body"> <h5 class="card-title">Ärimees</h5> <p class="card-text">Lorem ipsum, dolor sit amet consectetur adipisicing elit. Rem eveniet aut excepturi cupiditate explicabo quasi, quam, pariatur qui nemo deserunt aspernatur! Nostrum consequatur molestiae quasi.</p> - <a href="#" class="btn btn-lg btn-dark">Vali!</a> + <!--<a href="#" class="btn btn-lg btn-dark">Vali!</a> --> </div> </div> </div> @@ -95,4 +94,4 @@ <!-- 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>
\ No newline at end of file +</html> |
