diff --git a/.idea/kara.iml b/.idea/kara.iml index 029757b..01332f5 100644 --- a/.idea/kara.iml +++ b/.idea/kara.iml @@ -7,5 +7,7 @@ + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2065903..2598bfb 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,8 +5,11 @@ + + + @@ -44,7 +47,7 @@ - + 1597348071361 @@ -95,7 +98,14 @@ - @@ -109,25 +119,30 @@ - - + + + + + - - + + - - + + - + @@ -136,9 +151,9 @@ - + - + \ No newline at end of file diff --git a/app.css b/app.css index 28bd55c..689d2eb 100644 --- a/app.css +++ b/app.css @@ -53,4 +53,8 @@ body { text-align: center; padding: 0.7em; background-color: #515960; +} + +#kara-banner .btn { + margin-top: -0.3em; } \ No newline at end of file diff --git a/app.js b/app.js index 8b99273..3738416 100644 --- a/app.js +++ b/app.js @@ -50,7 +50,8 @@ let kara = new Vue({ setTimeout(() => { this.aiMessage( - this.getAnswer(message) + // this.getAnswer(message) + this.getAnswerFromDB(message) ); this.scrollDown(); }, 3000); @@ -117,8 +118,6 @@ let kara = new Vue({ .replace('…', ''); }, getAnswer(message) { - let isQuestion = (message.indexOf('?') > 0); - message = message.toLowerCase(); message = this.clearMessage(message); let phrases = message.split(' '); @@ -144,6 +143,21 @@ let kara = new Vue({ } return 'I don\'t know what to say..'; + }, + getAnswerFromDB(message) { + let answer = null; + + axios.get('https://luna-development.net/kara', { + params: { + message: message + } + }) + .then(function (response) { + answer = response.toString(); + }) + .catch(function (error) { + answer = error; + }) } } }) \ No newline at end of file diff --git a/index.html b/index.html index 3acf7b7..b2d52d5 100644 --- a/index.html +++ b/index.html @@ -62,6 +62,7 @@ +