20 Commits

Author SHA1 Message Date
Gustavo b1dd3a8b01 fodase :)
meco meram, meco meram, meco meram
2026-05-12 23:27:37 +00:00
Gustavo 3ed2fcf0b7 Correção de bugs 2026-03-24 20:27:51 -03:00
Gustavo 507f32e392 Correção do CSS do login 2026-03-24 19:44:21 -03:00
Gustavo f675979736 Atualização do calendario 2026-03-23 09:40:59 -03:00
Gustavo c49f619569 Atualização do calendarii 2026-03-23 08:50:26 -03:00
Gustavo 185946a3c6 Atualização do calendario 2026-03-23 06:55:02 -03:00
Gustavo f4223fae6d Correção de de erros 2026-03-14 15:48:13 -03:00
Gustavo b61b704af7 Optimização dos sites e atualização do calendario 2026-03-14 15:30:22 -03:00
Gustavo 683ab959f2 Criação da pagina calendario 2026-03-10 20:47:56 -03:00
Gustavo 7e8dec9c26 Junção da pagina de cadastro e de login 2026-03-10 20:10:19 -03:00
Gustavo 9aa9855498 Atualização 2026-03-03 20:17:00 -03:00
Gustavo 79da5450e2 update 2026-03-03 20:04:40 -03:00
Gustavo f26755deaa update 2026-03-03 19:41:28 -03:00
Gustavo 9eb90bf2ec Remove submódulo FrontFocusAgenda 2026-03-01 17:04:04 -03:00
Gustavo e0dff0ec3d Remoção do fundo para melhor estilização 2026-03-01 16:49:38 -03:00
Gustavo cf236a6b0b Remoção do fundo para melhor estilização 2026-03-01 16:43:34 -03:00
Gustavo f635a4e943 Excluir Site.html
remoção de copia
2026-02-27 01:28:23 +00:00
Gustavo 119b20eb12 Excluir Fundo1.png
Remoção do fundo antigo
2026-02-27 01:27:58 +00:00
Gustavo 9a2ea6114c Enviar arquivos para "/"
Criação do menu de login e um pouco de estilização
2026-02-27 01:00:13 +00:00
Gustavo e478ffcaa7 Enviar arquivos para "/"
Começo do front-end
2026-02-26 23:42:59 +00:00
126 changed files with 2931 additions and 3773 deletions
-37
View File
@@ -1,37 +0,0 @@
# Maven
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
.mvn/wrapper/maven-wrapper.jar
# Eclipse
.settings/
.classpath
.project
# IntelliJ IDEA
.idea/
*.iws
*.iml
*.ipr
out/
*.factorypath
# VS Code
.vscode/
# Environment variables
.env
# Logs
*.log
# OS
.DS_Store
Thumbs.db
Binary file not shown.
@@ -1,12 +1,12 @@
package com.agendaestudantil; package com.agendaestudantil;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication @SpringBootApplication
public class AgendaDigitalEstudantesApplication { public class AgendaDigitalEstudantesApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(AgendaDigitalEstudantesApplication.class, args); SpringApplication.run(AgendaDigitalEstudantesApplication.class, args);
} }
} }
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
+1
View File
@@ -0,0 +1 @@
0000000000000000000000000000000000000000 02cfd71cf4d0075701aa28ffec79d5047bc80214 Sala Maker - Note. 14 (carrinho) <smaker@smaker01.(none)> 1778625373 -0300 clone: from https://git.morpheusnox.shop/axel/FocusAgenda.git
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,6 +1,6 @@
spring.data.mongodb.uri=${MONGO_URI:mongodb://localhost:27017/agenda_estudantil} spring.data.mongodb.uri=${MONGO_URI:mongodb://localhost:27017/agenda_estudantil}
cors.allowed.origins=${CORS_ORIGINS:http://localhost:8080,http://localhost:3000} cors.allowed.origins=${CORS_ORIGINS:http://localhost:8080,http://localhost:3000}
jwt.secret=${JWT_SECRET:8a2b3c4d5e6f7g8h9i0j1k2l3m4n5o6p7q8r9s0t1u2v3w4x5y6z7A8B9C0D1E2F3} jwt.secret=${JWT_SECRET:8a2b3c4d5e6f7g8h9i0j1k2l3m4n5o6p7q8r9s0t1u2v3w4x5y6z7A8B9C0D1E2F3}
logging.level.org.springframework.data.mongodb=DEBUG logging.level.org.springframework.data.mongodb=DEBUG
springdoc.api-docs.enabled=true springdoc.api-docs.enabled=true
springdoc.swagger-ui.enabled=true springdoc.swagger-ui.enabled=true
@@ -1,8 +1,8 @@
spring.data.mongodb.uri=${MONGO_URI} spring.data.mongodb.uri=${MONGO_URI}
cors.allowed.origins=${CORS_ORIGINS} cors.allowed.origins=${CORS_ORIGINS}
jwt.secret=${JWT_SECRET} jwt.secret=${JWT_SECRET}
springdoc.api-docs.enabled=false springdoc.api-docs.enabled=false
springdoc.swagger-ui.enabled=false springdoc.swagger-ui.enabled=false
logging.level.root=WARN logging.level.root=WARN
logging.level.root=WARN logging.level.root=WARN
logging.level.com.agendaestudantil=INFO logging.level.com.agendaestudantil=INFO
@@ -1,13 +1,13 @@
spring.application.name=${APP_NAME:Focus Agenda} spring.application.name=${APP_NAME:Focus Agenda}
server.port=${SERVER_PORT:8080} server.port=${SERVER_PORT:8080}
server.servlet.context-path=/ server.servlet.context-path=/
spring.web.resources.static-locations=classpath:/static/ spring.web.resources.static-locations=classpath:/static/
spring.mvc.static-path-pattern=/** spring.mvc.static-path-pattern=/**
spring.mvc.contentnegotiation.favor-parameter=true spring.mvc.contentnegotiation.favor-parameter=true
spring.web.resources.add-mappings=true spring.web.resources.add-mappings=true
spring.servlet.multipart.enabled=false spring.servlet.multipart.enabled=false
spring.web.resources.cache.cachecontrol.max-age=3600 spring.web.resources.cache.cachecontrol.max-age=3600
spring.web.resources.cache.cachecontrol.cache-public=true spring.web.resources.cache.cachecontrol.cache-public=true
spring.profiles.active=${SPRING_PROFILES_ACTIVE:dev} spring.profiles.active=${SPRING_PROFILES_ACTIVE:dev}
+15
View File
@@ -0,0 +1,15 @@
#!/bin/sh
#
# An example hook script to check the commit log message taken by
# applypatch from an e-mail message.
#
# The hook should exit with non-zero status after issuing an
# appropriate message if it wants to stop the commit. The hook is
# allowed to edit the commit message file.
#
# To enable this hook, rename this file to "applypatch-msg".
. git-sh-setup
commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
:
@@ -1,113 +1,113 @@
* { margin: 0; padding: 0; box-sizing: border-box; } * { margin: 0; padding: 0; box-sizing: border-box; }
body { body {
min-height: 100vh; min-height: 100vh;
font-family: 'Poppins', Arial, sans-serif; font-family: 'Poppins', Arial, sans-serif;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 80px 20px 20px; padding: 80px 20px 20px;
background: #f5f5f5; background: #f5f5f5;
} }
#topo { #topo {
width: 100%; width: 100%;
height: 50px; height: 50px;
position: fixed; position: fixed;
top: 0; left: 0; top: 0; left: 0;
background: linear-gradient(to right, #c0392b 47%, #7a4951 73%, #114455 87%); background: linear-gradient(to right, #c0392b 47%, #7a4951 73%, #114455 87%);
display: flex; display: flex;
align-items: center; align-items: center;
z-index: 10; z-index: 10;
} }
#textotop { #textotop {
padding-left: 20px; padding-left: 20px;
font-size: clamp(22px, 5vw, 38px); font-size: clamp(22px, 5vw, 38px);
color: #fff; color: #fff;
} }
#log { #log {
width: 100%; width: 100%;
max-width: 400px; max-width: 400px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 16px; gap: 16px;
background-color: white; background-color: white;
border: rgba(0, 0, 0, 0.174) solid 3px; border: rgba(0, 0, 0, 0.174) solid 3px;
border-radius: 10px; border-radius: 10px;
padding: 10px; padding: 10px;
border-top: 0px; border-top: 0px;
border-left: 0px; border-left: 0px;
} }
.mens { text-align: center; color: #1f2937; } .mens { text-align: center; color: #1f2937; }
.campo { display: flex; flex-direction: column; gap: 8px; } .campo { display: flex; flex-direction: column; gap: 8px; }
label { font-weight: 700; color: #1f2937; } label { font-weight: 700; color: #1f2937; }
input, select { input, select {
height: 46px; height: 46px;
width: 100%; width: 100%;
padding: 10px; padding: 10px;
font-size: 16px; font-size: 16px;
border: 1px solid #c7c7c7; border: 1px solid #c7c7c7;
border-radius: 6px; border-radius: 6px;
font-family: inherit; font-family: inherit;
background: #fff; background: #fff;
} }
form { display: flex; flex-direction: column; gap: 16px; } form { display: flex; flex-direction: column; gap: 16px; }
.linha-dupla { display: grid; grid-template-columns: 1fr 1fr; gap: 12px; } .linha-dupla { display: grid; grid-template-columns: 1fr 1fr; gap: 12px; }
#logbtn { #logbtn {
align-self: center; align-self: center;
width: 50%; width: 50%;
padding: 12px; padding: 12px;
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
background-color: #c0392b; background-color: #c0392b;
color: #fff; color: #fff;
border: none; border: none;
border-radius: 6px; border-radius: 6px;
cursor: pointer; cursor: pointer;
transition: background-color 0.2s ease; transition: background-color 0.2s ease;
border: rgba(124, 20, 20, 0.496) solid 2px; border: rgba(124, 20, 20, 0.496) solid 2px;
border-radius: 10px; border-radius: 10px;
padding: 10px; padding: 10px;
border-top: 0px; border-top: 0px;
border-left: 0px; border-left: 0px;
} }
#logbtn:hover { #logbtn:hover {
background-color: #114455; background-color: #114455;
border: #14323c6f solid 2px; border: #14323c6f solid 2px;
border-radius: 10px; border-radius: 10px;
padding: 10px; padding: 10px;
border-top: 0px; border-top: 0px;
border-left: 0px;} border-left: 0px;}
#logbtn:disabled { background-color: #ccc; cursor: not-allowed; } #logbtn:disabled { background-color: #ccc; cursor: not-allowed; }
a { color: #111; text-decoration: none; } a { color: #111; text-decoration: none; }
a:hover { text-decoration: underline; } a:hover { text-decoration: underline; }
#mensagem-erro { #mensagem-erro {
background: #fee2e2; background: #fee2e2;
border: 1px solid #fca5a5; border: 1px solid #fca5a5;
color: #b91c1c; color: #b91c1c;
padding: 10px 14px; padding: 10px 14px;
border-radius: 6px; border-radius: 6px;
font-size: 14px; font-size: 14px;
display: none; display: none;
} }
#mensagem-sucesso { #mensagem-sucesso {
background: #d1fae5; background: #d1fae5;
border: 1px solid #6ee7b7; border: 1px solid #6ee7b7;
color: #065f46; color: #065f46;
padding: 10px 14px; padding: 10px 14px;
border-radius: 6px; border-radius: 6px;
font-size: 14px; font-size: 14px;
display: none; display: none;
} }
@@ -1,151 +1,151 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="pt-br"> <html lang="pt-br">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="icon" href="imagens/icone.png"> <link rel="icon" href="imagens/icone.png">
<link rel="stylesheet" href="cadastro.css"> <link rel="stylesheet" href="cadastro.css">
<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600;700&display=swap" rel="stylesheet"> <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600;700&display=swap" rel="stylesheet">
<title>Cadastro Focus Agenda</title> <title>Cadastro Focus Agenda</title>
</head> </head>
<body> <body>
<div id="topo"> <div id="topo">
<h1 id="textotop">Focus Agenda</h1> <h1 id="textotop">Focus Agenda</h1>
</div> </div>
<div id="log"> <div id="log">
<h1 class="mens">Crie Sua Conta</h1> <h1 class="mens">Crie Sua Conta</h1>
<div id="mensagem-erro" role="alert"></div> <div id="mensagem-erro" role="alert"></div>
<div id="mensagem-sucesso" role="status"></div> <div id="mensagem-sucesso" role="status"></div>
<form id="cadastroForm" novalidate> <form id="cadastroForm" novalidate>
<div class="campo"> <div class="campo">
<label for="emailid">Email</label> <label for="emailid">Email</label>
<input type="email" placeholder="Digite seu email" id="emailid" autocomplete="email" required> <input type="email" placeholder="Digite seu email" id="emailid" autocomplete="email" required>
</div> </div>
<div class="campo"> <div class="campo">
<label for="nomeid">Nome</label> <label for="nomeid">Nome</label>
<input type="text" placeholder="Seu nome completo" id="nomeid" autocomplete="name" required> <input type="text" placeholder="Seu nome completo" id="nomeid" autocomplete="name" required>
</div> </div>
<div class="campo"> <div class="campo">
<label for="cursoid">Curso</label> <label for="cursoid">Curso</label>
<input type="text" placeholder="Ex: Técnico em Informática" id="cursoid" required> <input type="text" placeholder="Ex: Técnico em Informática" id="cursoid" required>
</div> </div>
<div class="linha-dupla"> <div class="linha-dupla">
<div class="campo"> <div class="campo">
<label for="periodoid">Período</label> <label for="periodoid">Período</label>
<select id="periodoid" required> <select id="periodoid" required>
<option value="">Selecione</option> <option value="">Selecione</option>
<option value="1"></option> <option value="1"></option>
<option value="2"></option> <option value="2"></option>
<option value="3"></option> <option value="3"></option>
<option value="4"></option> <option value="4"></option>
<option value="5"></option> <option value="5"></option>
<option value="6"></option> <option value="6"></option>
<option value="7"></option> <option value="7"></option>
<option value="8"></option> <option value="8"></option>
</select> </select>
</div> </div>
</div> </div>
<div class="campo"> <div class="campo">
<label for="senhaid">Senha</label> <label for="senhaid">Senha</label>
<input type="password" placeholder="Mínimo 6 caracteres" id="senhaid" autocomplete="new-password" required minlength="6"> <input type="password" placeholder="Mínimo 6 caracteres" id="senhaid" autocomplete="new-password" required minlength="6">
</div> </div>
<div class="campo"> <div class="campo">
<label for="csenhaid">Confirmar Senha</label> <label for="csenhaid">Confirmar Senha</label>
<input type="password" placeholder="Confirme sua senha" id="csenhaid" autocomplete="new-password" required> <input type="password" placeholder="Confirme sua senha" id="csenhaid" autocomplete="new-password" required>
</div> </div>
<button type="submit" id="logbtn">Cadastrar</button> <button type="submit" id="logbtn">Cadastrar</button>
</form> </form>
<p class="mens"><a href="login.html">Já tem uma conta?</a></p> <p class="mens"><a href="login.html">Já tem uma conta?</a></p>
</div> </div>
<script> <script>
const form = document.getElementById('cadastroForm'); const form = document.getElementById('cadastroForm');
const erroEl = document.getElementById('mensagem-erro'); const erroEl = document.getElementById('mensagem-erro');
const sucessoEl = document.getElementById('mensagem-sucesso'); const sucessoEl = document.getElementById('mensagem-sucesso');
const btn = document.getElementById('logbtn'); const btn = document.getElementById('logbtn');
function mostrarErro(msg) { function mostrarErro(msg) {
erroEl.textContent = msg; erroEl.textContent = msg;
erroEl.style.display = 'block'; erroEl.style.display = 'block';
sucessoEl.style.display = 'none'; sucessoEl.style.display = 'none';
} }
function mostrarSucesso(msg) { function mostrarSucesso(msg) {
sucessoEl.textContent = msg; sucessoEl.textContent = msg;
sucessoEl.style.display = 'block'; sucessoEl.style.display = 'block';
erroEl.style.display = 'none'; erroEl.style.display = 'none';
} }
form.addEventListener('submit', async (e) => { form.addEventListener('submit', async (e) => {
e.preventDefault(); e.preventDefault();
erroEl.style.display = 'none'; erroEl.style.display = 'none';
sucessoEl.style.display = 'none'; sucessoEl.style.display = 'none';
const nome = document.getElementById('nomeid').value.trim(); const nome = document.getElementById('nomeid').value.trim();
const email = document.getElementById('emailid').value.trim(); const email = document.getElementById('emailid').value.trim();
const curso = document.getElementById('cursoid').value.trim(); const curso = document.getElementById('cursoid').value.trim();
const periodo = parseInt(document.getElementById('periodoid').value, 10); const periodo = parseInt(document.getElementById('periodoid').value, 10);
const senha = document.getElementById('senhaid').value; const senha = document.getElementById('senhaid').value;
const csenha = document.getElementById('csenhaid').value; const csenha = document.getElementById('csenhaid').value;
if (!nome || !email || !curso || !periodo || !senha) { if (!nome || !email || !curso || !periodo || !senha) {
mostrarErro('Preencha todos os campos.'); mostrarErro('Preencha todos os campos.');
return; return;
} }
if (senha.length < 6) { if (senha.length < 6) {
mostrarErro('A senha deve ter pelo menos 6 caracteres.'); mostrarErro('A senha deve ter pelo menos 6 caracteres.');
return; return;
} }
if (senha !== csenha) { if (senha !== csenha) {
mostrarErro('As senhas não conferem.'); mostrarErro('As senhas não conferem.');
document.getElementById('csenhaid').focus(); document.getElementById('csenhaid').focus();
return; return;
} }
btn.disabled = true; btn.disabled = true;
btn.textContent = 'Cadastrando...'; btn.textContent = 'Cadastrando...';
try { try {
const res = await fetch('/api/estudantes/cadastro', { const res = await fetch('/api/estudantes/cadastro', {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ nome, email, senha, curso, periodo }) body: JSON.stringify({ nome, email, senha, curso, periodo })
}); });
const json = await res.json(); const json = await res.json();
if (!res.ok) { if (!res.ok) {
// Erros de validação vêm como objeto // Erros de validação vêm como objeto
if (typeof json.data === 'object' && json.data !== null) { if (typeof json.data === 'object' && json.data !== null) {
const msgs = Object.values(json.data).join('; '); const msgs = Object.values(json.data).join('; ');
mostrarErro(msgs); mostrarErro(msgs);
} else { } else {
mostrarErro(json.message || 'Erro ao cadastrar.'); mostrarErro(json.message || 'Erro ao cadastrar.');
} }
return; return;
} }
mostrarSucesso('Conta criada! Redirecionando para o login...'); mostrarSucesso('Conta criada! Redirecionando para o login...');
setTimeout(() => window.location.href = 'login.html', 2000); setTimeout(() => window.location.href = 'login.html', 2000);
} catch (err) { } catch (err) {
mostrarErro('Erro de conexão. Verifique se o servidor está rodando.'); mostrarErro('Erro de conexão. Verifique se o servidor está rodando.');
} finally { } finally {
btn.disabled = false; btn.disabled = false;
btn.textContent = 'Cadastrar'; btn.textContent = 'Cadastrar';
} }
}); });
</script> </script>
</body> </body>
</html> </html>
@@ -1,304 +1,304 @@
* { margin: 0; padding: 0; box-sizing: border-box; } * { margin: 0; padding: 0; box-sizing: border-box; }
body { body {
font-family: 'Poppins', sans-serif; font-family: 'Poppins', sans-serif;
background: #f5f5f5; background: #f5f5f5;
} }
/* ===== HEADER ===== */ /* ===== HEADER ===== */
#header { #header {
width: 100%; width: 100%;
height: 50px; height: 50px;
position: fixed; position: fixed;
top: 0; left: 0; top: 0; left: 0;
background: linear-gradient(to right, #c0392b, #114455); background: linear-gradient(to right, #c0392b, #114455);
display: flex; display: flex;
align-items: center; align-items: center;
z-index: 10; z-index: 10;
} }
#title { #title {
padding-left: 20px; padding-left: 20px;
font-size: clamp(22px, 5vw, 38px); font-size: clamp(22px, 5vw, 38px);
color: #fff; color: #fff;
} }
/* ===== BARRA ESQUERDA ===== */ /* ===== BARRA ESQUERDA ===== */
#barraesquerda { #barraesquerda {
position: fixed; position: fixed;
top: 50px; left: 0; top: 50px; left: 0;
width: 280px; width: 280px;
height: calc(100vh - 50px); height: calc(100vh - 50px);
background: #c0392b; background: #c0392b;
padding: 15px; padding: 15px;
color: #fff; color: #fff;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
font-family: 'Inter', sans-serif; font-family: 'Inter', sans-serif;
overflow-y: auto; overflow-y: auto;
z-index: 5; z-index: 5;
} }
/* Mini Calendário */ /* Mini Calendário */
#calendario { margin-top: 10px; } #calendario { margin-top: 10px; }
.calendariotop { display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px; } .calendariotop { display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px; }
#mes { font-size: 16px; font-weight: 600; } #mes { font-size: 16px; font-weight: 600; }
#calendarseta { display: flex; gap: 10px; } #calendarseta { display: flex; gap: 10px; }
#calendarseta button { background: transparent; border: none; color: #fff; font-size: 24px; cursor: pointer; padding: 2px 8px; transition: transform 0.2s; } #calendarseta button { background: transparent; border: none; color: #fff; font-size: 24px; cursor: pointer; padding: 2px 8px; transition: transform 0.2s; }
#calendarseta button:hover { transform: scale(1.2); } #calendarseta button:hover { transform: scale(1.2); }
.calendariodia { width: 100%; border-collapse: collapse; } .calendariodia { width: 100%; border-collapse: collapse; }
.calendariodia th { font-size: 10px; opacity: 0.8; padding: 3px; text-align: center; } .calendariodia th { font-size: 10px; opacity: 0.8; padding: 3px; text-align: center; }
.calendariodia td { text-align: center; padding: 4px; font-size: 11px; border-radius: 50%; cursor: pointer; transition: background 0.15s; } .calendariodia td { text-align: center; padding: 4px; font-size: 11px; border-radius: 50%; cursor: pointer; transition: background 0.15s; }
.calendariodia td:hover { background: rgba(255,255,255,0.2); } .calendariodia td:hover { background: rgba(255,255,255,0.2); }
.calendariodia td.outromes { opacity: 0.4; } .calendariodia td.outromes { opacity: 0.4; }
.calendariodia td.today { background: #fff; color: #c0392b; font-weight: 700; border-radius: 50%; } .calendariodia td.today { background: #fff; color: #c0392b; font-weight: 700; border-radius: 50%; }
.calendariodia td.selecionado { background: rgba(255,255,255,0.35); border-radius: 50%; } .calendariodia td.selecionado { background: rgba(255,255,255,0.35); border-radius: 50%; }
/* Agenda */ /* Agenda */
#agenda { margin-top: 18px; } #agenda { margin-top: 18px; }
.agenda-header { font-size: 12px; font-weight: 700; opacity: 0.8; margin-bottom: 8px; letter-spacing: 0.5px; } .agenda-header { font-size: 12px; font-weight: 700; opacity: 0.8; margin-bottom: 8px; letter-spacing: 0.5px; }
.agenda-empty { font-size: 12px; opacity: 0.7; font-style: italic; } .agenda-empty { font-size: 12px; opacity: 0.7; font-style: italic; }
.evento { background: rgba(255,255,255,0.15); border-radius: 8px; padding: 8px 10px; margin-bottom: 8px; cursor: pointer; transition: background 0.15s; } .evento { background: rgba(255,255,255,0.15); border-radius: 8px; padding: 8px 10px; margin-bottom: 8px; cursor: pointer; transition: background 0.15s; }
.evento:hover { background: rgba(255,255,255,0.25); } .evento:hover { background: rgba(255,255,255,0.25); }
.evento .hora { font-size: 11px; opacity: 0.8; } .evento .hora { font-size: 11px; opacity: 0.8; }
.evento .titulo { font-size: 13px; font-weight: 600; } .evento .titulo { font-size: 13px; font-weight: 600; }
/* Feriados */ /* Feriados */
#feriados { margin-top: 16px; } #feriados { margin-top: 16px; }
.feriados-header { font-size: 12px; font-weight: 700; opacity: 0.8; margin-bottom: 8px; letter-spacing: 0.5px; } .feriados-header { font-size: 12px; font-weight: 700; opacity: 0.8; margin-bottom: 8px; letter-spacing: 0.5px; }
.feriado { display: flex; align-items: center; gap: 8px; font-size: 12px; margin-bottom: 4px; } .feriado { display: flex; align-items: center; gap: 8px; font-size: 12px; margin-bottom: 4px; }
.dot { width: 8px; height: 8px; background: #fff; border-radius: 50%; flex-shrink: 0; } .dot { width: 8px; height: 8px; background: #fff; border-radius: 50%; flex-shrink: 0; }
/* ===== MAIN ===== */ /* ===== MAIN ===== */
.main { .main {
margin-left: 280px; margin-left: 280px;
margin-top: 50px; margin-top: 50px;
padding: 24px; padding: 24px;
min-height: calc(100vh - 50px); min-height: calc(100vh - 50px);
} }
/* Topbar */ /* Topbar */
.topbar { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px; } .topbar { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px; }
.topbar h1 { font-size: 24px; color: #1f2937; } .topbar h1 { font-size: 24px; color: #1f2937; }
.user-area { display: flex; align-items: center; gap: 14px; } .user-area { display: flex; align-items: center; gap: 14px; }
.icone-img { width: 28px; height: 28px; cursor: pointer; opacity: 0.7; transition: opacity 0.2s; } .icone-img { width: 28px; height: 28px; cursor: pointer; opacity: 0.7; transition: opacity 0.2s; }
.icone-img:hover { opacity: 1; } .icone-img:hover { opacity: 1; }
.perfil { display: flex; align-items: center; gap: 10px; } .perfil { display: flex; align-items: center; gap: 10px; }
.avatar { width: 38px; height: 38px; border-radius: 50%; background: linear-gradient(135deg, #c0392b, #114455); } .avatar { width: 38px; height: 38px; border-radius: 50%; background: linear-gradient(135deg, #c0392b, #114455); }
.info { display: flex; flex-direction: column; } .info { display: flex; flex-direction: column; }
.nome { font-size: 14px; font-weight: 600; color: #1f2937; } .nome { font-size: 14px; font-weight: 600; color: #1f2937; }
.cargo { font-size: 12px; color: #6b7280; } .cargo { font-size: 12px; color: #6b7280; }
/* Botão logout */ /* Botão logout */
#btnLogout { #btnLogout {
background: transparent; background: transparent;
border: 1px solid #d1d5db; border: 1px solid #d1d5db;
border-radius: 6px; border-radius: 6px;
padding: 6px 12px; padding: 6px 12px;
font-size: 13px; font-size: 13px;
cursor: pointer; cursor: pointer;
color: #6b7280; color: #6b7280;
transition: all 0.2s; transition: all 0.2s;
} }
#btnLogout:hover { background: #fee2e2; border-color: #c0392b; color: #c0392b; } #btnLogout:hover { background: #fee2e2; border-color: #c0392b; color: #c0392b; }
/* Calendar header */ /* Calendar header */
.calendar-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 16px; flex-wrap: wrap; gap: 10px; } .calendar-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 16px; flex-wrap: wrap; gap: 10px; }
.mes-nav { display: flex; align-items: center; gap: 12px; } .mes-nav { display: flex; align-items: center; gap: 12px; }
.seta { background: transparent; border: 1px solid #d1d5db; border-radius: 6px; width: 32px; height: 32px; font-size: 20px; cursor: pointer; display: flex; align-items: center; justify-content: center; transition: background 0.15s; } .seta { background: transparent; border: 1px solid #d1d5db; border-radius: 6px; width: 32px; height: 32px; font-size: 20px; cursor: pointer; display: flex; align-items: center; justify-content: center; transition: background 0.15s; }
.seta:hover { background: #f3f4f6; } .seta:hover { background: #f3f4f6; }
.titulo-mes { font-size: 18px; font-weight: 600; color: #1f2937; min-width: 200px; text-align: center; } .titulo-mes { font-size: 18px; font-weight: 600; color: #1f2937; min-width: 200px; text-align: center; }
.view-switch { display: flex; gap: 4px; background: #f3f4f6; padding: 4px; border-radius: 8px; } .view-switch { display: flex; gap: 4px; background: #f3f4f6; padding: 4px; border-radius: 8px; }
.view-switch button { border: none; background: transparent; padding: 6px 14px; border-radius: 6px; font-size: 14px; cursor: pointer; color: #6b7280; transition: all 0.2s; font-family: inherit; } .view-switch button { border: none; background: transparent; padding: 6px 14px; border-radius: 6px; font-size: 14px; cursor: pointer; color: #6b7280; transition: all 0.2s; font-family: inherit; }
.view-switch button.active { background: #fff; color: #1f2937; font-weight: 600; box-shadow: 0 1px 3px rgba(0,0,0,0.12); } .view-switch button.active { background: #fff; color: #1f2937; font-weight: 600; box-shadow: 0 1px 3px rgba(0,0,0,0.12); }
/* Botão novo evento */ /* Botão novo evento */
#btnNovoEvento { #btnNovoEvento {
background: #c0392b; background: #c0392b;
color: #fff; color: #fff;
border: none; border: none;
border-radius: 8px; border-radius: 8px;
padding: 8px 18px; padding: 8px 18px;
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
cursor: pointer; cursor: pointer;
transition: background 0.2s; transition: background 0.2s;
font-family: inherit; font-family: inherit;
} }
#btnNovoEvento:hover { background: #a03224; } #btnNovoEvento:hover { background: #a03224; }
/* Calendar area */ /* Calendar area */
.calendar-area { background: #fff; border-radius: 12px; box-shadow: 0 1px 4px rgba(0,0,0,0.08); overflow: hidden; } .calendar-area { background: #fff; border-radius: 12px; box-shadow: 0 1px 4px rgba(0,0,0,0.08); overflow: hidden; }
/* Month view */ /* Month view */
.month-view { display: grid; grid-template-columns: repeat(7, 1fr); } .month-view { display: grid; grid-template-columns: repeat(7, 1fr); }
.dia-semana { text-align: center; padding: 10px; font-size: 12px; font-weight: 600; color: #6b7280; background: #f9fafb; border-bottom: 1px solid #e5e7eb; } .dia-semana { text-align: center; padding: 10px; font-size: 12px; font-weight: 600; color: #6b7280; background: #f9fafb; border-bottom: 1px solid #e5e7eb; }
.dia-box { min-height: 100px; padding: 8px; border-right: 1px solid #f0f0f0; border-bottom: 1px solid #f0f0f0; cursor: pointer; transition: background 0.1s; } .dia-box { min-height: 100px; padding: 8px; border-right: 1px solid #f0f0f0; border-bottom: 1px solid #f0f0f0; cursor: pointer; transition: background 0.1s; }
.dia-box:hover { background: #fef2f2; } .dia-box:hover { background: #fef2f2; }
.dia-box:nth-child(7n) { border-right: none; } .dia-box:nth-child(7n) { border-right: none; }
.dia-box.outro-mes { background: #fafafa; color: #d1d5db; } .dia-box.outro-mes { background: #fafafa; color: #d1d5db; }
.dia-box.outro-mes .num-dia { color: #d1d5db; } .dia-box.outro-mes .num-dia { color: #d1d5db; }
.num-dia { font-size: 13px; font-weight: 500; color: #374151; margin-bottom: 4px; } .num-dia { font-size: 13px; font-weight: 500; color: #374151; margin-bottom: 4px; }
.dia-box.today .num-dia { background: #c0392b; color: #fff; width: 24px; height: 24px; border-radius: 50%; display: flex; align-items: center; justify-content: center; font-weight: 700; font-size: 12px; } .dia-box.today .num-dia { background: #c0392b; color: #fff; width: 24px; height: 24px; border-radius: 50%; display: flex; align-items: center; justify-content: center; font-weight: 700; font-size: 12px; }
.dia-box.selecionado { background: #fef2f2; } .dia-box.selecionado { background: #fef2f2; }
.evento-mini { font-size: 10px; background: #c0392b; color: #fff; border-radius: 3px; padding: 1px 4px; margin-top: 2px; truncate: clip; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } .evento-mini { font-size: 10px; background: #c0392b; color: #fff; border-radius: 3px; padding: 1px 4px; margin-top: 2px; truncate: clip; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
.evento-mini.verde { background: #16a34a; } .evento-mini.verde { background: #16a34a; }
.evento-mini.azul { background: #1d4ed8; } .evento-mini.azul { background: #1d4ed8; }
.evento-mini.amarelo { background: #d97706; } .evento-mini.amarelo { background: #d97706; }
.mais-eventos { font-size: 10px; color: #6b7280; margin-top: 2px; cursor: pointer; } .mais-eventos { font-size: 10px; color: #6b7280; margin-top: 2px; cursor: pointer; }
/* Week view */ /* Week view */
.week-view { display: grid; grid-template-columns: repeat(7, 1fr); } .week-view { display: grid; grid-template-columns: repeat(7, 1fr); }
.week-col { border-right: 1px solid #e5e7eb; padding: 10px 8px; min-height: 300px; } .week-col { border-right: 1px solid #e5e7eb; padding: 10px 8px; min-height: 300px; }
.week-col:last-child { border-right: none; } .week-col:last-child { border-right: none; }
.week-col.today { background: #fef9f9; } .week-col.today { background: #fef9f9; }
.week-col-head { font-size: 13px; font-weight: 600; color: #6b7280; margin-bottom: 6px; } .week-col-head { font-size: 13px; font-weight: 600; color: #6b7280; margin-bottom: 6px; }
.week-col-date { display: block; font-size: 11px; font-weight: 400; color: #9ca3af; } .week-col-date { display: block; font-size: 11px; font-weight: 400; color: #9ca3af; }
.week-events { display: flex; flex-direction: column; gap: 6px; } .week-events { display: flex; flex-direction: column; gap: 6px; }
.week-empty { font-size: 11px; color: #d1d5db; font-style: italic; } .week-empty { font-size: 11px; color: #d1d5db; font-style: italic; }
/* Day view */ /* Day view */
.day-panel { padding: 20px; } .day-panel { padding: 20px; }
.day-panel-header { font-size: 16px; font-weight: 600; color: #374151; margin-bottom: 16px; } .day-panel-header { font-size: 16px; font-weight: 600; color: #374151; margin-bottom: 16px; }
.day-events { display: flex; flex-direction: column; gap: 10px; } .day-events { display: flex; flex-direction: column; gap: 10px; }
.day-empty { color: #9ca3af; font-style: italic; font-size: 14px; } .day-empty { color: #9ca3af; font-style: italic; font-size: 14px; }
/* Event cards */ /* Event cards */
.calendar-event { border-radius: 6px; padding: 8px 10px; background: #fee2e2; border-left: 4px solid #c0392b; } .calendar-event { border-radius: 6px; padding: 8px 10px; background: #fee2e2; border-left: 4px solid #c0392b; }
.calendar-event.verde { background: #d1fae5; border-color: #16a34a; } .calendar-event.verde { background: #d1fae5; border-color: #16a34a; }
.calendar-event.azul { background: #dbeafe; border-color: #1d4ed8; } .calendar-event.azul { background: #dbeafe; border-color: #1d4ed8; }
.calendar-event.amarelo { background: #fef3c7; border-color: #d97706; } .calendar-event.amarelo { background: #fef3c7; border-color: #d97706; }
.calendar-event.rosa { background: #fce7f3; border-color: #db2777; } .calendar-event.rosa { background: #fce7f3; border-color: #db2777; }
.calendar-event-hora { font-size: 11px; color: #6b7280; } .calendar-event-hora { font-size: 11px; color: #6b7280; }
.calendar-event-titulo { font-size: 13px; font-weight: 600; color: #1f2937; } .calendar-event-titulo { font-size: 13px; font-weight: 600; color: #1f2937; }
/* ===== LOADING SPINNER ===== */ /* ===== LOADING SPINNER ===== */
.loading { display: flex; align-items: center; justify-content: center; padding: 40px; color: #9ca3af; gap: 10px; font-size: 14px; } .loading { display: flex; align-items: center; justify-content: center; padding: 40px; color: #9ca3af; gap: 10px; font-size: 14px; }
.spinner { width: 20px; height: 20px; border: 2px solid #e5e7eb; border-top-color: #c0392b; border-radius: 50%; animation: spin 0.7s linear infinite; } .spinner { width: 20px; height: 20px; border: 2px solid #e5e7eb; border-top-color: #c0392b; border-radius: 50%; animation: spin 0.7s linear infinite; }
@keyframes spin { to { transform: rotate(360deg); } } @keyframes spin { to { transform: rotate(360deg); } }
/* ===== MODAL ===== */ /* ===== MODAL ===== */
.modal-overlay { .modal-overlay {
display: none; display: none;
position: fixed; position: fixed;
inset: 0; inset: 0;
background: rgba(0,0,0,0.45); background: rgba(0,0,0,0.45);
z-index: 100; z-index: 100;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.modal-overlay.aberto { display: flex; } .modal-overlay.aberto { display: flex; }
.modal { .modal {
background: #fff; background: #fff;
border-radius: 12px; border-radius: 12px;
padding: 28px; padding: 28px;
width: 100%; width: 100%;
max-width: 480px; max-width: 480px;
margin: 20px; margin: 20px;
box-shadow: 0 20px 60px rgba(0,0,0,0.2); box-shadow: 0 20px 60px rgba(0,0,0,0.2);
max-height: 90vh; max-height: 90vh;
overflow-y: auto; overflow-y: auto;
} }
.modal-titulo { font-size: 18px; font-weight: 700; color: #1f2937; margin-bottom: 20px; } .modal-titulo { font-size: 18px; font-weight: 700; color: #1f2937; margin-bottom: 20px; }
.modal-campo { display: flex; flex-direction: column; gap: 6px; margin-bottom: 16px; } .modal-campo { display: flex; flex-direction: column; gap: 6px; margin-bottom: 16px; }
.modal-campo label { font-size: 13px; font-weight: 600; color: #374151; } .modal-campo label { font-size: 13px; font-weight: 600; color: #374151; }
.modal-campo input, .modal-campo input,
.modal-campo select, .modal-campo select,
.modal-campo textarea { .modal-campo textarea {
border: 1px solid #d1d5db; border: 1px solid #d1d5db;
border-radius: 8px; border-radius: 8px;
padding: 10px 12px; padding: 10px 12px;
font-size: 14px; font-size: 14px;
font-family: inherit; font-family: inherit;
transition: border-color 0.2s; transition: border-color 0.2s;
background: #fff; background: #fff;
} }
.modal-campo input:focus, .modal-campo input:focus,
.modal-campo select:focus, .modal-campo select:focus,
.modal-campo textarea:focus { .modal-campo textarea:focus {
outline: none; outline: none;
border-color: #c0392b; border-color: #c0392b;
} }
.modal-campo textarea { resize: vertical; min-height: 70px; } .modal-campo textarea { resize: vertical; min-height: 70px; }
.modal-linha { display: grid; grid-template-columns: 1fr 1fr; gap: 12px; } .modal-linha { display: grid; grid-template-columns: 1fr 1fr; gap: 12px; }
.modal-acoes { display: flex; justify-content: flex-end; gap: 10px; margin-top: 20px; } .modal-acoes { display: flex; justify-content: flex-end; gap: 10px; margin-top: 20px; }
.btn-secundario { .btn-secundario {
background: transparent; background: transparent;
border: 1px solid #d1d5db; border: 1px solid #d1d5db;
border-radius: 8px; border-radius: 8px;
padding: 9px 18px; padding: 9px 18px;
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
color: #6b7280; color: #6b7280;
font-family: inherit; font-family: inherit;
transition: all 0.2s; transition: all 0.2s;
} }
.btn-secundario:hover { background: #f3f4f6; } .btn-secundario:hover { background: #f3f4f6; }
.btn-primario { .btn-primario {
background: #c0392b; background: #c0392b;
color: #fff; color: #fff;
border: none; border: none;
border-radius: 8px; border-radius: 8px;
padding: 9px 18px; padding: 9px 18px;
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
cursor: pointer; cursor: pointer;
font-family: inherit; font-family: inherit;
transition: background 0.2s; transition: background 0.2s;
} }
.btn-primario:hover { background: #a03224; } .btn-primario:hover { background: #a03224; }
.btn-primario:disabled { background: #ccc; cursor: not-allowed; } .btn-primario:disabled { background: #ccc; cursor: not-allowed; }
.btn-perigo { .btn-perigo {
background: transparent; background: transparent;
border: 1px solid #fca5a5; border: 1px solid #fca5a5;
color: #c0392b; color: #c0392b;
border-radius: 8px; border-radius: 8px;
padding: 9px 18px; padding: 9px 18px;
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
font-family: inherit; font-family: inherit;
transition: all 0.2s; transition: all 0.2s;
margin-right: auto; margin-right: auto;
} }
.btn-perigo:hover { background: #fee2e2; } .btn-perigo:hover { background: #fee2e2; }
/* Toast de feedback */ /* Toast de feedback */
#toast { #toast {
position: fixed; position: fixed;
bottom: 24px; bottom: 24px;
right: 24px; right: 24px;
background: #1f2937; background: #1f2937;
color: #fff; color: #fff;
padding: 12px 18px; padding: 12px 18px;
border-radius: 8px; border-radius: 8px;
font-size: 14px; font-size: 14px;
z-index: 200; z-index: 200;
transform: translateY(80px); transform: translateY(80px);
opacity: 0; opacity: 0;
transition: all 0.3s; transition: all 0.3s;
max-width: 320px; max-width: 320px;
} }
#toast.visivel { transform: translateY(0); opacity: 1; } #toast.visivel { transform: translateY(0); opacity: 1; }
#toast.sucesso { background: #065f46; } #toast.sucesso { background: #065f46; }
#toast.erro { background: #b91c1c; } #toast.erro { background: #b91c1c; }
/* Responsivo */ /* Responsivo */
@media (max-width: 768px) { @media (max-width: 768px) {
#barraesquerda { display: none; } #barraesquerda { display: none; }
.main { margin-left: 0; } .main { margin-left: 0; }
.month-view { font-size: 12px; } .month-view { font-size: 12px; }
.dia-box { min-height: 60px; padding: 4px; } .dia-box { min-height: 60px; padding: 4px; }
} }
File diff suppressed because it is too large Load Diff
+24
View File
@@ -0,0 +1,24 @@
#!/bin/sh
#
# An example hook script to check the commit log message.
# Called by "git commit" with one argument, the name of the file
# that has the commit message. The hook should exit with non-zero
# status after issuing an appropriate message if it wants to stop the
# commit. The hook is allowed to edit the commit message file.
#
# To enable this hook, rename this file to "commit-msg".
# Uncomment the below to add a Signed-off-by line to the message.
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
# hook is more suited to it.
#
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
# This example catches duplicate Signed-off-by lines.
test "" = "$(grep '^Signed-off-by: ' "$1" |
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
echo >&2 Duplicate Signed-off-by lines.
exit 1
}
+13
View File
@@ -0,0 +1,13 @@
[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
[remote "origin"]
url = https://git.morpheusnox.shop/axel/FocusAgenda.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "main"]
remote = origin
merge = refs/heads/main
+1
View File
@@ -0,0 +1 @@
Unnamed repository; edit this file 'description' to name the repository.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

+6
View File
@@ -0,0 +1,6 @@
# git ls-files --others --exclude-from=.git/info/exclude
# Lines that start with '#' are comments.
# For a project mostly in C, the following would be a good set of
# exclude patterns (uncomment them if you want to use them):
# *.[oa]
# *~
+174
View File
@@ -0,0 +1,174 @@
#!/usr/bin/perl
use strict;
use warnings;
use IPC::Open2;
# An example hook script to integrate Watchman
# (https://facebook.github.io/watchman/) with git to speed up detecting
# new and modified files.
#
# The hook is passed a version (currently 2) and last update token
# formatted as a string and outputs to stdout a new update token and
# all files that have been modified since the update token. Paths must
# be relative to the root of the working tree and separated by a single NUL.
#
# To enable this hook, rename this file to "query-watchman" and set
# 'git config core.fsmonitor .git/hooks/query-watchman'
#
my ($version, $last_update_token) = @ARGV;
# Uncomment for debugging
# print STDERR "$0 $version $last_update_token\n";
# Check the hook interface version
if ($version ne 2) {
die "Unsupported query-fsmonitor hook version '$version'.\n" .
"Falling back to scanning...\n";
}
my $git_work_tree = get_working_dir();
my $retry = 1;
my $json_pkg;
eval {
require JSON::XS;
$json_pkg = "JSON::XS";
1;
} or do {
require JSON::PP;
$json_pkg = "JSON::PP";
};
launch_watchman();
sub launch_watchman {
my $o = watchman_query();
if (is_work_tree_watched($o)) {
output_result($o->{clock}, @{$o->{files}});
}
}
sub output_result {
my ($clockid, @files) = @_;
# Uncomment for debugging watchman output
# open (my $fh, ">", ".git/watchman-output.out");
# binmode $fh, ":utf8";
# print $fh "$clockid\n@files\n";
# close $fh;
binmode STDOUT, ":utf8";
print $clockid;
print "\0";
local $, = "\0";
print @files;
}
sub watchman_clock {
my $response = qx/watchman clock "$git_work_tree"/;
die "Failed to get clock id on '$git_work_tree'.\n" .
"Falling back to scanning...\n" if $? != 0;
return $json_pkg->new->utf8->decode($response);
}
sub watchman_query {
my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
or die "open2() failed: $!\n" .
"Falling back to scanning...\n";
# In the query expression below we're asking for names of files that
# changed since $last_update_token but not from the .git folder.
#
# To accomplish this, we're using the "since" generator to use the
# recency index to select candidate nodes and "fields" to limit the
# output to file names only. Then we're using the "expression" term to
# further constrain the results.
my $last_update_line = "";
if (substr($last_update_token, 0, 1) eq "c") {
$last_update_token = "\"$last_update_token\"";
$last_update_line = qq[\n"since": $last_update_token,];
}
my $query = <<" END";
["query", "$git_work_tree", {$last_update_line
"fields": ["name"],
"expression": ["not", ["dirname", ".git"]]
}]
END
# Uncomment for debugging the watchman query
# open (my $fh, ">", ".git/watchman-query.json");
# print $fh $query;
# close $fh;
print CHLD_IN $query;
close CHLD_IN;
my $response = do {local $/; <CHLD_OUT>};
# Uncomment for debugging the watch response
# open ($fh, ">", ".git/watchman-response.json");
# print $fh $response;
# close $fh;
die "Watchman: command returned no output.\n" .
"Falling back to scanning...\n" if $response eq "";
die "Watchman: command returned invalid output: $response\n" .
"Falling back to scanning...\n" unless $response =~ /^\{/;
return $json_pkg->new->utf8->decode($response);
}
sub is_work_tree_watched {
my ($output) = @_;
my $error = $output->{error};
if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
$retry--;
my $response = qx/watchman watch "$git_work_tree"/;
die "Failed to make watchman watch '$git_work_tree'.\n" .
"Falling back to scanning...\n" if $? != 0;
$output = $json_pkg->new->utf8->decode($response);
$error = $output->{error};
die "Watchman: $error.\n" .
"Falling back to scanning...\n" if $error;
# Uncomment for debugging watchman output
# open (my $fh, ">", ".git/watchman-output.out");
# close $fh;
# Watchman will always return all files on the first query so
# return the fast "everything is dirty" flag to git and do the
# Watchman query just to get it over with now so we won't pay
# the cost in git to look up each individual file.
my $o = watchman_clock();
$error = $output->{error};
die "Watchman: $error.\n" .
"Falling back to scanning...\n" if $error;
output_result($o->{clock}, ("/"));
$last_update_token = $o->{clock};
eval { launch_watchman() };
return 0;
}
die "Watchman: $error.\n" .
"Falling back to scanning...\n" if $error;
return 1;
}
sub get_working_dir {
my $working_dir;
if ($^O =~ 'msys' || $^O =~ 'cygwin') {
$working_dir = Win32::GetCwd();
$working_dir =~ tr/\\/\//;
} else {
require Cwd;
$working_dir = Cwd::cwd();
}
return $working_dir;
}

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
View File
Binary file not shown.
@@ -1,11 +1,11 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="pt-br"> <html lang="pt-br">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="refresh" content="0;url=login.html"> <meta http-equiv="refresh" content="0;url=login.html">
<title>Focus Agenda</title> <title>Focus Agenda</title>
</head> </head>
<body> <body>
<script>window.location.href='login.html';</script> <script>window.location.href='login.html';</script>
</body> </body>
</html> </html>
@@ -1,99 +1,99 @@
* { margin: 0; padding: 0; box-sizing: border-box; } * { margin: 0; padding: 0; box-sizing: border-box; }
body { body {
min-height: 100vh; min-height: 100vh;
font-family: 'Poppins', 'Trebuchet MS', Arial, sans-serif; font-family: 'Poppins', 'Trebuchet MS', Arial, sans-serif;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 80px 20px 20px; padding: 80px 20px 20px;
background: #f5f5f5; background: #f5f5f5;
} }
#topo { #topo {
width: 100%; width: 100%;
height: 50px; height: 50px;
position: fixed; position: fixed;
top: 0; left: 0; top: 0; left: 0;
background: linear-gradient(to right, #c0392b 47%, #7a4951 73%, #114455 87%); background: linear-gradient(to right, #c0392b 47%, #7a4951 73%, #114455 87%);
display: flex; display: flex;
align-items: center; align-items: center;
z-index: 10; z-index: 10;
} }
#textotop { #textotop {
padding-left: 20px; padding-left: 20px;
font-size: clamp(22px, 5vw, 38px); font-size: clamp(22px, 5vw, 38px);
color: #fff; color: #fff;
} }
#log { #log {
width: 100%; width: 100%;
max-width: 360px; max-width: 360px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 16px; gap: 16px;
background-color: white; background-color: white;
border: rgba(0, 0, 0, 0.174) solid 3px; border: rgba(0, 0, 0, 0.174) solid 3px;
border-radius: 10px; border-radius: 10px;
padding: 10px; padding: 10px;
border-top: 0px; border-top: 0px;
border-left: 0px; border-left: 0px;
} }
.mens { text-align: center; color: #1f2937; } .mens { text-align: center; color: #1f2937; }
.campo { display: flex; flex-direction: column; gap: 8px; } .campo { display: flex; flex-direction: column; gap: 8px; }
label { font-weight: 700; color: #1f2937; } label { font-weight: 700; color: #1f2937; }
input[type="email"], input[type="password"] { input[type="email"], input[type="password"] {
height: 46px; height: 46px;
width: 100%; width: 100%;
padding: 10px; padding: 10px;
font-size: 16px; font-size: 16px;
border: 1px solid #c7c7c7; border: 1px solid #c7c7c7;
border-radius: 6px; border-radius: 6px;
font-family: inherit; font-family: inherit;
} }
form { display: flex; flex-direction: column; gap: 16px; } form { display: flex; flex-direction: column; gap: 16px; }
#logbtn { #logbtn {
align-self: center; align-self: center;
width: 50%; width: 50%;
padding: 12px; padding: 12px;
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
background-color: #c0392b; background-color: #c0392b;
color: #fff; color: #fff;
border: none; border: none;
border-radius: 6px; border-radius: 6px;
cursor: pointer; cursor: pointer;
transition: background-color 0.2s ease; transition: background-color 0.2s ease;
border: rgba(124, 20, 20, 0.496) solid 2px; border: rgba(124, 20, 20, 0.496) solid 2px;
border-radius: 10px; border-radius: 10px;
padding: 10px; padding: 10px;
border-top: 0px; border-top: 0px;
border-left: 0px; border-left: 0px;
} }
#logbtn:hover { background-color: #114455; #logbtn:hover { background-color: #114455;
border: #14323c6f solid 2px; border: #14323c6f solid 2px;
border-radius: 10px; border-radius: 10px;
padding: 10px; padding: 10px;
border-top: 0px; border-top: 0px;
border-left: 0px;} border-left: 0px;}
#logbtn:disabled { background-color: #ccc; cursor: not-allowed; } #logbtn:disabled { background-color: #ccc; cursor: not-allowed; }
a { color: #111; text-decoration: none; } a { color: #111; text-decoration: none; }
a:hover { text-decoration: underline; } a:hover { text-decoration: underline; }
#mensagem-erro { #mensagem-erro {
background: #fee2e2; background: #fee2e2;
border: 1px solid #fca5a5; border: 1px solid #fca5a5;
color: #b91c1c; color: #b91c1c;
padding: 10px 14px; padding: 10px 14px;
border-radius: 6px; border-radius: 6px;
font-size: 14px; font-size: 14px;
display: none; display: none;
} }
@@ -1,97 +1,97 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="pt-br"> <html lang="pt-br">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="icon" href="imagens/icone.png"> <link rel="icon" href="imagens/icone.png">
<link rel="stylesheet" href="login.css"> <link rel="stylesheet" href="login.css">
<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600;700&display=swap" rel="stylesheet"> <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600;700&display=swap" rel="stylesheet">
<title>Login Focus Agenda</title> <title>Login Focus Agenda</title>
</head> </head>
<body> <body>
<div id="topo"> <div id="topo">
<h1 id="textotop">Focus Agenda</h1> <h1 id="textotop">Focus Agenda</h1>
</div> </div>
<div id="log"> <div id="log">
<h1 class="mens">Bem-vindo!</h1> <h1 class="mens">Bem-vindo!</h1>
<h3 class="mens">Faça seu login</h3> <h3 class="mens">Faça seu login</h3>
<div id="mensagem-erro" role="alert"></div> <div id="mensagem-erro" role="alert"></div>
<form id="loginForm" novalidate> <form id="loginForm" novalidate>
<div class="campo"> <div class="campo">
<label for="emailid">Email</label> <label for="emailid">Email</label>
<input type="email" placeholder="Digite seu email" id="emailid" autocomplete="email" required> <input type="email" placeholder="Digite seu email" id="emailid" autocomplete="email" required>
</div> </div>
<div class="campo"> <div class="campo">
<label for="senhaid">Senha</label> <label for="senhaid">Senha</label>
<input type="password" placeholder="Digite sua senha" id="senhaid" autocomplete="current-password" required> <input type="password" placeholder="Digite sua senha" id="senhaid" autocomplete="current-password" required>
</div> </div>
<button type="submit" id="logbtn">Entrar</button> <button type="submit" id="logbtn">Entrar</button>
</form> </form>
<p class="mens"><a href="cadastro.html">Cadastrar-se</a></p> <p class="mens"><a href="cadastro.html">Cadastrar-se</a></p>
</div> </div>
<script> <script>
// Se já tiver token válido, redireciona direto // Se já tiver token válido, redireciona direto
(function () { (function () {
if (localStorage.getItem('fa_token')) { if (localStorage.getItem('fa_token')) {
window.location.href = 'calendario.html'; window.location.href = 'calendario.html';
} }
})(); })();
const form = document.getElementById('loginForm'); const form = document.getElementById('loginForm');
const erroEl = document.getElementById('mensagem-erro'); const erroEl = document.getElementById('mensagem-erro');
const btn = document.getElementById('logbtn'); const btn = document.getElementById('logbtn');
function mostrarErro(msg) { function mostrarErro(msg) {
erroEl.textContent = msg; erroEl.textContent = msg;
erroEl.style.display = 'block'; erroEl.style.display = 'block';
} }
form.addEventListener('submit', async (e) => { form.addEventListener('submit', async (e) => {
e.preventDefault(); e.preventDefault();
erroEl.style.display = 'none'; erroEl.style.display = 'none';
const email = document.getElementById('emailid').value.trim(); const email = document.getElementById('emailid').value.trim();
const senha = document.getElementById('senhaid').value; const senha = document.getElementById('senhaid').value;
if (!email || !senha) { if (!email || !senha) {
mostrarErro('Preencha todos os campos.'); mostrarErro('Preencha todos os campos.');
return; return;
} }
btn.disabled = true; btn.disabled = true;
btn.textContent = 'Entrando...'; btn.textContent = 'Entrando...';
try { try {
const res = await fetch('/api/estudantes/login', { const res = await fetch('/api/estudantes/login', {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ email, senha }) body: JSON.stringify({ email, senha })
}); });
const json = await res.json(); const json = await res.json();
if (!res.ok) { if (!res.ok) {
mostrarErro(json.message || 'Email ou senha incorretos.'); mostrarErro(json.message || 'Email ou senha incorretos.');
return; return;
} }
// Salva token e dados do usuário // Salva token e dados do usuário
localStorage.setItem('fa_token', json.data.token); localStorage.setItem('fa_token', json.data.token);
localStorage.setItem('fa_user', JSON.stringify(json.data.estudante)); localStorage.setItem('fa_user', JSON.stringify(json.data.estudante));
window.location.href = 'calendario.html'; window.location.href = 'calendario.html';
} catch (err) { } catch (err) {
mostrarErro('Erro de conexão. Verifique se o servidor está rodando.'); mostrarErro('Erro de conexão. Verifique se o servidor está rodando.');
} finally { } finally {
btn.disabled = false; btn.disabled = false;
btn.textContent = 'Entrar'; btn.textContent = 'Entrar';
} }
}); });
</script> </script>
</body> </body>
</html> </html>
+1
View File
@@ -0,0 +1 @@
02cfd71cf4d0075701aa28ffec79d5047bc80214
Binary file not shown.
Binary file not shown.
Binary file not shown.
+3
View File
@@ -0,0 +1,3 @@
# pack-refs with: peeled fully-peeled sorted
02cfd71cf4d0075701aa28ffec79d5047bc80214 refs/remotes/origin/main
aaa2b25ad793d5554c6715d4f17ff94b09a199ec refs/remotes/origin/master
+141 -141
View File
@@ -1,141 +1,141 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.0</version> <version>3.2.0</version>
<relativePath/> <relativePath/>
</parent> </parent>
<groupId>com.agendaestudantil</groupId> <groupId>com.agendaestudantil</groupId>
<artifactId>agenda-digital-estudantes</artifactId> <artifactId>agenda-digital-estudantes</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<name>Agenda Digital para Estudantes</name> <name>Agenda Digital para Estudantes</name>
<description>Backend para agenda digital destinado a estudantes com dificuldade de organização</description> <description>Backend para agenda digital destinado a estudantes com dificuldade de organização</description>
<properties> <properties>
<java.version>17</java.version> <java.version>17</java.version>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
<lombok.version>1.18.30</lombok.version> <lombok.version>1.18.30</lombok.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId> <artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId> <artifactId>spring-boot-starter-validation</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId> <artifactId>spring-boot-starter-security</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId> <artifactId>jjwt-api</artifactId>
<version>0.12.3</version> <version>0.12.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId> <artifactId>jjwt-impl</artifactId>
<version>0.12.6</version> <version>0.12.6</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId> <artifactId>jjwt-jackson</artifactId>
<version>0.12.3</version> <version>0.12.3</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springdoc</groupId> <groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.3.0</version> <version>2.3.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.github.cdimascio</groupId> <groupId>io.github.cdimascio</groupId>
<artifactId>dotenv-java</artifactId> <artifactId>dotenv-java</artifactId>
<version>2.3.2</version> <version>2.3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId> <artifactId>spring-security-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>17</source> <source>17</source>
<target>17</target> <target>17</target>
<compilerArgs> <compilerArgs>
<arg>-parameters</arg> <arg>-parameters</arg>
</compilerArgs> </compilerArgs>
<annotationProcessorPaths> <annotationProcessorPaths>
<path> <path>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>${lombok.version}</version> <version>${lombok.version}</version>
</path> </path>
</annotationProcessorPaths> </annotationProcessorPaths>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes>
<exclude> <exclude>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</exclude> </exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
+8
View File
@@ -0,0 +1,8 @@
#!/bin/sh
#
# An example hook script to prepare a packed repository for use over
# dumb transports.
#
# To enable this hook, rename this file to "post-update".
exec git update-server-info
+14
View File
@@ -0,0 +1,14 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed
# by applypatch from an e-mail message.
#
# The hook should exit with non-zero status after issuing an
# appropriate message if it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-applypatch".
. git-sh-setup
precommit="$(git rev-parse --git-path hooks/pre-commit)"
test -x "$precommit" && exec "$precommit" ${1+"$@"}
:
+49
View File
@@ -0,0 +1,49 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-commit".
if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=$(git hash-object -t tree /dev/null)
fi
# If you want to allow non-ASCII filenames set this variable to true.
allownonascii=$(git config --type=bool hooks.allownonascii)
# Redirect output to stderr.
exec 1>&2
# Cross platform projects tend to avoid non-ASCII filenames; prevent
# them from being added to the repository. We exploit the fact that the
# printable range starts at the space character and ends with tilde.
if [ "$allownonascii" != "true" ] &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
test $(git diff-index --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
then
cat <<\EOF
Error: Attempt to add a non-ASCII file name.
This can cause problems if you want to work with people on other platforms.
To be portable it is advisable to rename the file.
If you know what you are doing you can disable this check using:
git config hooks.allownonascii true
EOF
exit 1
fi
# If there are whitespace errors, print the offending file names and fail.
exec git diff-index --check --cached $against --
+13
View File
@@ -0,0 +1,13 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git merge" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message to
# stderr if it wants to stop the merge commit.
#
# To enable this hook, rename this file to "pre-merge-commit".
. git-sh-setup
test -x "$GIT_DIR/hooks/pre-commit" &&
exec "$GIT_DIR/hooks/pre-commit"
:
+53
View File
@@ -0,0 +1,53 @@
#!/bin/sh
# An example hook script to verify what is about to be pushed. Called by "git
# push" after it has checked the remote status, but before anything has been
# pushed. If this script exits with a non-zero status nothing will be pushed.
#
# This hook is called with the following parameters:
#
# $1 -- Name of the remote to which the push is being done
# $2 -- URL to which the push is being done
#
# If pushing without using a named remote those arguments will be equal.
#
# Information about the commits which are being pushed is supplied as lines to
# the standard input in the form:
#
# <local ref> <local oid> <remote ref> <remote oid>
#
# This sample shows how to prevent push of commits where the log message starts
# with "WIP" (work in progress).
remote="$1"
url="$2"
zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
while read local_ref local_oid remote_ref remote_oid
do
if test "$local_oid" = "$zero"
then
# Handle delete
:
else
if test "$remote_oid" = "$zero"
then
# New branch, examine all commits
range="$local_oid"
else
# Update to existing branch, examine new commits
range="$remote_oid..$local_oid"
fi
# Check for WIP commit
commit=$(git rev-list -n 1 --grep '^WIP' "$range")
if test -n "$commit"
then
echo >&2 "Found WIP commit in $local_ref, not pushing"
exit 1
fi
fi
done
exit 0
+169
View File
@@ -0,0 +1,169 @@
#!/bin/sh
#
# Copyright (c) 2006, 2008 Junio C Hamano
#
# The "pre-rebase" hook is run just before "git rebase" starts doing
# its job, and can prevent the command from running by exiting with
# non-zero status.
#
# The hook is called with the following parameters:
#
# $1 -- the upstream the series was forked from.
# $2 -- the branch being rebased (or empty when rebasing the current branch).
#
# This sample shows how to prevent topic branches that are already
# merged to 'next' branch from getting rebased, because allowing it
# would result in rebasing already published history.
publish=next
basebranch="$1"
if test "$#" = 2
then
topic="refs/heads/$2"
else
topic=`git symbolic-ref HEAD` ||
exit 0 ;# we do not interrupt rebasing detached HEAD
fi
case "$topic" in
refs/heads/??/*)
;;
*)
exit 0 ;# we do not interrupt others.
;;
esac
# Now we are dealing with a topic branch being rebased
# on top of master. Is it OK to rebase it?
# Does the topic really exist?
git show-ref -q "$topic" || {
echo >&2 "No such branch $topic"
exit 1
}
# Is topic fully merged to master?
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
if test -z "$not_in_master"
then
echo >&2 "$topic is fully merged to master; better remove it."
exit 1 ;# we could allow it, but there is no point.
fi
# Is topic ever merged to next? If so you should not be rebasing it.
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
only_next_2=`git rev-list ^master ${publish} | sort`
if test "$only_next_1" = "$only_next_2"
then
not_in_topic=`git rev-list "^$topic" master`
if test -z "$not_in_topic"
then
echo >&2 "$topic is already up to date with master"
exit 1 ;# we could allow it, but there is no point.
else
exit 0
fi
else
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
/usr/bin/perl -e '
my $topic = $ARGV[0];
my $msg = "* $topic has commits already merged to public branch:\n";
my (%not_in_next) = map {
/^([0-9a-f]+) /;
($1 => 1);
} split(/\n/, $ARGV[1]);
for my $elem (map {
/^([0-9a-f]+) (.*)$/;
[$1 => $2];
} split(/\n/, $ARGV[2])) {
if (!exists $not_in_next{$elem->[0]}) {
if ($msg) {
print STDERR $msg;
undef $msg;
}
print STDERR " $elem->[1]\n";
}
}
' "$topic" "$not_in_next" "$not_in_master"
exit 1
fi
<<\DOC_END
This sample hook safeguards topic branches that have been
published from being rewound.
The workflow assumed here is:
* Once a topic branch forks from "master", "master" is never
merged into it again (either directly or indirectly).
* Once a topic branch is fully cooked and merged into "master",
it is deleted. If you need to build on top of it to correct
earlier mistakes, a new topic branch is created by forking at
the tip of the "master". This is not strictly necessary, but
it makes it easier to keep your history simple.
* Whenever you need to test or publish your changes to topic
branches, merge them into "next" branch.
The script, being an example, hardcodes the publish branch name
to be "next", but it is trivial to make it configurable via
$GIT_DIR/config mechanism.
With this workflow, you would want to know:
(1) ... if a topic branch has ever been merged to "next". Young
topic branches can have stupid mistakes you would rather
clean up before publishing, and things that have not been
merged into other branches can be easily rebased without
affecting other people. But once it is published, you would
not want to rewind it.
(2) ... if a topic branch has been fully merged to "master".
Then you can delete it. More importantly, you should not
build on top of it -- other people may already want to
change things related to the topic as patches against your
"master", so if you need further changes, it is better to
fork the topic (perhaps with the same name) afresh from the
tip of "master".
Let's look at this example:
o---o---o---o---o---o---o---o---o---o "next"
/ / / /
/ a---a---b A / /
/ / / /
/ / c---c---c---c B /
/ / / \ /
/ / / b---b C \ /
/ / / / \ /
---o---o---o---o---o---o---o---o---o---o---o "master"
A, B and C are topic branches.
* A has one fix since it was merged up to "next".
* B has finished. It has been fully merged up to "master" and "next",
and is ready to be deleted.
* C has not merged to "next" at all.
We would want to allow C to be rebased, refuse A, and encourage
B to be deleted.
To compute (1):
git rev-list ^master ^topic next
git rev-list ^master next
if these match, topic has not merged in next at all.
To compute (2):
git rev-list master..topic
if this is empty, it is fully merged to "master".
DOC_END
+24
View File
@@ -0,0 +1,24 @@
#!/bin/sh
#
# An example hook script to make use of push options.
# The example simply echoes all push options that start with 'echoback='
# and rejects all pushes when the "reject" push option is used.
#
# To enable this hook, rename this file to "pre-receive".
if test -n "$GIT_PUSH_OPTION_COUNT"
then
i=0
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
do
eval "value=\$GIT_PUSH_OPTION_$i"
case "$value" in
echoback=*)
echo "echo from the pre-receive-hook: ${value#*=}" >&2
;;
reject)
exit 1
esac
i=$((i + 1))
done
fi
+42
View File
@@ -0,0 +1,42 @@
#!/bin/sh
#
# An example hook script to prepare the commit log message.
# Called by "git commit" with the name of the file that has the
# commit message, followed by the description of the commit
# message's source. The hook's purpose is to edit the commit
# message file. If the hook fails with a non-zero status,
# the commit is aborted.
#
# To enable this hook, rename this file to "prepare-commit-msg".
# This hook includes three examples. The first one removes the
# "# Please enter the commit message..." help message.
#
# The second includes the output of "git diff --name-status -r"
# into the message, just before the "git status" output. It is
# commented because it doesn't cope with --amend or with squashed
# commits.
#
# The third example adds a Signed-off-by line to the message, that can
# still be edited. This is rarely a good idea.
COMMIT_MSG_FILE=$1
COMMIT_SOURCE=$2
SHA1=$3
/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
# case "$COMMIT_SOURCE,$SHA1" in
# ,|template,)
# /usr/bin/perl -i.bak -pe '
# print "\n" . `git diff --cached --name-status -r`
# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
# *) ;;
# esac
# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
# if test -z "$COMMIT_SOURCE"
# then
# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
# fi
+78
View File
@@ -0,0 +1,78 @@
#!/bin/sh
# An example hook script to update a checked-out tree on a git push.
#
# This hook is invoked by git-receive-pack(1) when it reacts to git
# push and updates reference(s) in its repository, and when the push
# tries to update the branch that is currently checked out and the
# receive.denyCurrentBranch configuration variable is set to
# updateInstead.
#
# By default, such a push is refused if the working tree and the index
# of the remote repository has any difference from the currently
# checked out commit; when both the working tree and the index match
# the current commit, they are updated to match the newly pushed tip
# of the branch. This hook is to be used to override the default
# behaviour; however the code below reimplements the default behaviour
# as a starting point for convenient modification.
#
# The hook receives the commit with which the tip of the current
# branch is going to be updated:
commit=$1
# It can exit with a non-zero status to refuse the push (when it does
# so, it must not modify the index or the working tree).
die () {
echo >&2 "$*"
exit 1
}
# Or it can make any necessary changes to the working tree and to the
# index to bring them to the desired state when the tip of the current
# branch is updated to the new commit, and exit with a zero status.
#
# For example, the hook can simply run git read-tree -u -m HEAD "$1"
# in order to emulate git fetch that is run in the reverse direction
# with git push, as the two-tree form of git read-tree -u -m is
# essentially the same as git switch or git checkout that switches
# branches while keeping the local changes in the working tree that do
# not interfere with the difference between the branches.
# The below is a more-or-less exact translation to shell of the C code
# for the default behaviour for git's push-to-checkout hook defined in
# the push_to_deploy() function in builtin/receive-pack.c.
#
# Note that the hook will be executed from the repository directory,
# not from the working tree, so if you want to perform operations on
# the working tree, you will have to adapt your code accordingly, e.g.
# by adding "cd .." or using relative paths.
if ! git update-index -q --ignore-submodules --refresh
then
die "Up-to-date check failed"
fi
if ! git diff-files --quiet --ignore-submodules --
then
die "Working directory has unstaged changes"
fi
# This is a rough translation of:
#
# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
if git cat-file -e HEAD 2>/dev/null
then
head=HEAD
else
head=$(git hash-object -t tree --stdin </dev/null)
fi
if ! git diff-index --quiet --cached --ignore-submodules $head --
then
die "Working directory has staged changes"
fi
if ! git read-tree -u -m "$commit"
then
die "Could not update working tree to new HEAD"
fi
+77
View File
@@ -0,0 +1,77 @@
#!/bin/sh
# An example hook script to validate a patch (and/or patch series) before
# sending it via email.
#
# The hook should exit with non-zero status after issuing an appropriate
# message if it wants to prevent the email(s) from being sent.
#
# To enable this hook, rename this file to "sendemail-validate".
#
# By default, it will only check that the patch(es) can be applied on top of
# the default upstream branch without conflicts in a secondary worktree. After
# validation (successful or not) of the last patch of a series, the worktree
# will be deleted.
#
# The following config variables can be set to change the default remote and
# remote ref that are used to apply the patches against:
#
# sendemail.validateRemote (default: origin)
# sendemail.validateRemoteRef (default: HEAD)
#
# Replace the TODO placeholders with appropriate checks according to your
# needs.
validate_cover_letter () {
file="$1"
# TODO: Replace with appropriate checks (e.g. spell checking).
true
}
validate_patch () {
file="$1"
# Ensure that the patch applies without conflicts.
git am -3 "$file" || return
# TODO: Replace with appropriate checks for this patch
# (e.g. checkpatch.pl).
true
}
validate_series () {
# TODO: Replace with appropriate checks for the whole series
# (e.g. quick build, coding style checks, etc.).
true
}
# main -------------------------------------------------------------------------
if test "$GIT_SENDEMAIL_FILE_COUNTER" = 1
then
remote=$(git config --default origin --get sendemail.validateRemote) &&
ref=$(git config --default HEAD --get sendemail.validateRemoteRef) &&
worktree=$(mktemp --tmpdir -d sendemail-validate.XXXXXXX) &&
git worktree add -fd --checkout "$worktree" "refs/remotes/$remote/$ref" &&
git config --replace-all sendemail.validateWorktree "$worktree"
else
worktree=$(git config --get sendemail.validateWorktree)
fi || {
echo "sendemail-validate: error: failed to prepare worktree" >&2
exit 1
}
unset GIT_DIR GIT_WORK_TREE
cd "$worktree" &&
if grep -q "^diff --git " "$1"
then
validate_patch "$1"
else
validate_cover_letter "$1"
fi &&
if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL"
then
git config --unset-all sendemail.validateWorktree &&
trap 'git worktree remove -ff "$worktree"' EXIT &&
validate_series
fi
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

@@ -1,9 +0,0 @@
package com.agendaestudantil.configuracao;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.mongodb.config.EnableMongoAuditing;
@Configuration
@EnableMongoAuditing
public class ConfiguracaoMongo {
}
@@ -1,77 +0,0 @@
package com.agendaestudantil.configuracao;
import com.agendaestudantil.filtro.FiltroJwt;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import java.util.List;
@Configuration
@EnableWebSecurity
public class ConfiguracaoSeguranca {
private final FiltroJwt filtroJwt;
private final String corsAllowedOrigins;
public ConfiguracaoSeguranca(FiltroJwt filtroJwt, @Value("${cors.allowed.origins}") String corsAllowedOrigins) {
this.filtroJwt = filtroJwt;
this.corsAllowedOrigins = corsAllowedOrigins;
}
@Bean
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
http.csrf(csrf -> csrf.disable())
.cors(cors -> cors.configurationSource(corsConfigurationSource()))
.authorizeHttpRequests(auth -> auth
.requestMatchers(
"/", "/index.html", "/login.html", "/cadastro.html",
"/favicon.ico", "/imagens/**",
"/*.css", "/*.js", "/*.ico", "/*.png",
"/api/estudantes/cadastro", "/api/estudantes/login",
"/swagger-ui/**", "/v3/api-docs/**")
.permitAll()
.anyRequest().authenticated())
.sessionManagement(session -> session
.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.addFilterBefore(filtroJwt, UsernamePasswordAuthenticationFilter.class);
return http.build();
}
@Bean
public CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration configuration = new CorsConfiguration();
configuration.setAllowedOrigins(List.of(corsAllowedOrigins.split(",")));
configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"));
configuration.setAllowedHeaders(List.of("*"));
configuration.setExposedHeaders(List.of("Authorization"));
configuration.setAllowCredentials(true);
configuration.setMaxAge(3600L);
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", configuration);
return source;
}
@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
@Bean
public AuthenticationManager authenticationManager(AuthenticationConfiguration config) throws Exception {
return config.getAuthenticationManager();
}
}
@@ -1,18 +0,0 @@
package com.agendaestudantil.configuracao;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@Controller
public class ResourceController {
@GetMapping("/")
public String index() {
return "forward:/login.html";
}
@GetMapping("/app")
public String app() {
return "forward:/calendario.html";
}
}
@@ -1,74 +0,0 @@
package com.agendaestudantil.controlador;
import com.agendaestudantil.dto.RequisicaoDisciplinaDTO;
import com.agendaestudantil.dto.RespostaApi;
import com.agendaestudantil.dto.RespostaDisciplinaDTO;
import com.agendaestudantil.entidade.Disciplina;
import com.agendaestudantil.servico.DisciplinaServico;
import jakarta.validation.Valid;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/api/disciplinas")
public class DisciplinaControlador {
private final DisciplinaServico disciplinaServico;
public DisciplinaControlador(DisciplinaServico disciplinaServico) {
this.disciplinaServico = disciplinaServico;
}
@PostMapping
public ResponseEntity<RespostaApi<RespostaDisciplinaDTO>> criarDisciplina(
@Valid @RequestBody RequisicaoDisciplinaDTO dto) {
Disciplina disciplina = new Disciplina();
disciplina.setNome(dto.nome());
disciplina.setProfessor(dto.professor());
disciplina.setSala(dto.sala());
disciplina.setCor(dto.cor());
RespostaDisciplinaDTO resposta = disciplinaServico.criarDisciplina(disciplina, dto.estudanteId());
return ResponseEntity.status(HttpStatus.CREATED).body(RespostaApi.sucesso(resposta));
}
@GetMapping("/estudante/{estudanteId}")
public ResponseEntity<RespostaApi<List<RespostaDisciplinaDTO>>> listarPorEstudante(
@PathVariable String estudanteId) {
List<RespostaDisciplinaDTO> disciplinas = disciplinaServico.listarPorEstudante(estudanteId);
return ResponseEntity.ok(RespostaApi.sucesso(disciplinas));
}
@GetMapping("/{id}")
public ResponseEntity<RespostaApi<RespostaDisciplinaDTO>> buscarPorId(
@PathVariable String id,
@RequestParam String estudanteId) {
RespostaDisciplinaDTO disciplina = disciplinaServico.buscarPorId(id, estudanteId);
return ResponseEntity.ok(RespostaApi.sucesso(disciplina));
}
@PutMapping("/{id}")
public ResponseEntity<RespostaApi<RespostaDisciplinaDTO>> atualizarDisciplina(
@PathVariable String id,
@Valid @RequestBody RequisicaoDisciplinaDTO dto) {
Disciplina disciplina = new Disciplina();
disciplina.setNome(dto.nome());
disciplina.setProfessor(dto.professor());
disciplina.setSala(dto.sala());
disciplina.setCor(dto.cor());
RespostaDisciplinaDTO resposta = disciplinaServico.atualizarDisciplina(id, disciplina, dto.estudanteId());
return ResponseEntity.ok(RespostaApi.sucesso(resposta));
}
@DeleteMapping("/{id}")
public ResponseEntity<RespostaApi<Void>> excluirDisciplina(
@PathVariable String id,
@RequestParam String estudanteId) {
disciplinaServico.excluirDisciplina(id, estudanteId);
return ResponseEntity.status(HttpStatus.NO_CONTENT).body(RespostaApi.sucesso(null));
}
}
@@ -1,44 +0,0 @@
package com.agendaestudantil.controlador;
import com.agendaestudantil.dto.RespostaApi;
import com.agendaestudantil.dto.RequisicaoCadastroDTO;
import com.agendaestudantil.dto.RespostaEstudanteDTO;
import com.agendaestudantil.dto.RequisicaoLoginDTO;
import com.agendaestudantil.dto.RespostaLoginDTO;
import com.agendaestudantil.servico.EstudanteServico;
import jakarta.validation.Valid;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/api/estudantes")
public class EstudanteControlador {
private final EstudanteServico estudanteServico;
public EstudanteControlador(EstudanteServico estudanteServico) {
this.estudanteServico = estudanteServico;
}
@PostMapping("/cadastro")
public ResponseEntity<RespostaApi<RespostaEstudanteDTO>> cadastrar(@Valid @RequestBody RequisicaoCadastroDTO dto) {
RespostaEstudanteDTO resposta = estudanteServico.cadastrar(dto);
return ResponseEntity.status(HttpStatus.CREATED).body(RespostaApi.sucesso(resposta));
}
@PostMapping("/login")
public ResponseEntity<RespostaApi<RespostaLoginDTO>> login(@Valid @RequestBody RequisicaoLoginDTO dto) {
RespostaLoginDTO resposta = estudanteServico.login(dto);
return ResponseEntity.ok(RespostaApi.sucesso(resposta));
}
// Retorna dados do usuário autenticado via JWT (sem precisar do ID na URL)
@GetMapping("/me")
public ResponseEntity<RespostaApi<RespostaEstudanteDTO>> me(@AuthenticationPrincipal UserDetails userDetails) {
RespostaEstudanteDTO resposta = estudanteServico.buscarPorId(userDetails.getUsername());
return ResponseEntity.ok(RespostaApi.sucesso(resposta));
}
}
@@ -1,96 +0,0 @@
package com.agendaestudantil.controlador;
import com.agendaestudantil.dto.RequisicaoEventoDTO;
import com.agendaestudantil.dto.RespostaApi;
import com.agendaestudantil.dto.RespostaEventoDTO;
import com.agendaestudantil.entidade.Evento;
import com.agendaestudantil.servico.EventoServico;
import jakarta.validation.Valid;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.util.List;
@RestController
@RequestMapping("/api/eventos")
public class EventoControlador {
private final EventoServico eventoServico;
public EventoControlador(EventoServico eventoServico) {
this.eventoServico = eventoServico;
}
@PostMapping
public ResponseEntity<RespostaApi<RespostaEventoDTO>> criarEvento(
@Valid @RequestBody RequisicaoEventoDTO dto) {
Evento evento = new Evento();
evento.setTitulo(dto.titulo());
evento.setDescricao(dto.descricao());
evento.setTipo(dto.tipo());
evento.setLocal(dto.local());
evento.setDataHora(dto.dataHora());
evento.setDisciplinaId(dto.disciplinaId());
RespostaEventoDTO resposta = eventoServico.criarEvento(evento, dto.estudanteId());
return ResponseEntity.status(HttpStatus.CREATED).body(RespostaApi.sucesso(resposta));
}
@GetMapping("/estudante/{estudanteId}")
public ResponseEntity<RespostaApi<List<RespostaEventoDTO>>> listarPorEstudante(
@PathVariable String estudanteId) {
List<RespostaEventoDTO> eventos = eventoServico.listarPorEstudante(estudanteId);
return ResponseEntity.ok(RespostaApi.sucesso(eventos));
}
@GetMapping("/estudante/{estudanteId}/periodo")
public ResponseEntity<RespostaApi<List<RespostaEventoDTO>>> listarPorPeriodo(
@PathVariable String estudanteId,
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime inicio,
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime fim) {
List<RespostaEventoDTO> eventos = eventoServico.listarPorPeriodo(estudanteId, inicio, fim);
return ResponseEntity.ok(RespostaApi.sucesso(eventos));
}
@GetMapping("/estudante/{estudanteId}/proximos")
public ResponseEntity<RespostaApi<List<RespostaEventoDTO>>> listarProximosEventos(
@PathVariable String estudanteId) {
List<RespostaEventoDTO> eventos = eventoServico.listarProximosEventos(estudanteId);
return ResponseEntity.ok(RespostaApi.sucesso(eventos));
}
@GetMapping("/{id}")
public ResponseEntity<RespostaApi<RespostaEventoDTO>> buscarPorId(
@PathVariable String id,
@RequestParam String estudanteId) {
RespostaEventoDTO evento = eventoServico.buscarPorId(id, estudanteId);
return ResponseEntity.ok(RespostaApi.sucesso(evento));
}
@PutMapping("/{id}")
public ResponseEntity<RespostaApi<RespostaEventoDTO>> atualizarEvento(
@PathVariable String id,
@Valid @RequestBody RequisicaoEventoDTO dto) {
Evento evento = new Evento();
evento.setTitulo(dto.titulo());
evento.setDescricao(dto.descricao());
evento.setTipo(dto.tipo());
evento.setLocal(dto.local());
evento.setDataHora(dto.dataHora());
evento.setDisciplinaId(dto.disciplinaId());
RespostaEventoDTO resposta = eventoServico.atualizarEvento(id, evento, dto.estudanteId());
return ResponseEntity.ok(RespostaApi.sucesso(resposta));
}
@DeleteMapping("/{id}")
public ResponseEntity<RespostaApi<Void>> excluirEvento(
@PathVariable String id,
@RequestParam String estudanteId) {
eventoServico.excluirEvento(id, estudanteId);
return ResponseEntity.status(HttpStatus.NO_CONTENT).body(RespostaApi.sucesso(null));
}
}
@@ -1,86 +0,0 @@
package com.agendaestudantil.controlador;
import com.agendaestudantil.dto.RespostaApi;
import com.agendaestudantil.dto.RequisicaoTarefaDTO;
import com.agendaestudantil.dto.RespostaTarefaDTO;
import com.agendaestudantil.servico.TarefaServico;
import jakarta.validation.Valid;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
import java.util.List;
@RestController
@RequestMapping("/api/tarefas")
public class TarefaControlador {
private final TarefaServico tarefaServico;
public TarefaControlador(TarefaServico tarefaServico) {
this.tarefaServico = tarefaServico;
}
@PostMapping
public ResponseEntity<RespostaApi<RespostaTarefaDTO>> criarTarefa(@Valid @RequestBody RequisicaoTarefaDTO dto) {
RespostaTarefaDTO tarefa = tarefaServico.criarTarefa(dto);
return ResponseEntity.status(HttpStatus.CREATED).body(RespostaApi.sucesso(tarefa));
}
@GetMapping("/estudante/{estudanteId}")
public ResponseEntity<RespostaApi<List<RespostaTarefaDTO>>> listarTarefasPorEstudante(
@PathVariable String estudanteId) {
List<RespostaTarefaDTO> tarefas = tarefaServico.listarTarefasPorEstudante(estudanteId);
return ResponseEntity.ok(RespostaApi.sucesso(tarefas));
}
@GetMapping("/estudante/{estudanteId}/pendentes")
public ResponseEntity<RespostaApi<List<RespostaTarefaDTO>>> listarTarefasPendentes(
@PathVariable String estudanteId) {
List<RespostaTarefaDTO> tarefas = tarefaServico.listarTarefasPendentes(estudanteId);
return ResponseEntity.ok(RespostaApi.sucesso(tarefas));
}
@GetMapping("/estudante/{estudanteId}/data")
public ResponseEntity<RespostaApi<List<RespostaTarefaDTO>>> listarTarefasPorData(
@PathVariable String estudanteId,
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate data) {
List<RespostaTarefaDTO> tarefas = tarefaServico.listarTarefasPorData(estudanteId, data);
return ResponseEntity.ok(RespostaApi.sucesso(tarefas));
}
@GetMapping("/estudante/{estudanteId}/periodo")
public ResponseEntity<RespostaApi<List<RespostaTarefaDTO>>> listarTarefasPorPeriodo(
@PathVariable String estudanteId,
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate inicio,
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate fim) {
List<RespostaTarefaDTO> tarefas = tarefaServico.listarTarefasPorPeriodo(estudanteId, inicio, fim);
return ResponseEntity.ok(RespostaApi.sucesso(tarefas));
}
@GetMapping("/{id}")
public ResponseEntity<RespostaApi<RespostaTarefaDTO>> buscarTarefaPorId(@PathVariable String id) {
RespostaTarefaDTO dto = tarefaServico.buscarTarefaPorId(id);
return ResponseEntity.ok(RespostaApi.sucesso(dto));
}
@PutMapping("/{id}")
public ResponseEntity<RespostaApi<RespostaTarefaDTO>> atualizarTarefa(@PathVariable String id,
@Valid @RequestBody RequisicaoTarefaDTO dto) {
RespostaTarefaDTO tarefa = tarefaServico.atualizarTarefa(id, dto);
return ResponseEntity.ok(RespostaApi.sucesso(tarefa));
}
@DeleteMapping("/{id}")
public ResponseEntity<RespostaApi<Void>> excluirTarefa(@PathVariable String id) {
tarefaServico.excluirTarefa(id);
return ResponseEntity.status(HttpStatus.NO_CONTENT).body(RespostaApi.sucesso(null));
}
@PatchMapping("/{id}/concluir")
public ResponseEntity<RespostaApi<RespostaTarefaDTO>> marcarConcluida(@PathVariable String id) {
RespostaTarefaDTO tarefa = tarefaServico.marcarConcluida(id);
return ResponseEntity.ok(RespostaApi.sucesso(tarefa));
}
}
@@ -1,16 +0,0 @@
package com.agendaestudantil.dto;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
public record RequisicaoCadastroDTO(
@NotBlank String nome,
@Email @NotBlank String email,
@NotBlank @Size(min = 6) String senha,
@NotBlank String curso,
@NotNull @Min(1) Integer periodo
) {
}
@@ -1,11 +0,0 @@
package com.agendaestudantil.dto;
import jakarta.validation.constraints.NotBlank;
public record RequisicaoDisciplinaDTO(
@NotBlank String nome,
String professor,
String sala,
String cor,
@NotBlank String estudanteId
) {}
@@ -1,17 +0,0 @@
package com.agendaestudantil.dto;
import com.agendaestudantil.entidade.Evento;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.time.LocalDateTime;
public record RequisicaoEventoDTO(
@NotBlank String titulo,
String descricao,
@NotNull Evento.TipoEvento tipo,
String local,
String disciplinaId,
@NotNull LocalDateTime dataHora,
@NotBlank String estudanteId
) {}
@@ -1,10 +0,0 @@
package com.agendaestudantil.dto;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
public record RequisicaoLoginDTO(
@Email @NotBlank String email,
@NotBlank String senha
) {
}
@@ -1,19 +0,0 @@
package com.agendaestudantil.dto;
import com.agendaestudantil.entidade.Tarefa;
import jakarta.validation.constraints.FutureOrPresent;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.time.LocalDate;
public record RequisicaoTarefaDTO(
@NotBlank String titulo,
String descricao,
@NotNull(message = "Prioridade é obrigatória") Tarefa.Prioridade prioridade,
Tarefa.StatusTarefa status,
@NotNull @FutureOrPresent LocalDate dataEntrega,
String disciplinaId,
@NotBlank(message = "ID do estudante é obrigatório") String estudanteId
) {
}
@@ -1,9 +0,0 @@
package com.agendaestudantil.dto;
import java.time.LocalDateTime;
public record RespostaApi<T>(T data, String message, LocalDateTime timestamp) {
public static <T> RespostaApi<T> sucesso(T data) {
return new RespostaApi<>(data, "Sucesso", LocalDateTime.now());
}
}
@@ -1,10 +0,0 @@
package com.agendaestudantil.dto;
public record RespostaDisciplinaDTO(
String id,
String estudanteId,
String nome,
String professor,
String sala,
String cor
) {}
@@ -1,10 +0,0 @@
package com.agendaestudantil.dto;
public record RespostaEstudanteDTO(
String id,
String nome,
String email,
String curso,
Integer periodo
) {
}
@@ -1,14 +0,0 @@
package com.agendaestudantil.dto;
import java.time.LocalDateTime;
public record RespostaEventoDTO(
String id,
String estudanteId,
String titulo,
String descricao,
String tipo,
String local,
String disciplinaId,
LocalDateTime dataHora
) {}

Some files were not shown because too many files have changed in this diff Show More