Skip to content
This repository has been archived by the owner on Aug 30, 2020. It is now read-only.

Redesign #22

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
5488176
header
zhusupbekova May 4, 2020
0886354
header position, footer social links
zhusupbekova May 4, 2020
6fec6bd
saira font added
zhusupbekova May 4, 2020
e342966
home banner
zhusupbekova May 4, 2020
a7d8c1a
footer code clean up
zhusupbekova May 4, 2020
eb50cef
card component, our clients section
zhusupbekova May 5, 2020
39b8ae0
clients shrink according to screen size
zhusupbekova May 5, 2020
619aa12
testimonials
zhusupbekova May 6, 2020
bda00a6
window
zhusupbekova May 7, 2020
55cfa57
testimonials title hardcoded
zhusupbekova May 7, 2020
0b5eb2e
projects highlights, blog in progress. tags change color
zhusupbekova May 7, 2020
d23675d
get more link style
zhusupbekova May 7, 2020
ff03a5f
projects carousel
zhusupbekova May 8, 2020
e76fbe0
projects highlights
zhusupbekova May 8, 2020
591df9a
layout
zhusupbekova May 8, 2020
90498e3
home page english version
zhusupbekova May 8, 2020
9906ca6
.
zhusupbekova May 8, 2020
8591b6e
touch ups
zhusupbekova May 8, 2020
482f45d
.
zhusupbekova May 8, 2020
d50b764
clients images in our clients, testimonial images
zhusupbekova May 9, 2020
764bd7a
style clean up
zhusupbekova May 9, 2020
71ea717
background image
zhusupbekova May 9, 2020
f1ff1eb
responsive
zhusupbekova May 12, 2020
af7e0e6
responsive homepage
zhusupbekova May 12, 2020
d4f260d
overall styles
zhusupbekova May 27, 2020
e95929c
tech stack page title, text
zhusupbekova Jun 3, 2020
97d5c32
teck stack slider
zhusupbekova Jun 5, 2020
db98cb9
tech stack slider, project card, button
zhusupbekova Jun 5, 2020
2e115f0
home page tweaks
zhusupbekova Jun 9, 2020
3c47fea
err fix
zhusupbekova Jun 9, 2020
ef0c171
techstack list
zhusupbekova Jun 9, 2020
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
64 changes: 39 additions & 25 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ module.exports = {
'Mdx.frontmatter.meta.techstack': 'TechstackYaml',
'Mdx.frontmatter.meta.teammembers': 'AuthorYaml',
},
plugins: [{
plugins: [
{
resolve: 'gatsby-plugin-i18n',
options: {
langKeyDefault: 'en',
Expand Down Expand Up @@ -42,7 +43,8 @@ module.exports = {
resolve: `gatsby-mdx`,
options: {
extensions: ['.mdx', '.md'],
gatsbyRemarkPlugins: [{
gatsbyRemarkPlugins: [
{
resolve: 'gatsby-remark-responsive-iframe',
options: {
wrapperStyle: 'margin-bottom: 1rem',
Expand Down Expand Up @@ -95,26 +97,24 @@ module.exports = {
}
}
`,
feeds: [{
serialize: ({
query: {
site,
allMdx
}
}) => {
return allMdx.edges.map(edge => {
return Object.assign({}, edge.node.frontmatter, {
description: edge.node.excerpt,
date: edge.node.frontmatter.date,
url: site.siteMetadata.siteUrl + edge.node.fields.slug,
guid: site.siteMetadata.siteUrl + edge.node.fields.slug,
custom_elements: [{
'content:encoded': edge.node.html
}],
feeds: [
{
serialize: ({ query: { site, allMdx } }) => {
return allMdx.edges.map(edge => {
return Object.assign({}, edge.node.frontmatter, {
description: edge.node.excerpt,
date: edge.node.frontmatter.date,
url: site.siteMetadata.siteUrl + edge.node.fields.slug,
guid: site.siteMetadata.siteUrl + edge.node.fields.slug,
custom_elements: [
{
'content:encoded': edge.node.html,
},
],
});
});
});
},
query: `
},
query: `
{
allMdx(
limit: 1000,
Expand All @@ -134,9 +134,10 @@ module.exports = {
}
}
`,
output: '/rss.xml',
title: 'Gatsby RSS Feed',
}, ],
output: '/rss.xml',
title: 'Gatsby RSS Feed',
},
],
},
},

Expand All @@ -146,6 +147,19 @@ module.exports = {
postCssPlugins: [require('postcss-color-function'), require('cssnano')()],
},
},

{
resolve: `gatsby-plugin-google-fonts`,
options: {
fonts: [
`saira\:100,200,300,400,500,600,700,800,900`,
`sarala\:400,700`,
// you can also specify font weights and styles
],
display: 'swap',
},
},

{
resolve: `gatsby-plugin-google-analytics`,
options: {
Expand All @@ -166,4 +180,4 @@ module.exports = {
},
'gatsby-plugin-emotion',
],
};
};
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"gatsby-plugin-emotion": "^2.0.0-rc.5",
"gatsby-plugin-feed": "^2.0.11",
"gatsby-plugin-google-analytics": "^2.0.8",
"gatsby-plugin-google-fonts": "^1.0.1",
"gatsby-plugin-i18n": "^0.4.2",
"gatsby-plugin-manifest": "^2.0.29",
"gatsby-plugin-postcss": "2.0.2",
Expand Down Expand Up @@ -62,10 +63,10 @@
"prism-themes": "1.0.1",
"prismjs": "1.15.0",
"prop-types": "^15.6.2",
"react": "16.7.0",
"react-dom": "16.7.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-helmet": "5.2.0",
"react-intl": "^2.7.2",
"react-intl": "^4.5.2",
"react-messenger-customer-chat": "^0.7.2",
"react-slick": "^0.23.2",
"refractor": "^2.6.2",
Expand All @@ -77,10 +78,10 @@
"@types/classnames": "2.2.6",
"@types/lodash": "4.14.119",
"@types/node": "10.12.18",
"@types/react": "16.7.18",
"@types/react-dom": "16.0.11",
"@types/react": "^16.9.34",
"@types/react-dom": "^16.9.7",
"@types/react-helmet": "5.0.8",
"@types/react-intl": "^2.3.17",
"@types/react-intl": "^3.0.0",
"babel-plugin-styled-components": "1.10.0",
"prettier": "^1.15.3",
"rimraf": "2.6.2",
Expand Down
26 changes: 26 additions & 0 deletions src/components/Button.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import * as React from 'react';
import styled from '@emotion/styled';
import { colors } from '../styles/colors';

const Button = styled.a`
width: 200px;
height: 60px;
background: ${colors.yellow};
border-radius: 7px;
display: flex;
justify-content: center;
align-items: center;
box-shadow: 7px 13px 18px 6px rgba(255 205 54, 0.17);
color: ${colors.darkyellow};
font-family: Saira;
font-weight: 600;
font-size: 30px;
line-height: 56px;
text-decoration: none;

:hover {
background: ${colors.fadedyellow};
}
`;

export default Button;
68 changes: 68 additions & 0 deletions src/components/Card.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import * as React from 'react';
import styled from '@emotion/styled';
import { colors } from '../styles/colors';
import ChatIcon from './icons/chat';

const CardWrapper = styled.div`
width: 50%;
display: inline-block;
height: 318px;
`;

const Card = styled.div`
position: relative;
display: flex;
background: ${colors.backgroundgray};
padding: 53px 20px;
margin-top: 36px;
width: 48%;
max-height: 440px;
@media (max-width: 950px) {
flex-direction: column;
width: 100%;
}
/* @media (max-width: 1270px) {
max-width: 400px;
}
@media (max-width: 1070px) {
max-width: 300px;
} */
`;

const CardDescription = styled.div`
font-family: Sarala;
font-size: 26px;
line-height: 36px;
@media (max-width: 420px) {
font-size: 20px;
line-height: 30px;
}
`;

const Icon = styled.div`
position: absolute;
z-index: 10;
left: 19px;
top: -43px;
`;

export interface ICard {
text: string;
}

const CardComponent: React.FC<ICard> = ({ text }) => {
const maxLength = 220;
const sentenceCutter = (sentence = '') =>
sentence.length > maxLength ? sentence.substr(0, maxLength) + '...' : sentence;
console.log(text, sentenceCutter(text));
return (
<Card>
<Icon>
<ChatIcon />
</Icon>
<CardDescription>{sentenceCutter(text)}</CardDescription>
</Card>
);
};

export default CardComponent;
80 changes: 80 additions & 0 deletions src/components/Clients/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import * as React from 'react';
import styled from '@emotion/styled';
import { css } from 'emotion';

import koch from '../../content/clients/koch.svg';
import amz from '../../content/clients/amz.svg';
import dynamite from '../../content/clients/dynamite.svg';
import initialView from '../../content/clients/initialView.svg';
import ingclass from '../../content/clients/ingclass.svg';
import caminer from '../../content/clients/caminer.svg';

const StyledDiv = styled.div`
background-color: #ffffff;
width: 100%;
padding: 65px 130px;
display: grid;
@media (max-width: 800px) {
padding: 60px 50px;
}
@media (max-width: 500px) {
padding: 60px 20px;
}
`;

const ClientsWrapper = styled.div`
display: flex;
justify-content: space-between;
flex-wrap: wrap;
align-items: center;

.client {
width: 16%;
position: relative;
display: flex;
justify-content: center;
margin-top: 20px;
}
@media (max-width: 1300px) {
.client {
width: 30%;
}
}
`;

const title = css`
font-family: Saira;
align-self: center;
justify-self: center;
line-height: 42px;
`;

const Clients: React.FC<{}> = ({}) => {
return (
<StyledDiv>
<h4 className={`${title}`}>Our clients</h4>
<ClientsWrapper>
<div className="client">
<img src={koch} />
</div>
<div className="client">
<img src={initialView} />
</div>
<div className="client">
<img src={amz} />
</div>
<div className="client">
<img src={dynamite} />
</div>
<div className="client">
<img src={ingclass} />
</div>
<div className="client">
<img src={caminer} />
</div>
</ClientsWrapper>
</StyledDiv>
);
};

export default Clients;
Loading