diff --git a/api/lib/medium-casos.js b/api/lib/medium-casos.js index e249071..bf0ce07 100644 --- a/api/lib/medium-casos.js +++ b/api/lib/medium-casos.js @@ -3,7 +3,8 @@ const moment = require('moment') function getPublicacionesCasos (req, res) { getMediumCasos() - .then(mediumResponse => { + .then(mediumResponse => + { res.json(parsePublicaciones(mediumResponse, req.query.lang)) }) .catch(err => { @@ -40,7 +41,7 @@ function parsePublicaciones (mediumResponse, lang) { return posts.map(p => ( { - url: `${process.env.MEDIUM_URL_CASOS}/${p.uniqueSlug}`, + url: `${process.env.MEDIUM_URL}/${p.uniqueSlug}`, title: p.title, claps: p.virtuals.totalClapCount, createdAt: moment(p.createdAt).format('LT, dddd'), diff --git a/components/Facebook.js b/components/Facebook.js index cfca60d..6674bb6 100644 --- a/components/Facebook.js +++ b/components/Facebook.js @@ -10,14 +10,14 @@ const Facebook = (props) => ( diff --git a/components/Github.js b/components/Github.js index f206e09..efec83f 100644 --- a/components/Github.js +++ b/components/Github.js @@ -8,14 +8,14 @@ const Github = (props) => ( diff --git a/components/Instagram.js b/components/Instagram.js index 5d29f3e..f0de5af 100644 --- a/components/Instagram.js +++ b/components/Instagram.js @@ -1,21 +1,25 @@ const Instagram = (props) => ( - + // - - - - + // + // + // + + + + + diff --git a/components/Medium.js b/components/Medium.js new file mode 100644 index 0000000..e613573 --- /dev/null +++ b/components/Medium.js @@ -0,0 +1,26 @@ +const Medium = (props) => ( + + + + + + + + + + + +) + +export default Medium \ No newline at end of file diff --git a/components/SocialBar.js b/components/SocialBar.js index 360d89f..38b12c1 100644 --- a/components/SocialBar.js +++ b/components/SocialBar.js @@ -3,6 +3,7 @@ import Twitter from './Twitter' import Github from './Github' import Instagram from "./Instagram" import Youtube from "./Youtube" +import Medium from "./Medium" const SocialBar = ( { alignSelf, iconsSize, width, mobileWidth, justifyContent, iconHover, iconMobileHover } ) => ( diff --git a/components/Youtube.js b/components/Youtube.js index a1ca552..2cd2790 100644 --- a/components/Youtube.js +++ b/components/Youtube.js @@ -42,14 +42,14 @@ viewBox="0 0 455 455" /* style="enable-background:new 0 0 455 455;" */ xmlxspace diff --git a/containers/Header.js b/containers/Header.js index ae343c6..55ddd46 100644 --- a/containers/Header.js +++ b/containers/Header.js @@ -14,7 +14,7 @@ const Header = ( { title, bg }) => ( width: 100%; } .about-us-title { - color: var(--white); + color: var(--black); font-size: 4.2rem; } @media screen and (max-width: 1024px) { diff --git a/pages/about.js b/pages/about.js index f91f2d9..f74464e 100644 --- a/pages/about.js +++ b/pages/about.js @@ -47,7 +47,8 @@ export default class extends Component { currentLang={this.state.currentLang} >
+ // bg={'../static/assets/header/headerWeb.jpg'} + /> {/* */} diff --git a/sections/about/containers/Content.js b/sections/about/containers/Content.js index e6cd25b..10bd71c 100644 --- a/sections/about/containers/Content.js +++ b/sections/about/containers/Content.js @@ -7,7 +7,7 @@ class Content extends React.Component{ super(props) this.playlistId = 'PL-5jaKJlVw82dWX3ZNG5uVmoD9b5yf2bd' this.state = { - currentVideo : 'LhcS-IbQbTk', + currentVideo : 'TXNo80KL8Cg', videos: null } } @@ -19,6 +19,7 @@ class Content extends React.Component{ componentDidMount () { + console.log(this.state.currentVideo) const youtube = localStorage.getItem('youtube') fetch(`https://www.googleapis.com/youtube/v3/playlistItems?key=${youtube}&playlistId=${this.playlistId}&part=snippet&maxResults=12`) .then((response) => response.json()) diff --git a/sections/index/containers/Collaborate.js b/sections/index/containers/Collaborate.js index a5994b5..bc2d234 100644 --- a/sections/index/containers/Collaborate.js +++ b/sections/index/containers/Collaborate.js @@ -38,7 +38,7 @@ class Collaborate extends Component { render () { return (
-
+
{data.map((i)=>

{t(`index.collaborate.content.${i}.title`)}

@@ -63,7 +63,7 @@ class Collaborate extends Component { .carousel { display: flex; flex-wrap: wrap; - justify-content: space-between; + justify-content: center; width: 100%; } .collaborate-container { diff --git a/sections/index/containers/Header.js b/sections/index/containers/Header.js index 8f85564..ceb8b2b 100644 --- a/sections/index/containers/Header.js +++ b/sections/index/containers/Header.js @@ -5,28 +5,55 @@ import SocialBar from '../../../components/SocialBar.js' const Header = ( {modal, content, hideModal} ) => (
-
+
+
+ +
+
+

{t('index.header.subtitle')}

+
CONOCENOS
{/* */} - + {modal && } der_black \ No newline at end of file diff --git a/static/global.css b/static/global.css index b89953e..7b80d57 100644 --- a/static/global.css +++ b/static/global.css @@ -70,11 +70,11 @@ section { } section:nth-child(odd) { - background-color: var(--white); + background-color: var(--light-gray); } section:nth-child(even) { - background-color: var(--light-gray); + background-color: var(--white); } h1 { diff --git a/translations/en.json b/translations/en.json index fe302de..920bd1b 100644 --- a/translations/en.json +++ b/translations/en.json @@ -3,7 +3,7 @@ "index": { "header": { "title": "Democracia en Red", - "subtitle": "We imagine, design and implement innovations in the political system, to open decision processes, to redistribute power.", + "subtitle": "Together with governments and activists we create solutions for citizen participation to strengthen democracy.", "callToAction": "Send", "placeholder": "Sign up for news!", "mobilePlaceholder": "Receive updates in your email.", @@ -34,14 +34,14 @@ "callToAction": "More info" }, "caseStudies": { - "title": "Case Studies" + "title": "What we do?" }, "collaborate": { "content": [ { "title": "Collaborate", "subtitle": "How can I collaborate?", - "text": "Help us reach more people. There are many ways to collaborate.", + "text": "There are many ways to collaborate.", "icon": "/static/assets/icons/collaborate.svg", "callToAction": "Drop us a line", "href": "/contact", @@ -144,10 +144,10 @@ }, "whoWeAre": { "title": "Who we are", - "subtitle": ["Somos una organización de la sociedad conformada por personas activistas,", - "programadoras y científicas sociales que desde el hacer", - "buscamos abrir las instituciones públicas y los procesos de toma de desición.", - "Buscamos recuperar la política."], + "subtitle": ["We are a civil society organization made up of activists,", + "developers and social scientists who from doing", + "have sought to open up the public institutions and decision-making processes.", + "We seek to recover politics."], "team": [ { "name": "Agustín", @@ -156,20 +156,6 @@ "url": "https://twitter.com/agustinfrizzera", "img": "../static/assets/profiles/agustin.jpg" }, - { - "name": "Florencia", - "bio": "President", - "handle": "tw", - "url": "https://twitter.com/juicyminerva", - "img": "../static/assets/profiles/florencia-presi.jpg" - }, - { - "name": "Esteban", - "bio": "Vicepresident", - "handle": "tw", - "url": "https://twitter.com/ebrenman", - "img": "../static/assets/profiles/esteban.jpg" - }, { "name": "Florencia", "bio": "Project coordinator", @@ -253,6 +239,20 @@ "handle": "github", "url": "https://www.github.com/franciclo", "img": "../static/assets/profiles/francisco.jpg" + }, + { + "name": "Florencia", + "bio": "President", + "handle": "tw", + "url": "https://twitter.com/juicyminerva", + "img": "../static/assets/profiles/florencia-presi.jpg" + }, + { + "name": "Esteban", + "bio": "Vicepresident", + "handle": "tw", + "url": "https://twitter.com/ebrenman", + "img": "../static/assets/profiles/esteban.jpg" } ] diff --git a/translations/es.json b/translations/es.json index e370b82..b47f772 100644 --- a/translations/es.json +++ b/translations/es.json @@ -37,7 +37,7 @@ }, "caseStudies": { - "title": "Casos de Estudio" + "title": "¿Qué hacemos?" }, "collaborate": { "content": [ @@ -144,7 +144,7 @@ ] }, "whoWeAre": { - "title": "Quiénes somos", + "title": "¿Quiénes somos?", "subtitle": ["Somos una organización de la sociedad conformada por personas activistas,", "programadoras y científicas sociales que desde el hacer", "buscamos abrir las instituciones públicas y los procesos de toma de desición.", @@ -157,20 +157,6 @@ "url": "https://twitter.com/agustinfrizzera", "img": "../static/assets/profiles/agustin.jpg" }, - { - "name": "Florencia", - "bio": "Presidenta", - "handle": "tw", - "url": "https://twitter.com/juicyminerva", - "img": "../static/assets/profiles/florencia-presi.jpg" - }, - { - "name": "Esteban", - "bio": "Vicepresidente", - "handle": "tw", - "url": "https://twitter.com/ebrenman", - "img": "../static/assets/profiles/esteban.jpg" - }, { "name": "Florencia", "bio": "Coordinadora de Proyectos", @@ -254,6 +240,20 @@ "handle": "github", "url": "https://www.github.com/franciclo", "img": "../static/assets/profiles/francisco.jpg" + }, + { + "name": "Florencia", + "bio": "Presidenta", + "handle": "tw", + "url": "https://twitter.com/juicyminerva", + "img": "../static/assets/profiles/florencia-presi.jpg" + }, + { + "name": "Esteban", + "bio": "Vicepresidente", + "handle": "tw", + "url": "https://twitter.com/ebrenman", + "img": "../static/assets/profiles/esteban.jpg" }