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/mostra mapa #55

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 35 additions & 0 deletions src/Pages/Landing/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { openIDASignin } from '../../service/ida.lib';
import Map from '../../components/Map/Map';
import ReponsiveVideoPlayer from "../../components/ResponsiveVideoPlayer/ReponsiveVideoPlayer";
import Slider from '../../components/Slider/Slider';
import SimpleCard from '../../components/SimpleCard/SimpleCard';

const iWant = (history, state) => {
if (!state.auth) {
Expand All @@ -45,6 +46,30 @@ const Landing = ({ history }) => {
}, [state.auth, state.user]);


const cardData = {
dataEvent1:{
img:'../../assets/imgCard1.png',
description:'Imagem da praia em Fortaleza - CE',
dateEvent:'30 jul',
titleEvent:'Reunião Aberta Mídia Ninja em Fortaleza',
placeEvent:'Fortaleza, CE',
},
dataEvent2:{
img:'../../assets/imgCard1.png',
description:'Imagem da praia em Fortaleza - CE',
dateEvent:'2 ago',
titleEvent:'Reunião Aberta Mídia Ninja em Fortaleza',
placeEvent:'Fortaleza, CE',
},
dataEvent3:{
img:'../../assets/imgCard1.png',
description:'Imagem da praia em Fortaleza - CE',
dateEvent:'5 ago',
titleEvent:'Reunião Aberta Mídia Ninja em Fortaleza',
placeEvent:'Fortaleza, CE',
},
};
const dataCardEvent =JSON.stringify(cardData);
return (
<div className="landing-container">
<section className="landing">
Expand Down Expand Up @@ -79,6 +104,16 @@ const Landing = ({ history }) => {
</p>
</div>
</section>
<<<<<<< HEAD
<section className="event-calendar">
<p>Primeira rota lançada!</p>
<h2>República do Nordeste</h2>
<Slider>
<SimpleCard dataEvents={dataCardEvent}></SimpleCard>
</Slider>
</section>
=======
>>>>>>> 0acc27e272483f7e7acdd5a5dcfaa4881c5205d2
<section className="activist-map">
<div style={{ textAlign: "left" }}>
<img className="map-img" src={mapImg} alt="Mapa Ativista" />
Expand Down
37 changes: 30 additions & 7 deletions src/Pages/Landing/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
display: flex;
flex-direction: column;
font-size: 2rem;
font-weight: 700;
}
.heading-primary--white{
color: var(--white);
Expand Down Expand Up @@ -131,7 +132,30 @@
border: none;
padding: .5rem 1.5rem;
}

.event-calendar{
font-family: Roboto;
font-style: normal;
line-height: 36px;
display: flex;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
width: 70%;
height: 60vh;
margin: 2.5rem auto;
}
.event-calendar p{
font-weight: normal;
font-size: 18px;
}
.event-calendar h2 {
font-weight: bold;
font-size: 27px;
}
.navegue {
margin: 2rem 3rem;
width: 70%;
Expand Down Expand Up @@ -481,8 +505,8 @@
height: 40vh;
}
.pathImg{
top: -43px;
height: 44.8vh;
top: -14px;
height: 41.5vh;
}

.navegue {
Expand All @@ -497,13 +521,12 @@
flex-direction: row;
align-items: center;
justify-content: space-evenly;
height: 40vh;
height: 38vh;
height: 55vh;
}

.pathImg{
top: -77px;
height: 47.3vh;
top: -18px;
height: 57vh;
}

.navegue {
Expand Down
Binary file added src/assets/imgCard1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/imgCard2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/imgCard3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions src/components/SimpleCard/SimpleCard.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import { Card, DateEvent, Title, Place } from './simpleCard.style';


function SimpleCard() {
const data = JSON.parse(this.props.cardData);
return(
<Card>
<img src={data.dataEvent1.img} alt={data.dataEvent1.description} />
<DateEvent>{data.dataEvent1.dateEvent}</DateEvent>
<Title>{data.dataEvent1.titleEvent}</Title>
<Place>{data.dataEvent1.placeEvent}</Place>
</Card>
);
}

export default SimpleCard;
37 changes: 37 additions & 0 deletions src/components/SimpleCard/simpleCard.style.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import styled from 'styled-components';

export const Card = styled.div`
background: var(--light-gray-card);
border-radius: 7px;
width: 230px;
height: 360px;
`;

export const DateEvent = styled.p`
font-family: Roboto;
font-style: normal;
font-weight: normal;
font-size: 16px;
line-height: 30px;
color: rgba(59, 39, 55, 0.49);
`;

export const Title = styled.h3`
font-family: Roboto;
font-style: normal;
font-weight: bold;
font-size: 16px;
line-height: 20px;
color: #3B2737;
`;


export const Place = styled.p`
font-family: Roboto;
font-style: normal;
font-weight: bold;
font-size: 14px;
line-height: 13px;
color: rgba(59, 39, 55, 0.49);
`;

11 changes: 0 additions & 11 deletions src/components/Slider/SimpleCard.js

This file was deleted.

6 changes: 2 additions & 4 deletions src/components/Slider/Slider.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import React from 'react';
import { SliderWrapper } from './sliderCustom.style'
import { SliderWrapper } from './sliderCustom.style';

function Slider() {

return(
<SliderWrapper>
<p>Primeira rota lançada!
<h2>República do Nordeste</h2>
</p>
</SliderWrapper>
);
}
Expand Down
5 changes: 0 additions & 5 deletions src/components/Slider/simpleCard.style.js

This file was deleted.

14 changes: 0 additions & 14 deletions src/components/Slider/sliderCustom.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,4 @@ export const SliderWrapper = styled.div`
margin: 2.5rem auto;
`;

export const Title = styled.div`
font-family: Roboto;
font-style: normal;
line-height: 36px;

p{
font-weight: normal;
font-size: 18px;
}
h2 {
font-weight: bold;
font-size: 27px;
}
`;

1 change: 1 addition & 0 deletions src/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
--off-white: #f9f9f9;
--light-gray: #e0e0e0;
--lighter-gray: #e5e5e5;
--light-gray-card: #F2F2F2;
--gray: #888;
}

Expand Down