Skip to content

Commit

Permalink
Merge pull request #3 from Sprudeel/engine-update
Browse files Browse the repository at this point in the history
Engine update
  • Loading branch information
Sprudeel authored Feb 4, 2022
2 parents a9f1fc2 + 22bb8ce commit 4325414
Show file tree
Hide file tree
Showing 5 changed files with 619 additions and 242 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2022 Léonard Schafer

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
105 changes: 90 additions & 15 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,62 +1,127 @@
<!DOCTYPE html>
<html lang="en">
<head>

<!-- Meta Data -->
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Google Fonts & Icons -->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons"rel="stylesheet">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Archivo:wght@300;500;900&display=swap" rel="stylesheet">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">


<!-- Title -->
<title>SwissTopoLearner</title>

<!-- CSS -->
<link rel="stylesheet" href="style.css">

<!-- Favicon -->
<link rel="icon" href="images/logo.png">


</head>
<body>
<!-- Title -->
<div class="title">
<div class="version">Version 2.0</div>

<!-- Angaben ohne Gewähr -->
<div class="version">Angaben ohne Gewähr</div>

<!-- Title -->
<div class="name">Swiss Topo Learner</div>
<div class="credit" id="credit">created by <a href="https://github.com/Sprudeel">@Sprudeel</a></div>

<!-- Credit -->
<div class="credit" id="credit">Version 2.0 <br> created by <a href="https://github.com/Sprudeel">@Sprudeel</a></div>
</div>
</head>
<body>

<!-- Content -->
<div class="content">
<div class="menu" id="99">
<div class="choosemode">Modus auswählen <span title="Wähle einen Modus aus der Liste aus! &#013; 1. Endless - Zufällige Fragen und endlos! &#013; 2. Speed - 1 Minute Zeit um möglichst viel zulösen! &#013; 3. Learn - Alle Fragen einmal!"class="material-icons md-small png">help_outline</span></div>
<button id="101" class="mode" onclick="setMode('endless', '101')">Endless</button>
<br>
<button id="102" class="mode"onclick="setMode('speed', '102')">Speed</button>
<br>
<button id="103" class="mode"onclick="setMode('learn', '103')">Learn</button>

<!-- Choose Mode Menu -->
<div class="choosemode">Modus auswählen <span title="Wähle einen Modus aus der Liste aus! &#013; 1. Endless - Zufällige Fragen und endlos! &#013; 2. Speed - 1 Minute Zeit um möglichst viel zulösen! &#013; 3. Learn - Alle Fragen einmal! &#013; 4. Kartei - Beginne mit Karteikarten zu lernen!"class="material-icons md-small png">help_outline</span></div>

<!-- Container of Mode Buttons for Grid -->
<div class="container-mode">

<!-- Endless Mode Button -->
<button id="101" class="mode" onclick="setMode('endless', '101')">Endless</button>

<!-- Speed Mode Button -->
<button id="102" class="mode"onclick="setMode('speed', '102')">Speed</button>

<!-- Learn Mode Button -->
<button id="103" class="mode"onclick="setMode('learn', '103')">Learn</button>

<!-- Karteikarten Mode Button -->
<button id="104" class="mode"onclick="setMode('kartei', '104')">Kartei</button>
</div>

<!-- Container of Subject Buttons -->
<div class="choosemode">Thema auswählen <span title="Wähle was genau du lernen möchtest (selbst erklärend)" class="material-icons md-small png">help_outline</span></div>

<!-- Kantone -->
<button id="201" class="choose" onclick="setSubject('kantone', '201')">Kantone</button>
<br>

<!-- Städte -->
<button id="202" class="choose" onclick="setSubject('staedte', '202')">Städte</button>
<br>

<!-- Pässe -->
<button id="203" class="choose" onclick="setSubject('paesse', '203')">Pässe</button>
<br>

<!-- Seen -->
<button id="204" class="choose" onclick="setSubject('seen', '204')">Seen</button>
<br>

<!-- Flüsse -->
<button id="205" class="choose" onclick="setSubject('fluesse', '205')">Flüsse</button>
<br>

<!-- Berge, Gebirge -->
<button id="206" class="choose" onclick="setSubject('berge', '206')">Berge, Gebirge</button>
<br>

<!-- Spezielle Gebiete -->
<button id="207" class="choose" onclick="setSubject('special', '207')">Spezielle Gebiete</button>
<br>

<!-- Close Menu Button -->
<button id="300" class="close" onclick="hideMenu()"><span class="material-icons md-18 png">chevron_left</span>Menu schliessen</button>
</div>

<!-- Container of Question -->
<div class="game" id="69">

<!-- Image -->
<div class="image">
<img id="1000" src="images/normal.jpg" alt="">
</div>
<div class="input">

<!-- Input, Check Solution and Show Solution -->
<div id="check" class="input">
<input type="" placeholder="Lösung?" id="420"> <button class="submit" id="421" onclick="checkSolution()">Check</button>
<br> <div id="222"><button class="submit" onclick="showSolution()">Lösung Anzeigen</button></div>
</div>

<div>
<p class="solution">Lösung</p>
<!-- Buttons for Karteikarten Mode! -->
<div id="kartei">
<button id="2001" onclick="evalKartei('again')" class="submit kart">Nochmals</button><button id="2002" onclick="evalKartei('learned')" class="submit kart">Kann Ich!</button>
</div>
</div>


<!-- Info Menu -->
<div class="info" id="800">

<!-- Correctly Solved -->
<div class="info1">
<div class="subtitle">
<h3>
Expand All @@ -68,6 +133,8 @@ <h3>
<p id=501></p>
</div>
</div>

<!-- Stopwatch -->
<div class="info2">
<div class="subtitle">
<h3>
Expand All @@ -80,22 +147,30 @@ <h3>
<button id="556" class="close pad" onclick="resetTimer()">Reset</button>
</div>
</div>

<!-- Date & Time -->
<div class="info3">
<div class="subtitle">
<h3>
<span class="subtitle">Datum und Zeit</span>
</h3>
</div>
<div class="time" id="600"></div>

<!-- Hide Info -->
<button id="300" class="close" onclick="hideInfo()">Info schliessen<span class="material-icons md-18 png">chevron_right</span></button>
</div>
</div>
</div>

<!-- Expand Menu -->
<div id="400">
<button class="expand" onclick="expandMenu()">
<span class="material-icons md-18 png">chevron_right</span>
</button>
</div>

<!-- Expand Info -->
<div id="700">
<button class="expand2" onclick="expandInfo()">
<span class="material-icons md-18 png">chevron_left</span>
Expand Down
69 changes: 16 additions & 53 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,66 +1,29 @@
# Swiss Topo Learner
# Swiss Topo Learner

Welcome to the Repository of the **Swiss Topo Learner**. A Project created by @Spruudel.
Welcome to this Repository containing the Code of the Swiss Topo Learner

> Current Version: v2.0
Play here: [SwissTopoLearner](https://lchsd.ch/projects/swisstopolearner/)!

Play here: [SwissTopoLearner](https://lchsd.ch/projects/swisstopolearner/)
## 📙 About this Project
This Project is being created to help people learn the Topography of Switzerland!

# Update Log
![Commits](https://img.shields.io/github/last-commit/Sprudeel/SwissTopoLearner?style=plastic)

- May 2021 -> Release v1;
- June 2021 -> Fixed repeating questions bug;
- August 2021 -> Started v2;
- 5th September 2021 -> Release v2;

# Explanation
- HTML5
- CSS3
- JavaScript
- [Confetti.js](https://github.com/Agezao/confetti-js)

## Different Modes
## 🙋🏽‍♂️ Contributers

### Endless
As the name already suggest this Mode can be infinetly! However there *should* be no repeating Questions. If there are don't blame me...
- [Spruudel](https://github.com/Sprudeel)

### Speed
In this Mode your Speed will be tested. After clicking this Mode and a Subject there will be a quick countdown before you can play (to prepare yourself). After you'll have 1 minute to solve as many questions as possible! After that minute you'll be shown a little end card with some Information on your Performance. Maybe there will also be confetti... maybe...
## 🤝 Support

### Learn
With the Learn Mode you'll be having to solve all questions once. You can keep Track of your progress via the Info Board! Once you finished all questions you'll be shown an end screen.
Contributions, issues, and feature requests are welcome!

Contact: [email protected]

## Different Subjects
There are a total of 7 different Subjects. Here are all the Questions:
Give a ⭐️ if you like this project!

### Kantone

let cantonAnswers = ["Zürich", "Bern", "Luzern", "Uri", "Schwyz", "Obwalden", "Nidwalden", "Glarus", "Zug", "Freiburg", "Solothurn", "Basel Stadt", "Basel Land", "Schaffhausen", "Appenzell Ausserrhoden", "Appenzell Innerrhoden", "Sankt Gallen", "Graubünden", "Aargau", "Thurgau", "Tessin", "Waadt", "Wallis", "Neuenburg", "Genf", "Jura"];


### Städte

let stadtAnswers = ["Aarau", "Herisau", "Appenzell", "Liestal", "Basel", "Bern", "Biel", "Thun", "Freiburg", "Genf", "Glarus", "Chur", "Delémont", "Luzern", "La Chaux-de-Fonds", "Neuenburg", "Stans", "Sarnen", "Schaffhausen", "Schwyz", "Olten", "Solothurn", "Sankt Gallen", "Bellinzona", "Chiasso", "Lugano", "Frauenfeld", "Altdorf", "Lausanne", "Sion", "Zug", "Winterthur", "Zürich"];


### Pässe

let passAnwers = ["Bernina", "Bözberg", "Col du Mollendruz", "Furka", "Gemmi", "Gotthard", "Greina", "Grimsel", "Grosser Sankt Bernhard", "Hauenstein", "Julier", "Lötschberg", "Lukmanier", "Maloja", "Monte Moro", "Nufenen", "Ofen", "Panixer", "San Bernadino", "Septimer", "Simplon", "Vue des Alpes"];

### Seen

let seenAnswers = ["Bielersee", "Bodensee", "Genfersee", "Langensee", "Luganersee", "Neuenburgersee", "Sankt Moritzersee", "Thunersee", "Vierwaldstättersee", "Walensee", "Zugersee", "Zürichsee"];

### Flüsse

let flussAnswers = ["Aare", "Birs", "Broye", "Doubs", "Grosse Emme", "Hinterrhein", "Inn", "Kander", "Kleine Emme", "Landquart", "Limmat", "Linth", "Maggia", "Reuss", "Rhein", "Rhone", "Saane", "Simme", "Sitter", "Tessin", "Thur", "Vorderrhein"];

### Berge

let bergAnswers = ["Alpen", "Chasseral", "Churfirsten", "Dom", "Dufourspitze", "Eiger", "Jungfrau", "Jura", "Les Diablerets", "Matterhorn", "Mythen", "Napf", "Pilatus", "Piz Bernina", "Rigi", "San Salvatore", "Säntis", "Weissenstein"];


### Spezielle Gebiete

let specialAnswers = ["Berner Oberland", "Engadin", "Mittelland", "Seeland"];


Copyright Sprudeel 2021
❤️
Loading

0 comments on commit 4325414

Please sign in to comment.