Skip to content

Merav/duoli2.0 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pak0st merged 3 commits into from
May 28, 2025
Merged

Merav/duoli2.0 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88e69db
Commit Exemplet
Merav-M May 27, 2025
bfdba7f
English fixes and explanations.
Merav-M May 27, 2025
8981b71
add explanations for words in flashcard game
Merav-M May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
}
5 changes: 4 additions & 1 deletion auth-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,14 @@ document.getElementById("google-login").addEventListener("click", async () => {

// Function to handle guest access
// Функция для обработки гостевого доступа
export function continueAsGuest() {
function continueAsGuest() {
// Save guest status to local storage
// Сохранение статуса гостя в локальное хранилище
localStorage.setItem("user", JSON.stringify({ guest: true }));
// Redirect to home page
// Перенаправление на главную страницу
window.location.href = "index.html";
}

// Add event listener for guest login button
document.getElementById("guest-login").addEventListener("click", continueAsGuest);
4 changes: 2 additions & 2 deletions login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ <h1>Welcome To MegaPath</h1>
<!-- Google login button
Кнопка входа через Google -->
<button id="google-login">Enter With Google Account</button>
<p>ou</p>
<p>or</p>
<!-- Guest access button
Кнопка гостевого доступа -->
<button onclick="continueAsGuest()">Continue As Guest</button>
<button id="guest-login">Continue As Guest</button>
</div>

<!-- Import authentication handler module
Expand Down
49 changes: 10 additions & 39 deletions play-game.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
<!--
Game Play Page
Страница игры

This page implements the flashcard game functionality and word-picture matching game (coming soon)
Эта страница реализует функционал игры с карточками и игры на сопоставление слов с картинками (в разработке)
-->
<!DOCTYPE html>
<html lang="en">
<head>
Expand All @@ -18,64 +11,53 @@
<h1 id="game-title"></h1>
<div id="game-container"></div>
</div>
<!-- Import word data and game logic
Импорт данных слов и логики игры -->
<script src="updated_words_data.js"></script>
<script src="word_explanations.js"></script>
<script>
// Get game parameters from URL
// Получение параметров игры из URL
const urlParams = new URLSearchParams(window.location.search);
const lang = urlParams.get('lang');
const grade = urlParams.get('grade');
const game = urlParams.get('game');
const gameTitle = document.getElementById('game-title');
const gameContainer = document.getElementById('game-container');
const words = gradesData[grade];
const explanations = wordExplanations[grade] || [];

// Check if words exist for selected grade
// Проверка наличия слов для выбранного класса
if (!words) {
gameContainer.innerHTML = "<p>No words for this grade.</p>";
} else if (game === "flashcard") {
// Flashcard game implementation
// Реализация игры с карточками
gameTitle.textContent = "Flashcards";
let currentIndex = 0;
let score = 0;
let wrongWords = [];

// Function to display current flashcard
// Функция для отображения текущей карточки
function showCard() {
if (currentIndex >= words.length) {
gameContainer.innerHTML = `
<h2>You Finished The Game!</h2>
<p>Your Pontuation: ${score} de ${words.length}</p>
<h3>Your missed words:</h3>
<ul>${wrongWords.map(w => `<li>${w}</li>`).join('')}</ul>
`;
showFinalResult();
return;
}

// Display current word and input form
// Отображение текущего слова и формы ввода
const word = words[currentIndex];
const explanation = explanations.find(ex => ex.word === word.word) || {};

gameContainer.innerHTML = `
<h2>${word.word}</h2>
<input type="text" id="answer-input" placeholder="Type the translation" />
<button id="check-answer">Check Answer</button>
<p id="feedback"></p>
<p id="correct-answer" style="display:none;">Correct answer: ${word.translation[lang]}</p>
<p id="explanation-text" style="display:none;">
${explanation.he || ''} <br><em>${explanation[lang] || ''}</em>
</p>
<button id="next">Next</button>
<button id="finish">Finish Game</button>
`;

const input = document.getElementById("answer-input");
const feedback = document.getElementById("feedback");
const correctAnswer = document.getElementById("correct-answer");
const explanationText = document.getElementById("explanation-text");

// Check answer button handler
// Обработчик кнопки проверки ответа
document.getElementById("check-answer").addEventListener("click", () => {
const userAnswer = input.value.trim().toLowerCase();
const correct = word.translation[lang].toLowerCase();
Expand All @@ -88,23 +70,18 @@ <h2>${word.word}</h2>
wrongWords.push(`${word.word} → ${word.translation[lang]}`);
}
correctAnswer.style.display = "block";
explanationText.style.display = "block";
});

// Next button handler
// Обработчик кнопки "Следующий"
document.getElementById("next").addEventListener("click", () => {
currentIndex++;
showCard();
});

// Finish game button handler
// Обработчик кнопки завершения игры
document.getElementById("finish").addEventListener("click", () => {
showFinalResult();
});

// Enter key handler for answer submission
// Обработчик клавиши Enter для отправки ответа
input.addEventListener("keypress", (e) => {
if (e.key === "Enter") {
document.getElementById("check-answer").click();
Expand All @@ -114,8 +91,6 @@ <h2>${word.word}</h2>
input.focus();
}

// Function to show final game results
// Функция для показа финальных результатов игры
function showFinalResult() {
gameContainer.innerHTML = `
<h2>Game Over</h2>
Expand All @@ -126,12 +101,8 @@ <h3>Incorrect words:</h3>
`;
}

// Start the game
// Начать игру
showCard();
} else {
// Word-picture game placeholder
// Заглушка для игры сопоставления слов с картинками
gameTitle.textContent = "Coming Soon";
gameContainer.innerHTML = "<p>Word-to-picture not available yet.</p>";
}
Expand Down
Loading