From 4a9777b827ecdb4e50b3e844ac33efed3b2b16b3 Mon Sep 17 00:00:00 2001
From: alif fadila safriyanto <alif.fadila@ui.ac.id>
Date: Sun, 6 Oct 2019 23:53:59 +0700
Subject: [PATCH 1/5] [RED] check topmenu state containst today quotes
---
assets/js/__test__/components/TopMenu-test.jsx | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/assets/js/__test__/components/TopMenu-test.jsx b/assets/js/__test__/components/TopMenu-test.jsx
index b3398263..f2d530b5 100644
--- a/assets/js/__test__/components/TopMenu-test.jsx
+++ b/assets/js/__test__/components/TopMenu-test.jsx
@@ -214,5 +214,14 @@ describe('TopMenu', () => {
topmenu.handleItemClick(new Event('click'), 'undefined');
expect(topmenu.state.activeItem).to.equal(undefined);
});
+
+ it('check topmenu state containst today quotes', () => {
+ const topmenu = ReactTestUtils.renderIntoDocument(
+ <TopMenu user={adminUser2}>
+ <div> test </div>
+ </TopMenu>);
+ const topMenuQuote = topmenu.state.todayQuote;
+ expect(topMenuQuote).to.exist;
+ });
});
--
GitLab
From 8df392927800178d4616b81ca4309bd0ce826813 Mon Sep 17 00:00:00 2001
From: alif fadila safriyanto <alif.fadila@ui.ac.id>
Date: Mon, 7 Oct 2019 00:41:40 +0700
Subject: [PATCH 2/5] [GREEN] check topmenu state containst today quotes
---
assets/js/__test__/components/TopMenu-test.jsx | 3 +--
assets/js/components/TopMenu.jsx | 11 ++++++++++-
package.json | 2 ++
3 files changed, 13 insertions(+), 3 deletions(-)
mode change 100755 => 100644 package.json
diff --git a/assets/js/__test__/components/TopMenu-test.jsx b/assets/js/__test__/components/TopMenu-test.jsx
index f2d530b5..524461e7 100644
--- a/assets/js/__test__/components/TopMenu-test.jsx
+++ b/assets/js/__test__/components/TopMenu-test.jsx
@@ -220,8 +220,7 @@ describe('TopMenu', () => {
<TopMenu user={adminUser2}>
<div> test </div>
</TopMenu>);
- const topMenuQuote = topmenu.state.todayQuote;
- expect(topMenuQuote).to.exist;
+ expect(topmenu.state.todayQuote).to.not.equal(undefined);
});
});
diff --git a/assets/js/components/TopMenu.jsx b/assets/js/components/TopMenu.jsx
index e2229ecc..01b0801d 100644
--- a/assets/js/components/TopMenu.jsx
+++ b/assets/js/components/TopMenu.jsx
@@ -4,6 +4,7 @@ import { Link, browserHistory } from 'react-router';
import Server from '../lib/Server';
import Storage from '../lib/Storage';
+var quotes = require('starwars');
const defaultPicture = 'https://semantic-ui.com/images/avatar/small/elliot.jpg';
export default class TopMenu extends React.Component {
@@ -35,9 +36,14 @@ export default class TopMenu extends React.Component {
constructor(props) {
super(props);
/* istanbul ignore next */
- this.state = { activeItem: 'Beranda', logoutLoading: false };
+ this.state = {
+ activeItem: 'Beranda',
+ logoutLoading: false,
+ todayQuote: quotes(),
+ };
this.logout = this.logout.bind(this);
this.logoutCompany = this.logoutCompany.bind(this);
+ console.log(this.state.todayQuote);
}
handleItemClick = (e, { name }) => this.setState({ activeItem: name });
@@ -64,6 +70,9 @@ export default class TopMenu extends React.Component {
const data = TopMenu.getInfo(this.props.user);
return (
<div>
+ <div style={{ padding: '10px 0', fontStyle: 'italic', textAlign: 'center' }}>
+ { this.state.todayQuote }
+ </div>
{ this.props.user.data.is_staff && this.props.user.data.company && (
<div className="admin-bar">
<p>
diff --git a/package.json b/package.json
old mode 100755
new mode 100644
index f103a60d..a6e2dc05
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
"react-test-utils": "0.0.1",
"webpack": "^1.13.2",
"webpack-bundle-tracker": "0.0.93",
+ "quotes-go": "^1.0.5",
"webpack-dev-server": "^1.16.2"
},
"dependencies": {
@@ -59,6 +60,7 @@
"babel-core": "^6.24.0",
"babel-preset-react": "^6.16.0",
"object-assign": "^4.1.1",
+ "quotes-go": "^1.0.5",
"react": "15.4.2",
"react-addons-test-utils": "15.4.2",
"react-ckeditor-wrapper": "^1.0.22",
--
GitLab
From 5aa5532df61c2cdb79436f46db4a0f4537d1a954 Mon Sep 17 00:00:00 2001
From: alif fadila safriyanto <alif.fadila@ui.ac.id>
Date: Mon, 7 Oct 2019 00:47:43 +0700
Subject: [PATCH 3/5] fixing dependencies
---
package.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index a6e2dc05..864aed5a 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
"react-test-utils": "0.0.1",
"webpack": "^1.13.2",
"webpack-bundle-tracker": "0.0.93",
- "quotes-go": "^1.0.5",
+ "startwars": "^1.0.0",
"webpack-dev-server": "^1.16.2"
},
"dependencies": {
@@ -60,7 +60,6 @@
"babel-core": "^6.24.0",
"babel-preset-react": "^6.16.0",
"object-assign": "^4.1.1",
- "quotes-go": "^1.0.5",
"react": "15.4.2",
"react-addons-test-utils": "15.4.2",
"react-ckeditor-wrapper": "^1.0.22",
@@ -68,6 +67,7 @@
"react-dom": "15.4.2",
"react-router": "^3.0.2",
"react-tap-event-plugin": "^2.0.1",
- "semantic-ui-react": "^0.67.2"
+ "semantic-ui-react": "^0.67.2",
+ "startwars": "^1.0.0"
}
}
--
GitLab
From bba387a3aecae01093a8b02e01ae76ab3878837e Mon Sep 17 00:00:00 2001
From: alif fadila safriyanto <alif.fadila@ui.ac.id>
Date: Thu, 10 Oct 2019 22:50:31 +0700
Subject: [PATCH 4/5] fixing conflict
---
package.json | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 8f8ee3b4..344dc616 100644
--- a/package.json
+++ b/package.json
@@ -83,14 +83,10 @@
"react-dom": "^15.6.2",
"react-router": "^3.2.4",
"react-tap-event-plugin": "^2.0.1",
-<<<<<<< HEAD
- "semantic-ui-react": "^0.67.2",
- "startwars": "^1.0.0"
-=======
+ "startwars": "^1.0.0",
"semantic-ui-react": "^0.79.1",
"uglifyjs-webpack-plugin": "^2.2.0",
"webpack": "^4.41.0",
"webpack-bundle-tracker": "^0.4.3"
->>>>>>> master
}
}
--
GitLab
From 5c8718ac980e190df5d1fae713966338f7704ed3 Mon Sep 17 00:00:00 2001
From: alif fadila safriyanto <alif.fadila@ui.ac.id>
Date: Fri, 11 Oct 2019 00:16:06 +0700
Subject: [PATCH 5/5] fixing dependencies
---
package.json | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 344dc616..efb22444 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,6 @@
"react-test-utils": "0.0.1",
"webpack": "^1.13.2",
"webpack-bundle-tracker": "0.0.93",
- "startwars": "^1.0.0",
"webpack-cli": "^3.3.9",
"webpack-dev-server": "^3.0.0"
},
@@ -83,7 +82,7 @@
"react-dom": "^15.6.2",
"react-router": "^3.2.4",
"react-tap-event-plugin": "^2.0.1",
- "startwars": "^1.0.0",
+ "starwars": "^1.0.1",
"semantic-ui-react": "^0.79.1",
"uglifyjs-webpack-plugin": "^2.2.0",
"webpack": "^4.41.0",
--
GitLab