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

[US11]: Configurar disponibilidade de Visita #104

Merged
merged 33 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8c7017b
feat: adicionando rota do sac
DanielRogs Dec 3, 2024
8caf08b
feat: adicionando rotas get pra puxar todos os sacs e sacs por assunto
arthur-suares Dec 5, 2024
cfd5a31
feat: configurando funcao delete
arthur-suares Dec 6, 2024
6d641ab
feat: primeira versão do sac
manuvaladares Dec 6, 2024
baeb16f
Merge branch 'feature/sac' of https://github.com/mdsreq-fga-unb/2024.…
manuvaladares Dec 6, 2024
2f45061
Merge branch 'feature/disponibilidade_de_visita' of https://github.co…
manuvaladares Dec 6, 2024
f54ed99
fix: corrigindo a pasta do componente sac
manuvaladares Dec 6, 2024
3c321d3
feat: adiciona o campo de assunto e anexar arquivo
manuvaladares Dec 6, 2024
b5a416c
feat: envio de emails!
arthur-suares Dec 7, 2024
4e82fa8
feat: consumindo a api de sac
arthur-suares Dec 7, 2024
33b13f2
fix: corrigindo dependencias no json
arthur-suares Dec 7, 2024
65b0cc7
feat: envio de emails pelo forms do front - v1
arthur-suares Dec 7, 2024
b6ffe70
fix: correcao de dependencias
arthur-suares Dec 7, 2024
7a793cd
fix: envio de emails com ou sem arquivo anexado
arthur-suares Dec 8, 2024
e00090f
feat: estilizacao do campo de endereco no sacsection
arthur-suares Dec 8, 2024
2e514db
feat: ajuste de fonte e bordas no sac
manuvaladares Dec 9, 2024
a510454
feat: adicinando novos campos ao model visita
DanielRogs Dec 9, 2024
589b8f7
feat: amostragem dos dias de visitas disponibilizados
JoaoODragonborn Dec 10, 2024
6d78aa4
feat: puxando vetor de sacs do banco e mostrando na tela
arthur-suares Dec 11, 2024
0798216
feat: campo select para filtrar sacs
arthur-suares Dec 12, 2024
bcde1a0
Merge branch 'develop' of https://github.com/mdsreq-fga-unb/2024.2-T0…
arthur-suares Dec 12, 2024
c8a8669
fix: correcao de dependencia
arthur-suares Dec 12, 2024
3b15ec4
feat: pagina de visualizacao de sacs no frontadmin
arthur-suares Dec 12, 2024
77c9812
feat: botao para inserir arquivo estilizado
manuvaladares Dec 12, 2024
29e8af6
Merge branch 'develop' of https://github.com/mdsreq-fga-unb/2024.2-T0…
DanielRogs Dec 13, 2024
b89a9d6
feat: adicionando bigpost
DanielRogs Dec 13, 2024
379fda7
feat: inserindo responsividade melhorada
DanielRogs Dec 13, 2024
936ddc6
fix: ajustando responsividade de páginas
DanielRogs Dec 14, 2024
cce6c60
Merge branch 'feature/sac' of https://github.com/mdsreq-fga-unb/2024.…
DanielRogs Dec 14, 2024
4388bfd
Merge branch 'feature/blog' of https://github.com/mdsreq-fga-unb/2024…
DanielRogs Dec 14, 2024
b2106d1
feat: adicionando novas páginas
DanielRogs Dec 14, 2024
8dfa3e1
feat: finalizando feat das visitas técnicas
DanielRogs Dec 16, 2024
6a8bab4
fix: corrigindo botões
DanielRogs Dec 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions apps/frontend/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
import React, { useEffect } from 'react';
import { HashRouter as Router, Route, Routes} from 'react-router-dom';
import ContactPage from './pages/ContactPage';
import NossaHistoria from './pages/nossaHistoria'

import PublicRoutes from './routes/PublicRoutes';

const App = () => {
useEffect(() => {
}, []);

return (
<Router>
<Routes>
<Route path='/' element={<ContactPage />} />
<Route path='/nossaHistoria' element={<NossaHistoria />} />
<Routes>
<Route path='/*' element={<PublicRoutes />} />
</Routes>
</Router>
);
Expand Down
27 changes: 27 additions & 0 deletions apps/frontend/src/components/BigPost/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from "react";
import {
Content,
Title,
Description,
Button,
Image
} from "./styled"
import { DivContainer } from "../../pages/(public)/nossaHistoria/styled";

const BigPost = ({title, description, imagelink}) => {
return (
<Content>
<div>
<Title>{title}</Title>
<Description>{description}</Description>
<Button>Ler Mais</Button>
</div>

<div>
<Image src = {imagelink}/>
</div>
</Content>
);
};

export default BigPost;
42 changes: 42 additions & 0 deletions apps/frontend/src/components/BigPost/styled.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import styled from "styled-components";

export const Content = styled.div`
background-color: #f9f7f8;
width: 100%;
height: 350px;
display: flex;
flex-direction: column;
`;

export const Title = styled.h1`
color: #111;
font-family: 'Myriad Pro', sans-serif;
font-size: 2rem;

`;

export const Description = styled.span`
color: #555;
font-family: 'Myriad Pro', sans-serif;
font-size: 15rem;
`

export const Button = styled.button`
padding: 0.8rem 1.5rem;
font-size: 1rem;
color: white;
background-color: #006343;
border: none;
border-radius: 4px;
cursor: pointer;
transition: background-color 0.3s ease;

&:hover {
background-color: #004c2e;
}
`;

export const Image = styled.img`
width: 40vw;
margin-block: 3px;
`
6 changes: 3 additions & 3 deletions apps/frontend/src/components/Header/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ function Header({pagina}) {
<ul className="nav-list">
<li><a href="#">INICIO</a></li>
<li><a href="#">NOSSOS PRODUTOS</a></li>
<li><Link to="/nossaHistoria" style={{ color: isActive("/nossaHistoria") ? "#006343" : "black"}}>NOSSA HISTÓRIA</Link></li>
<li><a href="#">BLOG</a></li>
<li><Link to="/historia" style={{ color: isActive("/historia") ? "#006343" : "black"}}>NOSSA HISTÓRIA</Link></li>
<li><a href="/" style={{ color: isActive("/") ? "#006343" : "black"}}>BLOG</a></li>
<li><a href="#">SÍTIO VERDE</a></li>
<li><a href="#">VISITE A FÁBRICA</a></li>
<li><Link to="/" style={{ color: isActive("/") ? "#006343" : "black"}}>CONTATO</Link></li>
<li><Link to="/contatos" style={{ color: isActive("/contatos") ? "#006343" : "black"}}>CONTATO</Link></li>
</ul>
</InfoAreaDesktop>

Expand Down
6 changes: 4 additions & 2 deletions apps/frontend/src/components/Paginacao/index.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import React from "react";
import { DivPagincacao, Letreiro } from "./styled";
import { DivLetreiro, DivPagincacao, Letreiro } from "./styled";

function Paginacao({text}) {
return (
<DivPagincacao>
<Letreiro className="container">{text}</Letreiro>
<DivLetreiro>
<Letreiro className="container">{text}</Letreiro>
</DivLetreiro>
</DivPagincacao>
)
}
Expand Down
26 changes: 24 additions & 2 deletions apps/frontend/src/components/Paginacao/styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,36 @@ import styled from 'styled-components';
export const DivPagincacao = styled.div`
display: flex;
align-items: center;
justify-content: center;
left: 0;
position: absolute;
height: 40px;
width: 100%;
background: #006343;
margin-bottom: 50px;
/* margin-bottom: 50px; */

@media (max-width: 800px){
justify-content: left;
padding-inline: 20px;
}
`;

export const DivLetreiro = styled.div`
display: flex;
justify-content: space-between;
width: 1900px;

@media (max-width: 2000px){
width: 90%;
}

@media (max-width: 800px){
width: 100%;
}
`;

export const Letreiro = styled.h1`
font-size: 12px;
width: 100%;
color: white;
text-transform: uppercase;
`;
20 changes: 20 additions & 0 deletions apps/frontend/src/components/PublicLayout/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React from "react";
import Header from "../Header";
import Footer from "../Footer";
import { Centralização, Layout } from "./styled";

const PublicLayout = ({children}) => {
return(
<>
<Header />
<Centralização>
<Layout>
<main>{children}</main>
</Layout>
</Centralização>
<Footer />
</>
);
};

export default PublicLayout;
26 changes: 26 additions & 0 deletions apps/frontend/src/components/PublicLayout/styled.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import styled from "styled-components";

export const Centralização = styled.div`
display: flex;
justify-content: center;

@media (max-width: 800px){
justify-content: left;
padding-inline: 20px;
}
`;

export const Layout = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
width: 1900px;

@media (max-width: 2000px){
width: 90%;
}

@media (max-width: 800px){
width: 100%;
}
`;
17 changes: 4 additions & 13 deletions apps/frontend/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
font-display: swap;
}

*{
box-sizing: border-box;
}

body {
font-family: 'Myriad Pro', sans-serif;
margin: 0;
Expand All @@ -34,17 +38,4 @@ body {
min-width: 320px;
min-height: 100vh;
overflow-x: hidden;
}

.container {
margin: 2vh 20vh;

@media (max-width: 1640px) {
margin: 2vh 8vh;
}

@media (max-width: 850px) {
margin: 2vh 2vh;
}

}
20 changes: 20 additions & 0 deletions apps/frontend/src/pages/(public)/BlogPage/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React from "react";
import Paginacao from '../../../components/Paginacao';
import BigPost from "../../../components/BigPost";
import {
Space
} from "./styled";

const BlogPage = () => {
return (
<>
<Paginacao text={"Família do sítio > Blog"}/>
<Space />

<BigPost title={"Teste"}/>
</>
);

};

export default BlogPage;
5 changes: 5 additions & 0 deletions apps/frontend/src/pages/(public)/BlogPage/styled.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import styled from "styled-components";

export const Space = styled.div`
height: 68px;
`;
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React from 'react';
import Paginacao from '../../components/Paginacao';
import Header from '../../components/Header';
import Footer from '../../components/Footer';
import Sac from '../../components/SacSection'
import Paginacao from '../../../components/Paginacao';
import Sac from '../../../components/SacSection'
import {
ContactSection,
ContactCards,
Expand All @@ -14,7 +12,8 @@ import {
SocialIcons,
Links,
ContactInfo,
Horario_redes
Horario_redes,
Space
} from './styled';
import { FaEnvelope, FaPhoneAlt, FaInstagram, FaFacebook, FaYoutube, FaLinkedin, FaComments } from "react-icons/fa"; // Ícones do Font Awesome
import { FaXTwitter } from "react-icons/fa6";
Expand Down Expand Up @@ -43,18 +42,18 @@ const ContactPage = () => {

return (
<>
<Header pagina={"CONTATOS"} />
<Paginacao text={"FAMÍLIA DO SÍTIO > CONTATOS"} />
<Space />

<InfoSection className='container'>
<InfoSection>
<h1>FALE CONOSCO</h1>
<p>Precisa de ajuda com alguma dúvida, sugestão ou reclamação?<br />Utilize nossos canais de atendimento:</p>
</InfoSection>

<ContactSection>
<ContactCards>
{contacts.map((contact) => (
<ContactCard>
<ContactCard className='card'>
<h1>{contact.title}</h1>
<p>{contact.description}</p>
<EmailZone>
Expand Down Expand Up @@ -115,8 +114,6 @@ const ContactPage = () => {
</Links>
</FaleCom>
<Sac />

<Footer />
</>
);
};
Expand Down
Loading