Skip to content

Commit 5ef31ea

Browse files
committed
Using table
1 parent b7ee252 commit 5ef31ea

File tree

4 files changed

+31
-59
lines changed

4 files changed

+31
-59
lines changed

app/components/Client/Client.js

Lines changed: 28 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import { Link } from 'react-router'
55
import ClientService from 'services/Client'
66
import Error from 'components/Error/Error'
77

8-
import btn from 'components/Client/styles.css'
9-
108
class Client extends React.Component
119
{
1210
constructor(props) {
@@ -39,67 +37,46 @@ class Client extends React.Component
3937
const clientList = this.state.clients.map((client, key) => {
4038
let line = ((key % 2) ? 'is-success' : 'is-info');
4139
return (
42-
<div className={`columns notification ${line}`} key={key}>
43-
<div className="column">
40+
<tr key={key}>
41+
<td>
4442
{ client.name }
45-
</div>
46-
<div className="column">
47-
{ client.address }
48-
</div>
49-
<div className="column">
50-
{ client.city }
51-
</div>
52-
<div className="column">
53-
<Link to={ `#` }
54-
className="button is-info is-button-block"
55-
>
56-
<span className="icon">
57-
<i className="fa fa-check"></i>
58-
</span>
59-
<span>Visited</span>
43+
</td>
44+
<td>
45+
{ client.address } - { client.city }
46+
</td>
47+
<td className="is-icon">
48+
<Link to={ `#` } >
49+
<i className="fa fa-address-card"></i>
6050
</Link>
61-
</div>
51+
</td>
6252

63-
<div className="column">
64-
<Link to={ `#` }
65-
className="button is-info is-button-block"
66-
>
67-
<span className="icon">
68-
<i className="fa fa-calendar"></i>
69-
</span>
70-
<span>Schedule</span>
53+
<td className="is-icon">
54+
<Link to={ `#` } >
55+
<i className="fa fa-check"></i>
7156
</Link>
72-
</div>
57+
</td>
7358

74-
<div className="column">
75-
<Link to={ `#` }
76-
className="button is-info is-button-block"
77-
>
78-
<span className="icon">
79-
<i className="fa fa-pencil"></i>
80-
</span>
81-
<span>Update</span>
59+
<td className="is-icon">
60+
<Link to={ `#` } >
61+
<i className="fa fa-calendar"></i>
8262
</Link>
83-
</div>
63+
</td>
8464

85-
<div className="column">
86-
<Link to={ `#` }
87-
className="button is-danger is-button-block"
88-
>
89-
<span className="icon">
90-
<i className="fa fa-close"></i>
91-
</span>
92-
<span>Delete</span>
65+
<td className="is-icon">
66+
<Link to={ `#` } >
67+
<i className="fa fa-close"></i>
9368
</Link>
94-
</div>
95-
</div>
69+
</td>
70+
</tr>
9671
);
9772
});
9873

9974
return (
100-
<div>
101-
{ clientList }
102-
</div>
75+
<table className="table">
76+
<tbody>
77+
{ clientList }
78+
</tbody>
79+
</table>
10380
);
10481
}
10582
}

app/components/Client/styles.css

Lines changed: 0 additions & 4 deletions
This file was deleted.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dependencies": {
77
"axios": "^0.14.0",
88
"bulma": "^0.2.1",
9-
"font-awesome": "^4.6.3",
9+
"font-awesome": "^4.7.0",
1010
"react": "^15.3.2",
1111
"react-dom": "^15.3.2",
1212
"react-router": "^2.8.1"

tests/Client.test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,8 @@ describe('Test Client', () => {
132132

133133
Promise.all(promises).then(() => {
134134
component.update();
135-
expect(component.find('.message-header').at(0).text()).toEqual('Jon Snow');
136-
expect(component.find('.message-body > address').at(0).text()).toEqual('7 Street');
137-
expect(component.find('.message-body > city').at(0).text()).toEqual('Winterfell');
135+
expect(component.find('tbody td').at(0).text()).toEqual('Jon Snow');
136+
expect(component.find('tbody td').at(1).text()).toEqual('7 Street - Winterfell');
138137
done();
139138
}).catch((error) => {
140139
console.log(error);

0 commit comments

Comments
 (0)