Skip to content

add practice-styling #62

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
diana12337 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add practice-styling #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 15 additions & 12 deletions 01/Task01.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@ import Alert from './../src/components/Alert';
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>
)
}
return (
<Row>
<Col>
<RBAlert variant="secondary">
Uwaga! <em>Styled Components</em> nadchodzi!
</RBAlert>
</Col>
<Col>
<Alert variant="secondary">
Uwaga! <em>Styled Components</em> nadchodzi!
</Alert>
</Col>
</Row>
);
};

export default Task01;

27 changes: 15 additions & 12 deletions 02/Task02.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@ 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>
)
}
return (
<Row>
<Col>
<RBButton variant="primary" size="lg">
Button!
</RBButton>
</Col>
<Col>
<Button variant="primary" size="lg">
Button!
</Button>
</Col>
</Row>
);
};

export default Task02;

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

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

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.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;

90 changes: 67 additions & 23 deletions 04/Task04.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,73 @@
import React from 'react';

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

import Tabs from './../src/components/Tabs';
import Tab from '../src/components/Tabs/Tab';

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 defaultActiveKey="profile">
<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;

56 changes: 33 additions & 23 deletions 05/Task05.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,39 @@
import React from 'react';

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

import Card from '../src/components/Card/';
import Button from '../src/components/Button/Button';
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 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;

2 changes: 1 addition & 1 deletion src/components/Alert/Alert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { StyledAlert } from './Alert.styled';

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

Expand Down
13 changes: 11 additions & 2 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,16 @@

import { propTypes } from 'react-bootstrap/esm/Image';
import styled from 'styled-components';

const StyledAlert = styled.div`
display: block;

const StyledAlertDefault = styled.div`
position: relative;
padding: .75rem 1.25rem;
margin-bottom: 1rem;
border: 1px solid transparent;
border-radius: .25rem;
;
`

const StyledAlert = styled(StyledAlertDefault)(({theme, variant})=>theme.alert[variant])
export { StyledAlert };
45 changes: 44 additions & 1 deletion src/components/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,58 @@
import React from 'react';
import { Container, Row, Col } from 'react-bootstrap';

import {ThemeProvider} from 'styled-components';
import {css} from 'styled-components';
import Task01 from './../../01/Task01';
import Task02 from './../../02/Task02';
import Task03 from './../../03/Task03';
import Task04 from './../../04/Task04';
import Task05 from './../../05/Task05';


const theme = {
alert:{
primary: css`
color: #004085;
background-color: #cce5ff;
border-color: #b8daff;`,
secondary: css`
color: #383d41;
background-color: #e2e3e5;
border-color: #d6d8db;
`
},
button:{
color: {
primary: css`
color: #fff;
background-color: #007bff;
border-color: #007bff;`,
secondary: css`
color: #fff;
background-color: #6c757d;
border-color: #6c757d;
`
},
size: {
lg: css`
padding: .5rem 1rem;
font-size: 1.25rem;
line-height: 1.5;
border-radius: .3rem;`,
sm: css`
padding: .25rem .5rem;
font-size: .875rem;
line-height: 1.5;
border-radius: .2rem;`
},

},
}

const App = () => {
return (
<>
<ThemeProvider theme={theme}>
<Container fluid>
<Row>
<Col>
Expand All @@ -25,6 +67,7 @@ const App = () => {
<Task04/>
<Task05/>
</Container>
</ThemeProvider>
</>
)
}
Expand Down
14 changes: 14 additions & 0 deletions src/components/Breadcrumb/Breadcrumb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from 'react';
import BreadcrumbItem from './BreadcrumbItem';
import { StyledBreadcrumb } from './Breadcrumb.styled';

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

export default Object.assign(Breadcrumb, {
Item: BreadcrumbItem,
});

Loading