Skip to content

Commit 2ebed96

Browse files
committed
update SkillfactoryCoding#8 changed value input
1 parent d6a2a69 commit 2ebed96

File tree

3 files changed

+66
-16
lines changed

3 files changed

+66
-16
lines changed

bjs/08_if_else/index.html

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div class="card-body">
2020
<div class="row no-gutters">
2121
<div class="col">
22-
<h3 class="card-title m-0"><span id="answerField">Вы загадали число 5?</span></h3>
22+
<h3 class="card-title m-0"><span id="answerField"></span></h3>
2323
</div>
2424
</div>
2525
</div>
@@ -37,7 +37,51 @@ <h3 class="card-title m-0"><span id="answerField">Вы загадали числ
3737
</div>
3838
</div>
3939
</div>
40-
<script src="script.js"></script>
40+
41+
<div class="modal fade" id="modalInputValues" tabindex="-1" role="dialog">
42+
<div class="modal-dialog" role="document">
43+
<div class="modal-content">
44+
<div class="modal-header">
45+
<h5 class="modal-title">Введите значений для игры</h5>
46+
</div>
47+
<div class="modal-body">
48+
<form>
49+
<label for="minValueInput">Минимальное значение</label>
50+
<input type="text" class="form-control" id="minValueInput" placeholder="0">
51+
<label for="maxValueInput">Максимальное значение</label>
52+
<input type="text" class="form-control" id="maxValueInput" placeholder="100">
53+
</form>
54+
</div>
55+
<div class="modal-footer">
56+
<button type="button" class="btn btn-primary" data-dismiss="modal">Играть!</button>
57+
</div>
58+
</div>
59+
</div>
60+
</div>
61+
62+
<div class="modal fade" id="modalStartAlert" tabindex="-1" role="dialog">
63+
<div class="modal-dialog" role="document">
64+
<div class="modal-content">
65+
<div class="modal-header">
66+
<h5>
67+
68+
</h5>
69+
<button type="button" class="close" data-dismiss="modal">
70+
<span>&times;</span>
71+
</button>
72+
</div>
73+
<div class="modal-footer">
74+
<button type="button" class="btn btn-primary" data-dismiss="modal">ОК</button>
75+
</div>
76+
</div>
77+
</div>
78+
</div>
79+
80+
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
81+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
82+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
83+
<script src="script.js"></script>
84+
4185
<footer>
4286
<a href="https://ru.freepik.com/free-vector/acrylic-brush-stroke-textured-background-vector_4034280.htm#query=background%20sletch&position=20&from_view=search&track=ais&uuid=6235070a-3c1b-4096-b294-fc5e57f75730%22" target="_blank">Изображение от rawpixel.com</a> на Freepik
4387
</footer>

bjs/08_if_else/script.js

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,20 @@ const successAnswerPhrases = [
2525
//UI links
2626
const orderNumberField = document.querySelector('#orderNumberField');
2727
const answerField = document.querySelector('#answerField');
28+
const modalInputValues = $('#modalInputValues');
29+
const minValueField = document.querySelector('#minValueInput');
30+
const maxValueField = document.querySelector('#maxValueInput');
31+
const modalStartAlert = $('#modalStartAlert');
32+
const modalStartAlertText = document.querySelector("#modalStartAlert h5");
2833

2934
//vars
3035
let minValue, maxValue, answerNumber, orderNumber;
3136
let gameRun;
3237

3338
function Start()
3439
{
35-
//Заменить методы window на что-нибудь из bootstrap (20 баллов)
36-
minValue = parseInt(prompt('Минимальное знание числа для игры','0')) || 0;
37-
maxValue = parseInt(prompt('Максимальное знание числа для игры','100')) || 100;
40+
minValue = parseInt(minValueField.value) || 0;
41+
maxValue = parseInt(maxValueField.value) || 100;
3842

3943
if (minValue > maxValue)
4044
{
@@ -44,17 +48,17 @@ function Start()
4448
}
4549

4650
minValue = minValue < -999 ? -999 : minValue;
47-
maxValue = maxValue > 999 ? 999 : maxValue;
48-
49-
50-
alert(`Загадайте любое целое число от ${minValue} до ${maxValue}, а я его угадаю`);
51+
maxValue = maxValue > 999 ? 999 : maxValue;
5152

5253
answerNumber = Math.floor((minValue + maxValue) / 2);
5354
orderNumber = 1;
5455
gameRun = true;
5556

5657
orderNumberField.innerText = orderNumber++;
5758
answerField.innerText = `${nextAnswerPhrases[0]} ${IntToText(answerNumber)}?`;
59+
60+
modalStartAlertText.innerText = `Загадайте любое целое число от ${minValue} до ${maxValue}, а я его угадаю`;
61+
modalStartAlert.modal("show");
5862
}
5963

6064
function IntToText(n)
@@ -108,12 +112,12 @@ function IntToText(n)
108112
return (result.length < maxLength) ? result : n;
109113
}
110114

111-
Start();
115+
modalInputValues.on('hidden.bs.modal', Start);
112116

113117
// Рестарт программы
114118
document.querySelector('#btnRetry').addEventListener('click', function () {
115-
Start();
116-
})
119+
modalInputValues.modal("show");
120+
});
117121

118122
// Кнопка больше
119123
document.querySelector('#btnOver').addEventListener('click', function () {
@@ -142,7 +146,7 @@ document.querySelector('#btnOver').addEventListener('click', function () {
142146
answerField.innerText = `${nextAnswerPhrases[phraseRandom]} ${IntToText(answerNumber)}?`;
143147
}
144148
}
145-
})
149+
});
146150

147151
// Кнопка меньше
148152
document.querySelector('#btnLess').addEventListener('click', function () {
@@ -163,7 +167,7 @@ document.querySelector('#btnLess').addEventListener('click', function () {
163167
answerField.innerText = `${nextAnswerPhrases[phraseRandom]} ${IntToText(answerNumber)}?`;
164168
}
165169
}
166-
})
170+
});
167171

168172
// Кнопка Верно!
169173
document.querySelector('#btnEqual').addEventListener('click', function () {
@@ -173,4 +177,6 @@ document.querySelector('#btnEqual').addEventListener('click', function () {
173177

174178
gameRun = false;
175179
}
176-
})
180+
});
181+
182+
modalInputValues.modal("show");

bjs/08_if_else/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.game-card {
2-
height: 100vh;
2+
height: 95vh;
33
}
44

55
body

0 commit comments

Comments
 (0)