Skip to content

Commit

Permalink
The ALMOST Last Update: Quiz e back-end finalizado
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasgianine committed Jun 5, 2023
1 parent 8c7788e commit 4c8671c
Show file tree
Hide file tree
Showing 39 changed files with 1,682 additions and 767 deletions.
Binary file added Site/public/assets/img/esforço.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Site/public/assets/img/humildade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Site/public/assets/img/jogador1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Site/public/assets/img/jogador10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Site/public/assets/img/jogador11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Site/public/assets/img/jogador2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Site/public/assets/img/jogador3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Site/public/assets/img/jogador4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Site/public/assets/img/jogador5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Site/public/assets/img/jogador6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Site/public/assets/img/jogador7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Site/public/assets/img/jogador8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Site/public/assets/img/jogador9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Site/public/assets/img/lealdade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 14 additions & 19 deletions Site/public/cadastro.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,8 @@ <h2>Cadastrar-se</h2>
</div>
</div>
</body>

</html>

<script>

</script>

<script>
// Lista com imagem dos jogadores
var listaJogadores = [
Expand Down Expand Up @@ -179,7 +174,7 @@ <h2>Cadastrar-se</h2>
title: `Senha e confirmar senha estão diferentes!`,
showConfirmButton: true,
});
} else if (emailVar.indexOf('@gmail.com') == -1 && emailVar.indexOf('@sptech.school') == -1) {
} else if (emailVar.indexOf('@gmail.com') == -1 && emailVar.indexOf('@sptech.school') == -1 && emailVar.indexOf('@hotmail.com') == -1) {
Swal.fire({
position: 'center',
icon: 'warning',
Expand All @@ -200,25 +195,25 @@ <h2>Cadastrar-se</h2>
emailServer: emailVar,
posicaoServer: posicaoVar,
senhaServer: senhaVar,
confirmarSenhaServer: confirmarSenhaVar,
// confirmarSenhaServer: confirmarSenhaVar,
jogadorVotadoServer: jogadorVotadoVar
})
}).then(function (resposta) {

console.log("resposta: ", resposta);

if (resposta.ok) {
resposta.json().then(res => {
fetch('/voto/cadastrar', {
method: 'POST',
headers: {
"Content-Type": "application/json"
},
body: JSON.stringify({
insertIdServer: res.insertId,
jogadorVotadoServer: jogadorVotadoVar
})
})
})
// resposta.json().then(res => {
// fetch('/voto/cadastrar', {
// method: 'POST',
// headers: {
// "Content-Type": "application/json"
// },
// body: JSON.stringify({
// insertIdServer: res.insertId,
// })
// })
// })

// Validação
Swal.fire({
Expand Down
24 changes: 23 additions & 1 deletion Site/public/css/dash.css
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ body{
justify-content: center;
position: relative;
}
.form_carreira {
display: flex;
justify-content: center;
}
.form_principal p{
justify-content: center;
color: #ECF8E5;
Expand Down Expand Up @@ -347,5 +351,23 @@ body{
margin-bottom: 10px;
}
#b_usuario {
margin-bottom: 30px;
margin-bottom: 5px;
}
#b_email {
margin-bottom: 5px;
}
#b_posicao {
margin-bottom: 5px;
}
#alterar_dados{
margin-bottom: 26px;
}
#alterar_dados a{
color: #EBD937;
}

#img_jogador {
border-radius: 50%;
border: 2px solid #EBD937;
box-shadow: 0px 0px 5px #EBD937;
}
136 changes: 136 additions & 0 deletions Site/public/css/dataChange.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
@import url('https://fonts.googleapis.com/css2?family=Kanit&family=Montserrat:wght@800&family=Raleway:wght@400;600&family=Rubik+Mono+One&display=swap');

* {
overflow: hidden;
font-family: 'Raleway', sans-serif;
}

body {
background-image: url(../assets/img/bg_sobre.png);
display: flex;
align-items: start;
justify-content: center;
padding: 20px;
min-height: 100vh;
}

.box {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 43vw;
height: 90vh;
backdrop-filter: blur(40px);
border-radius: 15px;
border: 2px solid #EBD937;
box-shadow: 2px 4px 10px #EBD937;
}
.box img {
width: 190px;
}

.box button {
width: 280px;
height: 38px;
border-radius: 25px;
/* margin-left: 37%;
margin-top: 30px; */
padding-left: 10px;
outline: none;
border: none;

padding: 10px 25px;
background-color: #EBD937;
color: #121212;
font-weight: 500;
text-decoration: none;
letter-spacing: 1px;
transition: 0.2s ease-in-out;
font-family: 'Montserrat', sans-serif;
border: 1px solid #121212;
}
.box button:hover {
background-color: #121212;
color: #EBD937;
border: 1px solid #EBD937;
}

.form-box {
padding: 30px 40px;
width: 60%;
border-radius: 0 20px 20px 0;
}

.form-box h2 {
font-size: 30px;
color: #ECF8E5;
}
/*
select {
color: #121212;
border: 2px solid #121212;
border-radius: 10px;
outline: none;
width: 15vw;
height: 5vh;
font-family: 'Raleway', sans-serif;
padding-left: 5px;
} */

form .input-group select {
width: 100%;
height: 38px;
background-color: #ECF8E5;
border-radius: 15px;
padding-left: 7px;
outline: none;
border: none;
}

.form-box form {
margin: 20px 0;
}
form .input-group {
margin-bottom: 15px;
}

form .input-group label {
color: #ECF8E5;
font-weight: bold;
display: block;
margin-bottom: 5px;
}

form .input-group input {
width: 100%;
height: 38px;
background-color: #ECF8E5;
border-radius: 15px;
padding-left: 7px;
outline: none;
border: none;
}

.input-group2 {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}

.input-group2 p {
font-weight: bold;
color: #EBD937;
margin-top: 15px;
}
.input-group2 p a {
font-weight: bold;
color: #ECF8E5;
}

p {
font-weight: bold;
color: #EBD937;
margin-top: 15px;
}
Loading

0 comments on commit 4c8671c

Please sign in to comment.