Merge pull request misterGF#21 from euvl/master

Big update by @euvl! Great code examples in this PR. Thanks for helping keep CoPilot up to date. 👍👍👍
dbomfim · Mar 19, 2017 · 08212c1 · 08212c1
2 parents d61669b + a21c614
commit 08212c1
Show file tree

Hide file tree

Showing 28 changed files with 734 additions and 582 deletions.
diff --git a/index.html b/index.html
@@ -30,14 +30,13 @@
     <script src="/static/js/plugins/bootstrap/bootstrap.min.js"></script>
     <script src="/static/js/plugins/AdminLTE/app.min.js"></script>
     <script src="/static/js/plugins/pace/pace.min.js"></script>
-    <script src="/static/js/copilot.js"></script>
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
       m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
       })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
       // analytics section
-      ga('create', 'UA-76862457-1', 'auto')
+      ga('create', 'YOUR_SHIT_HERE', 'auto')
       ga('send', 'pageview')
     </script>
   </body>

diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "deploy": "netlify deploy dist"
   },
   "dependencies": {
+    "axios": "^0.15.3",
     "babel-runtime": "^5.8.0",
     "chart.js": "2.3.0",
     "datatables.net": "^1.10.11",
@@ -27,69 +28,72 @@
     "vue-date-picker": "^1.0.2",
     "vue-resource": "^1.0.3",
     "vue-router": "^2.0.1",
-    "vuex": "^2.0.0"
+    "vuex": "^2.0.0",
+    "vuex-router-sync": "^4.1.2"
   },
   "devDependencies": {
     "autoprefixer": "^6.4.0",
-      "babel-core": "^6.0.0",
-      "babel-eslint": "^7.0.0",
-      "babel-loader": "^6.0.0",
-      "babel-plugin-transform-runtime": "^6.0.0",
-      "babel-preset-es2015": "^6.0.0",
-      "babel-preset-stage-2": "^6.0.0",
-      "babel-register": "^6.0.0",
-      "chalk": "^1.1.3",
-      "connect-history-api-fallback": "^1.1.0",
-      "css-loader": "^0.25.0",
-      "eslint": "^3.7.1",
-      "eslint-friendly-formatter": "^2.0.5",
-      "eslint-loader": "^1.5.0",
-      "eslint-plugin-html": "^1.3.0",
-      "eslint-config-standard": "6.2.1",
-      "eslint-plugin-promise": "3.3.0",
-      "eslint-plugin-standard": "^2.0.1",
-      "eventsource-polyfill": "^0.9.6",
-      "express": "^4.13.3",
-      "extract-text-webpack-plugin": "^1.0.1",
-      "file-loader": "^0.9.0",
-      "function-bind": "^1.0.2",
-      "html-webpack-plugin": "^2.8.1",
-      "http-proxy-middleware": "^0.17.2",
-      "json-loader": "^0.5.4",
-      "karma": "^1.3.0",
-      "karma-coverage": "^1.1.1",
-      "karma-mocha": "^1.2.0",
-      "karma-phantomjs-launcher": "^1.0.0",
-      "karma-sinon-chai": "^1.2.0",
-      "karma-sourcemap-loader": "^0.3.7",
-      "karma-spec-reporter": "0.0.26",
-      "karma-webpack": "^1.7.0",
-      "lolex": "^1.4.0",
-      "mocha": "^3.1.0",
-      "chai": "^3.5.0",
-      "sinon": "^1.17.3",
-      "sinon-chai": "^2.8.0",
-      "inject-loader": "^2.0.1",
-      "isparta-loader": "^2.0.0",
-      "phantomjs-prebuilt": "^2.1.3",
-      "chromedriver": "^2.21.2",
-      "cross-spawn": "^4.0.2",
-      "nightwatch": "^0.9.8",
-      "selenium-server": "2.53.1",
-      "semver": "^5.3.0",
-      "opn": "^4.0.2",
-      "ora": "^0.3.0",
-      "shelljs": "^0.7.4",
-      "url-loader": "^0.5.7",
-      "vue-loader": "^9.4.0",
-      "vue-style-loader": "^1.0.0",
-      "webpack": "^1.13.2",
-      "webpack-dev-middleware": "^1.8.3",
-      "webpack-hot-middleware": "^2.12.2",
-      "webpack-merge": "^0.14.1"
+    "babel-core": "^6.0.0",
+    "babel-eslint": "^7.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "babel-register": "^6.0.0",
+    "chai": "^3.5.0",
+    "chalk": "^1.1.3",
+    "chromedriver": "^2.21.2",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-spawn": "^4.0.2",
+    "css-loader": "^0.25.0",
+    "eslint": "^3.7.1",
+    "eslint-config-standard": "6.2.1",
+    "eslint-friendly-formatter": "^2.0.5",
+    "eslint-loader": "^1.5.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "3.3.0",
+    "eslint-plugin-standard": "^2.0.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.9.0",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.17.2",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "json-loader": "^0.5.4",
+    "karma": "^1.3.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.2.0",
+    "karma-phantomjs-launcher": "^1.0.0",
+    "karma-sinon-chai": "^1.2.0",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.26",
+    "karma-webpack": "^1.7.0",
+    "lolex": "^1.4.0",
+    "mocha": "^3.1.0",
+    "nightwatch": "^0.9.8",
+    "node-sass": "^4.5.0",
+    "opn": "^4.0.2",
+    "ora": "^0.3.0",
+    "phantomjs-prebuilt": "^2.1.3",
+    "sass-loader": "^6.0.3",
+    "selenium-server": "2.53.1",
+    "semver": "^5.3.0",
+    "shelljs": "^0.7.4",
+    "sinon": "^1.17.3",
+    "sinon-chai": "^2.8.0",
+    "url-loader": "^0.5.7",
+    "vue-loader": "^9.4.0",
+    "vue-style-loader": "^1.0.0",
+    "webpack": "^1.13.2",
+    "webpack-dev-middleware": "^1.8.3",
+    "webpack-hot-middleware": "^2.12.2",
+    "webpack-merge": "^0.14.1"
   },
   "engines": {
-  "node": ">= 4.0.0",
-  "npm": ">= 3.0.0"
-}
+    "node": ">= 4.0.0",
+    "npm": ">= 3.0.0"
+  }
 }
diff --git a/src/api/index.js b/src/api/index.js
@@ -0,0 +1,19 @@
+import axios from 'axios'
+import config from '../config'
+
+export default {
+  request (method, uri, data = null) {
+    if (!method) {
+      console.error('API function call requires method argument')
+      return
+    }
+
+    if (!uri) {
+      console.error('API function call requires uri argument')
+      return
+    }
+
+    var url = config.serverURI + uri
+    return axios({ method, url, data })
+  }
+}
diff --git a/static/js/copilot.js → src/assets/.gitkeep b/static/js/copilot.js → src/assets/.gitkeep
diff --git a/src/assets/logo.png b/src/assets/logo.png
diff --git a/src/components/App.vue b/src/components/App.vue
@@ -1,33 +1,19 @@
 <template>
-  <div>
+  <div id="app">
     <router-view></router-view>
-    <div id="app"></div>
   </div>
 </template>
 
 <script>
   export default {
     name: 'App',
-    data: function () {
+    data () {
       return {
-        section: 'Head',
-        version: '0.10.0',
-        callingAPI: false,
-        serverURI: 'http://10.110.1.10:8080',
-        caller: this.$http
+        section: 'Head'
       }
     },
     methods: {
-      callAPI: function (method, url, data) {
-        this.callingAPI = true
-        url = url || this.serverURI // if no url is passed then inheret local server URI
-        return this.caller({
-          url: url,
-          method: method,
-          data: data
-        })
-      },
-      logout: function () {
+      logout () {
         this.$store.commit('SET_USER', null)
         this.$store.commit('SET_TOKEN', null)