Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy to main #45

Merged
merged 245 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
245 commits
Select commit Hold shift + click to select a range
276ecc9
remove push from ci
fernandes-natanael Aug 1, 2024
77002af
Add dev to pipeline
fernandes-natanael Aug 1, 2024
85a0570
Merge pull request #16 from fga-eps-mds/fix-ci
fernandes-natanael Aug 1, 2024
3f0591d
feat(#71): Criacao de testes dos metodos de user service e correcoes
joaobisi Aug 2, 2024
0d0ff62
feat(#71): Criacao de testes dos metodos de user service e correcoes
joaobisi Aug 2, 2024
9d72ac1
Merge pull request #17 from fga-eps-mds/feat#71/gerenciar-roles
paulohgontijoo Aug 2, 2024
f629c2a
refacting project structure
fernandes-natanael Aug 4, 2024
b468333
feat(#108): adicionando yml de CD
paulohgontijoo Aug 5, 2024
9173dc3
fix(#108): ajustando path de arquivo sh
paulohgontijoo Aug 5, 2024
b70243f
feat(#108): ajustando nome de workflow
paulohgontijoo Aug 5, 2024
61e8960
test(#108): testando caminho alternativo para script
paulohgontijoo Aug 5, 2024
b8d2934
test(#108): testando comando para executar o shell script
paulohgontijoo Aug 5, 2024
e298883
fix(#108): retirando passo desnecessário
paulohgontijoo Aug 5, 2024
571ae36
test(#108): outro teste
paulohgontijoo Aug 5, 2024
f6daf22
test(#108): teste sem o /
paulohgontijoo Aug 5, 2024
7db87f5
testando pwd via ssh na maquina
paulohgontijoo Aug 5, 2024
2bf3b5c
Fixing import error
fernandes-natanael Aug 5, 2024
64b5cee
Merge pull request #19 from fga-eps-mds/fix-project-file-structure
DaviMatheus Aug 5, 2024
9da21c1
fix docker compose
fernandes-natanael Aug 6, 2024
8908415
adding docker network
fernandes-natanael Aug 6, 2024
de193af
fix docker compose
fernandes-natanael Aug 6, 2024
73c727f
[enhancement](#103):Criando a branch para padronização
Neoprot Aug 6, 2024
8eb144a
enhacement(#103):Arrumando caminho
Neoprot Aug 6, 2024
3295a23
enhancement(#103): criando o arquivo base
Neoprot Aug 6, 2024
9606633
enhacement(#103):removendo comentarios
Neoprot Aug 6, 2024
4b0b700
enhancement#103: adicionado componente padrao para botao
natanalmeida03 Aug 6, 2024
8dcb164
enhancement(#103):Componente MyInput
Neoprot Aug 7, 2024
e7ef900
enhancement(#103):adicionando propriedade ao MyInput
Neoprot Aug 7, 2024
b59fee5
enhancement(#103): atualizando propriedades MyButton
natanalmeida03 Aug 7, 2024
971eb3a
feat(#72): Página de recuperação de conta
Nanashii76 Aug 7, 2024
08cf67e
feat(#72): Página de redefinição de senha
Nanashii76 Aug 7, 2024
461d88c
feat(#72): Página de redefinição de senha e recuperação de senha
Nanashii76 Aug 7, 2024
95d54f6
feat(#74):Modelo inicial do editor de markdown
joaobisi Aug 9, 2024
cba144e
feat(#74): Correcao no css do preview de markdown
joaobisi Aug 9, 2024
44a1234
feat(#74): Correcao no css da lista de itens do preview de markdown
joaobisi Aug 9, 2024
1a15384
feat(#74):Permitindo modificar seleção de texto
Neoprot Aug 9, 2024
c2b71fd
feat(#74): Modificacao no estilo da toolbar do estudio
joaobisi Aug 10, 2024
c20ef10
feat(#74):Mudança na toolbar do editor
Neoprot Aug 10, 2024
52ddb73
Adding fix
fernandes-natanael Aug 10, 2024
ee2d3e3
Merge branch 'feat#72/recuperar-senha' into bug-124-jwtAuth
fernandes-natanael Aug 10, 2024
23468a1
format code
fernandes-natanael Aug 10, 2024
955708b
feat(#74): Permite adicionar figuras, imagens dinâmicas, gifs por url
marcomarquesdc Aug 11, 2024
7eeeb56
Merge pull request #21 from fga-eps-mds/bug-124-jwtAuth
fernandes-natanael Aug 11, 2024
8ea6b07
feat(#72): connect pages with back
fernandes-natanael Aug 12, 2024
c8f1521
feat(#74):Contador de linhas
Neoprot Aug 12, 2024
c84b77b
feat(#74):ajuste comentário
Neoprot Aug 12, 2024
399561e
feat(#74): Inclusao da SideBar
joaobisi Aug 12, 2024
19243ce
feat(#74): Correção de botões
joaobisi Aug 12, 2024
fcde0be
feat(#74): testes do MarkdownEditor render e botões
pfc15 Aug 12, 2024
9beca0e
feat(#74): Comunicacao com o servico para criar e buscar conteudos no…
joaobisi Aug 12, 2024
bd492fb
test(#108): testando novo script para ssh
paulohgontijoo Aug 12, 2024
fdcffff
test(#108): trocando a lib de workflow
paulohgontijoo Aug 12, 2024
f0ae69e
ajustando script
paulohgontijoo Aug 12, 2024
b0da087
test(#108): teste
paulohgontijoo Aug 12, 2024
7ad3e1c
test(#108): adicionando flag de terminal interativo
paulohgontijoo Aug 12, 2024
6451fe6
fix(#108): ajustando path cd
paulohgontijoo Aug 12, 2024
ed957b6
feat(#108): scripts shell de deploy
paulohgontijoo Aug 12, 2024
c979e47
fix(#108): corrigindo path
paulohgontijoo Aug 12, 2024
6969099
feat(#108): adicionando healthcheck ao processo
paulohgontijoo Aug 12, 2024
dd4dd00
fix(#108): ajustando comandos para serem executados como root
paulohgontijoo Aug 13, 2024
d9683d9
test(:108): segregando terminal de execução
paulohgontijoo Aug 13, 2024
6fb94fd
test(108): teste execução
paulohgontijoo Aug 13, 2024
5083e65
test(108): teste
paulohgontijoo Aug 13, 2024
6be35e0
fix(#108): unificado healthcheck com deploy
paulohgontijoo Aug 13, 2024
b0851af
feat(#108): adicionando versão final de script de deploy front
paulohgontijoo Aug 13, 2024
c265dbd
feat(#108): refatorando actions para trigger on push
paulohgontijoo Aug 13, 2024
9b5e455
feat(#108): finalizando estrutura de deploy
paulohgontijoo Aug 13, 2024
4e98ed0
teste da função de imagem
pfc15 Aug 13, 2024
7ddd6f0
feat(#74): teste da função de imagem
pfc15 Aug 13, 2024
853e13b
feat(#74) consertando testes studio useSession
pfc15 Aug 13, 2024
68763eb
feat(#108): ignorando testes falhos por enquanto
joaobisi Aug 13, 2024
84492d3
feat(#108): removendo testes falhos
joaobisi Aug 13, 2024
de3641c
Merge pull request #18 from fga-eps-mds/feat(#108)/pipeline-deploy
joaobisi Aug 13, 2024
d04fd3a
feat(#74): Ao salvar conteudo, criando caso ainda nao exista e atuali…
joaobisi Aug 14, 2024
a3e8470
feat(#74): Adicionando opcao de deletar conteudo a partir do estudio …
joaobisi Aug 15, 2024
565ead2
feat(#75):alterando sidebar
Joa0V Aug 15, 2024
467ee4b
feat(#76): Criando página de gerenciar jornadas
Nanashii76 Aug 15, 2024
200e5b3
feat(#74):Componentizando Estúdio de criação
Neoprot Aug 16, 2024
4448a8a
feat(#74):Componentização do Estúdio de criação
Neoprot Aug 16, 2024
fc48c51
Iniciando tela de jornadas(exclusion dialog)
Joa0V Aug 16, 2024
8be7d8d
feat(#75): Adicionando botão de nova jornada e form de edição de jornada
Joa0V Aug 16, 2024
b555ff3
feat(#74): Reposicionando botao Salvar
joaobisi Aug 16, 2024
fdd4afe
feat(#74):Arrumando FetchContents
Neoprot Aug 16, 2024
bd7de6a
feat(#75): adicionando funcionalidade a searchbar e alterando form de…
Joa0V Aug 17, 2024
ae4e4fe
Merge pull request #23 from fga-eps-mds/feat#72/recuperar-senha
DaviMatheus Aug 18, 2024
8d94d5a
feat(#74): Fazendo alteracoes na manipulacao do conteudo, levando a t…
joaobisi Aug 18, 2024
ef9305b
adicionando coleçção de componenetes shadcn/ui
marcomarquesdc Aug 19, 2024
724af42
feat(#75): adicionando componentes auxiliares
marcomarquesdc Aug 19, 2024
61b5af8
feat(#75): criação de componente data-table com row actions
marcomarquesdc Aug 19, 2024
276d5e5
feat(#75): criação de componente de colunas para a tabela
marcomarquesdc Aug 19, 2024
6005ab1
feat(#72): adding conection with backend
fernandes-natanael Aug 19, 2024
ef586a8
Merge branch 'feat#75/gerenciar-jornada' of github.com:fga-eps-mds/20…
fernandes-natanael Aug 19, 2024
e31375e
fix tests
fernandes-natanael Aug 19, 2024
f6e22e4
Merge branch 'feat#75/gerenciar-jornada' of github.com:fga-eps-mds/20…
fernandes-natanael Aug 19, 2024
00ce634
feat(#76): adding conection with backend
fernandes-natanael Aug 19, 2024
c670bff
feat(#75): Finalizando conexao entre as paginas de jornada e criacao …
joaobisi Aug 19, 2024
28d7ddf
feat(#74): adicao de navegacao da trilha pro estudio
joaobisi Aug 19, 2024
995f33b
[feat#74]-run-linter
DaviMatheus Aug 19, 2024
305b365
[feat#76]-fixing_tests
DaviMatheus Aug 19, 2024
6c80510
Merge pull request #22 from fga-eps-mds/feat#76/gerenciar-trilha
fernandes-natanael Aug 19, 2024
82c5268
feat(#74): arrumando testes
joaobisi Aug 20, 2024
f42f131
Merge branch 'feat#74/estudio-de-criacao' of github.com:fga-eps-mds/2…
joaobisi Aug 20, 2024
eadbb80
adding toast popup
fernandes-natanael Aug 20, 2024
e8ea309
adding new tests
fernandes-natanael Aug 20, 2024
ddb7298
Merge pull request #24 from fga-eps-mds/feat#74/estudio-de-criacao
fernandes-natanael Aug 20, 2024
0d2a2a8
feat(#74): testando o service studio maker
joaobisi Aug 20, 2024
ee68a34
Merge pull request #25 from fga-eps-mds/feat#74/estudio-de-criacao
DaviMatheus Aug 20, 2024
da6beb5
Novos testes no frontend
joaobisi Aug 20, 2024
c4e9b46
teste do signout button
pfc15 Aug 20, 2024
a02ecf0
Correcao de testes e modificacao no roteamento da landing page
joaobisi Aug 20, 2024
31f2cc3
Corrigindo importacao do useRouter
joaobisi Aug 20, 2024
2e4c205
Corrigindo importacao do useRouter no arquivo de testes da landingpage
joaobisi Aug 20, 2024
208d7ba
Merge pull request #26 from fga-eps-mds/add-tests
DaviMatheus Aug 21, 2024
2f07dec
Merge branch 'dev' of github.com:fga-eps-mds/2024.1-CALCULUS-Frontend…
natanalmeida03 Aug 21, 2024
98bc44f
#Enhancement(#103)-Padronizacao-de-componentes-do-frontend: atualizan…
natanalmeida03 Aug 21, 2024
f378611
Enhancement(#103)-Padronizacao-de-componentes-do-frontend: arrumando …
natanalmeida03 Aug 21, 2024
0289ac5
Merge pull request #20 from fga-eps-mds/Enhancement(#103)-Padronizaca…
joaobisi Aug 21, 2024
a058bec
Correcao no caminho dos endpoints que causavam problema no deploy e n…
joaobisi Aug 22, 2024
c5f38d8
Merge pull request #27 from fga-eps-mds/fix#74/estudio-de-criacao
paulohgontijoo Aug 22, 2024
4557b51
feat(#79):Criação básica da página
Neoprot Aug 23, 2024
83e0652
feat(#79): alteracao visual home.
natanalmeida03 Aug 23, 2024
344d692
feat(#79): alteracao visual home.
natanalmeida03 Aug 23, 2024
bd72f4a
feat(#122)/ordenacao-jornadas: modificando estilo de tabela
Nanashii76 Aug 23, 2024
e575fed
feat(#79):Ajustando rotas
Neoprot Aug 23, 2024
6c5fd3d
Merge branch 'feat#79/ingressar-na-jornada' of github.com:fga-eps-mds…
Neoprot Aug 23, 2024
bc89a34
feat(#79):Alterando Carrousel
Neoprot Aug 23, 2024
eb3af26
feat(#79): texto padrão home
Neoprot Aug 23, 2024
7e7d959
feat(#122)/ordenaca-jornadas: Seção de trilhas
Nanashii76 Aug 23, 2024
354e05c
feat(#78):criando componente JourneyInfo
Joa0V Aug 24, 2024
bca9739
feat#79: alterando area das jornadas
natanalmeida03 Aug 24, 2024
0588f11
feat(#78)/progresso-da-trilha: Criando página da Jornada
Nanashii76 Aug 24, 2024
a68c09f
feat#79: barra de busca
natanalmeida03 Aug 24, 2024
9acd33b
feat(#79):corrigindo estrutura e caminhos
Neoprot Aug 24, 2024
6da22c8
feat(#78):Adicionando trails a interface de Journey e contagem de tri…
Joa0V Aug 24, 2024
bdc8df7
feat(#78)/progresso-da-trilha: Criação da página de ingressão de trilha
Nanashii76 Aug 24, 2024
8474a4e
Update user.service.ts
fernandes-natanael Aug 25, 2024
423bc38
Update oauth page
fernandes-natanael Aug 25, 2024
0e0326e
Merge pull request #28 from fga-eps-mds/fernandes-natanael-patch-1
DaviMatheus Aug 25, 2024
d92457b
[feat#79]-fixing_navbar
DaviMatheus Aug 25, 2024
a182765
[feat#79]-adding_tests
DaviMatheus Aug 25, 2024
650c7a9
[feat#79]-adding_tests
DaviMatheus Aug 25, 2024
b20c4d3
[feat#79]-adding_tests
DaviMatheus Aug 25, 2024
766323c
Merge pull request #30 from fga-eps-mds/feat#79/ingressar-na-jornada
DaviMatheus Aug 25, 2024
a931683
[feat#79]-fixing_bug
DaviMatheus Aug 26, 2024
4797c0d
Merge pull request #31 from fga-eps-mds/feat#79/ingressar-na-jornada
fernandes-natanael Aug 26, 2024
37b1eff
Update home.services.tsx
DaviMatheus Aug 26, 2024
3a89335
Merge pull request #32 from fga-eps-mds/DaviMatheus-patch-1
joaobisi Aug 26, 2024
e290140
Inclusao do caminho das trilhas de uma jornada
joaobisi Aug 26, 2024
3691a9e
feat(#78): adicionando logica para usuario ingressar na jornada
joaobisi Aug 26, 2024
4be849e
feat(#78): correcao na declaracao da funcao chamada no onclick
joaobisi Aug 26, 2024
868a221
feat(#78): Alterando conexão com o UserService:
Nanashii76 Aug 26, 2024
d4c19fb
feat(#78): Botão de progresso
Nanashii76 Aug 27, 2024
f0ed482
front ordenação
pfc15 Aug 27, 2024
26d4c2b
feat(#78): corrigindo erro de tipagema e importacao
joaobisi Aug 27, 2024
1538ba7
Merge branch 'feat(#78)/progresso-da-trilha' of github.com:fga-eps-md…
joaobisi Aug 27, 2024
a66f619
adicao de novos testes
joaobisi Aug 27, 2024
3bf3c4e
teste da page de journey
joaobisi Aug 27, 2024
19a92a3
Merge pull request #33 from fga-eps-mds/enhancement/tests
DaviMatheus Aug 27, 2024
a891cb0
feat(#122)/sorting trails
pfc15 Aug 28, 2024
9c349d2
feat(#76): Arrumando página de gerenciamento de trilha
Nanashii76 Aug 28, 2024
1cf54d3
feat(#78): dando forma ao grafo de trilhas
joaobisi Aug 28, 2024
e9681b5
feat(#78): adicionando conexao entre as trilhas no grafo
joaobisi Aug 28, 2024
0f795b8
feat(#78): Página de visualização de trilhas
Nanashii76 Aug 28, 2024
6b74fd0
feat(#78):adicionando caso em que nao ha trilhas na jornada na journe…
Joa0V Aug 28, 2024
c048158
feat(#78): movendo nome da trilha
joaobisi Aug 28, 2024
4cf3143
feat(#78): Adicionando teste para a pagina de jornada
joaobisi Aug 28, 2024
027a5eb
feat(#78): Arrumando página de progresso de trilha
Nanashii76 Aug 28, 2024
e466050
Feat(#144): Estruturando página de gereência de starting points
marcomarquesdc Aug 29, 2024
7e7cbed
feat(#144):Adicionando métodos de start points ao studioMaker service
Joa0V Aug 29, 2024
36b0e00
Merge pull request #34 from fga-eps-mds/feat#76/gerenciar-trilha
DaviMatheus Aug 29, 2024
74b33c5
Feat(#144): Criando startpoint table
marcomarquesdc Aug 30, 2024
2659d4a
feat#79: alterando visual home
natanalmeida03 Aug 30, 2024
7145a70
feat(#144):Modificando start-point page
Joa0V Aug 30, 2024
7f196e9
feat(#80):Visualização de Conteúdo
Nanashii76 Aug 30, 2024
db3d057
feat(#80)/visualizar-conteudo
Nanashii76 Aug 30, 2024
20a3f81
feat(#144):adicionando metodos de criar e editar startPoint e testes
Joa0V Aug 30, 2024
2b63338
feat(#80)/visualizar-conteudo
Nanashii76 Aug 30, 2024
dbb5645
Corrigindo a renderizacao do markdown na trail page
joaobisi Aug 30, 2024
21a3df6
feat#79: puxando pontos de partida
natanalmeida03 Aug 30, 2024
0be22d5
feat(#79):Merging branch 78
Neoprot Aug 30, 2024
b55ea79
Desabilitando botao de avancar e retroceder conteudo cas o seja o ult…
joaobisi Aug 30, 2024
1b3e2d1
feat(#79):Criando o redirecionamento
Neoprot Aug 30, 2024
6ae0731
feat(#79):Criando o redirecionamento
Neoprot Aug 30, 2024
2f8c816
Merge branch 'feat#79/ingressar-na-jornada' of github.com:fga-eps-mds…
Neoprot Aug 30, 2024
d73e349
feat(#80)/visualziar-conteudo
Nanashii76 Aug 30, 2024
1867872
Correcao necessaria para renderizar conteudo no editor markdown
joaobisi Aug 30, 2024
9f2ecff
feat(#144):Adicionando funcionalidade createStartPoint a start-point …
Joa0V Aug 30, 2024
3b83a30
feat(#144):Adicionando funcionalidade updateStartPoint a start-point …
Joa0V Aug 30, 2024
af5bb95
Alteração no layout da sidebar do editor e no modo de salvar conteudo
joaobisi Aug 30, 2024
f4825c9
Movendo o botao de criar novo conteudo para a toolbar
joaobisi Aug 30, 2024
80ce9ef
Merge remote-tracking branch 'origin/dev' into fix#74/estudio-de-criacao
joaobisi Aug 31, 2024
cde6907
merge conflicts
fernandes-natanael Aug 31, 2024
06e77ad
fix package.json
fernandes-natanael Aug 31, 2024
587f9ef
Merge pull request #35 from fga-eps-mds/fix#74/estudio-de-criacao
fernandes-natanael Aug 31, 2024
61a0f77
feat(#78)/progresso-da-trilha
Nanashii76 Aug 31, 2024
0b04f5f
merge branch feat#80/visualizar-conteudo
Nanashii76 Aug 31, 2024
85d0b70
feat(#78)/progresso-da-trilha
Nanashii76 Aug 31, 2024
fe6b535
adding ordenation
fernandes-natanael Aug 31, 2024
7be8d16
removing duplicated code
fernandes-natanael Aug 31, 2024
3766910
adding ordenation
fernandes-natanael Aug 31, 2024
851d9c2
adding redirection to home
fernandes-natanael Aug 31, 2024
1b400e2
Colorindo trilhas completadas pelo usuario
joaobisi Aug 31, 2024
682841f
feat(#78): Progresso de trilha
Nanashii76 Aug 31, 2024
990c5d9
feat(#78): Progresso da trilha
Nanashii76 Aug 31, 2024
34bbc60
preparing ordenation to content
fernandes-natanael Sep 1, 2024
79f3df3
feat(#122): Ordenação do Studio
Nanashii76 Sep 1, 2024
687f505
feat(#79):adicionando redirecionamento a jornada do JourneyCard
Joa0V Sep 2, 2024
155aaee
feat#79: atualizando testes
natanalmeida03 Sep 2, 2024
a57dbd9
feat#79: atualizando testes
natanalmeida03 Sep 2, 2024
ea66d09
Merge pull request #36 from fga-eps-mds/feat#79/ingressar-na-jornada
DaviMatheus Sep 2, 2024
501a2a8
adding ordering to content
fernandes-natanael Sep 2, 2024
bb0b838
Merge branch 'dev' into feat(#78)/progresso-da-trilha
Nanashii76 Sep 2, 2024
a5ff85e
merge conflicts
fernandes-natanael Sep 2, 2024
50c0a24
Merge pull request #37 from fga-eps-mds/feat(#122)/ordenacao-jornadas
DaviMatheus Sep 2, 2024
f009bd1
merge conflicts
fernandes-natanael Sep 2, 2024
1c77465
fix tests
fernandes-natanael Sep 2, 2024
5e22b37
Merge pull request #38 from fga-eps-mds/feat(#78)/progresso-da-trilha
DaviMatheus Sep 2, 2024
c2e98a5
feat(#78): Progresso da Trilha
Nanashii76 Sep 3, 2024
2c084e8
fix(#71):Resolvendo erro alterar role
Neoprot Sep 3, 2024
34d9b81
feat(#78):adicionando botoes de voltar e avancar jornadas
Joa0V Sep 3, 2024
481edf5
fix(#71):Mudando a função para receber token
Neoprot Sep 3, 2024
589d80f
fix(#71): criando teste para o metodo updateUserRole atualizado
joaobisi Sep 3, 2024
3bea937
Merge pull request #39 from fga-eps-mds/fix(#71)/gerenciar-roles
Neoprot Sep 3, 2024
1319102
feat(#78):Reposicionando os botões de voltar e avançar
Neoprot Sep 3, 2024
4b2eae8
feat(#78):mantendo a Toolbar no lugar
Neoprot Sep 3, 2024
55dd272
Ordenacao funcioanando, fetch não funcionando
pfc15 Sep 4, 2024
8f7693f
fix(#144): Ordenaçaõ Starting Points
Nanashii76 Sep 4, 2024
81f7063
fix(#144): Estilização da startingPointsTable
Nanashii76 Sep 4, 2024
146d811
Merge pull request #41 from fga-eps-mds/fix#144/ordenacao-pontos-de-p…
DaviMatheus Sep 5, 2024
c4fc494
Merge pull request #40 from fga-eps-mds/feat(#78)/progresso-da-trilha
DaviMatheus Sep 5, 2024
3c035c5
fix trocar nome do menu e router
pfc15 Sep 5, 2024
938d7ad
fix:arrumando scroll da journeypage
Neoprot Sep 5, 2024
8df9214
Merge branch 'dev' into fix#144/ordenacao-pontos-de-partida
DaviMatheus Sep 5, 2024
b937e41
Merge pull request #42 from fga-eps-mds/fix#144/ordenacao-pontos-de-p…
DaviMatheus Sep 5, 2024
ad4249d
fix(#149): adding fix to reability and manutenability
fernandes-natanael Sep 8, 2024
c6456b9
fix(#149): adding tests
fernandes-natanael Sep 9, 2024
dc8b981
update actions
fernandes-natanael Sep 9, 2024
fe3f38c
fix(#149): adding tests
fernandes-natanael Sep 9, 2024
012ec72
adding tests
fernandes-natanael Sep 9, 2024
3305ced
adding tests
fernandes-natanael Sep 9, 2024
d4623ea
adding tests
fernandes-natanael Sep 9, 2024
84c1514
Merge pull request #43 from fga-eps-mds/fix-sonar-hotspots
DaviMatheus Sep 9, 2024
48a4abc
removing comments
fernandes-natanael Sep 9, 2024
56e56bc
adding tests
fernandes-natanael Sep 9, 2024
5dea10f
Merge pull request #44 from fga-eps-mds/fix-sonar-hotspots
fernandes-natanael Sep 9, 2024
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
9 changes: 0 additions & 9 deletions .env.dev

This file was deleted.

3 changes: 3 additions & 0 deletions .env.dev.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
NEXT_PUBLIC_API_URL=
NEXTAUTH_URL=
NEXTAUTH_SECRET=
5 changes: 3 additions & 2 deletions .github/workflows/code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ name: Análise de Código
on:
push:
branches:
- dev
- main
- master
pull_request:

branches:
- dev
- main
- master

Expand All @@ -15,7 +16,7 @@ jobs:
name: SonarCloud
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/deploy-vm-azure.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Deploy App in Azure

# Dispara o workflow para push e pull request na branch 'dev'
on:
push:
branches:
- dev


jobs:
run-script:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: executing remote ssh commands using password
uses: appleboy/[email protected]
with:
host: ${{ secrets.IP_VM_AZURE_DEV }}
username: ${{ secrets.USER_VM_AZURE_DEV }}
password: ${{ secrets.USER_VM_AZURE_DEV }}
port: 22
request_pty: true
script: |
ls -alt
cd /home/Calculus-admin1/app
pwd
sudo ./manage_process_front.sh
echo "Starting deploy Front"
sudo ./deploy_front.sh


8 changes: 3 additions & 5 deletions .github/workflows/metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ name: Metrics and Release
on:
pull_request:
branches:
- main
- dev
- master
types: [closed]
push:
branches:
- main
- master
types: [closed]


jobs:
release:
Expand Down
8 changes: 2 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ yarn-error.log*
*.tsbuildinfo
next-env.d.ts

package-lock.json
/package-lock.json

reports/*

reports

report
/reports/*.xml
7 changes: 1 addition & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,12 @@ FROM node:18

WORKDIR /src


COPY package*.json ./

RUN npm install nodemon --save-dev

RUN npm install

COPY . .

RUN npm run build

EXPOSE 4000

CMD ["npm", "run", "start"]
CMD ["npm", "run", "dev"]
17 changes: 17 additions & 0 deletions components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": true,
"tsx": true,
"tailwind": {
"config": "tailwind.config.ts",
"css": "src/app/globals.css",
"baseColor": "slate",
"cssVariables": false,
"prefix": ""
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
}
8 changes: 7 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,10 @@ services:
- ./src:/app/src
env_file:
- .env

networks:
- calculus-network


networks:
calculus-network:
driver: bridge
18 changes: 8 additions & 10 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
import type { Config } from 'jest';
import nextJest from 'next/jest';

import nextJest from 'next/jest.js'

const createJestConfig = nextJest({
dir: './src',
})
dir: './',
});

const config: Config = {
coverageProvider: 'v8',
testEnvironment: 'jsdom',
preset: 'ts-jest',
moduleNameMapper: {
// ...
'^@/components/(.*)$': '<rootDir>/src/app/components/$1',
'^@/(.*)$': '<rootDir>/src/$1',
'\\.(css|less|scss|sass)$': 'identity-obj-proxy',
},
reporters: [
'default',
Expand All @@ -25,7 +23,7 @@ const config: Config = {
},
],
],
testMatch: ['<rootDir>/test/**/*.(test|spec).ts?(x)'],
};

}

export default createJestConfig(config)
export default createJestConfig(config);
8 changes: 8 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// next.config.js

/** @type {import('next').NextConfig} */
const nextConfig = {
reactStrictMode: true,
}

module.exports = nextConfig
8 changes: 0 additions & 8 deletions next.congif.js

This file was deleted.

27 changes: 24 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"start": "next start -p 4000",
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
"test": "jest --passWithNoTests --no-cache --runInBand",
"test:all": "npm run test -- --coverage --config jest.config.ts"
"test:all": "npm run test -- --coverage --config jest.config.ts",
"coverage": "jest --coverage"
},
"dependencies": {
"@emotion/react": "^11.13.0",
Expand All @@ -20,29 +21,49 @@
"@hookform/resolvers": "^3.9.0",
"@mui/icons-material": "^5.16.5",
"@mui/material": "^5.16.5",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-slot": "^1.1.0",
"@tanstack/react-query": "^5.51.11",
"@tanstack/react-table": "^8.20.1",
"axios": "^1.7.2",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"cookie": "^0.6.0",
"dotenv": "^16.4.5",
"glob": "^9.3.5",
"jsonwebtoken": "^9.0.2",
"lucide-react": "^0.428.0",
"material-react-table": "^2.13.1",
"next": "^14.2.5",
"next-auth": "^4.24.7",
"next-safe-action": "^7.4.3",
"react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.52.1",
"react-markdown": "^9.0.1",
"react-table": "^7.8.0",
"react-multi-carousel": "^2.8.5",
"react-toastify": "^10.0.5",
"rehype-katex": "^7.0.0",
"rehype-raw": "^7.0.0",
"remark-gfm": "^4.0.0",
"remark-math": "^6.0.0",
"sonner": "^1.5.0",
"tailwind-merge": "^2.5.2",
"tailwindcss-animate": "^1.0.7",
"zod": "^3.23.8"
},
"devDependencies": {
"@testing-library/jest-dom": "^6.4.8",
"@tanstack/react-query-devtools": "^5.51.21",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^16.0.0",
"@types/cookie": "^0.6.0",
"@types/jest": "^29.5.12",
"@types/jsonwebtoken": "^9.0.6",
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/tough-cookie": "^4.0.5",
"autoprefixer": "^10.4.19",
"eslint": "^8",
"eslint-config-next": "14.2.5",
Expand Down
59 changes: 59 additions & 0 deletions scripts/deploy/deploy_front.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/bin/bash

SESSION_NAME="npm_run_session"
ENV="dev"
DIR1="/home/Calculus-admin1/app/2024.1-CALCULUS-Frontend"

# Comandos renomeados para refletir a ordem de execução
CMD1="git fetch"
CMD2="git checkout $ENV"
CMD3="git pull origin $ENV"
CMD4="npm install"
CMD5="npm run dev &"
CMD6="echo Starting Deploy Front"

# Função para iniciar a sessão tmux e executar comandos
start_tmux_session() {
# Criar uma nova sessão tmux
tmux kill-session -t $SESSION_NAME 2>/dev/null
tmux new-session -d -s $SESSION_NAME

# Executar os comandos na pasta do frontend
tmux send-keys -t $SESSION_NAME "cd $DIR1" C-m
tmux send-keys -t $SESSION_NAME "$CMD1" C-m
tmux send-keys -t $SESSION_NAME "$CMD2" C-m
tmux send-keys -t $SESSION_NAME "$CMD3" C-m
tmux send-keys -t $SESSION_NAME "$CMD4" C-m
tmux send-keys -t $SESSION_NAME "$CMD5" C-m
tmux send-keys -t $SESSION_NAME "$CMD6" C-m

# Anexar à sessão tmux para visualizar os comandos em execução
}

# Função para executar o health check
run_healthcheck() {
PORT=4000
CHECK_INTERVAL=5

echo "Iniciando health check para a porta $PORT..."

while true; do
# Executa o comando para verificar se a porta está em uso
OUTPUT=$(ss -tuln | grep ":$PORT")

# Verifica se há algum resultado
if [ -n "$OUTPUT" ]; then
echo "A porta $PORT está em uso. Encerrando o health check."
break
else
echo "A porta $PORT não está em uso. Verificando novamente em $CHECK_INTERVAL segundos..."
sleep $CHECK_INTERVAL
fi
done
}

# Iniciar a sessão tmux e executar os comandos
start_tmux_session

# Após a execução do tmux, iniciar o health check
run_healthcheck
31 changes: 26 additions & 5 deletions src/app/(auth)/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use client';

import { Box } from '@mui/material';
import { Box, Grid, Link } from '@mui/material';
import Image from 'next/image';
import calcuclusLogo from '@/public/calculus-logo.svg';
import LoginComponent from '@/app/components/login.component';
import { GoogleAuthButton } from '@/components/ui/buttons/googleAuth.button';
import { MicrosoftAuthButton } from '@/components/ui/buttons/microsoftAuth.button';
import { SingInForm } from '@/components/forms/signInForm';

export default function LoginPage() {
return (
Expand All @@ -19,7 +19,28 @@ export default function LoginPage() {
/>
<p className="text-[32px] font-bold">Login</p>
</Box>
<LoginComponent />
<Grid
container
spacing={1}
justifyContent="center"
className="mt-2 mb-2"
>
<Grid item>
<GoogleAuthButton />
</Grid>
<Grid item>
<MicrosoftAuthButton />
</Grid>
</Grid>

<SingInForm />

<p className="text-[18px] font-light">
Novo Usuário?
<Link href="/register" className="text-indigo-700 block">
Cadastre-se
</Link>
</p>
</Box>
</Box>
);
Expand Down
Loading
Loading