s444413/Padel-Tournaments-System
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	frontend/dodawanie turnieju/index.html
This commit is contained in:
Lewy 2022-06-02 00:49:17 +02:00
commit 822cb920f1
4 changed files with 39 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/dodawanie turnieju/app.js Normal file
View File

@ -0,0 +1,13 @@
document.getElementById("tournamentSubmit").addEventListener("click", function () {
var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function () {
if (this.readyState == 4 && this.status == 200) {
alert("Dodano turniej");
} else if (this.readyState == 4) {
alert("something not work :( " + this.status);
}
}
xhttp.open("PUT", "dragonmaster.pl/inz/tournament");
xhttp.setRequestHeader("Authorization", "Bearer " + token);
xhttp.send('{"name":"' + document.getElementById("tournamentName").value + '","typeOfLadder":"' + document.getElementById("ladderType").value + '","pointsForTournament":"' + document.getElementById("tournamentPoints").value + '","places":"' + document.getElementById("tournamentPlace").value + '","roles":"' + document.getElementById("tournamentRole").value + '","ranked":"' + document.getElementById("isRanked").value + '"}');
});

18
frontend/logowanie/app.js Normal file
View File

@ -0,0 +1,18 @@
document.getElementById("loginsubmit").addEventListener("click", function () {
var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function () {
if (this.readyState == 4 && this.status == 200) {
alert("logged in");
console.log("dziala");
} else if (this.readyState == 4) {
alert("something not work :( " + this.status);
console.log("nie dziala");
}
}
xhttp.open("POST", "https://dragonmaster.pl/inz/user/login");
xhttp.send('{"username":"' + document.getElementById("loginusername").value + '","password":"' + document.getElementById("loginpassword").value + '"}');
});
function submit() {
("form").submit(function () { return false; })
}

13
frontend/logowanie/index.html
View File

@ -14,14 +14,16 @@
<div class="form"> <div class="form">
<div class="login"> <div class="login">
<h2>Logowanie</h2> <h2>Logowanie</h2>
<input placeholder="Tutaj wpisz email lub nick"> <input placeholder="Tutaj wpisz email lub nick" id="loginusername">
<input placeholder="Tutaj wpisz hasło"> <input placeholder="Tutaj wpisz hasło" id="loginpassword">
<br> <br>
<form action="../zalogowany_organizator/index.html"> <!-- trzeba dać cssy buttonowi bo zmieniłem z form na button -->
<input class="myButton" type="submit" value="Zaloguj" /> <button>
</form> <input class="myButton" type="submit" value="Zaloguj" id="loginsubmit" />
</button>
<br> <br>
<a href="#">Zapomniałeś hasła?</a> <a href="#">Zapomniałeś hasła?</a>
@ -31,6 +33,7 @@
</div> </div>
</div> </div>
<script type="text/javascript" src="app.js"></script>
</body> </body>
</html> </html>

50
frontend/rejestracja/myscript.js
View File

@ -17,56 +17,6 @@ form.addEventListener('submit', function (e) {
e.preventDefault(); e.preventDefault();
}); });
// <<<<<<< HEAD
// var token = "";
// // document.getElementById("loginButton").addEventListener("click", function () {
// // document.getElementById("login").style.display = "block";
// // });
// // =======
// //REST API
// var token = "";
// document.getElementById("loginButton").addEventListener("click", function () {
// document.getElementById("login").style.display = "block";
// });
// >>>>>>> b44b5f1fc14af7c8da4ca602072af953974b49af
// // document.getElementById("regButton").addEventListener("click", function () {
// // document.getElementById("reg").style.display = "block";
// // });
// document.getElementById("registrationButton").addEventListener("click", function () {
// document.getElementById("registration").style.display = "block";
// });
// document.getElementById("checkPaymentButton").addEventListener("click", function () {
// document.getElementById("checkStatus").style.display = "block";
// });
// var registartions = [];
// document.getElementById("getRegistartionsButton").addEventListener("click", function () {
// document.getElementById("getRegistartions").style.display = "block";
// });
// document.getElementById("getUserDataButton").addEventListener("click", function () {
// var xhttp = new XMLHttpRequest();
// xhttp.onreadystatechange = function () {
// if (this.readyState == 4 && this.status == 200) {
// var json = JSON.parse(this.response);
// document.getElementById("getUserDataid").innerText = json.id;
// document.getElementById("getUserDataname").innerText = json.name;
// document.getElementById("getUserDatasurname").innerText = json.surname;
// document.getElementById("getUserDatarole").innerText = json.role;
// document.getElementById("getUserDatalogin").innerText = json.login;
// document.getElementById("getUserDataphone").innerText = json.phone;
// document.getElementById("getUserDatamail").innerText = json.mail;
// document.getElementById("getUserData").style.display = "block";
// } else if (this.readyState == 4) {
// alert("something not work :( " + this.status);
// }
// }
// xhttp.open("GET", "dragonmaster.pl/inz/user");
// xhttp.setRequestHeader("Authorization", "Bearer " + token);
// xhttp.send();
// });
// document.getElementById("updateUserDataButton").addEventListener("click", function () {
// document.getElementById("updateUserData").style.display = "block";
// });
document.getElementById("regsubmit").addEventListener("click", function () { document.getElementById("regsubmit").addEventListener("click", function () {
var xhttp = new XMLHttpRequest(); var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function () { xhttp.onreadystatechange = function () {