Skip to content

Commit 2816d25

Browse files
committed
Add real-life test data
1 parent 05db03f commit 2816d25

File tree

4 files changed

+76
-60
lines changed

4 files changed

+76
-60
lines changed

components/NoteListItem.js

+13-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const styles = StyleSheet.create({
2727
title: {
2828
flexDirection: 'row',
2929
alignItems: 'center',
30-
marginBottom: 15
30+
marginBottom: 10
3131
},
3232

3333
avatar: {
@@ -45,6 +45,16 @@ const styles = StyleSheet.create({
4545
fontSize: 16
4646
},
4747

48+
time: {
49+
fontSize: 14,
50+
opacity: 0.8
51+
},
52+
53+
text: {
54+
fontSize: 16,
55+
color: '#222222'
56+
},
57+
4858
button: {
4959
position: 'absolute',
5060
right: 0,
@@ -107,10 +117,10 @@ export class NoteListItem extends PureComponent {
107117
<Image style={styles.avatar} source={avatar} />
108118
<View style={styles.info}>
109119
<Text style={styles.name}>{userName}</Text>
110-
<Text style={styles.name}>{editTime}</Text>
120+
<Text style={styles.time}>{editTime}</Text>
111121
</View>
112122
</View>
113-
<Text style={styles.name}>{text}</Text>
123+
<Text style={styles.text}>{text}</Text>
114124
<MenuButton
115125
style={styles.button}
116126
ref={ref => this._buttonRef = ref}

redux/actions.js

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
const currentUser = {
2-
userName: 'Alex Lavrov',
3-
avatar: require('../images/avatar_1.jpg'),
4-
}
1+
import { currentUser } from './testData'
52

63
export const actionTypes = {
74
PROJECT_ADDED: 'PROJECT_ADDED',
@@ -29,8 +26,7 @@ export const actions = {
2926
projectId,
3027
note: {
3128
id: noteId,
32-
userName: currentUser.userName,
33-
avatar: currentUser.avatar,
29+
...currentUser,
3430
editTime: new Date().toDateString(),
3531
text
3632
}
@@ -43,8 +39,7 @@ export const actions = {
4339
projectId,
4440
note: {
4541
id: noteId,
46-
userName: currentUser.userName,
47-
avatar: currentUser.avatar,
42+
...currentUser,
4843
editTime: new Date().toDateString(),
4944
text
5045
}

redux/store.js

+1-49
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,5 @@
11
import { createStore } from 'redux'
22
import { reducer } from './reducer'
3-
4-
const avatar_2 = require('../images/avatar_2.jpg')
5-
const avatar_3 = require('../images/avatar_3.jpg')
6-
7-
export const initialState = {
8-
projects: [
9-
{
10-
id: 'project_1',
11-
name: 'Project #1',
12-
notes: [
13-
{
14-
id: '1',
15-
userName: 'Alex',
16-
avatar: avatar_2,
17-
editTime: '11-11-2011',
18-
text: 'Some text here'
19-
},
20-
{
21-
id: '2',
22-
userName: 'Alex',
23-
avatar: avatar_3,
24-
editTime: '11-11-2011',
25-
text: 'Test \n\n text \n\n here'
26-
},
27-
{
28-
id: '3',
29-
userName: 'Alex',
30-
avatar: avatar_2,
31-
editTime: '11-11-2011',
32-
text: 'Test text Test textTest textTest textTest textTest textTest textTest textTest textTest textTest text'
33-
}
34-
]
35-
},
36-
{
37-
id: 'project_2',
38-
name: 'Second Project',
39-
notes: [
40-
{
41-
id: '1',
42-
userName: 'Alex',
43-
avatar: avatar_3,
44-
editTime: '11-11-2011',
45-
text: 'asdfdasfsadf sadfsadf asdfsad sadfas'
46-
}
47-
]
48-
}
49-
]
50-
}
51-
3+
import { initialState } from './testData'
524

535
export const store = createStore(reducer, initialState)

redux/testData.js

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
const avatar_1 = require('../images/avatar_1.jpg')
2+
const avatar_2 = require('../images/avatar_2.jpg')
3+
const avatar_3 = require('../images/avatar_3.jpg')
4+
5+
const user_1 = {
6+
userName: 'Мурзик',
7+
avatar: avatar_2
8+
}
9+
10+
const user_2 = {
11+
userName: 'Томас',
12+
avatar: avatar_3
13+
}
14+
15+
export const currentUser = {
16+
userName: 'Корнелиус',
17+
avatar: avatar_1
18+
}
19+
20+
export const initialState = {
21+
projects: [
22+
{
23+
id: 'project_1',
24+
name: 'Первый тестовый проект',
25+
notes: [
26+
{
27+
id: '1',
28+
...user_2,
29+
editTime: 'Mon Aug 27 2018',
30+
text: 'Тестирую возможности приложения'
31+
}
32+
]
33+
},
34+
{
35+
id: 'project_2',
36+
name: 'Кража сосиски',
37+
notes: [
38+
{
39+
id: '1',
40+
...user_1,
41+
editTime: 'Sat Aug 25 2018',
42+
text: 'Активные действия беру на себя!'
43+
},
44+
{
45+
id: '2',
46+
...user_2,
47+
editTime: 'Sun Aug 26 2018',
48+
text: 'Я отвлеку хозяина'
49+
},
50+
{
51+
id: '3',
52+
...currentUser,
53+
editTime: 'Mon Aug 27 2018',
54+
text: 'Парни, в этот раз без меня. Я пока отлежусь. Позовите, если у вас все получится'
55+
}
56+
]
57+
}
58+
]
59+
}

0 commit comments

Comments
 (0)