Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions kidcode/mainapp/static/mainapp/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -239,16 +239,17 @@ a{
left: -350px; /* Начальная позиция скрытого сайдбара */
width: 350px;
height: 100%;
background-color: #22231E;
background-color: #4E4D4D;
color: white;
transition: left 0.3s ease;
z-index: 5; /* Сайдбар будет под шапкой, но выше основного контента */
padding-top: 20px;

}

.sidebar h1{
padding: 10px;
#sidebar.active h1{
margin: 10px;
text-align: center;
}

/* Ссылки в сайдбаре */
Expand Down Expand Up @@ -645,4 +646,8 @@ form.change{
display: flex;
flex-direction: column;
overflow: auto;
}

.chapter-container{
border: #ffffff 1px solid;
}
38 changes: 38 additions & 0 deletions kidcode/mainapp/static/mainapp/js/gamefield.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,44 @@ document.addEventListener('DOMContentLoaded', () => {
let maxHoles = parseInt(holeInput.value, 10) || 0;
let maxBlocks = parseInt(blockInput.value, 10) || 0;


const manualButton = document.getElementById('manualButton');
const manualForm = document.getElementById('manualForm');

autoButton.addEventListener('click', () => {
manualForm.style.display = 'none'; // Скрываем ручную форму
savemanual.id = 'saveauto';
generateButton.style.display = 'block';
canvas.width = null;
canvas.height = null;
ctx.clearRect(0, 0, canvas.width, canvas.height);
});

// manualButton.addEventListener('click', () => {
// manualForm.style.display = 'block'; // Показываем ручную форму
// saveauto.id = 'savemanual';
// generateButton.style.display = 'none';
// canvas.width = null;
// canvas.height = null;
// ctx.clearRect(0, 0, canvas.width, canvas.height);
// });
manualButton.addEventListener('click', () => {
// Показываем ручную форму
manualForm.style.display = 'block';

// Скрываем кнопку генерации
generateButton.style.display = 'none';
saveauto.id = 'savemanual';
// Очищаем Canvas
ctx.clearRect(0, 0, canvas.width, canvas.height);



// Устанавливаем новый идентификатор через атрибут data
saveauto.setAttribute('data-mode', 'manual');
});


// Слушатели для обновления лимитов при изменении полей ввода
cubeInput.addEventListener('input', () => {
maxCubes = parseInt(cubeInput.value, 10) || 0;
Expand Down
2 changes: 2 additions & 0 deletions kidcode/mainapp/static/mainapp/js/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ function loadChapters() {
const a = document.createElement('a');
a.textContent = chapter;
a.href = '#';
li.className = 'chapter-container';
a.className = 'dropdown-toggle';
a.onclick = () => loadLevels(chapter);

li.appendChild(a);
Expand Down
8 changes: 2 additions & 6 deletions kidcode/mainapp/templates/mainapp/constructor.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ <h2 class="h2-settings">Текст задания</h2>

<div class="buttons">
<button type="submit" class="main" id = "savemanual">Сохранить</button>
<button type="submit" class="main" id = "saveauto" style="display: none;">Сохранить</button>
<button type="reset" class="clear">Очистить</button>
<button type = "button" class="reset" id = "generateButton" style="display: none;">Сгенерировать</button>
</div>
Expand All @@ -72,7 +71,6 @@ <h2 class="h2-settings">Текст задания</h2>
const autoButton = document.getElementById('autoButton');
const manualButton = document.getElementById('manualButton');
const savemanual = document.getElementById('savemanual');
const saveauto = document.getElementById('saveauto');
const generateButton = document.getElementById('generateButton');


Expand All @@ -81,15 +79,13 @@ <h2 class="h2-settings">Текст задания</h2>

autoButton.addEventListener('click', () => {
manualForm.style.display = 'none'; // Скрываем ручную форму
saveauto.style.display = 'block';
savemanual.style.display = 'none';
savemanual.id = 'saveauto';
generateButton.style.display = 'block';
});

manualButton.addEventListener('click', () => {
manualForm.style.display = 'block'; // Показываем ручную форму
saveauto.style.display = 'none';
savemanual.style.display = 'block';
saveauto.id = 'savemanual';
generateButton.style.display = 'none';
});
});
Expand Down
2 changes: 2 additions & 0 deletions kidcode/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@

<div id="sidebar">
<h1>Выберите задание</h1>
<div class = "all_chapter-container" >
<ul id="chapter-list"></ul>
</div>
</div>

<a href="{% url 'users:login'%}"><img src="{% static 'mainapp/images/pixel-last.png' %}" alt="logo" class = "logo"></a>
<p class = "logo_name">KidCode</p>
Expand Down