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

Feat/74 custo logistico #87

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
378 commits
Select commit Hold shift + click to select a range
58d9606
refactor: refatora chamada da dialog de perfil
thiagohdaqw Oct 24, 2023
630c0c0
feat: cria componnet do perfil
thiagohdaqw Oct 24, 2023
a66bbdb
chore: adiciona classes do collapse
thiagohdaqw Oct 24, 2023
8281792
feat: adiciona criacao de perfil
thiagohdaqw Oct 24, 2023
7c5401c
fix: troca erro para warn na autenticacao
thiagohdaqw Oct 24, 2023
49daed4
refactor: create table row component
VitorLamego Oct 25, 2023
a9af201
refactor: desacopla modal
thiagohdaqw Oct 25, 2023
5efc3df
refactor: generaliza e desacopla collpse
thiagohdaqw Oct 25, 2023
65f6ae5
feat: adiciona readonly no collapse
thiagohdaqw Oct 25, 2023
88a16f0
feat: adiciona readonly no collapse
thiagohdaqw Oct 25, 2023
1d02995
feat: add tests collapse
Oct 25, 2023
218603c
feat: cria pagina vazia com Gerencia de usuarios com header e footer
RafaelBP02 Oct 25, 2023
4f8cc97
feat: adiciona edicao de perfil
thiagohdaqw Oct 25, 2023
5b52092
feat: adiciona notificacao
thiagohdaqw Oct 25, 2023
cd863e7
Merge branch 'develop' into feat/64-gerenciar-perfis
thiagohdaqw Oct 25, 2023
25c927b
refactor: create table row component
VitorLamego Oct 25, 2023
8a8fb7c
fix: arruma testes
thiagohdaqw Oct 25, 2023
a5163cb
fix: visualizacao do collapse no readonly
thiagohdaqw Oct 25, 2023
90680a1
feat: adiciona tabela com perfis
thiagohdaqw Oct 25, 2023
90fbb1b
feat: adiciona detalhes do perfil
thiagohdaqw Oct 25, 2023
6b8a2c6
feat: adiciona mensagens de erro
thiagohdaqw Oct 25, 2023
752cfd4
feat: adição da exclusão do perfil
thiagohdaqw Oct 25, 2023
4df5cd7
refactor: componentizando dialog de deletar perfil
thiagohdaqw Oct 25, 2023
26b2f2d
feat: adiciona paginacao na tabela de perfis
thiagohdaqw Oct 25, 2023
dd0e4b0
Merge branch 'develop' of github.com:fga-eps-mds/2023.2-Dnit-Front in…
VitorLamego Oct 25, 2023
83851fc
feat: adiciona filtro por nome
thiagohdaqw Oct 25, 2023
58dd7a3
fix: arruma url no env de exemplo
thiagohdaqw Oct 25, 2023
3b3b1ae
fix: components tests
VitorLamego Oct 25, 2023
3723358
fix: code bugs by sonar cloud
VitorLamego Oct 25, 2023
3f4dd09
refactor: handle form submit
VitorLamego Oct 25, 2023
cf7dc26
feat: Inicia construcao da tabela no padrao do governo
RafaelBP02 Oct 25, 2023
0006118
Merge pull request #11 from fga-eps-mds/feat/66-implementar-design-sy…
thiagohdaqw Oct 25, 2023
e090b30
feat: aumenta tempo da mensagem de erro
thiagohdaqw Oct 25, 2023
14e9e54
Merge remote-tracking branch 'origin/develop' into feat/64-gerenciar-…
thiagohdaqw Oct 25, 2023
10b0514
feat: Arrumando estilização dos componentes
victorhugo21 Oct 25, 2023
9e045d9
fix: arruma test
thiagohdaqw Oct 25, 2023
cd92dc5
fix: user profile letter on header
VitorLamego Oct 25, 2023
74b92b1
refactor: add height on root app classes
VitorLamego Oct 25, 2023
5373d63
test: adiciona teste de perfil
thiagohdaqw Oct 25, 2023
33f3a9d
chore: Padroniza a tabela
RafaelBP02 Oct 25, 2023
5bf8682
feat: Corrigindo estilo de acordo com o design system do gov
victorhugo21 Oct 25, 2023
0f0ba7f
refactor: modulariza arquivos de teste
thiagohdaqw Oct 25, 2023
cfd97c3
feat: Colocando o botão de criar perfil no lugar correto
victorhugo21 Oct 25, 2023
3de0532
feat: Adicionando verificação de permissão para mostrar gerenciar per…
victorhugo21 Oct 25, 2023
b9087b6
refactor: add z-index to footer
VitorLamego Oct 25, 2023
80eae5c
hotfix: corrigindo verificação da permissão por url
victorhugo21 Oct 25, 2023
ecc0ab9
Merge branch 'feat/64-gerenciar-perfis' of https://github.com/fga-eps…
victorhugo21 Oct 25, 2023
d19ff2a
fix: remove arquivos desnecessarios
thiagohdaqw Oct 25, 2023
065eeec
test: adiciona teste do gerenciar perfis
thiagohdaqw Oct 25, 2023
85248e1
fix: arruma formatacao do gerenciar perfis
thiagohdaqw Oct 25, 2023
88b7844
Merge pull request #10 from fga-eps-mds/feat/64-gerenciar-perfis
victorhugo21 Oct 25, 2023
10827fc
Merge branch 'main' into develop
RafaelBP02 Oct 26, 2023
8d880be
test: remove teste duplicado
RafaelBP02 Oct 26, 2023
fb6d4ce
Merge pull request #12 from fga-eps-mds/develop
victorhugo21 Oct 26, 2023
2799afd
chore: atualiza branch com a develop
RafaelBP02 Oct 26, 2023
987d35f
chore: Corrige a tabela para o componente já criado
RafaelBP02 Oct 26, 2023
888ae9b
chore: Cria Componente Select
RafaelBP02 Oct 26, 2023
d8f2883
fix: Corrige Componente Select
RafaelBP02 Oct 26, 2023
f3943de
chore: Adiciona icone SVG para Gerenciar Usuarios
RafaelBP02 Oct 27, 2023
e2a3701
feat: mostra usuarios na tabela a partir de dados do back
RafaelBP02 Oct 27, 2023
28d33e3
feat: Filtra por UF a partir da conexão com o back
RafaelBP02 Oct 27, 2023
56f309a
feat: Atualiza tipo do perfil do usuario
RafaelBP02 Oct 28, 2023
6f36b48
test: Faz teste do componente Select
RafaelBP02 Oct 28, 2023
c32ba84
Merge branch 'develop' into hotfix/38-refatorar-comunicacao-com-a-api
victorhugo21 Oct 28, 2023
93291fb
fix: arruma bug do footer nas páginas de login e de cadastro
csreis72 Oct 28, 2023
91be3ee
test: Faz testes do componente EditarTipoPerfilDialog
RafaelBP02 Oct 28, 2023
e12b18f
fix: conserta bug do footer na página de cálculo de UPS
csreis72 Oct 28, 2023
45ca7b6
chore: Adiciona controle de acesso para Gerenciar Usuarios
RafaelBP02 Oct 28, 2023
80efe38
feat: Adiciona filtro de municipios
RafaelBP02 Oct 29, 2023
dfc65c1
test: Complementa testes da dashboard
RafaelBP02 Oct 29, 2023
1406b09
test: Faz testes da pagina de Gerenciar Usuarios
RafaelBP02 Oct 29, 2023
6b5f048
fix: Corrige bug de não listar as UFs dos usuarios corretamente
RafaelBP02 Oct 29, 2023
b9236c8
fix: Corrige o cadastro de usuarios
RafaelBP02 Oct 29, 2023
0272fb8
chore: Adiciona a requisição de municipio do usuario
RafaelBP02 Oct 29, 2023
0aec2f7
fix: Corrige bug detectado pelo Sonar e refatora teste de Gerenciar U…
RafaelBP02 Oct 29, 2023
efb5c23
test: Melhora os testes da página Gerenciar Usuários
RafaelBP02 Oct 29, 2023
67d9ff0
Merge pull request #13 from fga-eps-mds/hotfix/97-footer-nao-responsivo
VitorLamego Oct 29, 2023
a0399dc
Merge pull request #14 from fga-eps-mds/feat/2-gerenciar-diferentes-t…
RafaelBP02 Oct 29, 2023
6f59c64
fix: remove botao duplicado
thiagohdaqw Oct 29, 2023
7b2f46c
fix: arruma atualizacao do token e ortografia
thiagohdaqw Oct 29, 2023
f82c66e
hotfix: Inicio da correção de bugs detectados pelo Sonar
RafaelBP02 Oct 29, 2023
ba936e1
hotfix: Finaliza correções de bugs detectadas pelo Sonar até este mom…
RafaelBP02 Oct 30, 2023
1a7bdda
hotfix: Corrige testes do componente Select
RafaelBP02 Oct 30, 2023
7a3ff47
fix: Corrige componente Select
RafaelBP02 Oct 30, 2023
d7e7058
Merge pull request #15 from fga-eps-mds/Hotfix/Concerta_Bugs_Detectad…
RafaelBP02 Oct 30, 2023
946b316
fix: começa correção de paginação da tabela de usuários
yudi-azvd Oct 30, 2023
d19e674
bug: Concerta bug de mostrar placeholder
RafaelBP02 Oct 31, 2023
463c9f7
Test: Corrige testes dos componentes Select e EditarTipoPerfilDialog
RafaelBP02 Oct 31, 2023
735ff5f
refactor: renomeia action para ci
thiagohdaqw Oct 31, 2023
0a015f3
feat: adiciona acton do deploy continuo
thiagohdaqw Oct 31, 2023
e0ca0e2
feat: adiciona package locks
thiagohdaqw Oct 31, 2023
79b0e0e
fix: adicionando silent nos test do deploy
thiagohdaqw Oct 31, 2023
7ea505c
fix: optimize deploy tests
thiagohdaqw Oct 31, 2023
e2ddae5
ci: fix build fail
thiagohdaqw Oct 31, 2023
4e7515c
ci: definindo deploy para a branch develop
thiagohdaqw Oct 31, 2023
88d79e6
Merge pull request #18 from fga-eps-mds/deploy_continuo
thiagohdaqw Oct 31, 2023
49a1f69
Merge pull request #16 from fga-eps-mds/develop
thiagohdaqw Oct 31, 2023
7c5d192
fix: Corrige seleção de itens por página
RafaelBP02 Nov 1, 2023
f65747f
fix: Corrige o selecionador de páginas da paginação
RafaelBP02 Nov 1, 2023
f571335
fix: Finaliza correção da paginação
RafaelBP02 Nov 1, 2023
131729c
Merge pull request #17 from fga-eps-mds/Bugfix/placeholder-editar-tip…
RafaelBP02 Nov 1, 2023
0f76d98
Merge branch 'develop' into hotfix/paginacao-usuarios
RafaelBP02 Nov 1, 2023
4318100
Merge branch 'develop' into hotfix/38-refatorar-comunicacao-com-a-api
victorhugo21 Nov 1, 2023
19dfe6d
test: Faz teste da seleção de itens por pagina
RafaelBP02 Nov 1, 2023
731cbb0
Alocando um construtor para o recebimento de erros
Nov 2, 2023
3424c52
test: Corrige testes e faz teste de passar a pagina da tabela
RafaelBP02 Nov 2, 2023
839f02f
test: Cria testes para o dropdown de selecionar pagina da tabela
RafaelBP02 Nov 2, 2023
58dcd5d
fix: arruma redirecionamento no deploy
thiagohdaqw Nov 3, 2023
d1ac762
Merge branch 'develop' into hotfix/38-refatorar-comunicacao-com-a-api
victorhugo21 Nov 3, 2023
9435c9a
test: Refatora alguns testes e IDs de teste
RafaelBP02 Nov 3, 2023
28bd4fa
test: Faz novos testes para o componente de tabela customisável
RafaelBP02 Nov 3, 2023
02cd2bf
test: testa requisições ao passar de pagina no Gerenciar Usuario
RafaelBP02 Nov 3, 2023
02e368b
fix: refatorando as pastas de requisição para a api
victorhugo21 Nov 3, 2023
7ce5876
fix: Arrumando testes
victorhugo21 Nov 3, 2023
c54d98b
Merge branch 'hotfix/38-refatorar-comunicacao-com-a-api' into hotfix/…
victorhugo21 Nov 4, 2023
e0ead36
fix: Arrumando testes e erros de import
victorhugo21 Nov 4, 2023
2b84537
fix: Arrumando os problemas do merge com a develop
victorhugo21 Nov 5, 2023
ecc0bfb
fix: Dropdown fecha quando clika fora do componente
RafaelBP02 Nov 6, 2023
6ef76e5
fix: Faz modal fechar ao ser clikada no overlay
RafaelBP02 Nov 7, 2023
285c18f
test: Cria novos testes para o componente de Modal
RafaelBP02 Nov 7, 2023
f60f373
test: Cria no teste para o componente Select
RafaelBP02 Nov 7, 2023
a6fe0bf
test: Testa se a opção todos foi adicionada no componente Select
RafaelBP02 Nov 7, 2023
e7b3b1c
refactor: organize imports of same file
VitorLamego Nov 7, 2023
cf87c9b
refactor: remove unused code
VitorLamego Nov 7, 2023
85c04d4
refactor: change methods names on api service files
VitorLamego Nov 7, 2023
6c9143b
refactor: update methos calls on components
VitorLamego Nov 7, 2023
94bd12a
refactor: update tests to new methos on api call
VitorLamego Nov 7, 2023
bdca826
fix: remove comment
VitorLamego Nov 7, 2023
cd86685
fix: instala versão especifica da cli de deploy da azure
wagnermc506 Nov 8, 2023
b62809b
Merge pull request #20 from fga-eps-mds/hotfix/38-refatorar-comunicac…
wagnermc506 Nov 8, 2023
3579922
Merge branch 'develop' into hotfix/37-refatorar-a-disposicao-das-past…
victorhugo21 Nov 8, 2023
2481663
feat: Atualiza o gerenciamento de usuario
RafaelBP02 Nov 9, 2023
9660c46
test: Faz novos teste para o seletor de UF
RafaelBP02 Nov 9, 2023
84f7597
feat: Permite alterar o municipio do usuario e concerta o filtro de m…
RafaelBP02 Nov 10, 2023
2a60860
feat: Faz a lista atualizar ao mudar o municipio
RafaelBP02 Nov 10, 2023
c1d64c9
fix: Corrige bug de edição de usuário
RafaelBP02 Nov 10, 2023
81a2479
Merge pull request #5 from fga-eps-mds/hotfix/37-refatorar-a-disposic…
DanielPortods Nov 10, 2023
44457aa
Merge branch 'develop' into hotfix/paginacao-usuarios
RafaelBP02 Nov 10, 2023
2294e3b
fix: Corrige usuario.ts
RafaelBP02 Nov 10, 2023
b144499
test: Faz testes para as novas funcionalidades implementadas
RafaelBP02 Nov 11, 2023
e7dc770
chore: remove comentario desnecessario e insere teste
DanielPortods Nov 12, 2023
63dd20e
Merge pull request #19 from fga-eps-mds/hotfix/paginacao-usuarios
DanielPortods Nov 12, 2023
0933440
fix: dependencias do deploy
thiagohdaqw Nov 12, 2023
61219ae
Merge branch 'develop' into feat/ajustes-US2-gerenciar-usuarios
RafaelBP02 Nov 12, 2023
3540d43
Merge branch 'develop' into feat/ajustes-US2-gerenciar-usuarios
RafaelBP02 Nov 12, 2023
3bb36da
test: correção do teste quebrado
RafaelBP02 Nov 12, 2023
a2eacfc
test: Cria novos testes para o GerenciarUsuarios
RafaelBP02 Nov 12, 2023
2b02a7b
test: cria novos testes para aumentar a cobertura
RafaelBP02 Nov 12, 2023
9ae1697
feat: adiciona o arquivo css para a tela de ranqueamento das escolas
H0lzz Nov 9, 2023
d728fa7
feat: adiciona o arquivo .env no docker-compose.yml
H0lzz Nov 9, 2023
af26c3b
feat: importa a rota do ranking de escolas no arquivo app.tsx
H0lzz Nov 9, 2023
61b5c45
feat: adiciona o componente modal para a página do ranking de escolas
H0lzz Nov 9, 2023
76cdab4
feat: adiciona a pagina do ranking de escolas
H0lzz Nov 9, 2023
95ab013
Merge remote-tracking branch 'origin/develop' into feat/71-ranking-de…
thiagohdaqw Nov 12, 2023
5db2f3d
fix: Cobertura dos testes da ApiException
Nov 13, 2023
99bff2c
refactor: reutiliza componente de tabela
thiagohdaqw Nov 13, 2023
9f20708
Merge remote-tracking branch 'origin/develop' into bugfix/96-mensagem…
Nov 13, 2023
f077df1
fix: corrige erro detectado pelo revisor
RafaelBP02 Nov 13, 2023
98cc73b
integrando listagem do ranking com o serviço
thiagohdaqw Nov 13, 2023
424d918
fix: Trocando o termo 'nome' por 'perfil'
victorhugo21 Nov 13, 2023
5fe95f2
fix: Arrumando a busca a cada mudança no input de busca
victorhugo21 Nov 13, 2023
4cdbf79
chore: faz ajustes propostos pelo revisor
RafaelBP02 Nov 13, 2023
6b4c2a4
fix: adaptando o tratamento de erros ExcessõesApi
Nov 13, 2023
cf972cc
fix: Aumentando a cobertura dos testes
Nov 13, 2023
bded4b2
fix: remove undefined from table and dialog
VitorLamego Nov 13, 2023
afadc79
Merge pull request #22 from fga-eps-mds/feat/ajustes-US2-gerenciar-us…
VitorLamego Nov 13, 2023
822ead0
bugfix: mensagem erro cadastro
yudi-azvd Nov 13, 2023
c35521d
Merge pull request #25 from fga-eps-mds/feat/102-melhorias-gerenciar-…
DanielPortods Nov 13, 2023
f24200f
test: rascunho do primeiro teste
yudi-azvd Nov 14, 2023
f25ac3e
Merge pull request #23 from fga-eps-mds/develop
thiagohdaqw Nov 14, 2023
8a31802
fix: arruma icones
thiagohdaqw Nov 16, 2023
e183200
Merge branch 'feat/71-ranking-de-escolas' into feat/74-Menor-custo-lo…
joaoseisei Nov 16, 2023
fc5481c
feat: adicionando paginacao no ranking de escola
thiagohdaqw Nov 16, 2023
d0cd405
fix: arruma visualziacao do uf no ranking
thiagohdaqw Nov 16, 2023
84bf0b6
feat: arruma loading
thiagohdaqw Nov 16, 2023
d9d4aea
refactor: componentiza filtro de nome
thiagohdaqw Nov 16, 2023
2310760
feat: adiciona filtro de nome no ranking
thiagohdaqw Nov 16, 2023
856602d
fix: Corrigindo problemas no ambiente
joaoseisei Nov 16, 2023
b6f0d2c
feat: adiciona filtro de uf e municipio
thiagohdaqw Nov 16, 2023
580ab52
feat: adiciona filtro de etapa de ensino no ranking
thiagohdaqw Nov 16, 2023
d935547
feat: formata tabela de ranking de acordo com protótipo
DiceRunner714 Nov 16, 2023
7a2ee55
feat: adicionando inputs de filtro
joaoseisei Nov 16, 2023
3700257
Merge branch 'feat/74-Menor-custo-logístico-para-um-conjunto-de-ações…
joaoseisei Nov 16, 2023
a9f9ac4
feat: adicionando campos de superintendencia e custo logistico no modal
joaoseisei Nov 16, 2023
847d234
fix: Formata a tabela, adiciona custosuperintêndencia.
joaoseisei Nov 16, 2023
38cf3a0
feat: habilita modal na pagina de ranking
DiceRunner714 Nov 17, 2023
be43529
feat: adiciona modal para escolaRanqueData
joaoseisei Nov 17, 2023
9cb2695
fix: adiciona função troca escolaRanqueData para EscolaData no modal
DiceRunner714 Nov 17, 2023
7f32b2e
feat: adiciona os campos de posição, pontuação total e código da espe…
H0lzz Nov 17, 2023
c40e1b6
fix: adicionando dados ficticios no modal e corrigindo o blur
joaoseisei Nov 17, 2023
bf55872
feat: adicionando footer do modal
joaoseisei Nov 17, 2023
9c96bb5
feat: Estiliza escolaRanqueModal
DiceRunner714 Nov 17, 2023
9c60f0a
Merge branch 'feat/74-custo-logistico' of https://github.com/fga-eps-…
DiceRunner714 Nov 17, 2023
9cda2b7
feat: fecha escolaRanqueModal
DiceRunner714 Nov 17, 2023
dbc6219
fix: corrigindo a rota do ranque escola
joaoseisei Nov 17, 2023
e7d55be
feat: adicionando interface EscolaData
joaoseisei Nov 17, 2023
0f65426
fix: trocando a interface e corrigindo promisse de escolaData
joaoseisei Nov 17, 2023
0e5f4f0
Merge branch 'feat/74-custo-logistico' of https://github.com/fga-eps-…
joaoseisei Nov 17, 2023
95a8521
test: adiciona teste para renderizar o modal
bottinolucas Nov 18, 2023
4174f36
feat: formata escolaRanqueModal
DiceRunner714 Nov 18, 2023
db71ac3
fix: formatando tabela ranque (nomes nos campos de escrita/dropdown)
bottinolucas Nov 18, 2023
db7370d
test: adiciona teste para verificar o render da página Tabela Ranque
bottinolucas Nov 18, 2023
02701b3
hotfix: corrige bug da pagina não ser ajustada
RafaelBP02 Nov 18, 2023
72dec00
fix: formatando atributos e endereços do modal
joaoseisei Nov 18, 2023
7ca5842
feat: adiciona o botão de fechar no componente modal
H0lzz Nov 18, 2023
cc4362a
Merge pull request #26 from fga-eps-mds/hotfix/paginacao-gerenciar-us…
RafaelBP02 Nov 18, 2023
c8c84a5
feat: adiciona o onClose na chamada do modal do src/components/Deleta…
H0lzz Nov 18, 2023
90588a9
feat: adiciona o onClose na chamada do modal do src/components/Editar…
H0lzz Nov 18, 2023
9a7ea90
feat: adiciona o onClose na chamada do modal do src/components/Perfil…
H0lzz Nov 18, 2023
b6bee79
feat: adiciona a importação da interface EscolaData e adiciona o expo…
H0lzz Nov 18, 2023
6e85a99
feat: adiciona o onClose na chamada do modal do src/tests/TabelaRanqu…
H0lzz Nov 18, 2023
b82305c
feat: adiciona o onClose na chamada do modal do src/tests/components/…
H0lzz Nov 18, 2023
41cb25f
feat: Corrige o src/components/EscolaRanqueModal/index.tsx para mostr…
H0lzz Nov 18, 2023
8b24a09
feat: Corrige o src/pages/Ranque/index.tsx para abrir o modal ao clic…
H0lzz Nov 18, 2023
bb3f6ec
feat: adicionando valores da pontuação no modal
joaoseisei Nov 18, 2023
aeea821
feat: adiciona os export das funções de fetch dos dados de emProcessa…
H0lzz Nov 18, 2023
4e0c300
feat: adiciona os imports das funções de fetch dos dados de emProcess…
H0lzz Nov 18, 2023
2cdcaa0
fix: atualizando a opção de abrir do modal ranqueEscola
joaoseisei Nov 18, 2023
ab5bf87
feat: adicionando superintendencias nas interfaces
joaoseisei Nov 18, 2023
0046ed0
feat: adiciona campos da superintendencia no modal
joaoseisei Nov 18, 2023
fef7be1
fix: Remove filtroProvider do modal
joaoseisei Nov 18, 2023
0557e4c
feat: adiciona etapas de ensino no modal
joaoseisei Nov 18, 2023
ae42f57
feat: adiciona custo logistico com base na distância no modal e tabela
joaoseisei Nov 18, 2023
b406678
fix: corrigindo identação do modal
joaoseisei Nov 18, 2023
c9f5b2d
fix: transferindo as interfaces para o service.ts
joaoseisei Nov 18, 2023
f4afe7b
fix: adiciona urls no arquivo service e adiciona fetchSuperintendencia
joaoseisei Nov 18, 2023
3b84396
feat: adicionando a funçao formataCustoLogistico em um arquivo de uti…
joaoseisei Nov 18, 2023
8ceb603
fix: atualiza atributos de superintendencia em escola
joaoseisei Nov 18, 2023
4db3cd7
feat: adicionando os dados de superintendencia na tabela de escola
joaoseisei Nov 18, 2023
aec11fd
feat: adicionando teste do arquivo de utilidades
joaoseisei Nov 18, 2023
a33ed2b
test: adiciona teste para verificar o filtro de escola por nome
bottinolucas Nov 18, 2023
1b507f3
fix: adiciona superintendencia no teste de modal da tabela Escola
joaoseisei Nov 18, 2023
a8e72f5
Merge branch 'develop' into feat/74-custo-logistico
joaoseisei Nov 18, 2023
2c675e3
Merge branch 'develop' into feat/71-ranking-de-escolas
bottinolucas Nov 18, 2023
867dad5
Merge branch 'feat/71-ranking-de-escolas' into feat/74-custo-logistico
joaoseisei Nov 19, 2023
437251c
fix: corrigindo tabulaçao do modal
joaoseisei Nov 19, 2023
ed63053
fix: Corrigindo tabulações na tabela de ranque
joaoseisei Nov 19, 2023
39691f1
fix: adicionando etapa de ensino no modal
joaoseisei Nov 19, 2023
fbb50f2
fix: arruma tests
thiagohdaqw Nov 19, 2023
377eca4
test: testando filtros do ranque
thiagohdaqw Nov 19, 2023
e21cf4a
test: testa a paginacao do ranque
thiagohdaqw Nov 19, 2023
7cbea17
refactor: visualizacao do ultimo processamento
thiagohdaqw Nov 19, 2023
aa0b0e9
refactor: modal da escola ranque
thiagohdaqw Nov 19, 2023
953c61b
fix: rede no modal de ranking
thiagohdaqw Nov 19, 2023
a794491
fix: centralizando loading
thiagohdaqw Nov 19, 2023
19d4e1f
test: escola ranque modal
thiagohdaqw Nov 19, 2023
53ff9ab
fix: estilizando modal
thiagohdaqw Nov 19, 2023
9e6aecb
feat: adicionando autorizacao
thiagohdaqw Nov 19, 2023
eb85a65
fix: adiciona env exemplo
thiagohdaqw Nov 19, 2023
04076ef
Merge branch 'feat/71-ranking-de-escolas' into feat/74-custo-logistico
victorhugo21 Nov 19, 2023
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
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/
3 changes: 3 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
REACT_APP_API_USUARIOS=http://localhost:7083 # https://usuario.dnit.eps-fga.live
REACT_APP_API_ESCOLAS=http://localhost:7084 # https://escola.dnit.eps-fga.live
REACT_APP_API_UPS=http://localhost:7085 # https://up.dnit.eps-fga.live
18 changes: 14 additions & 4 deletions .github/workflows/sonarcloud.yml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Push Sonar Metrics
name: CI
on:
push:
branches:
- main
- develop
pull_request:
types: [opened, synchronize, reopened]
jobs:
Expand All @@ -13,12 +14,21 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Print env
run: printenv
- name: Install dependencies
run: npm install
run: npm ci
- name: Test and coverage
run: npm run test:cov --maxWorkers=2 --runInBand
env:
REACT_APP_API_USUARIOS: https://usuario.dnit.eps-fga.live
REACT_APP_API_ESCOLAS: https://escola.dnit.eps-fga.live
REACT_APP_API_UPS: https://up.dnit.eps-fga.live
run: npm run test:cov -- --silent
- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.TOKEN_GITHUB }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
50 changes: 50 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Deploy

on:
push:
branches: [ "develop" ]

jobs:
deploy:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- name: Install Azure Static Web Apps CLI
run: npm install -g @azure/static-web-apps-cli@1.1.4

- name: Install Dependencies
run: npm ci

- name: Environment
env:
DEPLOY_ENV: ${{ secrets.DEPLOY_ENV }}
DEPLOY_ENV_SEPARATOR: ${{ secrets.DEPLOY_ENV_SEPARATOR }}
run: echo "$DEPLOY_ENV" | tr "$DEPLOY_ENV_SEPARATOR" '\n' > .env

- name: Tests
run: npm run test -- --silent --ci --testLocationInResults --maxWorkers=100%

- name: Build
env:
CI: false
run: npm run build

- name: Copy Configuration
run: cp staticwebapp.config.json build/

- name: Deploy
env:
TOKEN: ${{ secrets.SWA_TOKEN }}
run: swa deploy --env production -d $TOKEN ./build
14 changes: 8 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Front-Release
name: Frontend-Release
on:
push:
tags:
Expand All @@ -12,25 +12,27 @@ jobs:
steps:
- name: Get file name
id: name
run: echo "::set-output name=file_name::fga-eps-mds-2023.1-Dnit-Front-$(TZ='America/Sao_Paulo' date +'%m-%d-%Y-%H-%M-%S')-${{github.ref_name}}"
run: echo "::set-output name=file_name::fga-eps-mds_2023.2-Dnit-Front-$(TZ='America/Sao_Paulo' date +'%m-%d-%Y-%H-%M-%S')-${{github.ref_name}}"

- name: Copy repository
- name: Copy repository and download metrics
uses: actions/checkout@v2
- run: wget $METRICS_URL -O ${{ steps.name.outputs.file_name }}.json
env:
METRICS_URL: ${{ secrets.METRICS_URL }}
- uses: actions/upload-artifact@v2

- name: Uploads file
uses: actions/upload-artifact@v2
with:
name: ${{ steps.name.outputs.file_name }}.json
path: ${{ steps.name.outputs.file_name }}.json

- name: Send metrics to doc repo
uses: dmnemec/copy_file_to_another_repo_action@v1.1.1
env:
API_TOKEN_GITHUB: ${{ secrets.TOKEN_GITHUB }}
API_TOKEN_GITHUB: ${{ secrets.GIT_TOKEN }}
with:
source_file: ${{ steps.name.outputs.file_name }}.json
destination_repo: 'fga-eps-mds/2023.1-Dnit-DOC'
destination_repo: 'fga-eps-mds/2023.2-Dnit-DOC'
destination_folder: 'analytics-raw-data'
user_email: ${{ secrets.GIT_EMAIL}}
user_name: ${{ secrets.GIT_USER }}
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jest-report.xml
.env.development.local
.env.test.local
.env.production.local
.env

npm-debug.log*
yarn-debug.log*
yarn-error.log*
package-lock.json
yarn.lock
yarn.lock
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM node:lts

WORKDIR /app

COPY package.json yarn.lock ./
COPY package.json .env ./

RUN yarn
RUN yarn --ignore-scripts

COPY ./ ./
9 changes: 5 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
version: '3.5'
version: "3.5"
services:
app:
environment:
CHOKIDAR_USEPOLLING: "true"
volumes:
- ./:/app
- ./node_modules:/app/node_modules
- ./src:/app/src
container_name: frontend_dnit
build:
context: ./
command: yarn start
ports:
- "3000:3000"
- "3000:3000"
env_file:
- .env
4 changes: 1 addition & 3 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ module.exports = {
"!src/styles/globalStyle.ts",
"!src/vite-env.d.ts",
"!src/index.tsx",
"!src/App.tsx",
"!src/service/*.{ts,tsx}",
"!src/provider/*.{ts,tsx}",
],
collectCoverage: true,
testEnvironment: "jest-environment-jsdom",
setupFilesAfterEnv: ["<rootDir>/.jest/setup-tests.js"],
setupFilesAfterEnv: ["<rootDir>/.jest/setup-tests.js", "dotenv/config"],
preset: "ts-jest",
transform: {
".*\\.[jt]sx?$": "babel-jest",
Expand Down
Loading
Loading