[go: nahoru, domu]
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.

Sign up for GitHub

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

Jump to bottom

Exercise 4b #6

Closed
wants to merge 9 commits into from
Closed

Exercise 4b #6

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
38c06ad
Header styling
mariani-helpscout Jan 7, 2022
14c3067
Merge pull request #1 from mariani-helpscout/exercise-1
mariani-helpscout Jan 7, 2022
790d4e8
Adding subheader changes
mariani-helpscout Jan 7, 2022
bfcd7cf
Merge pull request #2 from mariani-helpscout/exercise-2
mariani-helpscout Jan 7, 2022
93e63a6
Adding main layout
mariani-helpscout Jan 7, 2022
0ad5304
Merge pull request #3 from mariani-helpscout/exercise-3
mariani-helpscout Jan 7, 2022
cd99790
Layout solution
mariani-helpscout Jan 7, 2022
08e7d10
Merge pull request #4 from mariani-helpscout/exercise-4a
mariani-helpscout Jan 7, 2022
81ed605
Flag solution
mariani-helpscout Jan 7, 2022
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
16 changes: 9 additions & 7 deletions src/components/ShoeCard/ShoeCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import styled from 'styled-components/macro';
import React from "react";
import styled from "styled-components/macro";

import { COLORS, WEIGHTS } from '../../constants';
import { formatPrice, pluralize, isNewShoe } from '../../utils';
import Spacer from '../Spacer';
import { COLORS, WEIGHTS } from "../../constants";
import { formatPrice, pluralize, isNewShoe } from "../../utils";
import Spacer from "../Spacer";

const ShoeCard = ({
slug,
Expand Down Expand Up @@ -43,7 +43,7 @@ const ShoeCard = ({
<Price>{formatPrice(price)}</Price>
</Row>
<Row>
<ColorInfo>{pluralize('Color', numOfColors)}</ColorInfo>
<ColorInfo>{pluralize("Color", numOfColors)}</ColorInfo>
</Row>
</Wrapper>
</Link>
Expand All @@ -61,7 +61,9 @@ const ImageWrapper = styled.div`
position: relative;
`;

const Image = styled.img``;
const Image = styled.img`
width: 100%;
`;

const Row = styled.div`
font-size: 1rem;
Expand Down
23 changes: 17 additions & 6 deletions src/components/ShoeGrid/ShoeGrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,30 @@
import React from 'react';
import styled from 'styled-components/macro';
import React from "react";
import styled from "styled-components/macro";

import SHOES from '../../data';
import ShoeCard from '../ShoeCard';
import SHOES from "../../data";
import ShoeCard from "../ShoeCard";

const ShoeGrid = () => {
return (
<Wrapper>
{SHOES.map((shoe) => (
<ShoeCard key={shoe.slug} {...shoe} />
<ShoeWrapper key={shoe.slug}>
<ShoeCard {...shoe} />
</ShoeWrapper>
))}
</Wrapper>
);
};

const Wrapper = styled.div``;
const Wrapper = styled.div`
display: flex;
flex-wrap: wrap;
gap: 32px;
`;

const ShoeWrapper = styled.div`
min-width: 275px;
flex: 1;
`;

export default ShoeGrid;