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

[SW-55] Fixing mobile case studies rows #105

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d6c99ef
Page for la cochera
chepitoco Jan 25, 2019
6068fa8
Merge branch '2019' into development-ale
chepitoco Jan 25, 2019
844f73c
validations proyect similars
Bryan-villa1000 Jan 25, 2019
ca6439b
Merge pull request #101 from sancrisoft/development-bryan
chepitoco Jan 25, 2019
b208c30
Adding La Cohcera logo for case studies page.
chepitoco Jan 25, 2019
fb8e64f
Merge branch '2019' into development-ale
chepitoco Jan 25, 2019
5e6345a
changes in the section similar
Bryan-villa1000 Jan 25, 2019
39f7cb7
Merge branch '2019' into development-bryan
Bryan-villa1000 Jan 25, 2019
a96aee8
replace image meattogo
bryanvillamil Jan 25, 2019
13a56e5
changes in the proyects similars
Bryan-villa1000 Jan 25, 2019
797c349
merge
Bryan-villa1000 Jan 25, 2019
1f13cce
Adding lacochera case study page, and refactoring case-studies query …
chepitoco Jan 25, 2019
185ea22
Merge pull request #102 from sancrisoft/development-bryan
chepitoco Jan 26, 2019
cfb0925
Merge branch '2019' into development-ale
chepitoco Jan 26, 2019
a23bf51
Adding lacochera case study page, and refactoring case-studies query …
chepitoco Jan 26, 2019
18d1be3
Merge pull request #104 from sancrisoft/development-ale
chepitoco Jan 26, 2019
2870bd6
Minor fix in styling and adding GA plugin
JuanJo4 Feb 1, 2019
0f23466
Copying CNAME file to static folder
JuanJo4 Feb 1, 2019
c03ace6
Fixing copy content
JuanJo4 Feb 2, 2019
b87b107
Hiding similar section on case study
JuanJo4 Feb 2, 2019
7dc0b3b
Updating general content
JuanJo4 Feb 2, 2019
73d755d
Reestructuring Cases Studies JSON data, editing components accordingly
JuanJo4 Feb 2, 2019
3a3b079
Reestructuring Cases Studies JSON data
JuanJo4 Feb 2, 2019
5ad3789
Updating image tiles of case studies and adding it to JSON file
JuanJo4 Feb 2, 2019
71d12a4
Including technologies in same array of cases
JuanJo4 Feb 3, 2019
0814402
Editing logos section on case studies page
JuanJo4 Feb 3, 2019
47727ae
Adding title to similar section
JuanJo4 Feb 3, 2019
daa1731
Updating content of logos section
JuanJo4 Feb 3, 2019
c2adffb
Adding CTA content in case studies page
JuanJo4 Feb 3, 2019
e7131e9
Upgrading to gatsby-image: 2.0.24
JuanJo4 Feb 4, 2019
ee585bf
Editing lacochera tyoe of project
JuanJo4 Feb 6, 2019
cf1ebba
SW-55: Adding mobile styling to show columns, getting projectName fro…
Darking360 Mar 18, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 24 additions & 0 deletions gatsby-config.js
Expand Up @@ -41,6 +41,30 @@ module.exports = {
{
resolve: `gatsby-plugin-styled-components`,
},
{
resolve: `gatsby-plugin-google-analytics`,
options: {
trackingId: "UA-133655199-1",
// Puts tracking script in the head instead of the body
head: false,
// Setting this parameter is optional
// anonymize: true,
// Setting this parameter is also optional
// respectDNT: true,
// Avoids sending pageview hits from custom paths
// exclude: ["/preview/**", "/do-not-track/me/too/"],
// Enables Google Optimize using your container Id
// optimizeId: "YOUR_GOOGLE_OPTIMIZE_TRACKING_ID",
// Enables Google Optimize Experiment ID
// experimentId: "YOUR_GOOGLE_EXPERIMENT_ID",
// Set Variation ID. 0 for original 1,2,3....
// variationId: "YOUR_GOOGLE_OPTIMIZE_VARIATION_ID",
// Any additional create only fields (optional)
// sampleRate: 5,
// siteSpeedSampleRate: 10,
cookieDomain: "sancrisoft.com",
},
},
// this (optional) plugin enables Progressive Web App + Offline functionality
// To learn more, visit: https://gatsby.app/offline
// 'gatsby-plugin-offline',
Expand Down
7,347 changes: 3,753 additions & 3,594 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -7,7 +7,8 @@
"axios": "^0.18.0",
"babel-plugin-styled-components": "^1.9.4",
"gatsby": "2.0.53",
"gatsby-image": "2.0.20",
"gatsby-image": "2.0.24",
"gatsby-plugin-google-analytics": "^2.0.13",
"gatsby-plugin-manifest": "2.0.9",
"gatsby-plugin-offline": "2.0.16",
"gatsby-plugin-react-helmet": "3.0.2",
Expand Down
58 changes: 58 additions & 0 deletions src/components/SimilarProyects/index.js
@@ -0,0 +1,58 @@
import React from 'react'
import PropTypes from 'prop-types';
import Img from 'gatsby-image'
import {ThemeProvider} from 'styled-components'

import Title from '../title';

import {
Box,
BoxImage,
ContentBox,
A,
} from './styledComponents'

const theme = {
breakpoints: {
xs: 0,
sm: 568,
md: 768,
lg: 1024,
xl: 1400
}
};


const Similar = ({ name, image, type, link }) => {
return(
<ThemeProvider theme={theme}>
<Box>
<A href={link} >
<BoxImage>
<Img sizes={image} />
<ContentBox>
<Title
type={4}
text={name}
color="#fff"
align="left"
/>
<span>{type}</span>
</ContentBox>
</BoxImage>
</A>
</Box>
</ThemeProvider>
)
}

Similar.propTypes = {
name: PropTypes.string,
type: PropTypes.string,
link: PropTypes.string,
image: PropTypes.object,
};



export default Similar;
79 changes: 79 additions & 0 deletions src/components/SimilarProyects/styledComponents.js
@@ -0,0 +1,79 @@
import styled from 'styled-components';
import breakpoint from 'styled-components-breakpoint';

export const Box = styled.div`
display: flex;
width: 100%;
margin-bottom: 2em;
overflow: hidden;
transition: all .5s;
flex-direction: column;
${breakpoint('md')`
width: 48%;
`}
${breakpoint('lg')`
width: 31%;
height: 210px;
`}
${breakpoint('xl')`
height: 240px;
width: 350px;
`}
`;

export const BoxImage = styled.div`
display: flex;
position: relative;
width: 100%;
height: 100%;
cursor: default;
overflow: hidden;
border-radius: 5px;
cursor: pointer;
.gatsby-image-wrapper {
width: 100%;
transition: all .5s;
img {
filter: grayscale(1);
transition: all .5s;
}
&:hover {
img {
filter: grayscale(0);
}
}
}
`;
export const ContentBox = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
position: absolute;
bottom: 0;
left: 0;
right: 0;
width: 100%;
height: 70px;
background: rgba(0,0,0, .7);
color: #fff;
padding: 0 10px;
h4 {
font-size: 20px;
letter-spacing: 1px;
margin-bottom: 0;
text-shadow: 1px 1px 2px #333;
text-transform: capitalize;
}
span {
font-size: 14px;
text-shadow: 1px 1px 2px #333;
}
`;

export const A = styled.a`
display: flex;
width: 100%;
height: 100%;
transition: all .5s;
cursor: pointer;
`;
14 changes: 6 additions & 8 deletions src/components/casesAbout/index.js
Expand Up @@ -12,23 +12,21 @@ import {
AboutMore,
Services,
Features,
A,
UL
} from './styledComponents'

const CasesAbout = ({id ,urlNetwork, name, description, services, features, titleServices, titleFeatures }) => {
const CasesAbout = ({ name, description, services, features, titleServices, titleFeatures }) => {
return(
<ContentAbout>
<AboutDescription>
<AboutTitle>
<Title
type={2}
text={`${name} ${id}`}
text={name}
/>
</AboutTitle>
<p>
{description}
<A href={urlNetwork} target="_blank" >{urlNetwork}</A>
</p>
</AboutDescription>
<AboutMore>
Expand All @@ -46,8 +44,8 @@ const CasesAbout = ({id ,urlNetwork, name, description, services, features, titl
<Icons
iconName="check"
backgroundColor="#F28724"
height="13"
width="13"
height={13}
width={13}
/>
{item}
</li>
Expand All @@ -70,8 +68,8 @@ const CasesAbout = ({id ,urlNetwork, name, description, services, features, titl
<Icons
iconName="check"
backgroundColor="#F28724"
height="13"
width="13"
height={13}
width={13}
/>
{item}
</li>
Expand Down
4 changes: 2 additions & 2 deletions src/components/casesAbout/styledComponents.js
Expand Up @@ -40,7 +40,7 @@ export const AboutDescription = styled.div`
`}
p {
font-size: 16px;
line-height: 1.3;
line-height: 1.5;
margin: 0 auto;
${breakpoint('tablet')`
font-size: 15px;
Expand Down Expand Up @@ -115,7 +115,7 @@ export const UL = styled.ul`
li {
list-style: none;
font-size: 16px;
line-height: 1.3;
line-height: 1.5;
margin-bottom: 5px;
${breakpoint('tablet')`
font-size: 15px;
Expand Down
63 changes: 41 additions & 22 deletions src/components/casesImage/index.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react'
import PropTypes from 'prop-types'
import Img from 'gatsby-image'
import {ThemeProvider} from 'styled-components'

import { withNamespaces } from "react-i18next"
import Title from '../title'

import {
Expand All @@ -13,7 +13,8 @@ import {
CaseRight,
CaseRightImage,
Logos,
A
A,
ExternalLink,
} from './styledComponents'

const theme = {
Expand All @@ -26,21 +27,25 @@ const theme = {
}
};

const CasesImage = ({
title,
description,
image,
phone,
playStore,
appStore,
linkPlayStore,
linkAppStore }) => {

const CasesImage = (props) => {
const {
title,
description,
image,
phone,
playStore,
appStore,
linkPlayStore,
linkAppStore,
widthImage,
weblink,
weblinkTitle
} = props;
return(
<ThemeProvider theme={theme}>
<ContentCases>
<CaseLeft>
<CaseLeftTop>
<CaseLeftTop widthImage={widthImage}>
<Img sizes={image} />
<Title
type={3}
Expand All @@ -51,20 +56,32 @@ const CasesImage = ({
<p>{description}</p>
</CaseLeftBottom>
<Logos>
<A
{
(playStore) && <A
href={linkPlayStore}
target="_blank"
className="playStore"
>
<Img sizes={playStore} />
</A>
<A
href={linkAppStore}
target="_blank"
className="appStore"
>
<Img sizes={appStore} />
</A>
}
{
(playStore) && <A
href={linkAppStore}
target="_blank"
className="appStore"
>
<Img sizes={appStore} />
</A>
}
{
(weblink) && <ExternalLink
href={weblink}
target="_blank"
>
{weblinkTitle}
</ExternalLink>
}
</Logos>
</CaseLeft>
<CaseRight>
Expand All @@ -81,12 +98,14 @@ CasesImage.propTypes = {
title: PropTypes.string,
description: PropTypes.string,
image: PropTypes.object.isRequired,
widthImage: PropTypes.string,
phone: PropTypes.string,
playStore: PropTypes.object,
appStore: PropTypes.object,
linkAppStore: PropTypes.string,
linkPlayStore: PropTypes.string,
weblink: PropTypes.string,
};


export default CasesImage
export default withNamespaces('translations')(CasesImage)