Skip to content

solved task #61

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

Open
webEsperer wants to merge 7 commits into
base: master
Choose a base branch
from
Open

solved task #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6269eed
solved task 01
webEsperer Oct 22, 2024
7144c51
solved task 02
webEsperer Oct 22, 2024
c0acda1
imporved task02, added active and disabled atrybuts to button
webEsperer Oct 22, 2024
4f3fb80
refactor component Button.styled
webEsperer Oct 22, 2024
f070eaf
solved task03
webEsperer Oct 23, 2024
3de8f00
solved task 04
webEsperer Oct 24, 2024
24021d1
solved task05
webEsperer Oct 25, 2024
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
22 changes: 13 additions & 9 deletions 01/Task01.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@ import { Row, Col, Alert as RBAlert } from 'react-bootstrap';

const Task01 = () => {
return (
<Row>
<Col>
<RBAlert variant="primary">Uwaga! <em>Styled Components</em> nadchodzi!</RBAlert>
</Col>
<Col>
<Alert>Uwaga! <em>Styled Components</em> nadchodzi!</Alert>
</Col>
</Row>
)
<Row>
<Col>
<RBAlert variant="primary">
Uwaga! <em>Styled Components</em> nadchodzi!
</RBAlert>
</Col>
<Col>
<Alert variant="primary">
Uwaga! <em>Styled Components</em> nadchodzi!
</Alert>
</Col>
</Row>
);
}

export default Task01;
Expand Down
32 changes: 19 additions & 13 deletions 02/Task02.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
import React from 'react';

import Button from './../src/components/Button';
import { Row, Col, Button as RBButton } from 'react-bootstrap';
import { Button } from "./../src/components/Button";
import { Row, Col, Button as RBButton } from "react-bootstrap";

const Task02 = () => {
return (
<Row>
<Col>
<RBButton variant="primary" size="lg">Button!</RBButton>
</Col>
<Col>
Button!
</Col>
</Row>
)
}
// const isActive = true;
// const isDisabled = false;
return (
<Row>
<Col>
<RBButton variant="secondary" size="lg" active>
Button!
</RBButton>
</Col>
<Col>
<Button variant="secondary" size="lg">
Button!
</Button>
</Col>
</Row>
);
};

export default Task02;

38 changes: 22 additions & 16 deletions 03/Task03.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,30 @@
import React from 'react';

import Breadcrumb from "../src/components/Breadcrumb";
import { Row, Col, Breadcrumb as RBBreadcrumb } from 'react-bootstrap';

const Task03 = () => {
return (
<Row>
<Col>
<RBBreadcrumb>
<RBBreadcrumb.Item href="#">Home</RBBreadcrumb.Item>
<RBBreadcrumb.Item href="https://getbootstrap.com/docs/4.0/components/breadcrumb/">
Library
</RBBreadcrumb.Item>
<RBBreadcrumb.Item active>Data</RBBreadcrumb.Item>
</RBBreadcrumb>
</Col>
<Col>
Breadcrumb!
</Col>
</Row>
)
<Row>
<Col>
<RBBreadcrumb>
<RBBreadcrumb.Item href="#">Home</RBBreadcrumb.Item>
<RBBreadcrumb.Item href="https://getbootstrap.com/docs/4.0/components/breadcrumb/">
Library
</RBBreadcrumb.Item>
<RBBreadcrumb.Item active>Data</RBBreadcrumb.Item>
</RBBreadcrumb>
</Col>
<Col>
<Breadcrumb>
<Breadcrumb.Item href="#">Home</Breadcrumb.Item>
<Breadcrumb.Item href="https://getbootstrap.com/docs/4.0/components/breadcrumb/">
Library
</Breadcrumb.Item>
<Breadcrumb.Item active>Data</Breadcrumb.Item>
</Breadcrumb>
</Col>
</Row>
);
}

export default Task03;
Expand Down
82 changes: 62 additions & 20 deletions 04/Task04.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,70 @@
import React from 'react';

import { Row, Col, Tabs as RBTabs, Tab as RBTab, } from 'react-bootstrap';

import { Tabs, Tab } from "../src/components/Tabs";
const Task04 = () => {
return (
<Row>
<Col>
<RBTabs defaultActiveKey="profile" id="uncontrolled-tab-example">
<RBTab eventKey="home" title="Home">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur condimentum lacus nec ligula faucibus rhoncus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; </p>
</RBTab>
<RBTab eventKey="profile" title="Profile">
<p>Donec dignissim ultricies felis, eu dictum eros congue in. In gravida lobortis libero nec tempus. Cras rutrum nisl ut leo volutpat rhoncus. Nulla massa nulla, viverra hendrerit laoreet at, tincidunt eu lacus.</p>
</RBTab>
<RBTab eventKey="contact" title="Contact" disabled>
<p>Vivamus metus nulla, fermentum eget placerat vitae, mollis interdum elit. Pellentesque arcu augue, vulputate ut porttitor ut, suscipit non orci. Integer justo odio, suscipit eget tortor nec, molestie lobortis eros. Nullam commodo elit sit amet lacus blandit aliquet. Mauris at nibh eget nisl pulvinar dignissim.</p>
</RBTab>
</RBTabs>
</Col>
<Col>
Tabs!
</Col>
</Row>
)
<Row>
<Col>
<RBTabs defaultActiveKey="profile" id="uncontrolled-tab-example">
<RBTab eventKey="home" title="Home">
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Curabitur condimentum lacus nec ligula faucibus rhoncus.
Vestibulum ante ipsum primis in faucibus orci luctus et ultrices
posuere cubilia Curae;{" "}
</p>
</RBTab>
<RBTab eventKey="profile" title="Profile">
<p>
Donec dignissim ultricies felis, eu dictum eros congue in. In
gravida lobortis libero nec tempus. Cras rutrum nisl ut leo
volutpat rhoncus. Nulla massa nulla, viverra hendrerit laoreet
at, tincidunt eu lacus.
</p>
</RBTab>
<RBTab eventKey="contact" title="Contact" disabled>
<p>
Vivamus metus nulla, fermentum eget placerat vitae, mollis
interdum elit. Pellentesque arcu augue, vulputate ut porttitor
ut, suscipit non orci. Integer justo odio, suscipit eget tortor
nec, molestie lobortis eros. Nullam commodo elit sit amet lacus
blandit aliquet. Mauris at nibh eget nisl pulvinar dignissim.
</p>
</RBTab>
</RBTabs>
</Col>
<Col>
<Tabs defaultActiveKey="profile" id="uncontrolled-tab-example">
<Tab eventKey="home" title="Home">
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Curabitur condimentum lacus nec ligula faucibus rhoncus.
Vestibulum ante ipsum primis in faucibus orci luctus et ultrices
posuere cubilia Curae;{" "}
</p>
</Tab>
<Tab eventKey="profile" title="Profile">
<p>
Donec dignissim ultricies felis, eu dictum eros congue in. In
gravida lobortis libero nec tempus. Cras rutrum nisl ut leo
volutpat rhoncus. Nulla massa nulla, viverra hendrerit laoreet
at, tincidunt eu lacus.
</p>
</Tab>
<Tab eventKey="contact" title="Contact" disabled>
<p>
Vivamus metus nulla, fermentum eget placerat vitae, mollis
interdum elit. Pellentesque arcu augue, vulputate ut porttitor
ut, suscipit non orci. Integer justo odio, suscipit eget tortor
nec, molestie lobortis eros. Nullam commodo elit sit amet lacus
blandit aliquet. Mauris at nibh eget nisl pulvinar dignissim.
</p>
</Tab>
</Tabs>
</Col>
</Row>
);
}

export default Task04;
Expand Down
51 changes: 31 additions & 20 deletions 05/Task05.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,39 @@
import React from 'react';

import { Row, Col, Card as RBCard, Button as RBButton } from 'react-bootstrap';

import { Button } from "../src/components/Button";
import Card from "../src/components/Card";
const Task05 = () => {
return (
<Row>
<Col>
<RBCard style={{ width: '18rem' }}>
<RBCard.Img variant="top" src="https://picsum.photos/100/80" />
<RBCard.Body>
<RBCard.Title>Card Title</RBCard.Title>
<RBCard.Text>
Some quick example text to build on the card title and make up the bulk of
the card's content.
</RBCard.Text>
<RBButton variant="primary">Go somewhere</RBButton>
</RBCard.Body>
</RBCard>
</Col>
<Col>
Card!
</Col>
</Row>
)
<Row>
<Col>
<RBCard style={{ width: "18rem" }}>
<RBCard.Img variant="top" src="https://picsum.photos/100/80" />
<RBCard.Body>
<RBCard.Title>Card Title</RBCard.Title>
<RBCard.Text>
Some quick example text to build on the card title and make up
the bulk of the card's content.
</RBCard.Text>
<RBButton variant="primary">Go somewhere</RBButton>
</RBCard.Body>
</RBCard>
</Col>
<Col>
<Card style={{ width: "18rem" }}>
<Card.Img variant="top" src="https://picsum.photos/100/80" />
<Card.Body>
<Card.Title>Card Title</Card.Title>
<Card.Text>
Some quick example text to build on the card title and make up
the bulk of the card's content.
</Card.Text>
<Button variant="primary">Go somewhere</Button>
</Card.Body>
</Card>
</Col>
</Row>
);
}

export default Task05;
Expand Down
8 changes: 3 additions & 5 deletions src/components/Alert/Alert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ import React from 'react';

import { StyledAlert } from './Alert.styled';

const Alert = props => {
return (
<StyledAlert>{props.children}</StyledAlert>
);
}
const Alert = ({ variant, children }) => {
return <StyledAlert variant={variant}>{children}</StyledAlert>;
};

export default Alert;
18 changes: 13 additions & 5 deletions src/components/Alert/Alert.styled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
import styled from 'styled-components';
import styled from "styled-components";

const StyledAlert = styled.div`
display: block;
`
const DefaultStyledAlert = styled.div`
position: relative;
padding: 0.75rem 1.25rem;
margin-bottom: 1rem;
border: 1px solid transparent;
border-radius: 0.25rem;
`;

export { StyledAlert };
const StyledAlert = styled(DefaultStyledAlert)(
({ theme: { alert }, variant }) => alert[variant]
);

export { StyledAlert };
Loading