Skip to content

Commit d840394

Browse files
gspolimagspolima
committed
feat: deletar com redirect + design
1 parent 718a247 commit d840394

18 files changed

+122
-129
lines changed

‎composers/head.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
echo '<link rel="preconnect" href="https://fonts.googleapis.com">';
44
echo '<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>';
5-
echo '<link href="https://fonts.googleapis.com/css2?family=Londrina+Solid&family=Roboto:wght@300;400;500;700&display=swap" rel="stylesheet">';
5+
echo '<link href="https://fonts.googleapis.com/css2?family=Oswald:wght@500&family=Roboto:wght@300;400;500;700&display=swap" rel="stylesheet">';
66
echo '<link rel="stylesheet" href="../dependencies/uikit/css/uikit.min.css" />';
77
echo '<script src="../dependencies/uikit/js/uikit.min.js"></script>';
88
echo '<script src="../dependencies/uikit/js/uikit-icons.min.js"></script>';

‎composers/navbar.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
<a class="uk-navbar-item uk-logo" href="../index.php">Loggin</a>
99
<ul class="uk-navbar-nav">
1010
<li>
11-
<a href="#">Usuários</a>
11+
<a href="#"><span uk-icon="icon: users"></span> Usuários</a>
1212
<div class="uk-navbar-dropdown">
1313
<ul class="uk-nav uk-navbar-dropdown-nav">
1414
<li><a href="./consulta.php"><span uk-icon="icon: search"></span>Consultar</a></li>
15-
<li><a href="./cadastro.php"><span uk-icon="icon: plus"></span>Cadastrar</a></li>
15+
<li><a href="./cadastro.php"><span uk-icon="icon: plus-circle"></span>Cadastrar</a></li>
1616
</ul>
1717
</div>
1818
</li>
19+
<li><a href="https://github.com/gspolima/loggin" target="_blank"><span uk-icon="icon: code"></span> Código-fonte</a></li>
1920
</ul>
2021
</div>
2122
</nav>

‎composers/scripts.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
echo
3-
'
4-
<script type="text/javascript" src="../dependencies/jquery/jquery-3.6.0.min.js"></script>
5-
'
3+
"
4+
<script type='text/javascript' src='../dependencies/jquery/jquery-3.6.0.min.js'></script>
5+
";
66
?>

‎controllers/DbContext.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function abrirConexao() {
1919
$conexao= new PDO($dsn, $usuario, $senha, $options);
2020
$conexao->setAttribute( PDO::ATTR_EMULATE_PREPARES, false);
2121
$conexao->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
22-
echo "<script>console.warn('Conexão com banco realizada com sucesso')</script>";
22+
echo "<script>console.info('Conexão com banco realizada com sucesso')</script>";
2323
return $conexao;
2424

2525
} catch(PDOException $e) {

‎controllers/ListagemController.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,9 @@ function formatarCpf($doc) {
9696

9797
return $docFormatado;
9898
}
99-
return 'doc invalido';
99+
return 'doc invalido';
100100
}
101101

102-
103102
$controller = new ListagemController();
104103
$usuarios = $controller->getListaDeUsuarios();
105104
$controller->comporTabelaComDados($usuarios);

‎controllers/RemoveController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ function redirecionarParaConsulta() {
5353
$host = $_SERVER['HTTP_HOST'];
5454

5555
if ($host === "localhost") {
56-
$destino = "http://".$host."/Loggin/pages/cadastro.php";
56+
$destino = "http://".$host."/Loggin/pages/consulta.php?del=1";
5757
echo "<script>window.location.href = '$destino'</script>";
5858
}
5959
else {
60-
$destino = "https://".$host."/pages/cadastro.php";
60+
$destino = "https://".$host."/pages/consulta.php?del=1";
6161
echo "<script>window.location.href = '$destino'</script>";
6262
}
6363
}
@@ -66,11 +66,11 @@ function redirecionarParaConsulta() {
6666
$id = $_GET['id'];
6767

6868
$controller = new RemoveController();
69-
7069
$existe = $controller->usuarioExiste($id);
7170

7271
if ($existe === true) {
7372
$controller->removerEnderecoUsuario($id);
7473
$controller->removerUsuario($id);
74+
$controller->redirecionarParaConsulta();
7575
}
7676
?>

‎data/SQL-queries.sql

+8-7
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ WHERE ID IN (12);
1414
DELETE FROM USUARIOS
1515
WHERE ID IN (21);
1616

17-
1817
INSERT INTO usuarios (login, email, cpf, data_nascimento) VALUES ('teste', 'teste@teste.com', '08277083350', '1990-01-01');
18+
19+
1920
CREATE DATABASE LOGGIN;
2021
CREATE TABLE USUARIOS (
2122
ID INT AUTO_INCREMENT NOT NULL UNIQUE,
22-
LOGIN VARCHAR(25) NOT NULL UNIQUE,
23-
EMAIL VARCHAR(60) NOT NULL UNIQUE,
23+
LOGIN VARCHAR(70) NOT NULL UNIQUE,
24+
EMAIL VARCHAR(70) NOT NULL UNIQUE,
2425
CPF VARCHAR(11) NOT NULL UNIQUE,
2526
DATA_NASCIMENTO DATE,
2627

@@ -33,14 +34,14 @@ CREATE TABLE ENDERECOS (
3334
ID INT AUTO_INCREMENT NOT NULL UNIQUE,
3435
USUARIO_ID INT NOT NULL,
3536
CEP INT NOT NULL,
36-
LOGRADOURO VARCHAR(30) NOT NULL,
37-
NUMERO VARCHAR(8) NOT NULL DEFAULT 'S/N',
37+
LOGRADOURO VARCHAR(40) NOT NULL,
38+
NUMERO VARCHAR(10) NOT NULL DEFAULT 'S/N',
3839
BAIRRO VARCHAR(40) NOT NULL,
39-
CIDADE VARCHAR(30) NOT NULL,
40+
CIDADE VARCHAR(40) NOT NULL,
4041
UF VARCHAR(2) NOT NULL,
4142

4243
PRIMARY KEY(ID),
4344
FOREIGN KEY(USUARIO_ID) REFERENCES USUARIOS(ID),
4445
INDEX PK_IDX(ID),
4546
INDEX USUARIO_ID_IDX(USUARIO_ID)
46-
);SELECT * FROM USUARIOS;
47+
);

‎index.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,39 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<link rel="preconnect" href="https://fonts.googleapis.com">
88
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
9-
<link href="https://fonts.googleapis.com/css2?family=Londrina+Solid&family=Roboto:wght@300;400;500;700&display=swap" rel="stylesheet">
9+
<link href="https://fonts.googleapis.com/css2?family=Oswald:wght@500&family=Roboto:wght@300;400;500;700&display=swap" rel="stylesheet">
1010
<link rel="stylesheet" href="./dependencies/uikit/css/uikit.min.css" />
1111
<script src="./dependencies/uikit/js/uikit.min.js"></script>
1212
<script src="./dependencies/uikit/js/uikit-icons.min.js"></script>
1313
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
1414
<link rel="stylesheet" href="./styles.css" />
1515
<title>Loggin</title>
1616
</head>
17-
<body onload="UIkit.notification({message: document.getElementById('phpversion').innerHTML, status: 'success', pos: 'bottom-left', timeout: 2500})">
18-
<div id="phpversion" hidden><a class="uk-text-large uk-text-success" target="_blank" href="https://www.php.net/releases/8.0/en.php"><span uk-icon="server"></span> <?php echo 'PHP '.PHP_VERSION ?></a></div>
17+
<body onload="UIkit.notification({message: document.getElementById('phpversion').innerHTML, status: 'success', pos: 'bottom-left', timeout: 3000})">
18+
<div id="phpversion" hidden><a class="uk-text-primary" target="_blank" href="https://www.php.net/releases/8.0/en.php"><span uk-icon="server"></span> <?php echo 'PHP '.PHP_VERSION ?></a></div>
1919
<header class="uk-text-bold">
2020
<nav class="uk-navbar-container" uk-navbar>
2121
<a class="uk-navbar-item uk-logo" href="./index.php">Loggin</a>
2222
<div class="uk-navbar-left">
2323

2424
<ul class="uk-navbar-nav">
2525
<li>
26-
<a href="#">Usuários</a>
26+
<a href="#"><span uk-icon="icon: users"></span> Usuários</a>
2727
<div class="uk-navbar-dropdown">
2828
<ul class="uk-nav uk-navbar-dropdown-nav">
2929
<li><a href="./pages/consulta.php"><span uk-icon="icon: search"></span>Consultar</a></li>
30-
<li><a href="./pages/cadastro.php"><span uk-icon="icon: plus"></span>Cadastrar</a></li>
30+
<li><a href="./pages/cadastro.php"><span uk-icon="icon: plus-circle"></span>Cadastrar</a></li>
3131
</ul>
3232
</div>
3333
</li>
34+
<li><a href="https://github.com/gspolima/loggin" target="_blank"><span uk-icon="icon: code"></span> Código-fonte</a></li>
3435
</ul>
3536
</div>
3637
</nav>
3738
</header>
3839
<section>
39-
<div class="uk-section uk-section-default">
40-
<div class="uk-container">
40+
<div class="uk-section uk-section-small">
41+
<div class="uk-container uk-container-expand">
4142

4243
<h2>Bem-vindo ao Loggin</h2>
4344

@@ -46,12 +47,11 @@
4647
<p>Aqui você pode cadastrar, editar, remover e visualizar usuários cadastrados.</p>
4748
</div>
4849
<div>
49-
<p>Utilize o menu USUÁRIOS na barra superior para utilizar as operações disponíveis.</p>
50+
<p>Utilize o menu USUÁRIOS na barra superior para acessar as operações disponíveis.</p>
5051
</div>
5152
</div>
5253
</div>
5354
</div>
5455
</section>
55-
<?php echo $_SERVER['HTTP_HOST']; ?>
5656
</body>
5757
</html>

‎js/consulta.js

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
let uri = window.location;
2+
if (uri.search.includes('del=1'))
3+
UIkit.notification({ message: "<span uk-icon='icon: check'></span> Removido com sucesso", status: 'primary', pos: 'bottom-center', timeout: 4000});
4+
5+
$('.botaoRemover').click(function(event) {
6+
let clickado = event.target;
7+
let $clickado = $(clickado);
8+
console.log($clickado);
9+
let usuarioId = $clickado.attr('data-usuario-id');
10+
console.log(`usuario selecionado ${usuarioId}`);
11+
12+
let host = window.location.hostname;
13+
console.log(`Host ${host}`);
14+
let uriRemover;
15+
16+
if (host === 'localhost') {
17+
uriRemover = `http://${host}/Loggin/controllers/RemoveController.php?id=${usuarioId}`;
18+
}
19+
else {
20+
uriRemover = `https://${host}/controllers/RemoveController.php?id=${usuarioId}`;
21+
}
22+
console.log(uriRemover);
23+
24+
$('#botaoConfirmar').click(function (event) {
25+
26+
window.location.href = uriRemover;
27+
});
28+
});

‎js/removerUsuario.js

-33
This file was deleted.

‎js/validarBairro.js

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ function validarBairro(valor) {
66
if (tamanho < 2)
77
return 'Bairro deve ter pelo menos 2 caracteres';
88

9+
if (tamanho >= 40)
10+
return 'Bairro deve ter no máximo 40 caracteres';
11+
912
return true;
1013
}
1114

‎js/validarEmail.js

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
function validarEmail(valor) {
22

3+
let tamanho = String(valor).length;
4+
if (tamanho >= 70)
5+
return 'Email deve ter no máximo 70 caracteres';
6+
37
usuario = valor.substring(0, valor.indexOf("@"));
48
dominio = valor.substring(valor.indexOf("@") + 1, valor.length);
59

@@ -12,23 +16,20 @@ function validarEmail(valor) {
1216
(dominio.search(".") != -1) &&
1317
(dominio.indexOf(".") >= 1) &&
1418
(dominio.lastIndexOf(".") < dominio.length - 1)) {
15-
19+
1620
return true;
17-
//alert("email valido");
18-
//document.getElementById("msgemail").value = '';
1921
} else {
20-
// alert("E-mail invalido");
21-
// document.getElementById("email").value = '';
22-
return false
22+
return 'Email em formato inválido';
2323
}
2424
}
2525

2626
function validarCampoEmail(valor) {
2727
$(function () {
2828
const $campoErro = $('#erroEmail');
29+
const retorno = validarEmail(valor);
2930

30-
if(validarEmail(valor) === false) {
31-
$campoErro.addClass('uk-text-danger').text('Email Inválido');
31+
if(retorno !== true) {
32+
$campoErro.addClass('uk-text-danger').text(retorno);
3233
}
3334
else {
3435
$campoErro.removeClass('uk-text-danger').text('');

‎js/validarLogin.js

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ function validarLogin(valor) {
66
if (tamanho < 4)
77
return 'Login deve ter pelo menos 4 caracteres';
88

9+
if (tamanho >= 70)
10+
return 'Login deve ter no máximo 70 caracteres';
11+
912
return true;
1013
}
1114

‎js/validarLogradouro.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ function validarLogradouro(valor) {
44

55
let tamanho = valor.length;
66
if (tamanho < 5)
7-
return 'Logradouro deve ter pelo menos 5 caracteres';
7+
return 'Endereço deve ter pelo menos 5 caracteres';
8+
9+
if (tamanho >= 40)
10+
return 'Endereço deve ter no máximo 40 caracteres';
811

912
return true;
1013
}

‎js/validarNumero.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
function validarNumero(valor) {
22
if (valor === null || valor === '')
33
return 'Insira S/N se não houver número';
4+
5+
let tamanho = String(valor).length;
6+
7+
if (tamanho >= 10)
8+
return 'Não pode ter mais do que 10 caracteres';
49

510
return true;
611
}
@@ -11,7 +16,7 @@ function validarCampoNumero(valor) {
1116
const retorno = validarNumero(valor);
1217

1318
if(retorno !== true) {
14-
$campoErro.addClass('uk-text-warning').text(retorno);
19+
$campoErro.addClass('uk-text-danger').text(retorno);
1520
}
1621
else {
1722
$campoErro.removeClass('uk-text-danger').text('');

0 commit comments

Comments
 (0)