Skip to content

Commit 1c14904

Browse files
NataliaButenkoNataliaButenko
committed
update cookbook (18.09.18)
1 parent b334ca0 commit 1c14904

File tree

23 files changed

+465
-325
lines changed

23 files changed

+465
-325
lines changed

‎cookbook/cookbook/package-lock.json‎

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cookbook/cookbook/package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
"dependencies": {
66
"react": "^16.5.0",
77
"react-dom": "^16.5.0",
8+
"react-redux": "^5.0.7",
89
"react-router-dom": "^4.3.1",
9-
"react-scripts": "1.1.5"
10+
"react-scripts": "1.1.5",
11+
"redux": "^4.0.0"
1012
},
1113
"scripts": {
1214
"start": "react-scripts start",

‎cookbook/cookbook/src/App.css‎

Lines changed: 0 additions & 238 deletions
Original file line numberDiff line numberDiff line change
@@ -31,39 +31,6 @@ body {
3131
background-color: #a6dcee;
3232
}
3333

34-
.header-container {
35-
border: 2px solid #00040e;
36-
height: 60px;
37-
margin: 0 30px;
38-
display: flex;
39-
flex-direction: row;
40-
justify-content: space-between;
41-
font-family: 'Brush Script MT', Trattatello;
42-
font-size: 40px;
43-
color: #5389a6;
44-
background-color: #dab6c8;
45-
}
46-
47-
.login-button {
48-
height: 40px;
49-
width: 200px;
50-
font-family: 'Brush Script MT', Trattatello;
51-
font-size: 40px;
52-
color: #5389a6;
53-
background-color: #dab6c8;
54-
border: none;
55-
vertical-align: top;
56-
}
57-
58-
.img-cookbook {
59-
height: 50px;
60-
width: 60px;
61-
}
62-
63-
.navigation {
64-
margin-right: 20px;
65-
}
66-
6734
.main {
6835
border: 2px solid #00040e;
6936
height: 500px;
@@ -72,211 +39,6 @@ body {
7239
color: #5389a6;
7340
}
7441

75-
.authorization_form {
76-
border: 1px solid #00040e;
77-
height: 300px;
78-
width: 400px;
79-
margin: 60px auto;
80-
background-color: #dab6c8;
81-
}
82-
83-
.authorization_caption {
84-
text-align: center;
85-
margin: 7px 0px;
86-
}
87-
88-
label {
89-
display: block;
90-
margin: 10px 50px;
91-
font-size: 35px;
92-
}
93-
94-
.authorization_input {
95-
height: 25px;
96-
width: 150px;
97-
margin-left: 10px;
98-
background-color: #e8ebea;
99-
}
100-
101-
.authorization_button {
102-
height: 45px;
103-
width: 150px;
104-
background-color: #e8ebea;
105-
color: #a6dcee;
106-
margin-left: 110px;
107-
font-size: 35px;
108-
border-radius: 3px;
109-
}
110-
111-
.authorization_checkbox {
112-
margin-left: 45px;
113-
}
114-
115-
.user-login {
116-
margin-left: 20px;
117-
}
118-
119-
.recept-edit-recept {
120-
width: 830px;
121-
height: 400px;
122-
border: 1px solid #00040e;
123-
background-color: #dab6c8;
124-
}
125-
126-
.recept-edit-cake {
127-
width: 470px;
128-
height: 400px;
129-
}
130-
131-
.recept-edit-main {
132-
display: flex;
133-
flex-direction: row;
134-
justify-content: space-between;
135-
margin: 35px 20px;
136-
}
137-
138-
.recept-edit-cake-box {
139-
margin: 30px 120px;
140-
}
141-
142-
.dish-image {
143-
width: 270px;
144-
height: 270px;
145-
display: block;
146-
margin-left: -40px;
147-
}
148-
149-
.recept-control-button {
150-
height: 30px;
151-
width: 150px;
152-
border-radius: 3px;
153-
background-color: #e8ebea;
154-
color: #a6dcee;
155-
font-size: 25px;
156-
margin-left: 50px;
157-
margin-top: 10px;
158-
font-family: 'Brush Script MT', Trattatello;
159-
}
160-
161-
h2.recept-name {
162-
text-align: center;
163-
font-size: 40px;
164-
margin-bottom: 10px;
165-
}
166-
167-
.recept-edit-search {
168-
text-align: center;
169-
}
170-
171-
.recept-edit-list-container {
172-
display: flex;
173-
flex-direction: row;
174-
justify-content: space-around;
175-
margin-top: 30px;
176-
font-size: 25px;
177-
}
178-
179-
.recept-edit-list {
180-
border: 1px solid #00040e;
181-
width: 200px;
182-
height: 210px;
183-
}
184-
185-
.recept-edit-button {
186-
padding-top: 75px;
187-
}
188-
189-
.exchange {
190-
display: block;
191-
height: 23px;
192-
margin-bottom: 10px;
193-
width: 40px;
194-
border-radius: 3px;
195-
color: #5389a6;
196-
background-color: #e8ebea;
197-
font-size: 17px
198-
}
199-
200-
.dashboard {
201-
font-family: 'Brush Script MT', Trattatello;
202-
color: #5389a6;
203-
font-size: 20px;
204-
margin: 25px auto;
205-
padding-left: 100px;
206-
}
207-
208-
.entry-field {
209-
border: 1px solid #00040e;
210-
height: 25px;
211-
width: 300px;
212-
background-color: #e8ebea;
213-
}
214-
215-
.find {
216-
height: 35px;
217-
width: 150px;
218-
background-color: #e8ebea;
219-
font-family: 'Brush Script MT', Trattatello;
220-
color: #5389a6;
221-
font-size: 21px;
222-
margin-left: 20px;
223-
border: 1px solid #00040e;
224-
}
225-
226-
.add-recipe {
227-
height: 35px;
228-
width: 150px;
229-
background-color: #e8ebea;
230-
font-family: 'Brush Script MT', Trattatello;
231-
color: #5389a6;
232-
font-size: 21px;
233-
margin-right: 100px;
234-
border: 1px solid #00040e;
235-
float: right;
236-
}
237-
238-
.recepts-list {
239-
border: 2px solid #00040e;
240-
height: 440px;
241-
margin: 25px 30px;
242-
font-family: 'Brush Script MT', Trattatello;
243-
color: #5389a6;
244-
overflow: auto;
245-
}
246-
247-
.dish {
248-
border: 1px solid #00040e;
249-
height: 140px;
250-
margin: 15px 15px;
251-
background-color: #dab6c8;
252-
display: flex;
253-
flex-direction: row;
254-
justify-content: space-between;
255-
overflow: auto;
256-
}
257-
258-
.img-dish {
259-
width: 160px;
260-
height: 130px;
261-
margin-top: 5px;
262-
margin-left: 10px;
263-
}
264-
265-
.list-ingredients-dish {
266-
width: 200px;
267-
font-size: 25px;
268-
}
269-
270-
ol {
271-
margin: 0px;
272-
}
273-
274-
.sum-ingredients {
275-
text-align: center;
276-
padding-top: 50px;
277-
font-size: 30px;
278-
}
279-
28042
.button-remove {
28143
height: 30px;
28244
width: 150px;

‎cookbook/cookbook/src/App.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@ import React, {Component, Fragment} from 'react';
22
import {Link, Route} from 'react-router-dom';
33
import logo from './logo.svg';
44
import './App.css';
5-
import {Login} from "./pages/autorization-page/autorization-page";
5+
import Login from "./pages/autorization-page/autorization-page";
66
import {Recepts} from "./pages/recepts-page/recepts-page";
77
import {ReceptEdit} from "./pages/edit-recept-page/edit-recept-page";
8-
import {HeaderComponent} from "./shared-components/header-component";
8+
import {HeaderComponent} from "./shared-components/header-component/header-component";
99

1010
class App extends Component {
11-
// constructor() {
12-
// super();
13-
// this.state = {
14-
// activePage: 'recepts'
15-
// }
16-
// }
1711
render() {
1812
return (
1913
<Fragment>

‎cookbook/cookbook/src/api/api.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export const API_USERS = 'https://flatearth-api.herokuapp.com/api/v1/auth/login';
2+
export const API_RECEPTS = '';

‎cookbook/cookbook/src/index.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
3+
import {Provider} from 'react-redux';
4+
import {store} from "./store/store";
35
import {BrowserRouter} from 'react-router-dom';
46
import './index.css';
57
import App from './App';
6-
import registerServiceWorker from './registerServiceWorker';
78

89
const RouteApp = () => {
910
return (
@@ -13,5 +14,7 @@ const RouteApp = () => {
1314
);
1415
};
1516

16-
ReactDOM.render(<RouteApp />, document.getElementById('root'));
17-
registerServiceWorker();
17+
ReactDOM.render(
18+
<Provider store={store}>
19+
<RouteApp />
20+
</Provider>, document.getElementById('root'));

0 commit comments

Comments
 (0)