Skip to content

Revert "Tela de Divisão" #5

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
JoneBulande wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "Tela de Divisão" #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 5 additions & 14 deletions add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,11 @@
<a href="index.html">Home</a>
</header>
<div class="container2">
<h1>Digite a Reposta</h1>
<div class="contentbox">
<div class="yeah" id="n1"></div>
<div class="yeah">+</div>
<div class="yeah" id="n2"></div>

<div class="contenttext">
<input class="yeah" type="text" id="n3">
</div>

<button class="yeah" onclick="add()">Ok</button>
</div>


<div class="yeah" id="n1"></div>
<div class="yeah">+</div>
<div class="yeah" id="n2"></div>
<input class="yeah" type="text" id="n3">
<button class="yeah" onclick="add()">ok</button>
</div>
</body>
</html>
27 changes: 0 additions & 27 deletions divisao.html
View file
Open in desktop

This file was deleted.

17 changes: 2 additions & 15 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,9 @@
</head>
<body>
<header class="header">
<a href="index.html">Game Math</a>
<a href="index.html">Math Games</a>
</header>

<div class="tittle-content">
<h1>Choose One</h1>
</div>

<div class="container">


<div class="item">
<a href="add.html">+<br/></a>
</div>
Expand All @@ -27,14 +20,8 @@ <h1>Choose One</h1>
<a href="mult.html">x<br/></a>
</div>
<div class="item">
<a href="divisao.html">/<br/></a>
<a href="">/<br/></a>
</div>
</div>
<div class="final-content">
<h1>Diretrizes</h1>
<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Et ut earum sequi? Quod quisquam quaerat corrupti, animi facilis ab obcaecati autem tempora dicta placeat pariatur earum ducimus. Laboriosam, exercitationem est.</p>
<br>
<h1>By Jone Bulande</h1>
</div>
</body>
</html>
30 changes: 2 additions & 28 deletions js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,10 @@ function resetar() {
document.getElementById("n1").innerHTML = alt1;
document.getElementById("n2").innerHTML = alt2;
}
function resetardivisao() {
alt1 = Math.floor((Math.random() * 12))+1;
alt2 = Math.floor((Math.random() * 10 ))+1;
document.getElementById("n3").value = "";
document.getElementById("n1").innerHTML = alt1*alt2;
document.getElementById("n2").innerHTML = alt2;
}
/********************************************************************/
/********************************| subtração |**********************************/
/********************************************************************/
function sub() {
function sub(argument) {
var n3 = document.getElementById('n3').value;
if (n3 != "") {
var n1 = Number(document.getElementById('n1').innerHTML);
Expand All @@ -53,7 +46,7 @@ function sub() {
/********************************************************************/
/********************************| multiplicação |**********************************/
/********************************************************************/
function mult() {
function mult(argument) {
var n3 = document.getElementById('n3').value;
if (n3 != "") {
var n1 = Number(document.getElementById('n1').innerHTML);
Expand All @@ -69,22 +62,3 @@ function mult() {
resetar();
}
}
/********************************************************************/
/********************************| divisão |**********************************/
/********************************************************************/
function divisao() {
var n3 = document.getElementById('n3').value;
if (n3 != "") {
var n1 = Number(document.getElementById('n1').innerHTML);
var n2 = Number(document.getElementById('n2').innerHTML);
if((n1/n2) == n3){
alert("ACERTOU!");
}else{
alert("ERROU!");
}
resetardivisao();
}else{
alert("Preencha o campo")
resetardivisao();
}
}
18 changes: 6 additions & 12 deletions mult.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,11 @@
<a href="index.html">Home</a>
</header>
<div class="container2">
<h1>Digite a Reposta</h1>
<div class="contentbox">
<div class="yeah" id="n1"></div>
<div class="yeah">X</div>
<div class="yeah" id="n2"></div>

<div class="contenttext">
<input class="yeah" type="text" id="n3">
</div>

<button class="yeah" onclick="mult()">Ok</button>
</div>
<div class="yeah" id="n1"></div>
<div class="yeah">X</div>
<div class="yeah" id="n2"></div>
<input class="yeah" type="text" id="n3">
<button class="yeah" onclick="mult()">ok</button>
</div>
</body>
</html>
18 changes: 6 additions & 12 deletions sub.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,11 @@
<a href="index.html">Home</a>
</header>
<div class="container2">
<h1>Digite a Reposta</h1>
<div class="contentbox">
<div class="yeah" id="n1"></div>
<div class="yeah">-</div>
<div class="yeah" id="n2"></div>

<div class="contenttext">
<input class="yeah" type="text" id="n3">
</div>

<button class="yeah" onclick="sub()">Ok</button>
</div>
<div class="yeah" id="n1"></div>
<div class="yeah">-</div>
<div class="yeah" id="n2"></div>
<input class="yeah" type="text" id="n3">
<button class="yeah" onclick="sub()">ok</button>
</div>
</body>
</html>