Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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 >
Uwaga! <em>Styled Components</em> nadchodzi!
</Alert>
</Col>
</Row>
)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}

export default Task01;
Expand Down
20 changes: 11 additions & 9 deletions 02/Task02.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@ 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>
)
<Row>
<Col>
<RBButton variant="primary" size="lg">
Button!
</RBButton>
</Col>
<Col>
<Button>Button!</Button>
</Col>
</Row>
)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}

export default Task02;
Expand Down
35 changes: 18 additions & 17 deletions 03/Task03.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
import React from 'react';

import { Row, Col, Breadcrumb as RBBreadcrumb } from 'react-bootstrap';
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>
)
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></Breadcrumb>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Zobacz, że tutaj nie przekazujesz danych - masz na sztywno je zapisane. Jak będziesz chciał wyświetlać różne dane? Na każdej podstronie musi być inna ścieżka (Zawartość).

</Col>
</Row>
)
}

export default Task03;
Expand Down
55 changes: 33 additions & 22 deletions 04/Task04.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,39 @@
import React from 'react';

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

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>
)
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></Tabs>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tak jak już pisałem - musi to być bardziej elastyczne.

</Col>
</Row>
)
}

export default Task04;
Expand Down
42 changes: 21 additions & 21 deletions 05/Task05.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import React from 'react';
import Card from '../src/components/Card/Card'

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

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>
)
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 />
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tutaj podobnie. Zwróć uwagę jak wygląda zapis wyżej.

</Col>
</Row>
)
}

export default Task05;
Expand Down
15 changes: 11 additions & 4 deletions src/components/Alert/Alert.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
import React from 'react';

import { StyledAlert } from './Alert.styled';
import { StyledAlert } from './Alert.styled'
import { ThemeProvider } from 'styled-components'

const themeSettings = {
colorAlfa: 'royalblue',
}

const Alert = props => {
return (
<StyledAlert>{props.children}</StyledAlert>
);
return (
<ThemeProvider theme={themeSettings}>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docelowo warto mieć jeden motyw dla całej strony/aplikacji - w zadaniach może zostać ;)

<StyledAlert variant="primary">{props.children}</StyledAlert>
</ThemeProvider>
)
}

export default Alert;
23 changes: 20 additions & 3 deletions src/components/Alert/Alert.styled.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
import styled from 'styled-components';
import styled, { css } from 'styled-components'

const variantStyles = {
primary: css`
background-color: red;
color: #fce2c2;
`,
secondary: css`
background-color: green;
color: #fce2c2;
`,
}

const StyledAlert = styled.div`
display: block;
--color-alfa: ${props => props.theme.colorAlfa};
display: block;
border: 1px solid darken(var(--color-alfa), 10%);
background-color: var(--color-alfa);
${props => props.variant && variantStyles[props.variant]};
border-radius: 5px;
padding: 12px 15px;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

`

export { StyledAlert };
export { StyledAlert }
19 changes: 19 additions & 0 deletions src/components/Breadcrumb/BreadCrumbItems.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
const BreadcrumItems = [
{
name: 'Home',
active: false,
id: 1,
},
{
name: 'Library',
active: false,
id: 2,
},
{
name: 'Data',
active: true,
id: 3,
},
]

export { BreadcrumItems }
15 changes: 15 additions & 0 deletions src/components/Breadcrumb/Breadcrumb.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react'

import BreadcrumbItem from './BreadcrumbItem'
import { StyledBreadcrumb } from './Breadcrumb.styled'

const Breadcrumb = props => {
// return <StyledBreadcrumb>{props.children}</StyledBreadcrumb>
return (
<StyledBreadcrumb>
<BreadcrumbItem></BreadcrumbItem>
</StyledBreadcrumb>
)
}

export default Breadcrumb
13 changes: 13 additions & 0 deletions src/components/Breadcrumb/Breadcrumb.styled.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import styled, { css } from 'styled-components'

const StyledBreadcrumb = styled.ol`
display: flex;
flex-wrap: wrap;
padding: 0.75rem 1rem;
margin-bottom: 1rem;
list-style: none;
background-color: #e9ecef;
border-radius: 0.25rem;
`

export { StyledBreadcrumb }
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

19 changes: 19 additions & 0 deletions src/components/Breadcrumb/BreadcrumbItem.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react'

import { StyledBreadcrumbItem } from './BreadcrumbItem.styled'
import { BreadcrumItems } from './BreadCrumbItems'

const BreadcrumbItem = () => {
const item = BreadcrumItems.map(item => (
<StyledBreadcrumbItem key={item.id}>
<a href="#" className={item.active ? 'active' : ''}>
{item.name}
</a>
<span>/</span>
</StyledBreadcrumbItem>
))

return item
}

export default BreadcrumbItem
25 changes: 25 additions & 0 deletions src/components/Breadcrumb/BreadcrumbItem.styled.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import styled, { css } from 'styled-components'

const StyledBreadcrumbItem = styled.li`
a {
color: #007bff;
text-decoration: none;
background-color: transparent;

&:hover {
text-decoration: underline;
}

&.active {
cursor: default;
color: #6c757d;
text-decoration: none;
}
}
span {
margin: 0 0.5rem;
content: '⛅ ';
}
`

export { StyledBreadcrumbItem }
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

3 changes: 3 additions & 0 deletions src/components/Breadcrumb/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Breadcrumb from './Breadcrumb'

export default Breadcrumb
22 changes: 22 additions & 0 deletions src/components/Button/Button.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import React from 'react'

import { StyledButton } from './Button.styled'
import { ThemeProvider } from 'styled-components'

const themeSettings = {
colorAlfa: 'royalblue',
padding: '1rem 2rem',
fontSize: '1.5rem',
}

const Button = props => {
return (
<ThemeProvider theme={themeSettings}>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Motyw (theme) powinien być poza samym komponent aby można było go definiować dowolnie w każdy aplikacji. W tym przypadku moglibyśmy po prostu go ostylować bez motywu.

<StyledButton variant="primary" size="xl" disabled={false}>
{props.children}
</StyledButton>
</ThemeProvider>
)
}

export default Button
Loading