Skip to content

Commit

Permalink
aplica alterações solicitadas no pull request
Browse files Browse the repository at this point in the history
  • Loading branch information
Laércio Fernandes Correia de Melo Neto committed Nov 30, 2023
1 parent 666acfe commit 435642f
Show file tree
Hide file tree
Showing 16 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion src/components/carousel-therapies/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const CarouselTherapies = () => {
}
}}
modules={[Navigation]}
className="my-swiper"
className="partner-swiper"
>
<section>
<div className="swiper-slide">
Expand Down
2 changes: 1 addition & 1 deletion src/components/carousel-workshop/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const CarouselWorkshop = () => {
}
}}
modules={[Navigation]}
className="my-swiper"
className="partner-swiper"
>
<section>
<div className="swiper-slide">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { cms } from '../../client'
import { Swiper, SwiperSlide } from 'swiper/react'
import EventsComponent from './styled.js'

const CarouselEvents = () => {
const EventsCarousel = () => {
const [attributesEvents, setAttributesEvents] = useState([])
const urlCms = process.env.REACT_APP_URL_CMS
useEffect(() => {
Expand Down Expand Up @@ -60,7 +60,7 @@ const CarouselEvents = () => {
}
}}
modules={[Navigation]}
className="my-swiper"
className="partner-swiper"
>
<section>
<div className="swiper-slide">
Expand All @@ -70,7 +70,7 @@ const CarouselEvents = () => {
<SwiperSlide>
<div>
<div>
<img className="img-photo" src={urlCms + events.image_url} />
<img className="event-img" src={urlCms + events.image_url} />
</div>
<div>
<p className="date">{events.date.toLocaleDateString('pt-BR', { Timezone: 'UTF' })}</p>
Expand All @@ -90,4 +90,4 @@ const CarouselEvents = () => {
</EventsComponent >
)
}
export default CarouselEvents
export default EventsCarousel
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const EventsComponent = styled.div`
}
}
.my-swiper {
.partner-swiper {
position: relative;
z-index: 0;
}
Expand All @@ -28,7 +28,7 @@ const EventsComponent = styled.div`
height: 70vh;
padding-left: 3em;
margin-right: 20px;
.img-photo{
.event-img{
width: 45vh;
height: 35vh;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/global-styles/carousel-styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const CssCarouselGlobal = styled.div`
}
}
.my-swiper {
.partner-swiper {
background-color: #fafafa;
position: relative;
z-index: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/components/modal-gallery/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const ModalGallery = ({ type }) => {
{type === 'gallery' && (
<>
<div className="top">
<h2 className="h2-modal-galery">Fotos da Nossa Casa</h2>
<h2 className="h2-modal-gallery">Fotos da Nossa Casa</h2>
</div>
<Swiper
style={{
Expand Down
6 changes: 3 additions & 3 deletions src/components/modal-gallery/styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ p {
padding-right: 20px;
}
.top > .h2-modal-galery {
.top > .h2-modal-gallery {
margin: 0;
margin-left: 25%;
font-size: 2.25rem;
Expand Down Expand Up @@ -244,7 +244,7 @@ p {
margin-bottom: 30px;
}
.top > .h2-modal-galery {
.top > .h2-modal-gallery {
margin-left: 20%;
}
.swiper-slide-view {
Expand All @@ -262,7 +262,7 @@ p {
@media (min-width: 1281px) {
.top > .h2-modal-galery {
.top > .h2-modal-gallery {
margin-left: 20%;
}
.swiper {
Expand Down
2 changes: 1 addition & 1 deletion src/components/partners/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const Partners = () => {
}
}}
modules={[Navigation]}
className="my-swiper"
className="partner-swiper"
>
<section className='partners'>
<div className="swiper-slide">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/events/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import EventsContainer from './styled'
import NavBar from '../../components/navbar'
import Partners from '../../components/partners'
import Footer from '../../components/footer'
import CarouselEvents from '../../components/carousel-events'
import EventsCarousel from '../../components/events-carousel'

export const EventsPage = () => {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/pages/events/styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const EventsContainer = styled.div`
height: 100vh;
.carousel-events {
.events-carousel {
background-color: #DADADA;
height: 748px;
width: 100%;
Expand Down
10 changes: 5 additions & 5 deletions src/pages/home/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Home from './styled'
import mural from './mural.png'
import NavBar from '../../components/navbar'
import ModalGallery from '../../components/modal-gallery'
import photoOurHouse from './nossacasa.png'
import nossaCasaImage from './nossacasa.png'
import Partners from '../../components/partners'
import Footer from '../../components/footer'
import 'swiper/css'
Expand All @@ -21,7 +21,7 @@ export function HomePage() {
const urlCms = process.env.REACT_APP_URL_CMS

useEffect(() => {
cms.get('api/CarouselEvents/?populate=foto_divulgacao').then((response) => {
cms.get('api/events/?populate=foto_divulgacao').then((response) => {
const { data } = response.data
const event = data.map((data) => {
if (data.attributes.destaque) {
Expand Down Expand Up @@ -113,12 +113,12 @@ export function HomePage() {
</button>
</div>
<div className='photo'>
<img src={photoOurHouse} />
<img src={nossaCasaImage} />
</div>
</div >
</section >
<section className="galery">
<h2 className='title-galery'>Galeria de fotos</h2>
<section className="gallery">
<h2 className='title-gallery'>Galeria de fotos</h2>
<div className='container-painel'>
<ul className='painel'>
{galeria.map((fotos) => (
Expand Down
12 changes: 6 additions & 6 deletions src/pages/home/styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ const Home = styled.div`
}
}
.galery {
.gallery {
padding-top: 30px;
background-color: #fafafa;
display: flex;
Expand All @@ -169,7 +169,7 @@ const Home = styled.div`
align-items: center;
gap: 30px;
.title-galery {
.title-gallery {
align-self: flex-start;
margin-left: 8.3%;
font-weight: 700;
Expand Down Expand Up @@ -269,7 +269,7 @@ const Home = styled.div`
line-height: 1.5em;
}
.galery .title-galery {
.gallery .title-gallery {
font-size: 2.75rem;
align-self: center;
margin-left: initial;
Expand Down Expand Up @@ -360,12 +360,12 @@ const Home = styled.div`
margin-bottom: 0;
}
.galery {
.gallery {
padding-top: initial;
gap: 10px;
}
.galery .title-galery {
.gallery .title-gallery {
font-size: 1.75rem;
margin-left: initial;
align-self: center;
Expand All @@ -374,7 +374,7 @@ const Home = styled.div`
grid-template-columns: repeat(2, 1fr);
grid-template-rows: repeat(2, 1fr);
}
.galery button{
.gallery button{
margin-bottom: 30px
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/pages/therapies-description/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export const DetailsTherapies = () => {
</div>
</li>
<li>
<div className="therapie-type">
<div className="therapy-type">
<p className="type">
<FontAwesomeIcon icon={faLock} size="lg" />
<div className="spacing-type">
Expand Down Expand Up @@ -151,7 +151,7 @@ export const DetailsTherapies = () => {
<li>
{therapies.attributes?.url_agendamento == null && (
<>
<div className="inscription-icon">
<div className="register-icon">
<div>
<FontAwesomeIcon icon={faPenToSquare} size="lg" />
</div>
Expand Down Expand Up @@ -208,7 +208,7 @@ export const DetailsTherapies = () => {
freeMode={true}
watchSlidesProgress={true}
modules={[FreeMode, Navigation, Thumbs]}
className="my-swiper"
className="partner-swiper"
>
{galleryPhoto.map((image) => (
<SwiperSlide key={image.id}>
Expand Down
8 changes: 4 additions & 4 deletions src/pages/therapies-description/styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const Details = styled.div`
padding-left: 90px;
}
.inscription-icon {
.register-icon {
width: 20vw;
display: flex;
}
Expand Down Expand Up @@ -129,19 +129,19 @@ const Details = styled.div`
padding-bottom: 30px;
}
}
.my-swiper {
.partner-swiper {
height: 20%;
box-sizing: border-box;
padding: 10px 0;
}
.my-swiper .swiper-slide {
.partner-swiper .swiper-slide {
width: 25%;
height: 100%;
opacity: 0.4;
}
.my-swiper .swiper-slide-thumb-active {
.partner-swiper .swiper-slide-thumb-active {
* {
margin: 0;
padding: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workshop-description/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export const WorkshopDetails = () => {
<li>
{workshops.attributes?.url_inscricao == null && (
<>
<div className="inscription-icon">
<div className="register-icon">
<div>
<FontAwesomeIcon icon={faPenToSquare} size="lg" />
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workshop-description/styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const Details = styled.div`
padding-left: 90px;
}
.inscription-icon {
.register-icon {
width: 20vw;
display: flex;
}
Expand Down

0 comments on commit 435642f

Please sign in to comment.