Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
4df191d
Perfil de Usuário
wagnerquadros Mar 29, 2025
bcfd29a
fix: Bug do ID igual entre as QA's
doffyGC Mar 29, 2025
2f9b51c
fix(bug11): duplicate RQs and update button in english
reinaldowendt Mar 29, 2025
1040636
fix: visualizador nao consegue editar etapas de planning
MatheusCiocca Mar 30, 2025
3ddec34
fix(bug03): Terms & Synonyms - Error 500
MiguelYSieghart Mar 30, 2025
0a1efde
fix: termino da correcao de visualizador conseguir editar um projeto
MatheusCiocca Mar 30, 2025
d0727ac
feat: verifica caracteres especiais no ID da pergunta de extração
felipedresch Mar 30, 2025
ad20936
create funciona com quill
ARTHUR9011 Mar 31, 2025
91c2781
fix(LoginController + session.php): configuracoes de seguranca +
Eduardo-Prates Mar 31, 2025
95b4198
validar inputs
ARTHUR9011 Mar 31, 2025
7081801
mudanças no update do controller
ARTHUR9011 Mar 31, 2025
cc5bf70
Editando, mandando correto mas sem salvar BD
ARTHUR9011 Mar 31, 2025
3cb85d8
Adiciona checkboxes para Avaliação por Pares e Revisor no formulário …
camillabdt Mar 31, 2025
d68629d
permitir ler html Overview
ARTHUR9011 Mar 31, 2025
fa7420f
Ajuste searchTerm e SearchStringController
luscasmartinez Mar 31, 2025
4f7798b
Adição de Botão que abra diretamente o projeto a partir da pagina de …
Mar 31, 2025
dbec241
fazendo creates e tentando entender o sistema
camillabdt Mar 31, 2025
866d350
feat: planning progress bar updates after changes (add/delete)
JulioSilveiraFTTB Mar 31, 2025
0feaca1
Corrige problema de exclusão de questões de pesquisa: formulário é ap…
Francisco1669 Mar 31, 2025
ba524ee
fix
Francisco1669 Mar 31, 2025
35e3c59
enviando ajuste do routes permission pelo kernel
Mar 31, 2025
f29c4eb
arrumando os modelos livewer
camillabdt Apr 1, 2025
d5a12cb
Alterações do grupo 2
camillabdt Apr 1, 2025
2a1da76
Merge pull request #526 from R-ZW/dev-kng
diegocomis Apr 2, 2025
e388e1a
Delete config/app.php
diegocomis Apr 2, 2025
2e5d191
Merge pull request #527 from doffyGC/dev-guilherme
diegocomis Apr 2, 2025
52d073e
Merge pull request #528 from MiguelYSieghart/dev-Miguel
diegocomis Apr 2, 2025
117283f
Merge branch 'develop' into dev-ciocca
diegocomis Apr 2, 2025
aaa4568
Merge pull request #529 from MatheusCiocca/dev-ciocca
diegocomis Apr 2, 2025
cca30f1
Merge pull request #525 from wagnerquadros/develop
diegocomis Apr 2, 2025
d0a4dad
Merge pull request #530 from felipedresch/dev-dresch
diegocomis Apr 2, 2025
385387a
Merge pull request #531 from Eduardo-Prates/dev-edufuze
diegocomis Apr 2, 2025
8d72f6b
Merge pull request #536 from luscasmartinez/develop
diegocomis Apr 2, 2025
bda1655
Merge pull request #533 from ARTHUR9011/Rp5_Arthur
diegocomis Apr 2, 2025
ea38243
Merge pull request #539 from JulioSilveiraFTTB/feat/319/project-progr…
diegocomis Apr 2, 2025
ff0c7f1
Merge pull request #541 from 1802450038/bug/corrigindo-autenticacao
diegocomis Apr 2, 2025
713e2d0
Merge branch 'develop' into develop
PabloGuadagnin Apr 3, 2025
b23fa73
Merge pull request #537 from PabloGuadagnin/develop
diegocomis Apr 3, 2025
c90ed42
feat: upgrade on planning progress bar (incl. all items and better vi…
JulioSilveiraFTTB Apr 5, 2025
a72d153
fix(bug03): Terms & Synonyms - Error 500 and empty synonym
MiguelYSieghart Apr 5, 2025
9ea3e3b
fix(bug12): Add quality question with negative weight
MiguelYSieghart Apr 5, 2025
c25b6da
fix(bug 8): Correção de crash de "pelo menos" em critérios de inclusã…
doffyGC Apr 5, 2025
d3c53ca
Corrige cor do texto da sidebar com base na cor de fundo selecionada
camillabdt Apr 6, 2025
ac841a8
Trigger rebuild
camillabdt Apr 6, 2025
45046ee
fix+refactor(bug06): html warning in criteria blade and exception han…
reinaldowendt Apr 6, 2025
15304bc
feat: domain input corrected (only accepts words now)
JulioSilveiraFTTB Apr 6, 2025
6080715
feat: input validation on keywords and research questions
JulioSilveiraFTTB Apr 6, 2025
407a89e
fix: crash na exportacao consertada com verificacoes de 'papers' vazi…
MatheusCiocca Apr 6, 2025
4b05bbc
feat: strategy, criteria and terms input validation
JulioSilveiraFTTB Apr 6, 2025
e6c1221
fix(bug13): raw sql in import studies page
reinaldowendt Apr 6, 2025
43804ec
feat: input validation on data extraction and quality assessment
JulioSilveiraFTTB Apr 6, 2025
473b377
feat: adjusting code formatting
JulioSilveiraFTTB Apr 6, 2025
6799dfe
fix: labels fields in general score now save automatically
JulioSilveiraFTTB Apr 6, 2025
21d3afa
fix: evita a entrada da letra E e outros caracteres
felipedresch Apr 6, 2025
52b2893
fix (bug 43): aspas duplas quebram as strings de aviso
felipedresch Apr 6, 2025
830735d
Correção de ícone e texto de deslogar para dispositivos móveis
liviavbarbosa Apr 6, 2025
ac9afee
Remoção de barra extra que impedia a rolagem completa da tela de Crit…
liviavbarbosa Apr 6, 2025
bf8a801
correção na alteração de cores tema, seguindo a seguinte lógica de se…
gabrielaramires Apr 7, 2025
83c77db
fix(bug05): Test the new Grade Assignment flow
MiguelYSieghart Apr 7, 2025
54db71e
Refactor sidenav links for improved active state handling and formatting
Francisco1669 Apr 7, 2025
562a9f4
fix(bug 11): correção de problema de inconsistência entre idiomas nas…
doffyGC Apr 7, 2025
dca4698
adicionando o botão de configuração para guest
camillabdt Apr 7, 2025
eb657a8
"atualizando as configurações"
camillabdt Apr 7, 2025
6d59fad
ajuste completo na alteração das cores da barra e modo escuro/claro
gabrielaramires Apr 7, 2025
bc11f39
Merge branch 'grupo2' of https://github.com/camillabdt/thoth-remake i…
gabrielaramires Apr 7, 2025
5bb75b1
ajustes
gabrielaramires Apr 7, 2025
6ec26cb
Adição de validação para caracteres especiais no campo de ID da pergu…
liviavbarbosa Apr 7, 2025
168b894
ajuste completo na alteração das cores da barrabranco/preto e modo e…
gabrielaramires Apr 7, 2025
8cd8448
ajuste nas cores do cabeçalho ao voltar do tema escuro para claro
gabrielaramires Apr 7, 2025
b94b5b9
remoção pasta duplicada
gabrielaramires Apr 7, 2025
37c0607
Adicionado o app
Beutler28 Apr 7, 2025
96033b6
teste
Beutler28 Apr 7, 2025
b3c49f4
arrumado
Beutler28 Apr 7, 2025
bbfaf9d
Merge branch 'develop' into description-ci-ajuste
Beutler28 Apr 7, 2025
aeab01d
adicionando traducao
Francisco1669 Apr 7, 2025
1116ed1
Adição de linguagens extras e refatoração local
PabloGuadagnin Apr 7, 2025
5d1a8e9
Merge branch 'develop' into adicionando-traducao
Francisco1669 Apr 7, 2025
de3db9a
Add autocomplete suggestions for input fields across various forms
guimoura0202 Apr 7, 2025
49406a1
adicionando traducao corrigida
Francisco1669 Apr 7, 2025
9c90018
Remove unused datalist elements for criteria, question, quality quest…
guimoura0202 Apr 7, 2025
ace4af6
adição de variável no reset para que todos os campos sejam limpos cor…
gabrielaramires Apr 13, 2025
3f0ef13
adição do reset antes de editar uma questão para garantir a integrida…
gabrielaramires Apr 13, 2025
33bdf56
fix(bug 37): invalid bibUpload save and major problems with import
reinaldowendt Apr 13, 2025
1a21227
Revert "fix(bug 37): invalid bibUpload save and major problems with i…
reinaldowendt Apr 13, 2025
6ef5aef
fix(bug37): invalid bibUpload save and major problems with import
reinaldowendt Apr 13, 2025
1f30eb0
Revert "fix(bug37): invalid bibUpload save and major problems with im…
reinaldowendt Apr 13, 2025
87b8257
fix(bug17): General structure of the paper modal
MiguelYSieghart Apr 13, 2025
ce4858c
Revert "fix(bug17): General structure of the paper modal"
MiguelYSieghart Apr 13, 2025
01bb79e
ajuste no ícone de visualização de senha na tela de login
gabrielaramires Apr 14, 2025
3b95bf3
ajuste na visualização da senha na tela de cadastro de usuário
gabrielaramires Apr 14, 2025
7c0ef7d
fix: Finalização da correção de inconsistência entre idiomas
doffyGC Apr 14, 2025
045d85d
fix(bug 2): Correção de parâmetros não automatizados na etapa de cond…
doffyGC Apr 14, 2025
c17621f
colocar configuração
camillabdt Apr 14, 2025
f76bcd7
20250508
PabloGuadagnin May 8, 2025
d14dec4
atualizando comentarios para entender melhor o que cada coisa faz
camillabdt May 12, 2025
19b55e3
atualizando nav-bar
camillabdt May 12, 2025
cf8c61f
Comentários para auxiliar no entendimento do código
gabrielaramires May 15, 2025
75bd747
comentando
camillabdt May 19, 2025
6e639b1
Merge branch 'develop' into grupo2
diegocomis May 26, 2025
17bfdf4
Merge pull request #532 from camillabdt/grupo2
diegocomis May 26, 2025
d2319ba
Merge branch 'develop' into fix-at-research-question
diegocomis May 26, 2025
78fb590
Merge pull request #540 from Francisco1669/fix-at-research-question
diegocomis May 26, 2025
3b2e4f2
Merge branch 'develop' into feat/319/project-progression
diegocomis May 26, 2025
74980b6
Merge pull request #543 from JulioSilveiraFTTB/feat/319/project-progr…
diegocomis May 26, 2025
bea6577
Merge pull request #545 from R-ZW/dev-kng
diegocomis May 26, 2025
8c945a2
Merge pull request #547 from felipedresch/validacao-valores-pontuacao…
diegocomis May 26, 2025
a80fd7a
Merge pull request #548 from felipedresch/strings-quebradas-toasts
diegocomis May 26, 2025
4e7cb4e
Merge branch 'develop' into feat/input_fields_correction
diegocomis May 26, 2025
9d87e22
Merge pull request #546 from JulioSilveiraFTTB/feat/input_fields_corr…
diegocomis May 26, 2025
32a566d
Merge pull request #550 from liviavbarbosa/barra-extra-criterios
diegocomis May 26, 2025
231ae9b
Merge branch 'develop' into icone-deslogar-dispositivos-moveis
diegocomis May 26, 2025
c5ccfaa
Merge pull request #551 from liviavbarbosa/icone-deslogar-dispositivo…
diegocomis May 26, 2025
6824bd6
Merge branch 'develop' into dev-Miguel
diegocomis May 26, 2025
835fdbb
Merge pull request #553 from MiguelYSieghart/dev-Miguel
diegocomis May 26, 2025
e18e385
Merge pull request #554 from Francisco1669/side-menu-ajuste-home-sele…
diegocomis May 26, 2025
4588af9
Merge branch 'develop' into dev-guilherme
diegocomis May 26, 2025
2fdf7e5
Merge pull request #555 from doffyGC/dev-guilherme
diegocomis May 26, 2025
76cb1d0
Merge pull request #556 from MatheusCiocca/dev-ciocca
diegocomis May 26, 2025
dc97fec
Merge branch 'develop' into validacao-caracteres-especiais-id-pergunta
diegocomis May 26, 2025
b644bc2
Merge pull request #558 from liviavbarbosa/validacao-caracteres-espec…
diegocomis May 26, 2025
05e9655
Merge branch 'develop' into feat/automatic-saving-score-labels
diegocomis May 26, 2025
7a3eec5
Merge pull request #560 from JulioSilveiraFTTB/feat/automatic-saving-…
diegocomis May 26, 2025
36c5b6f
Merge branch 'develop' into description-ci-ajuste
diegocomis May 26, 2025
e11bed7
Merge pull request #567 from Beutler28/description-ci-ajuste
diegocomis May 26, 2025
ff6591d
Merge branch 'develop' into main
diegocomis May 26, 2025
3849e96
Merge pull request #568 from PabloGuadagnin/main
diegocomis May 26, 2025
165cf17
Merge pull request #569 from Francisco1669/adicionando-traducao
diegocomis May 26, 2025
374bab6
Merge branch 'develop' into main
diegocomis May 26, 2025
23b1bd1
Merge pull request #570 from guimoura0202/main
diegocomis May 26, 2025
940817d
Merge branch 'develop' into dev-gabrielaramires
diegocomis May 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 0 additions & 68 deletions .env.example

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ yarn-error.log
/.vscode
/.docker
.DS_Store
config/app.php
Empty file added app/Chat/chat.php
Empty file.
Empty file added app/Chat/chat_api/config.php
Empty file.
Empty file.
Empty file.
29 changes: 29 additions & 0 deletions app/Http/Controllers/ChatController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php

namespace App\Http\Controllers;

use Illuminate\Http\Request;
use App\Models\Mensagem;

class ChatController extends Controller
{
public function index($projeto_id)
{
return view('chat', compact('projeto_id'));
}

public function fetchMessages($projeto_id)
{
return Mensagem::where('projeto_id', $projeto_id)->get();
}

public function sendMessage(Request $request, $projeto_id)
{
return Mensagem::create([
'projeto_id' => $projeto_id,
'usuario' => $request->usuario,
'mensagem' => $request->mensagem,
]);
}

}
1 change: 0 additions & 1 deletion app/Http/Controllers/HomeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class HomeController extends Controller
// {
// $this->middleware('auth');
// }

/**
* Show the application dashboard.
*
Expand Down
64 changes: 45 additions & 19 deletions app/Http/Controllers/LoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,60 @@
class LoginController extends Controller
{
/**
* Display login page.
* Construtor para aplicar o middleware de limitação de taxa (throttle).
*/
public function __construct()
{
$this->middleware('throttle:5,1')->only('login');
}

/**
* Exibe a página de login.
*
*/
public function show(): View
{
return view('auth.login');
}

/**
* Realiza o login do usuário.
*
*/
public function login(Request $request)
{
// Validação das credenciais
$credentials = $request->validate([
'email' => ['required', 'email'],
'password' => ['required'],
]);

// Verifica se o usuário existe
$user = User::where('email', $request->email)->first();
// Verifica as credenciais e autentica o usuário
if (Auth::attempt($credentials)) {
$request->session()->regenerate(); // Regenera a sessão para evitar sequestro

if (!$user) {
return back()->withErrors(['email' => __('auth/login.user_not_found')]);
}
$user = Auth::user(); // Obtém o usuário autenticado diretamente

// Verifica se o usuário está ativo
if (!$user->active) {
return back()->withErrors(['email' => __('auth/login.inactive')]);
}
// Verifica se o IP armazenado na sessão corresponde ao IP atual
$userIp = session('user_ip');
$currentIp = $request->ip();

// Verifica as credenciais
if (Auth::attempt($credentials)) {
$request->session()->regenerate();
// Se o IP mudar, desloga o usuário e limpa a sessão
if ($userIp && $userIp !== $currentIp) {
Auth::logout(); // Faz logout
$request->session()->invalidate(); // Invalida a sessão
return redirect()->route('login')->with('error', 'Sessão expirada devido a mudança de IP.');
}

// Armazena o IP na sessão se não estiver já armazenado
session(['user_ip' => $currentIp]);

// Verificar se o usuário aceitou os termos e exibir modal se não aceitou
// Verifica se o usuário aceitou os termos e exibe o modal LGPD se necessário
if (!$user->terms_and_lgpd) {
// Define uma sessão para mostrar o modal LGPD após o login
$request->session()->flash('show_lgpd_modal', true);
}

// Redireciona para a página desejada
return redirect()->intended('about');
}

Expand All @@ -57,6 +75,10 @@ public function login(Request $request)
]);
}

/**
* Aceita os termos de uso e a LGPD.
*
*/
public function acceptLgpd(Request $request)
{
$user = Auth::user();
Expand All @@ -67,13 +89,17 @@ public function acceptLgpd(Request $request)
return response()->json(['success' => false], 401);
}

/**
* Realiza o logout do usuário.
*
*/
public function logout(Request $request)
{
Auth::logout();
Auth::logout(); // Realiza o logout do usuário

$request->session()->invalidate();
$request->session()->regenerateToken();
$request->session()->invalidate(); // Invalidar a sessão
$request->session()->regenerateToken(); // Regenera o token CSRF

return redirect('/');
return redirect('/'); // Redireciona para a página inicial
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,9 @@ public function index(string $id_project): View|RedirectResponse

//Verificar Campos necessários cadastrados no Planning
CheckProjectDataPlanning::checkProjectData($id_project);

// Consulta databases do projeto
$databases = $project->databases()->get();

return view('project.conducting.index', [
'project' => $project,
'studies' => $studies,
Expand Down
22 changes: 14 additions & 8 deletions app/Http/Controllers/Project/Planning/CriteriaController.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function store(Request $request, string $projectId): RedirectResponse
return redirect()
->back()
->with('activePlanningTab', 'criteria')
->with('error', 'Project not found');
->with('error', __('project/planning.criteria.not_found'));
}

$project = Project::findOrFail($projectId);
Expand All @@ -38,7 +38,7 @@ public function store(Request $request, string $projectId): RedirectResponse
->back()
->with('activePlanningTab', 'criteria')
->withErrors([
'duplicate' => 'The provided ID already exists in this project.',
'duplicate' => __('project/planning.criteria.duplicate_id'),
]);
}

Expand All @@ -56,10 +56,13 @@ public function store(Request $request, string $projectId): RedirectResponse
projectId: $projectId
);

$progress = app(PlanningProgressController::class)->calculate($projectId);

return redirect()
->back()
->with('activePlanningTab', 'criteria')
->with('success', 'Criteria added successfully');
->with('success', 'Criteria added successfully')
->with('progress', $progress);
}


Expand All @@ -81,7 +84,7 @@ public function update(Request $request, string $projectId, Criteria $criterion)

if ($existingCriteria) {
return back()->withErrors([
'duplicate' => 'The provided ID already exists in this project.',
'duplicate' => __('project/planning.criteria.duplicate_id'),
]);
}

Expand All @@ -96,7 +99,7 @@ public function update(Request $request, string $projectId, Criteria $criterion)
return redirect()
->back()
->with('activePlanningTab', 'criteria')
->with('success', 'Criteria updated successfully');
->with('success', __('project/planning.criteria.updated_success'));
}

/**
Expand All @@ -112,7 +115,7 @@ public function destroy(string $projectId, Criteria $criterion): RedirectRespons
if ($criterion->id_project != $projectId) {
return redirect()
->back()
->with('error', 'Criteria not found');
->with('error', __('project/planning.criteria.not_found'));
}


Expand All @@ -126,10 +129,13 @@ public function destroy(string $projectId, Criteria $criterion): RedirectRespons
projectId: $projectId
);

$progress = app(PlanningProgressController::class)->calculate($projectId);

return redirect()
->back()
->with('activePlanningTab', 'criteria')
->with('success', 'Criteria deleted successfully');
->with('success', __('project.planning.criteria.deleted_success'));

}

/**
Expand Down Expand Up @@ -160,7 +166,7 @@ public function change_preselected(Request $request, string $id): RedirectRespon
return redirect()
->back()
->with('activePlanningTab', 'criteria')
->with('success', 'Pre-selected value updated successfully');
->with('success', __('project/planning.criteria.preselected_updated'));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,12 @@ public function store(StoreOptionRequest $request, string $projectId): RedirectR
projectId: $projectId
);

$progress = app(PlanningProgressController::class)->calculate($projectId);

return redirect()
->back()
->with('activePlanningTab', 'data-extraction')
->with('progress', $progress)
->with('success', 'Option added successfully');
}

Expand Down Expand Up @@ -113,11 +116,13 @@ public function destroy(string $projectId, Option $option): RedirectResponse
);

$option->delete();
$progress = app(PlanningProgressController::class)->calculate($projectId);

return redirect()
->back()
->with('activePlanningTab', 'data-extraction')
->with('success', 'Question deleted successfully');
->with('progress', $progress)
->with('success', 'Option deleted successfully');
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,13 @@ public function store(StoreQuestionRequest $request, string $projectId): Redirec
projectId: $projectId
);

$progress = app(PlanningProgressController::class)->calculate($projectId);

return redirect()
->back()
->with('activePlanningTab', 'data-extraction')
->with('success', 'Question added successfully');
->with('success', 'Question added successfully')
->with('progress', $progress);
}

/**
Expand Down Expand Up @@ -101,11 +104,13 @@ public function destroy(string $projectId, Question $question): RedirectResponse
);

$question->delete();
$progress = app(PlanningProgressController::class)->calculate($projectId);

return redirect()
->back()
->with('activePlanningTab', 'data-extraction')
->with('success', 'Question deleted successfully');
->with('success', 'Question deleted successfully')
->with('progress', $progress);
}

/**
Expand Down
Loading