Merge branch 'release/README-Chanages'

ram-g-athreya · ram-g-athreya · commit 62ed8ddcd57a · 2017-08-07T11:28:51.000+05:30
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -39,7 +39,6 @@ master_build:
   <<: *build_template
   only:
     - master
-    - tags
   artifacts:
     expire_in: 1 month
     paths:
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # DBpedia Chatbot
 
-## [GSoC Wiki](https://github.com/dbpedia/chatbot/wiki/GSoC-2017:-Chatbot-for-DBpedia)
+[![BCH compliance](https://bettercodehub.com/edge/badge/dbpedia/chatbot?branch=master)](https://bettercodehub.com/)
+
+For more information about this project and **GSoC Progress** please refer to [GSoC Wiki](https://github.com/dbpedia/chatbot/wiki/GSoC-2017:-Chatbot-for-DBpedia)
 
 ## Environment Configurations
      admin.username = <admin-username>
@@ -35,3 +37,22 @@
 ## Development
      mvn spring-boot:run
      node/node node_modules/.bin/webpack --watch
+
+## Embed Code
+Add the following snippet to the `<head>` section of the webpage where you want to embed the ChatBot.
+``` javascript
+ <script type="text/javascript">
+    window.onload = function() {
+        var iframe = document.createElement("iframe");
+        iframe.setAttribute("src", "http://chat.dbpedia.org/embed");
+        iframe.setAttribute("frameBorder", 0);
+        iframe.style.zIndex = 10000000;
+        iframe.style.height = "100%";
+        iframe.style.width = "40%";
+        iframe.style.position = "fixed";
+        iframe.style.bottom = "20px";
+        iframe.style.right = "20px";
+        document.body.appendChild(iframe);
+    }
+ </script>
+```
diff --git a/app/src/js/components/embed/Embed.jsx b/app/src/js/components/embed/Embed.jsx
@@ -26,7 +26,7 @@ class Embed extends React.Component {
                     </div>
                 </div>
                 <div className="embed-chat-button-container">
-                    <a className="embed-chat-button btn btn-raised btn-fab btn-primary" onClick={this.toggleChat}>
+                    <a className="embed-chat-button btn btn-raised btn-fab" onClick={this.toggleChat}>
                         <i className="material-icons">
                             {this.state.isChatOpen ? "clear" : "chat"}
                         </i>
diff --git a/app/src/less/pages/embed.less b/app/src/less/pages/embed.less
@@ -26,4 +26,5 @@ html, body {
 .embed-chat-button {
     left: 100% !important;
     margin-left: -56px !important;
+    background: @brand-secondary !important;
 }
diff --git a/src/main/java/chatbot/Application.java b/src/main/java/chatbot/Application.java
@@ -79,6 +79,7 @@ protected void configure(HttpSecurity http) throws Exception {
                     .and()
                     .logout()
                     .permitAll();
+            http.headers().frameOptions().disable();
         }
 
         @Autowired
diff --git a/src/main/java/chatbot/lib/api/dbpedia/GenesisService.java b/src/main/java/chatbot/lib/api/dbpedia/GenesisService.java
@@ -33,6 +33,12 @@ public GenesisService() {
         client = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig).build();
     }
 
+    // Created for tests since they fail because Genesis cannot produce results before timeout occurs
+    public GenesisService(int timeout) {
+        RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(timeout).build();
+        client = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig).build();
+    }
+
     private String makeRequest(String endpoint, String uri, String requestType) {
         try {
             HttpPost httpPost = new HttpPost(endpoint);
diff --git a/src/test/java/chatbot/lib/api/dbpedia/TestGenesisService.java b/src/test/java/chatbot/lib/api/dbpedia/TestGenesisService.java
@@ -15,14 +15,14 @@
 public class TestGenesisService {
     @Test
     public void checkSimilar() throws Exception {
-        String uris = new GenesisService().getSimilarEntities("http://dbpedia.org/resource/Barack_Obama");
+        String uris = new GenesisService(0).getSimilarEntities("http://dbpedia.org/resource/Barack_Obama");
         assertNotNull(uris);
         assertNotEquals(uris.trim(), "");
     }
 
     @Test
     public void checkRelated() throws Exception {
-        String uris = new GenesisService().getRelatedEntities("http://dbpedia.org/resource/Barack_Obama");
+        String uris = new GenesisService(0).getRelatedEntities("http://dbpedia.org/resource/Barack_Obama");
         assertNotNull(uris);
         assertNotEquals(uris.trim(), "");
     }

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,5 @@ html, body {`
`26`	`26`	`.embed-chat-button {`
`27`	`27`	`left: 100% !important;`
`28`	`28`	`margin-left: -56px !important;`
	`29`	`+ background: @brand-secondary !important;`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ protected void configure(HttpSecurity http) throws Exception {`
`79`	`79`	`.and()`
`80`	`80`	`.logout()`
`81`	`81`	`.permitAll();`
	`82`	`+ http.headers().frameOptions().disable();`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`@Autowired`