Skip to content
This repository was archived by the owner on Jul 28, 2023. It is now read-only.

Commit f7e2c2d

Browse files
dev-dwrdev-dwr
committed
repair error: failed to push some refs to 'https://github.com/DawidJS/react-burger-builder.git'
2 parents be48b38 + 4edf738 commit f7e2c2d

6 files changed

Lines changed: 116 additions & 48 deletions

File tree

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Burger Builder Project
22
Burger Builder Project is an application which creating a buger.
3+
I learned React by creating this application.
4+
It's comes from Maximilian Schwarzmüller's course on Udemy.
35

46

57

@@ -22,4 +24,4 @@ npm start
2224
https://react-burger-builder-135e4.firebaseapp.com/
2325

2426
## Contributing
25-
Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.
27+
Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.

‎src/components/Burger/BuildControls/BuildControls.css‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
.BuildControls {
2-
width: 100%;
2+
float: right;
3+
margin: 25px;
4+
position: fixed;
5+
width: 30%;
36
background-color: #CF8F2E;
47
display: flex;
58
flex-flow: column;
69
align-items: center;
7-
box-shadow: 0 2px 1px #ccc;
8-
margin:auto;
10+
border-radius: 25px;
911
padding: 8px 0;
1012
}
1113

‎src/components/Burger/Burger.css‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,10 @@
11
.Burger {
2-
width: 100%;
3-
margin: auto;
4-
height: 250px;
5-
overflow: auto;
2+
float: right;
3+
margin: 0px;
4+
padding: 0px;
5+
width: 65vw;
6+
height: 65vw;
67
text-align: center;
78
font-weight: bold;
89
font-size: 1.2rem;
9-
}
10-
11-
@media (min-width: 500px) and (min-height: 400px) {
12-
.Burger {
13-
width: 350px;
14-
height: 300px;
15-
}
16-
}
17-
18-
@media (min-width: 500px) and (min-height: 401px) {
19-
.Burger {
20-
width: 450px;
21-
height: 400px;
22-
}
23-
}
24-
25-
@media (min-width: 1000px) and (min-height: 700px) {
26-
.Burger {
27-
width: 500px;
28-
height: 600px;
29-
}
3010
}

‎src/components/Burger/Burger.js‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,33 @@ import {withRouter} from 'react-router-dom'
33
import classes from './Burger.css';
44
import BurgerIngredient from './BurgerIngredient/BurgerIngredient';
55

6-
const burger = ( props ) => {
7-
let transformedIngredients = Object.keys( props.ingredients )
8-
.map( igKey => {
9-
return [...Array( props.ingredients[igKey] )].map( ( _, i ) => {
10-
return <BurgerIngredient key={igKey + i} type={igKey} />;
11-
} );
12-
} )
13-
.reduce((arr, el) => { // arr jest to argument(array) do ktorego przypne wszystkie elemnety w tablicy ktore beda w jednej tablicy
14-
return arr.concat(el)
15-
}, []);
16-
if (transformedIngredients.length === 0) {
17-
transformedIngredients = <p>Please start adding ingredients!</p>;
6+
const burger = ( props ) => {
7+
8+
const mapIngridients = (ingridinetKey) => {
9+
return [...Array( props.ingredients[ingridinetKey] )].map( ( _, i ) => {
10+
return <BurgerIngredient key={ingridinetKey + i} type={ingridinetKey} />;
11+
} );
12+
}
13+
14+
// arr jest to argument(array) do ktorego przypne wszystkie elemnety w tablicy ktore beda w jednej tablicy
15+
const reduceIngridients = (arr, el) => {
16+
return arr.concat(el)
1817
}
18+
19+
const getTranformedIngidients = () => {
20+
let transformedIngredients = Object.keys( props.ingredients )
21+
.map(mapIngridients)
22+
.reduce(reduceIngridients, []);
23+
24+
return transformedIngredients.length === 0
25+
? <p>Please start adding ingredients!</p>
26+
: transformedIngredients;
27+
}
28+
1929
return (
2030
<div className={classes.Burger}>
2131
<BurgerIngredient type="bread-top" />
22-
{transformedIngredients}
32+
{getTranformedIngidients()}
2333
<BurgerIngredient type="bread-bottom" />
2434
</div>
2535
);

‎src/containers/CheckOut/CheckOut.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ import ContactData from './ContacData/ContactData'
66
//import * as actions from '../../store/actions//index'
77
import {connect} from 'react-redux'
88
class Checkout extends Component{
9-
10-
11-
12-
13-
149
checkoutCancelledHandler = ()=>{
1510
//This will back to previous page
1611
this.props.history.goBack()
@@ -20,7 +15,6 @@ class Checkout extends Component{
2015
this.props.history.replace('/checkout/contact-data')
2116
}
2217

23-
2418
render(){
2519
let summary = <Redirect to="/"/>
2620

‎were rejected because the tip of your current branch is behind‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
2+
SSUUMMMMAARRYY OOFF LLEESSSS CCOOMMMMAANNDDSS
3+
4+
Commands marked with * may be preceded by a number, _N.
5+
Notes in parentheses indicate the behavior if _N is given.
6+
A key preceded by a caret indicates the Ctrl key; thus ^K is ctrl-K.
7+
8+
h H Display this help.
9+
q :q Q :Q ZZ Exit.
10+
---------------------------------------------------------------------------
11+
12+
MMOOVVIINNGG
13+
14+
e ^E j ^N CR * Forward one line (or _N lines).
15+
y ^Y k ^K ^P * Backward one line (or _N lines).
16+
f ^F ^V SPACE * Forward one window (or _N lines).
17+
b ^B ESC-v * Backward one window (or _N lines).
18+
z * Forward one window (and set window to _N).
19+
w * Backward one window (and set window to _N).
20+
ESC-SPACE * Forward one window, but don't stop at end-of-file.
21+
d ^D * Forward one half-window (and set half-window to _N).
22+
u ^U * Backward one half-window (and set half-window to _N).
23+
ESC-) RightArrow * Right one half screen width (or _N positions).
24+
ESC-( LeftArrow * Left one half screen width (or _N positions).
25+
ESC-} ^RightArrow Right to last column displayed.
26+
ESC-{ ^LeftArrow Left to first column.
27+
F Forward forever; like "tail -f".
28+
ESC-F Like F but stop when search pattern is found.
29+
r ^R ^L Repaint screen.
30+
R Repaint screen, discarding buffered input.
31+
---------------------------------------------------
32+
Default "window" is the screen height.
33+
Default "half-window" is half of the screen height.
34+
---------------------------------------------------------------------------
35+
36+
SSEEAARRCCHHIINNGG
37+
38+
/_p_a_t_t_e_r_n * Search forward for (_N-th) matching line.
39+
?_p_a_t_t_e_r_n * Search backward for (_N-th) matching line.
40+
n * Repeat previous search (for _N-th occurrence).
41+
N * Repeat previous search in reverse direction.
42+
ESC-n * Repeat previous search, spanning files.
43+
ESC-N * Repeat previous search, reverse dir. & spanning files.
44+
ESC-u Undo (toggle) search highlighting.
45+
&_p_a_t_t_e_r_n * Display only matching lines
46+
---------------------------------------------------
47+
A search pattern may be preceded by one or more of:
48+
^N or ! Search for NON-matching lines.
49+
^E or * Search multiple files (pass thru END OF FILE).
50+
^F or @ Start search at FIRST file (for /) or last file (for ?).
51+
^K Highlight matches, but don't move (KEEP position).
52+
^R Don't use REGULAR EXPRESSIONS.
53+
---------------------------------------------------------------------------
54+
55+
JJUUMMPPIINNGG
56+
57+
g < ESC-< * Go to first line in file (or line _N).
58+
G > ESC-> * Go to last line in file (or line _N).
59+
p % * Go to beginning of file (or _N percent into file).
60+
t * Go to the (_N-th) next tag.
61+
T * Go to the (_N-th) previous tag.
62+
{ ( [ * Find close bracket } ) ].
63+
} ) ] * Find open bracket { ( [.
64+
ESC-^F _<_c_1_> _<_c_2_> * Find close bracket _<_c_2_>.
65+
ESC-^B _<_c_1_> _<_c_2_> * Find open bracket _<_c_1_>
66+
---------------------------------------------------
67+
Each "find close bracket" command goes forward to the close bracket
68+
matching the (_N-th) open bracket in the top line.
69+
Each "find open bracket" command goes backward to the open bracket
70+
matching the (_N-th) close bracket in the bottom line.
71+
72+
m_<_l_e_t_t_e_r_> Mark the current top line with <letter>.
73+
M_<_l_e_t_t_e_r_> Mark the current bottom line with <letter>.
74+
'_<_l_e_t_t_e_r_> Go to a previously marked position.
75+
'' Go to the previous position.
76+
^X^X Same as '.
77+
ESC-M_<_l_e_t_t_e_r_> Clear a mark.
78+
---------------------------------------------------
79+
A mark is any upper-case or lower-case letter.
80+
Certain marks are predefined:

0 commit comments

Comments
 (0)