From eeb8581b73046a136ad3daf8d26f844c879e5270 Mon Sep 17 00:00:00 2001 From: isadoragalvaoss Date: Mon, 10 Jul 2023 04:46:26 -0300 Subject: [PATCH] Code smell --- src/App.css | 7 - .../FiltragemTabela.tsx | 14 +- .../ModalExcluirEscolas.tsx | 128 +++-- .../ModalExibirInformacoes.tsx | 2 +- .../TabelaEscola.tsx | 6 +- .../style/FiltragemTabela.css | 3 - .../style/Footer.css | 339 +++++------ .../style/ModalExcluirEscolas.css | 6 - .../style/ModalExibirInformacoes.css | 392 +++++++------ .../style/TabelaEscola.css | 533 +++++++++--------- src/components/form/CadAcidentes.tsx | 7 +- src/components/form/Steps/AcidentesAceito.tsx | 39 +- src/components/form/Steps/AcidentesErro1.tsx | 4 +- src/components/form/Steps/Step3Aceito.tsx | 68 +-- .../form/Steps/Step3ErroTamanho.tsx | 4 +- src/context/FiltroTabela.tsx | 4 +- src/models/service.ts | 2 +- src/service/Situacao.ts | 8 +- src/service/alterarDadosEscola.ts | 1 + src/service/calcularUps.ts | 9 +- src/service/deleteSituation.ts | 7 +- src/service/etapasDeEnsino.ts | 4 +- src/service/excluirEscola.ts | 14 +- src/service/federativeUnit.ts | 1 + src/service/inepAPI.ts | 1 + src/service/insertFile.ts | 6 +- src/service/insertFileRodovia.ts | 23 +- src/service/listSchools.ts | 1 + src/service/listarInfoEscola.ts | 1 + src/service/login.ts | 1 + src/service/municipio.ts | 8 +- src/service/recoverPW.ts | 5 +- src/service/register.ts | 1 + src/service/registerSchool.ts | 6 +- src/service/resetPassword.ts | 1 + src/service/solicitaAcao.ts | 1 + src/service/viaCEP.ts | 9 +- src/styles/App.css | 4 - src/styles/form.css | 10 - 39 files changed, 872 insertions(+), 808 deletions(-) diff --git a/src/App.css b/src/App.css index 1795484d..10c85c18 100644 --- a/src/App.css +++ b/src/App.css @@ -80,7 +80,6 @@ height: 100%; } - .Central { display: flex; justify-content: center; @@ -89,11 +88,6 @@ height: inherit; } -.logoDnit { - width: 380px; - height: 96px; -} - .imgLateral { width: 437px; height: 291px; @@ -209,5 +203,4 @@ width: 237px; height: 131px; } - } diff --git a/src/components/components-escolasCadastradas/FiltragemTabela.tsx b/src/components/components-escolasCadastradas/FiltragemTabela.tsx index 923a0fea..5d7761e0 100644 --- a/src/components/components-escolasCadastradas/FiltragemTabela.tsx +++ b/src/components/components-escolasCadastradas/FiltragemTabela.tsx @@ -11,8 +11,6 @@ import "../components-escolasCadastradas/style/FiltragemTabela.css"; export default function TabelaEscolas() { const { - setNomeEscola, - NomePesquisado, setNomePesquisado, @@ -22,7 +20,6 @@ export default function TabelaEscolas() { situacaoSelecionada, setSituacaoSelecionada, - etapaDeEnsinoSelecionada, setEtapaDeEnsinoSelecionada, municipioSelecionado, @@ -99,8 +96,7 @@ export default function TabelaEscolas() { useEffect(() => { if (opcoesSituacao.length == 0) getEtapasDeEnsino(); }); - const [showOpcoesEtapasDeEnsino, setShowOpcoesEtapasDeEnsino] = - useState(false); + const [, setShowOpcoesEtapasDeEnsino] = useState(false); const [OpcoesEtapasDeEnsino, setOpcoesEtapasDeEnsino] = useState< { value: number; label: string }[] >([]); @@ -214,7 +210,7 @@ export default function TabelaEscolas() { .map((options, index) => { return (
handleOptionClick(options, 1)} > @@ -269,7 +265,7 @@ export default function TabelaEscolas() { ) .map((options, index) => (
handleOptionClick(options, 2)} > @@ -323,7 +319,7 @@ export default function TabelaEscolas() { ) .map((options, index) => (
handleOptionClick(options, 4)} > @@ -355,4 +351,4 @@ export default function TabelaEscolas() {
); -} \ No newline at end of file +} diff --git a/src/components/components-escolasCadastradas/ModalExcluirEscolas.tsx b/src/components/components-escolasCadastradas/ModalExcluirEscolas.tsx index eb967926..bb6eee00 100644 --- a/src/components/components-escolasCadastradas/ModalExcluirEscolas.tsx +++ b/src/components/components-escolasCadastradas/ModalExcluirEscolas.tsx @@ -1,54 +1,86 @@ -import { notification } from 'antd'; -import fetchExcluirEscola from '../../service/excluirEscola'; -import './style/ModalExcluirEscolas.css'; -import { useState } from 'react'; -import { useFiltroTabela } from '../../context/FiltroTabela'; +import { notification } from "antd"; +import { useFiltroTabela } from "../../context/FiltroTabela"; +import fetchExcluirEscola from "../../service/excluirEscola"; +import "./style/ModalExcluirEscolas.css"; interface ModalExcluirEscolaProps { - open: boolean - id: number - close: () => void - closeModalExcluirEscola: () => void - nomeEscola: string + open: boolean; + id: number; + close: () => void; + closeModalExcluirEscola: () => void; + nomeEscola: string; } -const ModalExcluirEscolas = ({open, id, close, closeModalExcluirEscola, nomeEscola}: ModalExcluirEscolaProps) => { - const {fetchEscolasFiltradas} = useFiltroTabela() - const excluirEscola = async () => { - try { - await fetchExcluirEscola({ id_escola: id }); - notification.success({ message: `Escola ${nomeEscola} excluída com sucesso!` }); - close(); - fetchEscolasFiltradas(); - } catch (error) { - notification.error({ message: `Erro ao excluir a escola ${nomeEscola}! ` }); - close(); - } - +const ModalExcluirEscolas = ({ + open, + id, + close, + closeModalExcluirEscola, + nomeEscola, +}: ModalExcluirEscolaProps) => { + const { fetchEscolasFiltradas } = useFiltroTabela(); + const excluirEscola = async () => { + try { + await fetchExcluirEscola({ id_escola: id }); + notification.success({ + message: `Escola ${nomeEscola} excluída com sucesso!`, + }); + close(); + fetchEscolasFiltradas(); + } catch (error) { + notification.error({ + message: `Erro ao excluir a escola ${nomeEscola}! `, + }); + close(); } - if (!open) { return null } - return ( - < > -
-
-
-
Confirmar Exclusão -
-
-
-

- Deseja excluir a escola permanentemende? A ação não pode ser desfeita. -

-
- - -
-
-
+ }; + if (!open) { + return null; + } + return ( + <> +
+
+
+
+ Confirmar Exclusão
- - ); -} -export default ModalExcluirEscolas; \ No newline at end of file +
+

+ Deseja excluir a escola permanentemende? A ação não pode ser + desfeita. +

+
+ + +
+
+
+
+ + ); +}; +export default ModalExcluirEscolas; diff --git a/src/components/components-escolasCadastradas/ModalExibirInformacoes.tsx b/src/components/components-escolasCadastradas/ModalExibirInformacoes.tsx index 50700578..374837ce 100644 --- a/src/components/components-escolasCadastradas/ModalExibirInformacoes.tsx +++ b/src/components/components-escolasCadastradas/ModalExibirInformacoes.tsx @@ -98,7 +98,7 @@ const ModalExibirInformacoes = ({ escola, open, close }: ModalProps) => { }); const { selectedValue, setSelectedValue } = useSelectedValue(); - const [api, contextHolder] = notification.useNotification(); + const [, contextHolder] = notification.useNotification(); const { fetchEscolasFiltradas } = useFiltroTabela(); const chamarSituacao = async () => { diff --git a/src/components/components-escolasCadastradas/TabelaEscola.tsx b/src/components/components-escolasCadastradas/TabelaEscola.tsx index 72ddd162..66033bdd 100644 --- a/src/components/components-escolasCadastradas/TabelaEscola.tsx +++ b/src/components/components-escolasCadastradas/TabelaEscola.tsx @@ -19,9 +19,9 @@ export default function TabelaEscola() { const [, contextHolder] = notification.useNotification(); const [showOptionsPages, setShowOptionsPages] = useState(false); - const [showSchoolsPerPage, setShowSchoolsPerPage] = useState(false); + const [, setShowSchoolsPerPage] = useState(false); const optionsSchoolsPerPage = ["2", "5", "10", "20"]; - const [schools, setschools] = useState([]); + const [schools] = useState([]); const [modalStates, setModalStates] = useState( Array(schools.length).fill(false) ); @@ -214,7 +214,7 @@ export default function TabelaEscola() {
{optionsSchoolsPerPage.map((options, index) => (
handleOptionClick(Number(options))} data-testid={`options-${options}`} diff --git a/src/components/components-escolasCadastradas/style/FiltragemTabela.css b/src/components/components-escolasCadastradas/style/FiltragemTabela.css index c987b101..f0cf8a74 100644 --- a/src/components/components-escolasCadastradas/style/FiltragemTabela.css +++ b/src/components/components-escolasCadastradas/style/FiltragemTabela.css @@ -277,9 +277,6 @@ color: var(--color-secondary-09); outline: none; } -.br-select .br-list:hover::-webkit-scrollbar-thumb { - background: var(--color-secondary-07); -} .br-select .br-list[expanded] { display: block; } diff --git a/src/components/components-escolasCadastradas/style/Footer.css b/src/components/components-escolasCadastradas/style/Footer.css index f94d9dcc..a2eb7a91 100644 --- a/src/components/components-escolasCadastradas/style/Footer.css +++ b/src/components/components-escolasCadastradas/style/Footer.css @@ -1,174 +1,179 @@ .br-footer { - --footer-logo-height: 48px; - --footer-logo-width: 180px; - --footer-logo-padding: var(--spacing-scale-6x) 0 var(--spacing-scale-4x); - --footer-assigns-height: 46px; - --footer-assigns-width: 180px; - background: var(--background); - border-top: 1px solid var(--border-color); - color: var(--color); - display: block; - --background: var(--background-dark); - --color: var(--color-dark); - --color-rgb: var(--color-dark-rgb); - --text-color: var(--color); - --interactive: var(--interactive-dark); - --interactive-rgb: var(--interactive-dark-rgb); - --visited: var(--visited-dark); - --hover: var(--hover-dark); - --pressed: var(--pressed-dark); - --focus-color: var(--focus-color-dark); - --focus: var(--focus-color); - } - .br-footer .br-item { - --color: var(--color-dark); - --color-rgb: var(--color-dark-rgb); - --text-color: var(--color); - --interactive: var(--interactive-dark); - --interactive-rgb: var(--interactive-dark-rgb); - --visited: var(--visited-dark); - --hover: var(--hover-dark); - --pressed: var(--pressed-dark); - --focus-color: var(--focus-color-dark); - --focus: var(--focus-color); - } - .br-footer[inverted], .br-footer.inverted { - --background: var(--background-light); - --color: var(--color-light); - --color-rgb: var(--color-light-rgb); - --text-color: var(--color); - --interactive: var(--interactive-light); - --interactive-rgb: var(--interactive-light-rgb); - --visited: var(--visited-light); - --hover: var(--hover-light); - --pressed: var(--pressed-light); - --focus-color: var(--focus-color-light); - --focus: var(--focus-color); - } - .br-footer[inverted] .br-item, .br-footer.inverted .br-item { - --color: var(--color-light); - --color-rgb: var(--color-light-rgb); - --text-color: var(--color); - --interactive: var(--interactive-light); - --interactive-rgb: var(--interactive-light-rgb); - --visited: var(--visited-light); - --hover: var(--hover-light); - --pressed: var(--pressed-light); - --focus-color: var(--focus-color-light); - --focus: var(--focus-color); - } - .br-footer .logo { - padding: var(--footer-logo-padding); - } - .br-footer .logo img { - max-height: var(--footer-logo-height); - max-width: var(--footer-logo-width); - } - .br-footer .br-list.horizontal { - display: flex; - flex-wrap: wrap; - } - .br-footer .br-list.horizontal .header { - width: 100%; - } + --footer-logo-height: 48px; + --footer-logo-width: 180px; + --footer-logo-padding: var(--spacing-scale-6x) 0 var(--spacing-scale-4x); + --footer-assigns-height: 46px; + --footer-assigns-width: 180px; + background: var(--background); + border-top: 1px solid var(--border-color); + color: var(--color); + display: block; + --background: var(--background-dark); + --color: var(--color-dark); + --color-rgb: var(--color-dark-rgb); + --text-color: var(--color); + --interactive: var(--interactive-dark); + --interactive-rgb: var(--interactive-dark-rgb); + --visited: var(--visited-dark); + --hover: var(--hover-dark); + --pressed: var(--pressed-dark); + --focus-color: var(--focus-color-dark); + --focus: var(--focus-color); +} +.br-footer .br-item { + --color: var(--color-dark); + --color-rgb: var(--color-dark-rgb); + --text-color: var(--color); + --interactive: var(--interactive-dark); + --interactive-rgb: var(--interactive-dark-rgb); + --visited: var(--visited-dark); + --hover: var(--hover-dark); + --pressed: var(--pressed-dark); + --focus-color: var(--focus-color-dark); + --focus: var(--focus-color); +} +.br-footer[inverted], +.br-footer.inverted { + --background: var(--background-light); + --color: var(--color-light); + --color-rgb: var(--color-light-rgb); + --text-color: var(--color); + --interactive: var(--interactive-light); + --interactive-rgb: var(--interactive-light-rgb); + --visited: var(--visited-light); + --hover: var(--hover-light); + --pressed: var(--pressed-light); + --focus-color: var(--focus-color-light); + --focus: var(--focus-color); +} +.br-footer[inverted] .br-item, +.br-footer.inverted .br-item { + --color: var(--color-light); + --color-rgb: var(--color-light-rgb); + --text-color: var(--color); + --interactive: var(--interactive-light); + --interactive-rgb: var(--interactive-light-rgb); + --visited: var(--visited-light); + --hover: var(--hover-light); + --pressed: var(--pressed-light); + --focus-color: var(--focus-color-light); + --focus: var(--focus-color); +} +.br-footer .logo { + padding: var(--footer-logo-padding); +} +.br-footer .logo img { + max-height: var(--footer-logo-height); + max-width: var(--footer-logo-width); +} +.br-footer .br-list.horizontal { + display: flex; + flex-wrap: wrap; +} +.br-footer .br-list.horizontal .header { + width: 100%; +} +.br-footer .br-list.horizontal .col, +.br-footer .br-list.horizontal [class*="col-"] { + flex-grow: 0; + padding: 0; +} +@media (max-width: 991px) { .br-footer .br-list.horizontal .col, - .br-footer .br-list.horizontal [class*=col-] { - flex-grow: 0; - padding: 0; - } - @media (max-width: 991px) { - .br-footer .br-list.horizontal .col, - .br-footer .br-list.horizontal [class*=col-] { - flex-basis: 100% !important; - max-width: 100%; - } - } - .br-footer .social-network { - border: 0; - } - .br-footer .social-network .social-network-title { - font-size: var(--font-size-scale-up-01); - font-weight: var(--font-weight-extra-bold); - margin-bottom: var(--spacing-scale-2x); - text-transform: uppercase; - text-align: left; - } - .br-footer .social-network a:hover { + .br-footer .br-list.horizontal [class*="col-"] { + flex-basis: 100% !important; + max-width: 100%; + } +} +.br-footer .social-network { + border: 0; +} +.br-footer .social-network .social-network-title { + font-size: var(--font-size-scale-up-01); + font-weight: var(--font-weight-extra-bold); + margin-bottom: var(--spacing-scale-2x); + text-transform: uppercase; + text-align: left; +} +.br-footer .social-network a:hover { + background-image: none; +} +.br-footer .social-network img { + max-height: var(--footer-assigns-height); + max-width: var(--footer-assigns-height); +} +.br-footer .assigns img { + max-height: var(--footer-assigns-height); + max-width: var(--footer-assigns-width); +} +@media (min-width: 992px) { + .br-footer .info { + text-align: center; + } +} +.br-footer .br-list { + --background: var(--background-dark); +} +.br-footer .br-list.horizontal .br-item, +.br-footer .br-list.horizontal .br-list .br-item { + min-height: 4em; +} +.br-footer .br-list.horizontal .br-item .content, +.br-footer .br-list.horizontal .br-list .br-item .content { + height: auto; + line-height: 16px; + padding: 0 var(--spacing-scale-2x); +} +@media (min-width: 992px) { + .br-footer .br-item.horizontal .br- { background-image: none; - } - .br-footer .social-network img { - max-height: var(--footer-assigns-height); - max-width: var(--footer-assigns-height); - } - .br-footer .assigns img { - max-height: var(--footer-assigns-height); - max-width: var(--footer-assigns-width); - } - @media (min-width: 992px) { - .br-footer .info { - text-align: center; - } - } - .br-footer .br-list { - --background: var(--background-dark); - } - .br-footer .br-list.horizontal .br-item, - .br-footer .br-list.horizontal .br-list .br-item { - min-height: 4em; - } - .br-footer .br-list.horizontal .br-item .content, - .br-footer .br-list.horizontal .br-list .br-item .content { - height: auto; - line-height: 16px; - padding: 0 var(--spacing-scale-2x); - } - .br-footer .br-item { - align-items: center; - display: flex; - } - @media (min-width: 992px) { - .br-footer .br-item.horizontal .br- { - background-image: none; - max-height: 200em !important; - } - } - .br-footer .br-item.horizontal .br-item { - min-height: 4em; - } - .br-footer .br-item.horizontal .br-item .content { - height: auto; - line-height: 16px; - padding: 0 var(--spacing-scale-2x); - } - .br-footer .br-item.horizontal .col .br-item.header.active, - .br-footer .br-item.horizontal [class*=col-] .br-item.header.active { - border-bottom: 1px solid var(--border-color); - } - .br-footer .br-item.horizontal .col .br-item.header.active + .br-list, - .br-footer .br-item.horizontal [class*=col-] .br-item.header.active + .br-list { - border-bottom: 1px solid var(--border-color); + max-height: 200em !important; + } +} +.br-footer .br-item.horizontal .br-item { + min-height: 4em; +} +.br-footer .br-item.horizontal .br-item .content { + height: auto; + line-height: 16px; + padding: 0 var(--spacing-scale-2x); +} +.br-footer .br-item.horizontal .col .br-item.header.active, +.br-footer .br-item.horizontal [class*="col-"] .br-item.header.active { + border-bottom: 1px solid var(--border-color); +} +.br-footer .br-item.horizontal .col .br-item.header.active + .br-list, +.br-footer + .br-item.horizontal + [class*="col-"] + .br-item.header.active + + .br-list { + border-bottom: 1px solid var(--border-color); +} +.br-footer .br-item .content { + flex: 1; +} +.br-footer .br-item:not(:disabled):hover { + background-image: linear-gradient( + rgba(var(--interactive-rgb), var(--hover)), + rgba(var(--interactive-rgb), var(--hover)) + ); +} +.br-footer .br-item.active { + background: transparent; +} +@media (min-width: 992px) { + .br-footer .br-item .support:last-child { + display: none; + pointer-events: none; } .br-footer .br-item .content { flex: 1; } - .br-footer .br-item:not(:disabled):hover { - background-image: linear-gradient(rgba(var(--interactive-rgb), var(--hover)), rgba(var(--interactive-rgb), var(--hover))); - } - .br-footer .br-item.active { - background: transparent; - } - @media (min-width: 992px) { - .br-footer .br-item .support:last-child { - display: none; - pointer-events: none; - } - .br-footer .br-item .content { - flex: 1; - } - } - .br-footer[inverted] .br-list, .br-footer.inverted .br-list { - --background: var(--background-light); - } - - /*# sourceMappingURL=footer.css.map*/ - \ No newline at end of file +} +.br-footer[inverted] .br-list, +.br-footer.inverted .br-list { + --background: var(--background-light); +} + +/*# sourceMappingURL=footer.css.map*/ diff --git a/src/components/components-escolasCadastradas/style/ModalExcluirEscolas.css b/src/components/components-escolasCadastradas/style/ModalExcluirEscolas.css index 54e75afd..f0e8a754 100644 --- a/src/components/components-escolasCadastradas/style/ModalExcluirEscolas.css +++ b/src/components/components-escolasCadastradas/style/ModalExcluirEscolas.css @@ -149,9 +149,6 @@ .br-modal .terms:active { outline: none; } -.br-modal .terms:hover::-webkit-scrollbar-thumb { - background: var(--color-secondary-07); -} @media (max-width: 991px) { .br-modal .terms { margin-left: unset !important; @@ -204,9 +201,6 @@ color: var(--color-secondary-09); outline: none; } - .br-select .br-list:hover::-webkit-scrollbar-thumb { - background: var(--color-secondary-07); - } .br-select .br-list[expanded] { display: block; } diff --git a/src/components/components-escolasCadastradas/style/ModalExibirInformacoes.css b/src/components/components-escolasCadastradas/style/ModalExibirInformacoes.css index 8555056d..dbfa62da 100644 --- a/src/components/components-escolasCadastradas/style/ModalExibirInformacoes.css +++ b/src/components/components-escolasCadastradas/style/ModalExibirInformacoes.css @@ -1,182 +1,183 @@ -.container{ +.container { display: flex; justify-content: center; align-items: center; margin: 70px; - } .br-modal { - --modal-size: var(--modal-medium); - --modal-xsmall: 220px; - --modal-small: 300px; - --modal-medium: 500px; - --modal-large: 640px; - --modal-auto: auto; - background: var(--background); - box-shadow: var(--surface-shadow-sm); - display: flex; - flex-direction: column; - max-width: var(--modal-size); - width: 50%; - z-index: var(--z-index-layer-4); - position: fixed !important; - height: 93vh; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - } + --modal-size: var(--modal-medium); + --modal-xsmall: 220px; + --modal-small: 300px; + --modal-medium: 500px; + --modal-large: 640px; + --modal-auto: auto; + background: var(--background); + box-shadow: var(--surface-shadow-sm); + display: flex; + flex-direction: column; + max-width: var(--modal-size); + width: 50%; + z-index: var(--z-index-layer-4); + position: fixed !important; + height: 93vh; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} - .alinhar-botoes { - display: flex; - flex-direction: row-reverse; - } - - .br-modal-header { - font-size: var(--font-size-scale-up-01); - font-weight: var(--font-weight-bold); - padding: var(--spacing-scale-2x) var(--spacing-scale-2x) 0; - position: relative; - text-align: left; - } - .br-modal-header .close { - position: absolute; - right: var(--spacing-scale-base); - top: var(--spacing-scale-base); - } - .br-modal .modal-title { - font-size: var(--font-size-scale-up-01); - font-weight: var(--font-weight-bold); - margin-right: 40px; - max-height: calc(var(--font-size-scale-up-01) * 3); - overflow: hidden; - text-overflow: ellipsis; - } - .content-left{ - align-self: flex-start !important; - justify-self: flex-start !important; - justify-content: flex-start !important; - margin-right: 31%; - } +.alinhar-botoes { + display: flex; + flex-direction: row-reverse; +} - .content-right{ - align-self: flex-end !important; - justify-content: right !important; - } - - - -.button-space{ +.br-modal-header { + font-size: var(--font-size-scale-up-01); + font-weight: var(--font-weight-bold); + padding: var(--spacing-scale-2x) var(--spacing-scale-2x) 0; + position: relative; + text-align: left; +} +.br-modal-header .close { + position: absolute; + right: var(--spacing-scale-base); + top: var(--spacing-scale-base); +} +.br-modal .modal-title { + font-size: var(--font-size-scale-up-01); + font-weight: var(--font-weight-bold); + margin-right: 40px; + max-height: calc(var(--font-size-scale-up-01) * 3); + overflow: hidden; + text-overflow: ellipsis; +} +.content-left { + align-self: flex-start !important; + justify-self: flex-start !important; + justify-content: flex-start !important; + margin-right: 31%; +} + +.content-right { + align-self: flex-end !important; + justify-content: right !important; +} + +.button-space { margin-right: 2em !important; } - .br-modal-body { - flex: 1; - height: 100vh; - margin: var(--spacing-scale-3x) 0 var(--spacing-scale-2x); - padding: 0 var(--spacing-scale-2x); - display: flex; - justify-content: space-between; - text-align: left; - } +.br-modal-body { + flex: 1; + height: 100vh; + margin: var(--spacing-scale-3x) 0 var(--spacing-scale-2x); + padding: 0 var(--spacing-scale-2x); + display: flex; + justify-content: space-between; + text-align: left; +} - .br-modal-body .br-input{ - display: inline; - flex-basis: 50%; - margin-top: 5px; - margin-bottom: 5px; - padding: 10px; - } - .br-modal-body .br-select{ - display: inline; - flex-basis: 50%; - margin-top: 5px; - margin-bottom: 5px; - padding: 5px; - } - - .br-modal-body::-webkit-scrollbar { - height: var(--spacing-scale-base); - width: var(--spacing-scale-base); - } - .br-modal-body::-webkit-scrollbar-track { - background: var(--gray-10); - } - .br-modal-body::-webkit-scrollbar-thumb { - background: var(--gray-30); - } - .br-modal-body:hover::-webkit-scrollbar-thumb { - background: var(--gray-40); - } - .br-modal-body *:last-child { - margin-bottom: 0; - } - .br-modal-footer { - display: flex; - flex-direction: row; - padding: 10px !important; - width: 100%; - } - .br-modal.is-xsmall, .br-modal.xsmall { - --modal-size: var(--modal-xsmall); - } - .br-modal.is-small, .br-modal.small { - --modal-size: var(--modal-small); - } - .br-modal.is-medium, .br-modal.medium { - --modal-size: var(--modal-medium); - } - .br-modal.is-large, .br-modal.large { - --modal-size: var(--modal-large); - } - .br-modal.is-auto, .br-modal.auto { - --modal-size: var(--modal-auto); - } - .br-modal .loading.medium { - min-height: calc(var(--loading-indetermined-diameter-md) + var(--spacing-scale-2x) * 2); - } +.br-modal-body .br-input { + display: inline; + flex-basis: 50%; + margin-top: 5px; + margin-bottom: 5px; + padding: 10px; +} +.br-modal-body .br-select { + display: inline; + flex-basis: 50%; + margin-top: 5px; + margin-bottom: 5px; + padding: 5px; +} + +.br-modal-body::-webkit-scrollbar { + height: var(--spacing-scale-base); + width: var(--spacing-scale-base); +} +.br-modal-body::-webkit-scrollbar-track { + background: var(--gray-10); +} +.br-modal-body::-webkit-scrollbar-thumb { + background: var(--gray-30); +} +.br-modal-body:hover::-webkit-scrollbar-thumb { + background: var(--gray-40); +} +.br-modal-body *:last-child { + margin-bottom: 0; +} +.br-modal-footer { + display: flex; + flex-direction: row; + padding: 10px !important; + width: 100%; +} +.br-modal.is-xsmall, +.br-modal.xsmall { + --modal-size: var(--modal-xsmall); +} +.br-modal.is-small, +.br-modal.small { + --modal-size: var(--modal-small); +} +.br-modal.is-medium, +.br-modal.medium { + --modal-size: var(--modal-medium); +} +.br-modal.is-large, +.br-modal.large { + --modal-size: var(--modal-large); +} +.br-modal.is-auto, +.br-modal.auto { + --modal-size: var(--modal-auto); +} +.br-modal .loading.medium { + min-height: calc( + var(--loading-indetermined-diameter-md) + var(--spacing-scale-2x) * 2 + ); +} +.br-modal .terms { + border: 0; + box-shadow: var(--surface-shadow-sm-inset), var(--surface-shadow-sm-inset-up); + font-size: var(--font-size-scale-base); + height: 216px; + margin-bottom: var(--spacing-scale-2x); + margin-left: calc(var(--spacing-scale-2x) * -1); + margin-right: calc(var(--spacing-scale-2x) * -1); + overflow: auto; + padding: var(--spacing-scale-2x); + resize: none; + width: auto; +} +.br-modal .terms::-webkit-scrollbar { + height: var(--spacing-scale-base); + width: var(--spacing-scale-base); +} +.br-modal .terms::-webkit-scrollbar-track { + background: var(--gray-10); +} +.br-modal .terms::-webkit-scrollbar-thumb { + background: var(--gray-30); +} +.br-modal .terms:hover::-webkit-scrollbar-thumb { + background: var(--gray-40); +} +.br-modal .terms:active { + outline: none; +} +@media (max-width: 991px) { .br-modal .terms { - border: 0; - box-shadow: var(--surface-shadow-sm-inset), var(--surface-shadow-sm-inset-up); - font-size: var(--font-size-scale-base); - height: 216px; - margin-bottom: var(--spacing-scale-2x); - margin-left: calc(var(--spacing-scale-2x) * -1); - margin-right: calc(var(--spacing-scale-2x) * -1); - overflow: auto; - padding: var(--spacing-scale-2x); - resize: none; - width: auto; - } - .br-modal .terms::-webkit-scrollbar { - height: var(--spacing-scale-base); - width: var(--spacing-scale-base); - } - .br-modal .terms::-webkit-scrollbar-track { - background: var(--gray-10); - } - .br-modal .terms::-webkit-scrollbar-thumb { - background: var(--gray-30); - } - .br-modal .terms:hover::-webkit-scrollbar-thumb { - background: var(--gray-40); - } - .br-modal .terms:active { - outline: none; + margin-left: unset !important; + margin-right: unset !important; } - .br-modal .terms:hover::-webkit-scrollbar-thumb { - background: var(--color-secondary-07); - } - @media (max-width: 991px) { - .br-modal .terms { - margin-left: unset !important; - margin-right: unset !important; - } - .br-modal-header .close { + .br-modal-header .close { top: 0; } - .br-label{ + .br-label { border: 1px solid #ccc; padding: 10px; border-radius: 5px; @@ -188,7 +189,6 @@ max-width: 400px; min-width: 100px; position: relative; - } .br-select .br-list { background: var(--bg-color); @@ -215,13 +215,11 @@ .br-select .br-list:hover::-webkit-scrollbar-thumb { background: var(--gray-40); } - .br-select .br-list:focus, .br-select .br-list:active { + .br-select .br-list:focus, + .br-select .br-list:active { color: var(--color-secondary-09); outline: none; } - .br-select .br-list:hover::-webkit-scrollbar-thumb { - background: var(--color-secondary-07); - } .br-select .br-list[expanded] { display: block; } @@ -252,7 +250,9 @@ } .br-select .br-item .br-checkbox input + label, .br-select .br-item .br-radio input + label { - padding-left: calc(var(--checkbox-padding) + var(--checkbox-size) + var(--item-padding-x)); + padding-left: calc( + var(--checkbox-padding) + var(--checkbox-size) + var(--item-padding-x) + ); } .br-select .br-item .br-radio input + label { color: var(--text-color); @@ -261,7 +261,8 @@ min-height: 0; padding: var(--item-padding); } - .br-select .br-item .br-radio input + label::before, .br-select .br-item .br-radio input + label::after { + .br-select .br-item .br-radio input + label::before, + .br-select .br-item .br-radio input + label::after { content: none; } .br-select .br-item:not(:last-child) { @@ -273,16 +274,21 @@ .br-select .br-item:not([disabled]):focus { outline: none; } - .br-select .br-item:not([disabled]).focus-visible, .br-select .br-item:not([disabled]):focus-visible { + .br-select .br-item:not([disabled]).focus-visible, + .br-select .br-item:not([disabled]):focus-visible { outline-color: var(--focus); outline-offset: var(--focus-offset); outline-style: var(--focus-style); outline-width: var(--focus-width); } .br-select .br-item:not([disabled]):not(:disabled):hover { - background-image: linear-gradient(rgba(var(--color-rgb), var(--hover)), rgba(var(--color-rgb), var(--hover))); + background-image: linear-gradient( + rgba(var(--color-rgb), var(--hover)), + rgba(var(--color-rgb), var(--hover)) + ); } - .br-select .br-item.selected, .br-select .br-item[selected] { + .br-select .br-item.selected, + .br-select .br-item[selected] { --color: var(--color-dark); --color-rgb: var(--color-dark-rgb); --text-color: var(--color); @@ -294,50 +300,68 @@ --focus-color: var(--focus-color-dark); --focus: var(--focus-color); } - .br-select .br-item.selected:focus, .br-select .br-item[selected]:focus { + .br-select .br-item.selected:focus, + .br-select .br-item[selected]:focus { outline: none; } - .br-select .br-item.selected.focus-visible, .br-select .br-item.selected:focus-visible, .br-select .br-item[selected].focus-visible, .br-select .br-item[selected]:focus-visible { + .br-select .br-item.selected.focus-visible, + .br-select .br-item.selected:focus-visible, + .br-select .br-item[selected].focus-visible, + .br-select .br-item[selected]:focus-visible { outline-color: var(--focus); outline-offset: var(--focus-offset); outline-style: var(--focus-style); outline-width: var(--focus-width); } - .br-select .br-item.selected:not(:disabled):hover, .br-select .br-item[selected]:not(:disabled):hover { - background-image: linear-gradient(rgba(var(--color-rgb), var(--hover)), rgba(var(--color-rgb), var(--hover))); + .br-select .br-item.selected:not(:disabled):hover, + .br-select .br-item[selected]:not(:disabled):hover { + background-image: linear-gradient( + rgba(var(--color-rgb), var(--hover)), + rgba(var(--color-rgb), var(--hover)) + ); } .br-select .br-item.disabled { line-height: calc(var(--font-line-height-high) * 2); padding-left: calc(var(--item-padding) + var(--spacing-scale-base)); } - .br-select .br-item.highlighted, .br-select .br-item[highlighted] { + .br-select .br-item.highlighted, + .br-select .br-item[highlighted] { background-color: var(--gray-2); padding-bottom: var(--spacing-scale-base); padding-top: var(--spacing-scale-base); } .br-select .br-item.highlighted .br-checkbox label, - .br-select .br-item.highlighted .br-radio label, .br-select .br-item[highlighted] .br-checkbox label, + .br-select .br-item.highlighted .br-radio label, + .br-select .br-item[highlighted] .br-checkbox label, .br-select .br-item[highlighted] .br-radio label { font-weight: var(--font-weight-semi-bold); } .br-select .br-item.highlighted .br-checkbox:hover, - .br-select .br-item.highlighted .br-radio:hover, .br-select .br-item[highlighted] .br-checkbox:hover, + .br-select .br-item.highlighted .br-radio:hover, + .br-select .br-item[highlighted] .br-checkbox:hover, .br-select .br-item[highlighted] .br-radio:hover { - background: linear-gradient(rgba(var(--interactive-rgb), var(--hover)), rgba(var(--interactive-rgb), var(--hover))); + background: linear-gradient( + rgba(var(--interactive-rgb), var(--hover)), + rgba(var(--interactive-rgb), var(--hover)) + ); } .br-select .br-item.highlighted .br-checkbox:hover label, - .br-select .br-item.highlighted .br-radio:hover label, .br-select .br-item[highlighted] .br-checkbox:hover label, + .br-select .br-item.highlighted .br-radio:hover label, + .br-select .br-item[highlighted] .br-checkbox:hover label, .br-select .br-item[highlighted] .br-radio:hover label { color: var(--text-color); } - .br-select .br-item.highlighted.selected, .br-select .br-item.highlighted[selected], .br-select .br-item[highlighted].selected, .br-select .br-item[highlighted][selected] { + .br-select .br-item.highlighted.selected, + .br-select .br-item.highlighted[selected], + .br-select .br-item[highlighted].selected, + .br-select .br-item[highlighted][selected] { background-color: var(--selected); } .br-select.inverted .br-input, - .br-select.inverted .br-input label, .br-select.dark-mode .br-input, + .br-select.inverted .br-input label, + .br-select.dark-mode .br-input, .br-select.dark-mode .br-input label { --color: var(--color-dark); --focus-color: var(--focus-color-dark); } - } - \ No newline at end of file +} diff --git a/src/components/components-escolasCadastradas/style/TabelaEscola.css b/src/components/components-escolasCadastradas/style/TabelaEscola.css index 1b40eb55..f74bd2d8 100644 --- a/src/components/components-escolasCadastradas/style/TabelaEscola.css +++ b/src/components/components-escolasCadastradas/style/TabelaEscola.css @@ -1,262 +1,279 @@ .br-table { - --table-padding: var(--spacing-scale-3x); - --table-row-size: var(--table-row-medium); - --table-row-small: var(--spacing-scale-base); - --table-row-medium: var(--spacing-scale-2x); - --table-row-large: var(--spacing-scale-3x); - } + --table-padding: var(--spacing-scale-3x); + --table-row-size: var(--table-row-medium); + --table-row-small: var(--spacing-scale-base); + --table-row-medium: var(--spacing-scale-2x); + --table-row-large: var(--spacing-scale-3x); +} - .br-table th { - background-color: rgba(0, 46, 110, 0.15); - } - - .br-table caption { - opacity: 0; - position: absolute; - z-index: -1; - } +.br-table th { + background-color: rgba(0, 46, 110, 0.15); +} - .br-table th { - color: #1351B4; - } - - .br-table .responsive { - overflow: auto; - } - .br-table .column-checkbox { - width: 24px; - } - .br-table .table-header { - position: relative; - } - .br-table .table-header.show .top-bar { - visibility: hidden; - } - .br-table .top-bar { - align-items: center; - display: flex; - padding: var(--spacing-scale-base) var(--spacing-scale-2x) var(--spacing-scale-base) var(--table-padding); - } - .br-table .top-bar .title, - .br-table .top-bar .table-title { - color: var(--color); - flex-grow: 1; - font-size: var(--font-size-scale-up-01); - font-weight: var(--font-weight-semi-bold); - text-align: left; - } - .br-table .top-bar .actions-trigger { - margin-right: var(--spacing-scale-base); - } - .br-table .top-bar .dropdown [data-toggle=dropdown] + *, - .br-table .top-bar .dropdown [data-toggle=dropdown-legacy] + * { - left: auto; - right: 0; - } - @media (min-width: 576px) { - .br-table .top-bar title { - font-size: var(--font-size-scale-up-03); - line-height: var(--font-line-height-medium); - } - } - .br-table .search-bar { - align-items: center; - bottom: 0; - display: none; - height: 56px; - left: 0; - padding-left: var(--table-padding); - padding-right: var(--spacing-scale-2x); - position: absolute; - right: 0; - top: 0; - } - .br-table .search-bar.show { - display: flex; - } - .br-table .search-bar .br-input { - flex: 1; - } - .br-table .search-bar .br-input label { - display: none; - } - .br-table .search-bar .br-input input { - margin-bottom: 0; - margin-top: 0; - } - .br-table .search-bar .br-input input + .br-button { - --button-size: var(--button-small); - margin-top: 0; - position: absolute; - right: var(--spacing-scale-half); - top: 0; - } - .br-table .search-bar .br-input + .br-button { - margin-left: var(--table-row-medium); - } - .br-table .selected-bar, - .br-table .selection-bar { - --color: var(--color-dark); - --color-rgb: var(--color-dark-rgb); - --text-color: var(--color); - --interactive: var(--interactive-dark); - --interactive-rgb: var(--interactive-dark-rgb); - --visited: var(--visited-dark); - --hover: var(--hover-dark); - --pressed: var(--pressed-dark); - --focus-color: var(--focus-color-dark); - --focus: var(--focus-color); - --table-padding: var(--spacing-scale-base) var(--spacing-scale-2x); - align-items: center; - background-color: var(--interactive-light); - bottom: 0; - color: var(--color); - display: none; - left: 0; - padding: var(--table-padding); - right: 0; - top: 0; - } - .br-table .selected-bar.show, - .br-table .selection-bar.show { - display: flex; - } - .br-table .selected-bar .info, - .br-table .selection-bar .info { - align-items: center; - display: flex; - flex-grow: 1; - white-space: nowrap; - } - .br-table .selected-bar .info [data-toggle=check-all], - .br-table .selected-bar .info .select-all, - .br-table .selection-bar .info [data-toggle=check-all], - .br-table .selection-bar .info .select-all { +.br-table caption { + opacity: 0; + position: absolute; + z-index: -1; +} + +.br-table .responsive { + overflow: auto; +} +.br-table .column-checkbox { + width: 24px; +} +.br-table .table-header { + position: relative; +} +.br-table .table-header.show .top-bar { + visibility: hidden; +} +.br-table .top-bar { + align-items: center; + display: flex; + padding: var(--spacing-scale-base) var(--spacing-scale-2x) + var(--spacing-scale-base) var(--table-padding); +} +.br-table .top-bar .title, +.br-table .top-bar .table-title { + color: var(--color); + flex-grow: 1; + font-size: var(--font-size-scale-up-01); + font-weight: var(--font-weight-semi-bold); + text-align: left; +} +.br-table .top-bar .actions-trigger { + margin-right: var(--spacing-scale-base); +} +.br-table .top-bar .dropdown [data-toggle="dropdown"] + *, +.br-table .top-bar .dropdown [data-toggle="dropdown-legacy"] + * { + left: auto; + right: 0; +} +@media (min-width: 576px) { + .br-table .top-bar title { font-size: var(--font-size-scale-up-03); - margin-right: var(--spacing-scale-half); - padding: 0; - } - .br-table .selected-bar .text, - .br-table .selected-bar .count, - .br-table .selection-bar .text, - .br-table .selection-bar .count { - line-height: var(--font-line-height-low); - padding-right: var(--spacing-scale-half); - } - .br-table .selected-bar.is-active, .br-table .selected-bar.active, - .br-table .selection-bar.is-active, - .br-table .selection-bar.active { - opacity: 1; - top: 0; - } - .br-table .footer, - .br-table .table-footer { - padding: var(--spacing-scale-base) var(--spacing-scale-2x) var(--spacing-scale-base) var(--table-padding); - } - .br-table .footer .br-input .br-button, - .br-table .table-footer .br-input .br-button { - transform: rotate(180deg); - } - .br-table .footer .br-list, - .br-table .table-footer .br-list { - bottom: 100%; - } - .br-table.small table, - .br-table.small .headers, - .br-table.small .clone-headers .item { - --table-row-size: var(--table-row-small); - } - .br-table.medium table, - .br-table.medium .headers, - .br-table.medium .clone-headers .item { - --table-row-size: var(--table-row-medium); - } - .br-table.large table, - .br-table.large .headers, - .br-table.large .clone-headers .item { - --table-row-size: var(--table-row-large); - } - .br-table.inverted, .br-table.dark-mode { - --color: var(--color-dark); - --color-rgb: var(--color-dark-rgb); - --text-color: var(--color); - --interactive: var(--interactive-dark); - --interactive-rgb: var(--interactive-dark-rgb); - --visited: var(--visited-dark); - --hover: var(--hover-dark); - --pressed: var(--pressed-dark); - --focus-color: var(--focus-color-dark); - --focus: var(--focus-color); - } - .br-table.inverted.inverted, .br-table.inverted.dark-mode, .br-table.dark-mode.inverted, .br-table.dark-mode.dark-mode { - --color: var(--color-dark); - --color-rgb: var(--color-dark-rgb); - --text-color: var(--color); - --interactive: var(--interactive-dark); - --interactive-rgb: var(--interactive-dark-rgb); - --visited: var(--visited-dark); - --hover: var(--hover-dark); - --pressed: var(--pressed-dark); - --focus-color: var(--focus-color-dark); - --focus: var(--focus-color); - } - .br-table.inverted.inverted.inverted .br-input, - .br-table.inverted.inverted.inverted .br-input label, .br-table.inverted.inverted.dark-mode .br-input, - .br-table.inverted.inverted.dark-mode .br-input label, .br-table.inverted.dark-mode.inverted .br-input, - .br-table.inverted.dark-mode.inverted .br-input label, .br-table.inverted.dark-mode.dark-mode .br-input, - .br-table.inverted.dark-mode.dark-mode .br-input label, .br-table.dark-mode.inverted.inverted .br-input, - .br-table.dark-mode.inverted.inverted .br-input label, .br-table.dark-mode.inverted.dark-mode .br-input, - .br-table.dark-mode.inverted.dark-mode .br-input label, .br-table.dark-mode.dark-mode.inverted .br-input, - .br-table.dark-mode.dark-mode.inverted .br-input label, .br-table.dark-mode.dark-mode.dark-mode .br-input, - .br-table.dark-mode.dark-mode.dark-mode .br-input label { - --color: var(--color-dark); - --focus-color: var(--focus-color-dark); - } - .br-table.inverted.inverted .page.active, .br-table.inverted.dark-mode .page.active, .br-table.dark-mode.inverted .page.active, .br-table.dark-mode.dark-mode .page.active { - --interactive-rgb: var(--active-rgb); - background-color: var(--background-light); - color: var(--active); - } - .br-table.inverted th, .br-table.dark-mode th { - background-color: var(--background-dark); - } - .br-table.no-hover:hover td { - background: none; - } - .modal-informacoes{ - position: absolute; - top: 10%; - left: 15%; - right: 15%; - z-index: 1000; - } - .background-modal{ - position: fixed; - left: 0%; - top: 0; - right: 0%; - bottom: 0%; - background-color: rgba(0,0,0,0.5); - display: flex; - align-items: center; - justify-content: center; - z-index: 99; - } - .select-options{ - box-shadow: 0 3px 6px 0 rgba(0,0,0,0.16); - } - .select-options div:not(:last-child){ - border-bottom: 1px solid #ccc; - } - .options{ - --focus-color: var(--focus-color-light); - --focus: var(--focus-color); - background-color: #fff; - transition: background-color 0.3s ease; - } - .options:hover{ - background-image: linear-gradient(rgba(var(--color-rgb),var(--hover)),rgba(var(--color-rgb),var(--hover))); - } - .pagination-inhtmlFormation{ - align-items: center; - } \ No newline at end of file + line-height: var(--font-line-height-medium); + } +} +.br-table .search-bar { + align-items: center; + bottom: 0; + display: none; + height: 56px; + left: 0; + padding-left: var(--table-padding); + padding-right: var(--spacing-scale-2x); + position: absolute; + right: 0; + top: 0; +} +.br-table .search-bar.show { + display: flex; +} +.br-table .search-bar .br-input { + flex: 1; +} +.br-table .search-bar .br-input label { + display: none; +} +.br-table .search-bar .br-input input { + margin-bottom: 0; + margin-top: 0; +} +.br-table .search-bar .br-input input + .br-button { + --button-size: var(--button-small); + margin-top: 0; + position: absolute; + right: var(--spacing-scale-half); + top: 0; +} +.br-table .search-bar .br-input + .br-button { + margin-left: var(--table-row-medium); +} +.br-table .selected-bar, +.br-table .selection-bar { + --color: var(--color-dark); + --color-rgb: var(--color-dark-rgb); + --text-color: var(--color); + --interactive: var(--interactive-dark); + --interactive-rgb: var(--interactive-dark-rgb); + --visited: var(--visited-dark); + --hover: var(--hover-dark); + --pressed: var(--pressed-dark); + --focus-color: var(--focus-color-dark); + --focus: var(--focus-color); + --table-padding: var(--spacing-scale-base) var(--spacing-scale-2x); + align-items: center; + background-color: var(--interactive-light); + bottom: 0; + color: var(--color); + display: none; + left: 0; + padding: var(--table-padding); + right: 0; + top: 0; +} +.br-table .selected-bar.show, +.br-table .selection-bar.show { + display: flex; +} +.br-table .selected-bar .info, +.br-table .selection-bar .info { + align-items: center; + display: flex; + flex-grow: 1; + white-space: nowrap; +} +.br-table .selected-bar .info [data-toggle="check-all"], +.br-table .selected-bar .info .select-all, +.br-table .selection-bar .info [data-toggle="check-all"], +.br-table .selection-bar .info .select-all { + font-size: var(--font-size-scale-up-03); + margin-right: var(--spacing-scale-half); + padding: 0; +} +.br-table .selected-bar .text, +.br-table .selected-bar .count, +.br-table .selection-bar .text, +.br-table .selection-bar .count { + line-height: var(--font-line-height-low); + padding-right: var(--spacing-scale-half); +} +.br-table .selected-bar.is-active, +.br-table .selected-bar.active, +.br-table .selection-bar.is-active, +.br-table .selection-bar.active { + opacity: 1; + top: 0; +} +.br-table .footer, +.br-table .table-footer { + padding: var(--spacing-scale-base) var(--spacing-scale-2x) + var(--spacing-scale-base) var(--table-padding); +} +.br-table .footer .br-input .br-button, +.br-table .table-footer .br-input .br-button { + transform: rotate(180deg); +} +.br-table .footer .br-list, +.br-table .table-footer .br-list { + bottom: 100%; +} +.br-table.small table, +.br-table.small .headers, +.br-table.small .clone-headers .item { + --table-row-size: var(--table-row-small); +} +.br-table.medium table, +.br-table.medium .headers, +.br-table.medium .clone-headers .item { + --table-row-size: var(--table-row-medium); +} +.br-table.large table, +.br-table.large .headers, +.br-table.large .clone-headers .item { + --table-row-size: var(--table-row-large); +} +.br-table.inverted, +.br-table.dark-mode { + --color: var(--color-dark); + --color-rgb: var(--color-dark-rgb); + --text-color: var(--color); + --interactive: var(--interactive-dark); + --interactive-rgb: var(--interactive-dark-rgb); + --visited: var(--visited-dark); + --hover: var(--hover-dark); + --pressed: var(--pressed-dark); + --focus-color: var(--focus-color-dark); + --focus: var(--focus-color); +} +.br-table.inverted.inverted, +.br-table.inverted.dark-mode, +.br-table.dark-mode.inverted, +.br-table.dark-mode.dark-mode { + --color: var(--color-dark); + --color-rgb: var(--color-dark-rgb); + --text-color: var(--color); + --interactive: var(--interactive-dark); + --interactive-rgb: var(--interactive-dark-rgb); + --visited: var(--visited-dark); + --hover: var(--hover-dark); + --pressed: var(--pressed-dark); + --focus-color: var(--focus-color-dark); + --focus: var(--focus-color); +} +.br-table.inverted.inverted.inverted .br-input, +.br-table.inverted.inverted.inverted .br-input label, +.br-table.inverted.inverted.dark-mode .br-input, +.br-table.inverted.inverted.dark-mode .br-input label, +.br-table.inverted.dark-mode.inverted .br-input, +.br-table.inverted.dark-mode.inverted .br-input label, +.br-table.inverted.dark-mode.dark-mode .br-input, +.br-table.inverted.dark-mode.dark-mode .br-input label, +.br-table.dark-mode.inverted.inverted .br-input, +.br-table.dark-mode.inverted.inverted .br-input label, +.br-table.dark-mode.inverted.dark-mode .br-input, +.br-table.dark-mode.inverted.dark-mode .br-input label, +.br-table.dark-mode.dark-mode.inverted .br-input, +.br-table.dark-mode.dark-mode.inverted .br-input label, +.br-table.dark-mode.dark-mode.dark-mode .br-input, +.br-table.dark-mode.dark-mode.dark-mode .br-input label { + --color: var(--color-dark); + --focus-color: var(--focus-color-dark); +} +.br-table.inverted.inverted .page.active, +.br-table.inverted.dark-mode .page.active, +.br-table.dark-mode.inverted .page.active, +.br-table.dark-mode.dark-mode .page.active { + --interactive-rgb: var(--active-rgb); + background-color: var(--background-light); + color: var(--active); +} +.br-table.inverted th, +.br-table.dark-mode th { + background-color: var(--background-dark); +} +.br-table.no-hover:hover td { + background: none; +} +.modal-informacoes { + position: absolute; + top: 10%; + left: 15%; + right: 15%; + z-index: 1000; +} +.background-modal { + position: fixed; + left: 0%; + top: 0; + right: 0%; + bottom: 0%; + background-color: rgba(0, 0, 0, 0.5); + display: flex; + align-items: center; + justify-content: center; + z-index: 99; +} +.select-options { + box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.16); +} +.select-options div:not(:last-child) { + border-bottom: 1px solid #ccc; +} +.options { + --focus-color: var(--focus-color-light); + --focus: var(--focus-color); + background-color: #fff; + transition: background-color 0.3s ease; +} +.options:hover { + background-image: linear-gradient( + rgba(var(--color-rgb), var(--hover)), + rgba(var(--color-rgb), var(--hover)) + ); +} +.pagination-inhtmlFormation { + align-items: center; +} diff --git a/src/components/form/CadAcidentes.tsx b/src/components/form/CadAcidentes.tsx index d70670d3..5ae8521c 100644 --- a/src/components/form/CadAcidentes.tsx +++ b/src/components/form/CadAcidentes.tsx @@ -1,8 +1,7 @@ import "../../styles/form/step3.css"; import Dragdrop from "../Upload/DragDropAcidentes"; - -interface Step1_AcidentesProps { +interface Step1AcidentesProps { onClickBack: () => void; onClickError: () => void; onClickAceito: () => void; @@ -12,7 +11,7 @@ export default function CadAcidentes({ onClickBack, onClickError, onClickAceito, -}: Step1_AcidentesProps) { +}: Step1AcidentesProps) { return (

Inserir Sinistros via planilha

@@ -21,7 +20,7 @@ export default function CadAcidentes({ onClickBack={onClickBack} onClickError={onClickError} onClickAceito={onClickAceito} - /> + />
); diff --git a/src/components/form/Steps/AcidentesAceito.tsx b/src/components/form/Steps/AcidentesAceito.tsx index a5452c64..c7089afc 100644 --- a/src/components/form/Steps/AcidentesAceito.tsx +++ b/src/components/form/Steps/AcidentesAceito.tsx @@ -1,24 +1,23 @@ -import "../../../styles/form/step3_1.css" -import { Button, Form, Space } from "antd"; import { CheckCircleOutlined } from "@ant-design/icons"; +import { Button } from "antd"; +import "../../../styles/form/step3_1.css"; -interface Step3_1Props { - onClickVoltar: () => void; +interface Step31Props { + onClickVoltar: () => void; } -export default function AcidentesAceito({onClickVoltar }: Step3_1Props) { - return ( - -
-
-

Inserção de arquivos concluída com sucesso

- -
-
- -
-
- ) -} \ No newline at end of file +export default function AcidentesAceito({ onClickVoltar }: Step31Props) { + return ( +
+
+

Inserção de arquivos concluída com sucesso

+ +
+
+ +
+
+ ); +} diff --git a/src/components/form/Steps/AcidentesErro1.tsx b/src/components/form/Steps/AcidentesErro1.tsx index d4918a4e..a45ad67e 100644 --- a/src/components/form/Steps/AcidentesErro1.tsx +++ b/src/components/form/Steps/AcidentesErro1.tsx @@ -1,10 +1,10 @@ import { Button } from "antd"; -interface Step3_Erro2Props { +interface Step3Erro2Props { onClickVoltar: () => void; } -export default function Acidentes_erro1({ onClickVoltar }: Step3_Erro2Props) { +export default function Acidentes_erro1({ onClickVoltar }: Step3Erro2Props) { return (
diff --git a/src/components/form/Steps/Step3Aceito.tsx b/src/components/form/Steps/Step3Aceito.tsx index 7af0d9e7..c92b6adf 100644 --- a/src/components/form/Steps/Step3Aceito.tsx +++ b/src/components/form/Steps/Step3Aceito.tsx @@ -1,41 +1,41 @@ -import "../../../styles/form/step3_1.css" -import { Button } from "antd"; import { CheckCircleOutlined } from "@ant-design/icons"; +import { Button } from "antd"; import { useEscolasCadastradas } from "../../../context/escolasCadastradasErro"; +import "../../../styles/form/step3_1.css"; -interface Step3_1Props { - onClickVoltar: () => void; +interface Step31Props { + onClickVoltar: () => void; } -export default function Step3_Aceito({onClickVoltar }: Step3_1Props) { - const { escolasCadastradas } = useEscolasCadastradas(); - if (escolasCadastradas.length > 0) { - return ( -
-
-

Inserção de arquivos concluída com sucesso

-

Quantidade de escolas novas: {escolasCadastradas.length}

- -
-
- -
-
- ) - } +export default function Step3_Aceito({ onClickVoltar }: Step31Props) { + const { escolasCadastradas } = useEscolasCadastradas(); + if (escolasCadastradas.length > 0) { return ( -
-
-

Inserção de arquivos concluída com sucesso

- -
-
- -
+
+
+

Inserção de arquivos concluída com sucesso

+

Quantidade de escolas novas: {escolasCadastradas.length}

+
- ) -} \ No newline at end of file +
+ +
+
+ ); + } + return ( +
+
+

Inserção de arquivos concluída com sucesso

+ +
+
+ +
+
+ ); +} diff --git a/src/components/form/Steps/Step3ErroTamanho.tsx b/src/components/form/Steps/Step3ErroTamanho.tsx index 9c29b390..119aafdb 100644 --- a/src/components/form/Steps/Step3ErroTamanho.tsx +++ b/src/components/form/Steps/Step3ErroTamanho.tsx @@ -1,11 +1,11 @@ import { Button } from "antd"; import "../../../styles/form/step3ErroTamanho.css"; -interface Step3_Erro2Props { +interface Step3Erro2Props { onClickVoltar: () => void; } -export default function Step3_erroTamanho({ onClickVoltar }: Step3_Erro2Props) { +export default function Step3_erroTamanho({ onClickVoltar }: Step3Erro2Props) { return (
diff --git a/src/context/FiltroTabela.tsx b/src/context/FiltroTabela.tsx index 97c5955e..35bd4937 100644 --- a/src/context/FiltroTabela.tsx +++ b/src/context/FiltroTabela.tsx @@ -90,7 +90,7 @@ const FiltroProvider = ({ children }: any) => { [`IdEtapaEnsino[${index}]`]: item, }) ); - const response: AxiosResponse = await axios.get( + const response: AxiosResponse = await axios.get( EscolasFiltradasURL, { params: { @@ -151,7 +151,7 @@ const FiltroProvider = ({ children }: any) => { fetchEscolasFiltradas(); }, [paginaAtual, gatilho]); - interface responseData { + interface ResponseData { escolas: EscolaData[]; escolasPorPagina: number; totalEscolas: number; diff --git a/src/models/service.ts b/src/models/service.ts index 554c409b..7d86d370 100644 --- a/src/models/service.ts +++ b/src/models/service.ts @@ -4,7 +4,7 @@ export interface FederativeUnit { sigla: string; } -export interface viaCEP { +export interface ViaCEP { cep: string; logradouro: string; complemento: string; diff --git a/src/service/Situacao.ts b/src/service/Situacao.ts index 555af5e6..b1201e30 100644 --- a/src/service/Situacao.ts +++ b/src/service/Situacao.ts @@ -2,16 +2,14 @@ import axios, { AxiosResponse } from "axios"; import { SituacaoURL } from "../consts/service"; import { Situacao } from "../models/service"; - async function fetchSituacao(): Promise { try { - const response: AxiosResponse = await axios.get( - SituacaoURL - ); + const response: AxiosResponse = await axios.get(SituacaoURL); return response.data; } catch (error) { + console.log(error); throw error; } } -export default fetchSituacao; \ No newline at end of file +export default fetchSituacao; diff --git a/src/service/alterarDadosEscola.ts b/src/service/alterarDadosEscola.ts index e63f6b38..4dd2a54a 100644 --- a/src/service/alterarDadosEscola.ts +++ b/src/service/alterarDadosEscola.ts @@ -16,6 +16,7 @@ async function fetchAlterarDadosEscola( ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/calcularUps.ts b/src/service/calcularUps.ts index 7c97a2a6..abddf0bb 100644 --- a/src/service/calcularUps.ts +++ b/src/service/calcularUps.ts @@ -17,10 +17,17 @@ async function fetchCalcularUps( ): Promise { try { const response: AxiosResponse = await axios.get( - calcularUpsURL, { params: { Latitude: coordenadasData.latitude, Longitude: coordenadasData.longitude } } + calcularUpsURL, + { + params: { + Latitude: coordenadasData.latitude, + Longitude: coordenadasData.longitude, + }, + } ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/deleteSituation.ts b/src/service/deleteSituation.ts index 759e7c2b..fdccaec1 100644 --- a/src/service/deleteSituation.ts +++ b/src/service/deleteSituation.ts @@ -2,21 +2,22 @@ import axios, { AxiosResponse } from "axios"; import { excluirSituacaoURL } from "../consts/service"; import { ExcluirSituacaoData } from "../models/service"; -interface deleteSituationResponse { +interface DeleteSituationResponse { status: number; } async function fetchDeleteSituation( excluirSituacaoData: ExcluirSituacaoData -): Promise { +): Promise { try { - const response: AxiosResponse = await axios.post( + const response: AxiosResponse = await axios.post( excluirSituacaoURL, null, { params: { idEscola: excluirSituacaoData.idEscola } } ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/etapasDeEnsino.ts b/src/service/etapasDeEnsino.ts index 4d143f15..290174d5 100644 --- a/src/service/etapasDeEnsino.ts +++ b/src/service/etapasDeEnsino.ts @@ -2,7 +2,6 @@ import axios, { AxiosResponse } from "axios"; import { EtapasDeEnsinoURL } from "../consts/service"; import { EtapasDeEnsino } from "../models/service"; - async function fetchEtapasDeEnsino(): Promise { try { const response: AxiosResponse = await axios.get( @@ -10,8 +9,9 @@ async function fetchEtapasDeEnsino(): Promise { ); return response.data; } catch (error) { + console.log(error); throw error; } } -export default fetchEtapasDeEnsino; \ No newline at end of file +export default fetchEtapasDeEnsino; diff --git a/src/service/excluirEscola.ts b/src/service/excluirEscola.ts index d58c6416..16d50e48 100644 --- a/src/service/excluirEscola.ts +++ b/src/service/excluirEscola.ts @@ -2,19 +2,21 @@ import axios, { AxiosResponse } from "axios"; import { excluirEscolaURL } from "../consts/service"; import { ExcluirEscolaData } from "../models/service"; -interface excluirEscolaResponse { +interface ExcluirEscolaResponse { status: number; } -async function fetchExcluirEscola( - { id_escola }: ExcluirEscolaData -): Promise { +async function fetchExcluirEscola({ + id_escola, +}: ExcluirEscolaData): Promise { try { - const response: AxiosResponse = await axios.delete( - excluirEscolaURL, { params: { id: id_escola } } + const response: AxiosResponse = await axios.delete( + excluirEscolaURL, + { params: { id: id_escola } } ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/federativeUnit.ts b/src/service/federativeUnit.ts index 7cffd723..065a2c68 100644 --- a/src/service/federativeUnit.ts +++ b/src/service/federativeUnit.ts @@ -9,6 +9,7 @@ async function fetchFederativeUnit(): Promise { ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/inepAPI.ts b/src/service/inepAPI.ts index 1b4991fb..4c824125 100644 --- a/src/service/inepAPI.ts +++ b/src/service/inepAPI.ts @@ -9,6 +9,7 @@ async function fetchEscolasInep(municipio: number): Promise { ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/insertFile.ts b/src/service/insertFile.ts index 17541923..0de13f98 100644 --- a/src/service/insertFile.ts +++ b/src/service/insertFile.ts @@ -1,6 +1,5 @@ import axios, { AxiosResponse } from "axios"; import { insertFileURL } from "../consts/service"; -import { InsertFileData } from "../models/service"; interface InsertFileResponse { status: number; @@ -12,11 +11,12 @@ async function fetchInsertFile( ): Promise { try { const response: AxiosResponse = await axios.post( - insertFileURL, - fileData + insertFileURL, + fileData ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/insertFileRodovia.ts b/src/service/insertFileRodovia.ts index 5eaccad0..95f42e13 100644 --- a/src/service/insertFileRodovia.ts +++ b/src/service/insertFileRodovia.ts @@ -2,21 +2,22 @@ import axios, { AxiosResponse } from "axios"; import { insertFileRodoviasURL } from "../consts/service"; interface InsertFileResponse { - status: number; + status: number; } async function fetchInsertRodoviaFile( - fileData: FormData + fileData: FormData ): Promise { - try { - const response: AxiosResponse = await axios.post( - insertFileRodoviasURL, - fileData - ); - return response; - } catch (error) { - throw error; - } + try { + const response: AxiosResponse = await axios.post( + insertFileRodoviasURL, + fileData + ); + return response; + } catch (error) { + console.log(error); + throw error; + } } export default fetchInsertRodoviaFile; diff --git a/src/service/listSchools.ts b/src/service/listSchools.ts index 672e698a..e34ef82d 100644 --- a/src/service/listSchools.ts +++ b/src/service/listSchools.ts @@ -9,6 +9,7 @@ async function fetchlistSchools(): Promise { ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/listarInfoEscola.ts b/src/service/listarInfoEscola.ts index f6e278fd..32dc14cd 100644 --- a/src/service/listarInfoEscola.ts +++ b/src/service/listarInfoEscola.ts @@ -16,6 +16,7 @@ async function fetchInfoEscola({ ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/login.ts b/src/service/login.ts index dae94cb1..75b5aada 100644 --- a/src/service/login.ts +++ b/src/service/login.ts @@ -14,6 +14,7 @@ async function fetchLogin(loginData: LoginData): Promise { ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/municipio.ts b/src/service/municipio.ts index 1e3fc03a..0559d73a 100644 --- a/src/service/municipio.ts +++ b/src/service/municipio.ts @@ -2,16 +2,16 @@ import axios, { AxiosResponse } from "axios"; import { MunicipioURL } from "../consts/service"; import { Municipio } from "../models/service"; - -async function fetchMunicipio(UfId:number): Promise { +async function fetchMunicipio(UfId: number): Promise { try { - const response: AxiosResponse = await axios.get( + const response: AxiosResponse = await axios.get( `${MunicipioURL}?idUf=${UfId.toString()}` ); return response.data; } catch (error) { + console.log(error); throw error; } } -export default fetchMunicipio; \ No newline at end of file +export default fetchMunicipio; diff --git a/src/service/recoverPW.ts b/src/service/recoverPW.ts index 25959635..b0e936e3 100644 --- a/src/service/recoverPW.ts +++ b/src/service/recoverPW.ts @@ -11,11 +11,12 @@ async function fetchRecoverPassword( ): Promise { try { const response: AxiosResponse = await axios.put( - recoverPasswordURL, - recoverData + recoverPasswordURL, + recoverData ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/register.ts b/src/service/register.ts index 8f418102..9e3d1e69 100644 --- a/src/service/register.ts +++ b/src/service/register.ts @@ -16,6 +16,7 @@ async function fetchRegister( ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/registerSchool.ts b/src/service/registerSchool.ts index 05f62f46..a43e6f76 100644 --- a/src/service/registerSchool.ts +++ b/src/service/registerSchool.ts @@ -1,13 +1,14 @@ import axios, { AxiosResponse } from "axios"; -import { RegisterSchoolData } from "../models/service"; import { registerSchoolURL } from "../consts/service"; +import { RegisterSchoolData } from "../models/service"; interface RegisterSchoolResponse { status: number; } async function fetchCadastroEscola( - registerSchoolData: RegisterSchoolData): Promise { + registerSchoolData: RegisterSchoolData +): Promise { try { const response: AxiosResponse = await axios.post( registerSchoolURL, @@ -15,6 +16,7 @@ async function fetchCadastroEscola( ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/resetPassword.ts b/src/service/resetPassword.ts index 6c929b26..8cd16df8 100644 --- a/src/service/resetPassword.ts +++ b/src/service/resetPassword.ts @@ -16,6 +16,7 @@ async function fetchResetPassword( ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/solicitaAcao.ts b/src/service/solicitaAcao.ts index 4e7a85ab..0629a42a 100644 --- a/src/service/solicitaAcao.ts +++ b/src/service/solicitaAcao.ts @@ -18,6 +18,7 @@ async function fetchSolicitaAcao( ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/service/viaCEP.ts b/src/service/viaCEP.ts index 4c82315b..96d9cb2a 100644 --- a/src/service/viaCEP.ts +++ b/src/service/viaCEP.ts @@ -1,14 +1,15 @@ import axios, { AxiosResponse } from "axios"; import { urlAPIViaCEP } from "../consts/service"; -import { viaCEP } from "../models/service"; +import { ViaCEP } from "../models/service"; -async function fetchCEP(cep: string): Promise { +async function fetchCEP(cep: string): Promise { try { - const response: AxiosResponse = await axios.get( - urlAPIViaCEP + `/${cep}` + '/json' + const response: AxiosResponse = await axios.get( + urlAPIViaCEP + `/${cep}` + "/json" ); return response.data; } catch (error) { + console.log(error); throw error; } } diff --git a/src/styles/App.css b/src/styles/App.css index 6df6e4ff..0ea7eb45 100644 --- a/src/styles/App.css +++ b/src/styles/App.css @@ -63,10 +63,6 @@ display: inline-block; vertical-align: middle; } -.buttonContrast { - display: inline-block; - vertical-align: middle; -} .HeaderIcon { display: flex; diff --git a/src/styles/form.css b/src/styles/form.css index 23a0bb61..08512d2a 100644 --- a/src/styles/form.css +++ b/src/styles/form.css @@ -19,11 +19,6 @@ font-weight: 1000; } -.form h2 { - justify-content: flex-start; - display: flex; -} - .formc { padding: 1.5% 3.5%; margin-top: 0px; @@ -42,11 +37,6 @@ font-weight: 1000; } -.formc h2 { - justify-content: flex-start; - display: flex; -} - .ant-input-affix-wrapper > input.ant-input { background-color: var(--gray1); }