Skip to content

Commit

Permalink
Changing EVERYTHING
Browse files Browse the repository at this point in the history
  • Loading branch information
@viniciusjaa
viniciusjaa authored Dec 4, 2017
1 parent a194973 commit 35052cf
Show file tree
Hide file tree
Showing 13 changed files with 224 additions and 97 deletions.
17 changes: 4 additions & 13 deletions altera-usuario.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,23 @@
require 'header.php';
require 'dao-usuario.php';

$id = $_POST['id'];
$id = $_SESSION['id_usuario'];
$nome=$_POST['nome_user'];
$sobrenome=$_POST['sobrenome_user'];

$sexo=$_POST['sexo'];
$dataNasc=$_POST['dataNasc'];
$escolaridade=$_POST['escolaridade'];
$sexo=$_POST['sexo_user'];
$dataNasc=$_POST['dataNasc_user'];
$escolaridade=$_POST['escolaridade_user'];


if(alteraUsuario($conexao, $id, $nome, $sobrenome, $sexo, $dataNasc, $escolaridade)){

$_SESSION['id_usuario'] = $id;
$_SESSION['nm_usuario'] = $nome;
$_SESSION['sbm_usuario'] = $sobrenome;
$_SESSION['escolaridade'] = $escolaridade;
$_SESSION['sexo'] = $sexo;
$_SESSION['dt_nasc'] = $dataNasc;

$_SESSION['alert_tipo'] = "text_success";
$_SESSION["alert"] = "Usuario alterado com sucesso.";
header("Location: perfil.php");

}else{
$msg = mysqli_error($conexao);
$_SESSION['alert_tipo'] = "text_danger";
$_SESSION["alert"] = "Não foi possível alterar seus dados: \n".$msg;
header("Location: perfil.php");

}
167 changes: 167 additions & 0 deletions break_-_15.11.sql
View file

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions conteudo-notebook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@
<p class="header_space2"><i>by <?=$conteudo['nome_user']?></i></p>

</div ::after>
<hr>
<br>

<div id="opt">
<form action="form-altera-anotacao.php" method="post">
<input type="hidden" name="id" value="<?=$conteudo['id'] ?>"/>
Expand All @@ -99,7 +98,6 @@
</button>
</div>
</form>

<form action="exclui-anotacao.php" method="post" class="opt">
<input type="hidden" name="id" value="<?=$conteudo['id'] ?>" />
<div id="reply2">
Expand Down
2 changes: 1 addition & 1 deletion dao-anotacao.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function buscaAnotacao($conexao, $id)
function procuraAnotacao($conexao, $search, $id)
{
$anotacoes = array();
$query = "SELECT a.*, d.disc_nome, d.disc_apelido, d.disc_back_color, u.nome_user
$query = "SELECT a.*, d.disc_nome, u.nome_user
FROM disciplina AS d
JOIN anotacao AS a ON a.fk_disciplina = d.iddisciplina
JOIN usuario AS u ON u.idusuario = a.fk_usuario
Expand Down
19 changes: 2 additions & 17 deletions dao-usuario.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ function alteraUsuario($conexao, $id, $nome, $sobrenome, $sexo, $dataNasc, $esco
nome_user = '{$nome}',
sobrenome_user = '{$sobrenome}',
sexo = '{$sexo}',
dataNasc = '{$dataNasc}',
dataNasc = {$dataNasc},
escolaridade = '{$escolaridade}'
WHERE idusuario={$id};";
WHERE idusuario={$id}";
echo $query;
$resultado = mysqli_query($conexao, $query);
return $resultado;
Expand All @@ -24,18 +24,3 @@ function procuraUsuario($conexao, $search){
return $usuarios;

}

function removePerguntaWhereUsuario($conexao, $id){
$query = "DELETE * FROM pergunta WHERE fk_usuario={$id};";
return mysqli_query($conexao, $query);
}

function removeAnotacaoWhereUsuario($conexao, $id){
$query = "DELETE * FROM anotacao WHERE fk_usuario={$id};";
return mysqli_query($conexao, $query);
}

function removeUsuario($conexao, $id){
$query = "DELETE FROM usuario WHERE idusuario = {$id};";
return mysqli_query($conexao, $query);
}
63 changes: 15 additions & 48 deletions form-altera-usuario.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,6 @@

require 'dao-usuario.php';

$selecaoNone="";
$selecaoEF1="";
$selecaoEF2="";
$selecaoEM="";
$selecaoES="";

if ($_SESSION['escolaridade'] == "Ensino Fundamental I") {
$selecaoEF1 = "selected='selected'" ;
}elseif ($_SESSION['escolaridade'] == "Ensino Fundamental II") {
$selecaoEF2 = "selected='selected'" ;
}elseif ($_SESSION['escolaridade'] == "Ensino Médio") {
$selecaoEM = "selected='selected'" ;
}elseif ($_SESSION['escolaridade'] == "Ensino Superior") {
$selecaoES = "selected='selected'" ;
}else{
$selecaoNone = "selected='selected'" ;
}

?>

Expand Down Expand Up @@ -48,54 +31,38 @@
<div id="header_main">
<div id="header_space2">
<form action="altera-usuario.php" method="post">
<input type="hidden" name="id" value="<?=$_SESSION['id_usuario']?>">

<label for="nome_user">Primeiro Nome</label>
<br>
<input type="text" id="nome_user" title="Insira seu Primeiro nome"
placeholder="ex.: Luke" value="<?=$_SESSION['nm_usuario']?>" name="nome_user"
required autofocus />
<br/>
<label for="nome_user">Nome</label>
<input type="text" id="nome_user" name="nome_user" value="<?=$_SESSION['nm_usuario']?>" />

<label for="sobrenome_user">Sobrenome</label>
<br>
<input type="text" id="sobrenome_user" title="Insira seu Sobrenome" placeholder="ex.: Skybreaker" value="<?=$_SESSION['sbm_usuario']?>" name="sobrenome_user" required />
<br/>
<label for="sobrenome_user">Sobrenome</label>
<input type="text" id="sobrenome_user" name="sobrenome_user" value="<?=$_SESSION['sbm_usuario']?>" />
<br/>

<div id="radio-genero" >
<?php
$checkedM = "";
$checkedF = "";
?>
<label for="sexo_user">Gênero</label>
<br>
<?php
if ($_SESSION['sexo'] == "M"){
$checkedM = "checked";
}else{
$checkedF = "checked";
}?>
<input type="radio" id="sexo" name="sexo" value="M" title="Gênero masculino" <?=$checkedM?>> Masculino
<br>
<input type="radio" id="sexo" name="sexo" value="F" title="Gênero feminino" <?=$checkedF?>> Feminino
</div>
<input type="radio" id="sexo_user" name="sexo_user" value="M" <?=$checkedM?> > Masculino
<input type="radio" id="sexo_user" name="sexo_user" value="F" <?=$checkedF?>> Feminino
</div>
<br/>

<label for="dataNasc">Data de Nascimento</label>
<br>
<input type="date" id="dataNasc" title="Para sabermos sua idade" required name="dataNasc" value="<?=$_SESSION['dt_nasc']?>"/>
<br/>
<label for="dataNasc_user">Data de Nascimento</label>
<input type="date" id="dataNasc_user" name="dataNasc_user" value="<?=$_SESSION['dt_nasc']?>" />
<br/>

<label for="escolaridade">Escolaridade</label>
<br>
<select id="escolaridade" name="escolaridade">
<option id="opt" <?=$selecaoNone?> value="">Grau de escolaridade</option>
<option id="opt" <?=$selecaoEF1?> value="Ensino Fundamental I">Ensino Fundamental I</option>
<option id="opt" <?=$selecaoEF2?> value="Ensino Fundamental I">Ensino Fundamental II</option>
<option id="opt" <?=$selecaoEM?> value="Ensino Médio">Ensino Médio</option>
<option id="opt" <?=$selecaoES?> value="Ensino Superior">Ensino Superior</option>
</select>
<br>
<label for="escolaridade_user">Escolaridade</label>
<select id="escolaridade_user" name="escolaridade_user">
<option value="escolaridade"><?=$_SESSION['escolaridade']?></option>
</select>
<br>

<input type="submit" name="" value="Alterar"></input>
Expand Down
Binary file added img/Languages.png
View file
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 img/balao icon white.png
View file
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 img/justify_img.png
View file
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 img/list.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions js/filtro-conteudo-notebook.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
filterSelection("all")
function filterSelection(materia) {
var element, i;
element = document.getElementsByClassName("filterDiv");
if (materia == "all") materia = "";
for (i = 0; i < element.length; i++) {
removeClasse(element[i], "show");
if (element[i].className.indexOf(materia) > -1) addClasse(element[i], "show");
}
}

function addClasse(element, name) {
var i, arr1, arr2;
arr1 = element.className.split(" ");
arr2 = name.split(" ");
for (i = 0; i < arr2.length; i++) {
if (arr1.indexOf(arr2[i]) == -1) {element.className += " " + arr2[i];}
}
}

function removeClasse(element, name) {
var i, arr1, arr2;
arr1 = element.className.split(" ");
arr2 = name.split(" ");
for (i = 0; i < arr2.length; i++) {
while (arr1.indexOf(arr2[i]) > -1) {
arr1.splice(arr1.indexOf(arr2[i]), 1);
}
}
element.className = arr1.join(" ");
}
9 changes: 0 additions & 9 deletions login.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,6 @@
<title> Break | Entra aí</title>
</head>
<body>
<?php
if (isset($_SESSION['alert']) && isset($_SESSION['alert_tipo'])){
?>
<p class="<?=$_SESSION['alert_tipo']?>"><?=$_SESSION['alert'] ?></p>
<?php
unset($_SESSION['alert']);
unset($_SESSION['alert_tipo']);
}
?>

<div class="box-that">
<img id="hominho" src="img/Hominho.png"
Expand Down
9 changes: 3 additions & 6 deletions search.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,10 @@
<?php
foreach ($anotacoes as $anotacao) :
?>
<div id="anotacaozin" class="" >

<div class="">
<?=$anotacao['anota_descricao'] ?>
</div>

<h2 style="color: <?=$anotacao['disc_back_color']?>;"><strong><?= $anotacao['anota_titulo']?> </strong>| </h2>
<h3><?=$anotacao['anota_descricao']?></h3>

<div class="baixo_resposta">
<p class="header_space2"><a href="notebook.php">Ir para o meu caderno</a></p>
<p class="header_space2">
Expand All @@ -143,7 +141,6 @@
Postado em: <time><?=$anotacao['anota_registro']?></time>
</p>
</div>
</div>
<br>
<?php
endforeach;
Expand Down

0 comments on commit 35052cf

Please sign in to comment.