Skip to content

bla bla #8

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

bla bla #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65d42bb
add calc func
Dictator90 Jul 30, 2023
ca0602b
add calc func
Dictator90 Jul 30, 2023
44c2028
add complete app
Dictator90 Aug 5, 2023
24d1e55
add complete app personGenerator
Dictator90 Aug 5, 2023
ff39a42
fix recalc()
Dictator90 Aug 8, 2023
1b68025
fix recalc()
Dictator90 Aug 8, 2023
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
58 changes: 57 additions & 1 deletion bjs/07_Number_and_string/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,63 @@
<input class="form-control input-window" id="inputWindow" value="">
<div class="row no-gutters">
<div class="col">
<button class="btn btn-outline-danger form-control" id="btn_clr">C</button>
<button class="btn btn-danger form-control" id="btn_clr">C</button>
</div>
</div>
<div class="row no-gutters">
<div class="col">
<button class="btn btn-primary form-control" id="btn_1" data-type="number">1</button>
</div>
<div class="col">
<button class="btn btn-primary form-control" id="btn_2" data-type="number">2</button>
</div>
<div class="col">
<button class="btn btn-primary form-control" id="btn_3" data-type="number">3</button>
</div>
<div class="col">
<button class="btn btn-primary form-control" id="btn_sum" data-type="operation" data-action="sum">+</button>
</div>
</div>
<div class="row no-gutters">
<div class="col">
<button class="btn btn-primary form-control" id="btn_4" data-type="number">4</button>
</div>
<div class="col">
<button class="btn btn-primary form-control" id="btn_5" data-type="number">5</button>
</div>
<div class="col">
<button class="btn btn-primary form-control" id="btn_6" data-type="number">6</button>
</div>
<div class="col">
<button class="btn btn-primary form-control" id="btn_def" data-type="operation" data-action="def">-</button>
</div>
</div>
<div class="row no-gutters">
<div class="col">
<button class="btn btn-primary form-control" id="btn_7" data-type="number">7</button>
</div>
<div class="col">
<button class="btn btn-primary form-control" id="btn_8" data-type="number">8</button>
</div>
<div class="col">
<button class="btn btn-primary form-control" id="btn_9" data-type="number">9</button>
</div>
<div class="col">
<button class="btn btn-primary form-control" id="btn_prod" data-type="operation" data-action="prod">*</button>
</div>
</div>
<div class="row no-gutters">
<div class="col">
<button class="btn btn-primary form-control" id="btn_calc" data-type="calc">=</button>
</div>
<div class="col">
<button class="btn btn-primary form-control" id="btn_0" data-type="number">0</button>
</div>
<div class="col">
<button class="btn btn-primary form-control" data-type="operation" data-action=""></button>
</div>
<div class="col">
<button class="btn btn-primary form-control" id="btn_div" data-type="operation" data-action="div">/</button>
</div>
</div>
</div>
Expand Down
47 changes: 47 additions & 0 deletions bjs/07_Number_and_string/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,55 @@
let lastOperand = 0;
let operation = null;
let buffer = null;

let numbers = document.querySelectorAll('button[data-type="number"]');
let operations = document.querySelectorAll('button[data-type="operation"]');
let $calc = document.querySelector('button[data-type="calc"]')

const inputWindow = document.getElementById('inputWindow');

numbers.forEach( e => {
e.addEventListener('click', () => {
if (parseInt(inputWindow.value) === 0)
inputWindow.value = e.textContent;
else
inputWindow.value += e.textContent;
})
});

operations.forEach( e => {
let action = e.dataset.action;

e.addEventListener('click', () => {
lastOperand = parseFloat(inputWindow.value);
inputWindow.value = '';
operation = action;
})
});

$calc.addEventListener('click', () => {
let result = null;

switch (operation)
{
case 'sum':
result = lastOperand + parseInt(inputWindow.value);
break;
case 'def':
result = lastOperand - parseInt(inputWindow.value);
break;
case 'prod':
result = lastOperand * parseInt(inputWindow.value);
break;
case 'div':
result = lastOperand / parseInt(inputWindow.value);
break;
}

operation = null;
lastOperand = 0;
inputWindow.value = result;
})

document.getElementById('btn_clr').addEventListener('click', function () {
lastOperand = 0;
Expand Down
10 changes: 10 additions & 0 deletions bjs/07_Number_and_string/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,13 @@
text-align: end;
font-size: x-large;
}

.card-body {
display: flex;
flex-direction: column;
gap: 5px;
}

.row {
gap: 5px;
}
57 changes: 49 additions & 8 deletions bjs/08_if_else/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
<head>
<meta charset="UTF-8">
<title>Угадайка</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css2?family=Open+Sans" rel="stylesheet">
<link rel="stylesheet" href="style.css" type="text/css"/>
</head>
<body>
<div class="container">
<div class="row game-card align-items-center">
<div class="col col-md-4 offset-md-4">
<div class="card text-center">
<div class="col col-md-4">
<div class="card text-center" id="gameContainer" style="display: none">
<div class="card-header">
<p class="m-0">Вопрос №<span id="orderNumberField">5</span></p>
</div>
Expand All @@ -23,11 +22,11 @@ <h3 class="card-title m-0"><span id="answerField">Вы загадали числ
</div>
</div>
</div>
<div class="card-body">
<div class="btn-group">
<button class="btn btn-info" id="btnLess">&#129047;<br>меньше</button>
<div class="card-body buttons-area">
<div class="d-grid gap-2 d-md-block">
<button class="btn btn-outline-primary" id="btnLess">&#129047; меньше</button>
<button class="btn btn-success btn-lg" id="btnEqual">Верно!</button>
<button class="btn btn-info" id="btnOver">больше<br>&#129045;</button>
<button class="btn btn-outline-primary" id="btnOver">&#129045; больше</button>
</div>
</div>
<div class="card-footer">
Expand All @@ -37,6 +36,48 @@ <h3 class="card-title m-0"><span id="answerField">Вы загадали числ
</div>
</div>
</div>

<div class="modal fade" id="modalFirst" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5">Укажите диаразон чисел</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="row g-3">
<div class="col-12">
<input type="text" id="minValue" class="form-control" placeholder="Минимальное знание числа" aria-label="Число от">
</div>
<div class="col-12">
<input type="text" id="maxValue" class="form-control" placeholder="Максимальное знание числа" aria-label="Число до">
</div>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary" id="nextModalSecond" >Далее</button>
</div>
</div>
</div>
</div>

<div class="modal fade" id="modalFinish" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5"></h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<button class="btn btn-primary" id="startGame">Поехали</button>
</div>
</div>
</div>
</div>

<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script>
<script src="script.js"></script>
</body>
</html>
Loading