Skip to content

Commit

Permalink
V2.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yaro2709
Yaro2709 committed Sep 7, 2022
1 parent 12c80a5 commit 1ec7811
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 1 deletion.
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><title>Tutor</title><link rel="manifest" href="./manifest.json"><link rel="shortcut icon" href="./favicon.ico" type="image/x-icon"><meta http-equiv="content-type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="css/bootstrap.min_4.6.0.css"><script type="text/javascript" src="scripts/jquery.js"></script><script type="text/javascript" src="scripts/jquery.ui.js"></script><script type="text/javascript" src="scripts/popper.min.js"></script><script type="text/javascript" src="scripts/bootstrap.min.js"></script><script src="scripts/mathjax/es5/tex-chtml.js" id="MathJax-script" async></script><script type="text/javascript" src="scripts/general.js"></script><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"></head><body><nav class="navbar navbar-expand-md fixed-top bg-dark navbar-dark"><div class="container-xl"><a class="navbar-brand" href="#"><img class="d-inline-block align-text-top" src="./img/logo.png" alt="" width="30" height="30"><text>Tutor</text></a><button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExample07XL" aria-controls="navbarsExample07XL" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbarsExample07XL"><ul class="navbar-nav mr-auto"><li class="nav-item"> <a class="nav-link" href="./index.html">Меню</a></li><li class="nav-item"> <a class="nav-link" href="./contacts.html">Контакты</a></li></ul></div></div></nav><main class="container" role="main"><div class="row"><div class="col-md-12"> <div class="card mb-4 shadow-sm"><div class="card-body"><h4 class="card-title">Добро пожаловать в Tutor!</h4><p class="card-text overflow-auto"><h5>Горячие темы</h5><ul><li><a href="./tabularIntegrals.html">Табличные интегралы</a></li><li><a href="./tabularTrigonometry.html">Табличные значения тригонометрических углов</a></li></ul></p></div></div></div></div></main></body><footer><div class="container"> <p class="float-right"> <a href="#">Наверх </a></p><p>© 2022 <a href="https://github.com/Yaro2709">github</a></p></div></footer></html>
<!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><title>Tutor</title><link rel="manifest" href="./manifest.json"><link rel="shortcut icon" href="./favicon.ico" type="image/x-icon"><meta http-equiv="content-type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="css/bootstrap.min_4.6.0.css"><script type="text/javascript" src="scripts/jquery.js"></script><script type="text/javascript" src="scripts/jquery.ui.js"></script><script type="text/javascript" src="scripts/popper.min.js"></script><script type="text/javascript" src="scripts/bootstrap.min.js"></script><script src="scripts/mathjax/es5/tex-chtml.js" id="MathJax-script" async></script><script type="text/javascript" src="scripts/general.js"></script><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"></head><body><nav class="navbar navbar-expand-md fixed-top bg-dark navbar-dark"><div class="container-xl"><a class="navbar-brand" href="#"><img class="d-inline-block align-text-top" src="./img/logo.png" alt="" width="30" height="30"><text>Tutor</text></a><button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExample07XL" aria-controls="navbarsExample07XL" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbarsExample07XL"><ul class="navbar-nav mr-auto"><li class="nav-item"> <a class="nav-link" href="./index.html">Меню</a></li><li class="nav-item"> <a class="nav-link" href="./contacts.html">Контакты</a></li></ul></div></div></nav><main class="container" role="main"><div class="row"><div class="col-md-12"> <div class="card mb-4 shadow-sm"><div class="card-body"><h4 class="card-title">Добро пожаловать в Tutor!</h4><p class="card-text overflow-auto"><h5>Горячие темы</h5><ul><li><a href="./tabularIntegrals.html">Табличные интегралы</a></li><li><a href="./tabularTrigonometry.html">Табличные значения тригонометрических углов</a></li><li><a href="./сastFormulas.html">Формулы приведения</a></li></ul></p></div></div></div></div></main></body><footer><div class="container"> <p class="float-right"> <a href="#">Наверх </a></p><p>© 2022 <a href="https://github.com/Yaro2709">github</a></p></div></footer></html>
62 changes: 62 additions & 0 deletions scripts/BD/сastFormulas.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
//Флаг шаблона
flag = module(1,12);
//Шаблоны
switch (flag) {
//Основные формулы
//cosx
case 1:
task = "$$\\cos (\\pi-x)$$";
answer = "$$- \\cos (x)$$";
break;
case 2:
task = "$$\\cos (\\pi+x)$$";
answer = "$$- \\cos (x)$$";
break;
case 3:
task = "$$\\cos (\\frac{\\pi}{2}-x)$$";
answer = "$$\\sin (x)$$";
break;
case 4:
task = "$$\\cos (\\frac{\\pi}{2}+x)$$";
answer = "$$-\\sin (x)$$";
break;
case 5:
task = "$$\\cos (\\frac{3\\pi}{2}-x)$$";
answer = "$$-\\sin (x)$$";
break;
case 6:
task = "$$\\cos (\\frac{\\pi}{2}+x)$$";
answer = "$$\\sin (x)$$";
break;
//sinx
case 7:
task = "$$\\sin (\\pi-x)$$";
answer = "$$\\sin (x)$$";
break;
case 8:
task = "$$\\sin (\\pi+x) $$";
answer = "$$-\\sin (x)$$";
break;
case 9:
task = "$$\\sin (\\frac{\\pi}{2}-x)$$";
answer = "$$\\cos (x)$$";
break;
case 10:
task = "$$\\sin (\\frac{\\pi}{2}+x)$$";
answer = "$$\\cos (x)$$";
break;
case 11:
task = "$$\\sin (\\frac{3\\pi}{2}-x)$$";
answer = "$$-\\cos (x)$$";
break;
case 12:
task = "$$\\sin (\\frac{3\\pi}{2}-x)$$";
answer = "$$-\\cos (x)$$";
break;
//Дополнительные формулы
default:
alert( "400 Bad Request: value is undefined!" );
}
//Вывод
document.getElementById("task").innerHTML = task;
document.getElementById("answer").innerHTML = answer;
2 changes: 2 additions & 0 deletions templates/index.pug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ html(lang="ru")
a(href="./tabularIntegrals.html") Табличные интегралы
li
a(href="./tabularTrigonometry.html") Табличные значения тригонометрических углов
li
a(href="./сastFormulas.html") Формулы приведения



Expand Down
26 changes: 26 additions & 0 deletions templates/сastFormulas.pug
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
doctype html
html(lang="ru")
include ./templates/layout/head.pug
body
include ./templates/layout/nav.pug



main.container(role="main")
div.row
div.col-md-12
div.card.mb-4.shadow-sm
div.card-body
h5.card-title Формулы приведения
p.card-text.overflow-auto
module(id="task")
p
button.btn.btn-success(type="button", data-toggle="collapse", data-target="#tabularTrigonometryAnswer", aria-expanded="false", aria-controls="#tabularTrigonometryAnswer") Ответ
div.collapse(id="tabularTrigonometryAnswer")
div.card.card-body
result(id="answer")
script(type="text/javascript", src="scripts/BD/сastFormulas.js")



include ./templates/layout/footer.pug
1 change: 1 addition & 0 deletions сastFormulas.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><title>Tutor</title><link rel="manifest" href="./manifest.json"><link rel="shortcut icon" href="./favicon.ico" type="image/x-icon"><meta http-equiv="content-type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="css/bootstrap.min_4.6.0.css"><script type="text/javascript" src="scripts/jquery.js"></script><script type="text/javascript" src="scripts/jquery.ui.js"></script><script type="text/javascript" src="scripts/popper.min.js"></script><script type="text/javascript" src="scripts/bootstrap.min.js"></script><script src="scripts/mathjax/es5/tex-chtml.js" id="MathJax-script" async></script><script type="text/javascript" src="scripts/general.js"></script><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"></head><body><nav class="navbar navbar-expand-md fixed-top bg-dark navbar-dark"><div class="container-xl"><a class="navbar-brand" href="#"><img class="d-inline-block align-text-top" src="./img/logo.png" alt="" width="30" height="30"><text>Tutor</text></a><button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExample07XL" aria-controls="navbarsExample07XL" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><div class="collapse navbar-collapse" id="navbarsExample07XL"><ul class="navbar-nav mr-auto"><li class="nav-item"> <a class="nav-link" href="./index.html">Меню</a></li><li class="nav-item"> <a class="nav-link" href="./contacts.html">Контакты</a></li></ul></div></div></nav><main class="container" role="main"><div class="row"><div class="col-md-12"> <div class="card mb-4 shadow-sm"><div class="card-body"><h5 class="card-title">Формулы приведения</h5><p class="card-text overflow-auto"><module id="task"></module></p><p><button class="btn btn-success" type="button" data-toggle="collapse" data-target="#tabularTrigonometryAnswer" aria-expanded="false" aria-controls="#tabularTrigonometryAnswer">Ответ</button></p><div class="collapse" id="tabularTrigonometryAnswer"><div class="card card-body"><result id="answer"></result></div></div></div></div></div></div></main><script type="text/javascript" src="scripts/BD/сastFormulas.js"></script></body><footer><div class="container"> <p class="float-right"> <a href="#">Наверх </a></p><p>© 2022 <a href="https://github.com/Yaro2709">github</a></p></div></footer></html>

0 comments on commit 1ec7811

Please sign in to comment.