update npm packages & change to local dependency

mainsail-crew · Apr 19, 2020 · 544d5e2 · 544d5e2
1 parent 70e8ce5
commit 544d5e2
Show file tree

Hide file tree

Showing 20 changed files with 1,355 additions and 446 deletions.
diff --git a/README.md b/README.md
@@ -171,6 +171,14 @@ server {
                 proxy_pass http://apiserver/printer;
         }
 
+        location /api {
+                proxy_pass http://apiserver/api;
+        }
+        
+        location /access {
+                proxy_pass http://apiserver/access;
+        }
+
         location /websocket {
             proxy_pass http://apiserver/websocket;
             proxy_http_version 1.1;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,35 +10,32 @@
   "dependencies": {
     "axios": "^0.19.2",
     "chart.js": "^2.9.3",
-    "core-js": "^3.6.4",
+    "core-js": "^3.6.5",
     "object-assign-deep": "^0.4.0",
     "vue": "^2.6.11",
     "vue-chartjs": "^3.5.0",
-    "vue-context": "^5.0.0",
+    "vue-context": "^5.1.0",
     "vue-headful": "^2.1.0",
     "vue-json-rpc-websocket": "^1.1.1",
     "vue-resource": "^1.5.1",
     "vue-simple-upload": "^0.1.6",
-    "vue-toast-notification": "0.0.3",
-    "vuetify": "^2.2.17",
-    "vuetify-toast-snackbar": "^0.6.1",
-    "vuex": "^3.1.3"
+    "vue-toast-notification": "^0.2.0",
+    "vuetify": "^2.2.22",
+    "vuex": "^3.2.0"
   },
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.12.1",
-    "@mdi/font": "^4.9.95",
-    "@vue/cli-plugin-babel": "^4.2.3",
-    "@vue/cli-plugin-eslint": "^4.2.3",
-    "@vue/cli-service": "^4.2.3",
+    "@mdi/font": "^5.1.45",
+    "@vue/cli-plugin-babel": "^4.3.1",
+    "@vue/cli-plugin-eslint": "^4.3.1",
+    "@vue/cli-service": "^4.3.1",
     "babel-eslint": "^10.1.0",
-    "css-loader": "^3.4.2",
-    "eslint": "^5.16.0",
-    "eslint-plugin-vue": "^5.0.0",
-    "material-design-icons-iconfont": "^5.0.1",
+    "css-loader": "^3.5.2",
+    "eslint": "^6.8.0",
+    "eslint-plugin-vue": "^6.2.2",
     "sass": "^1.26.3",
     "sass-loader": "^8.0.2",
     "vue-cli-plugin-route": "0.0.7",
-    "vue-cli-plugin-vuetify": "^1.1.2",
+    "vue-cli-plugin-vuetify": "^2.0.5",
     "vue-router": "^3.1.6",
     "vue-template-compiler": "^2.6.11",
     "vuetify-loader": "^1.4.3"

diff --git a/public/config.json b/public/config.json
@@ -1,6 +1,6 @@
 {
   "socket": {
-    "hostname": "kossel.local",
+    "hostname": "voron250.local",
     "reconnectInterval": 5000,
     "reconnectAttempts": 1000
   }

diff --git a/public/fonts/roboto-black.woff2 b/public/fonts/roboto-black.woff2
diff --git a/public/fonts/roboto-bold.woff2 b/public/fonts/roboto-bold.woff2
diff --git a/public/fonts/roboto-light.woff2 b/public/fonts/roboto-light.woff2
diff --git a/public/fonts/roboto-medium.woff2 b/public/fonts/roboto-medium.woff2
diff --git a/public/fonts/roboto-regular.woff2 b/public/fonts/roboto-regular.woff2
diff --git a/public/fonts/roboto-thin.woff2 b/public/fonts/roboto-thin.woff2
diff --git a/public/index.html b/public/index.html
@@ -6,8 +6,6 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico" id="favicon" />
     <title>KlipperWebControl</title>
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
   </head>
   <body>
     <noscript>

diff --git a/src/App.vue b/src/App.vue
@@ -1,3 +1,7 @@
+<style>
+    @import './assets/styles/fonts.css';
+</style>
+
 <template>
     <v-app>
         <vue-headful
@@ -62,7 +66,7 @@
 
         <v-footer app class="d-block">
             <span v-if="version">{{ version }}</span>
-            <span class="float-right">&copy; 2020</span>
+            <span class="float-right">Made with <img src="/img/heard.svg" height="10" /> by <img src="/img/voron.png" height="10" />.   &copy; 2020</span>
         </v-footer>
     </v-app>
 </template>

diff --git a/src/assets/styles/fonts.css b/src/assets/styles/fonts.css
@@ -0,0 +1,48 @@
+/* latin */
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 100;
+    src: local('Roboto Thin'), local('Roboto-Thin'), url(/fonts/roboto-thin.woff2) format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 300;
+    src: local('Roboto Light'), local('Roboto-Light'), url(/fonts/roboto-light.woff2) format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 400;
+    src: local('Roboto'), local('Roboto-Regular'), url(/fonts/roboto-regular.woff2) format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 500;
+    src: local('Roboto Medium'), local('Roboto-Medium'), url(/fonts/roboto-medium.woff2) format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 700;
+    src: local('Roboto Bold'), local('Roboto-Bold'), url(/fonts/roboto-bold.woff2) format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin */
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 900;
+    src: local('Roboto Black'), local('Roboto-Black'), url(/fonts/roboto-black.woff2) format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/components/panels/Settings/LimitsPanel.vue b/src/components/panels/Settings/LimitsPanel.vue
@@ -1,7 +1,7 @@
 <template>
     <v-card>
         <v-list-item>
-            <v-list-item-avatar color="grey"><v-icon dark>fa-exclamation</v-icon></v-list-item-avatar>
+            <v-list-item-avatar color="grey"><v-icon dark>mdi-exclamation-thick</v-icon></v-list-item-avatar>
             <v-list-item-content>
                 <v-list-item-title class="headline">Machinelimits</v-list-item-title>
             </v-list-item-content>

diff --git a/src/components/panels/StatusPanel.vue b/src/components/panels/StatusPanel.vue
@@ -1,7 +1,7 @@
 <template>
     <v-card>
         <v-list-item>
-            <v-list-item-avatar color="grey"><v-icon dark>fa-info</v-icon></v-list-item-avatar>
+            <v-list-item-avatar color="grey"><v-icon dark>mdi-information-variant</v-icon></v-list-item-avatar>
             <v-list-item-content>
                 <v-list-item-title class="headline">Status</v-list-item-title>
                 <v-list-item-subtitle class="mr-3">{{ printer_state }}{{ printer_is_printing ? " - "+current_file : "" }}</v-list-item-subtitle>

diff --git a/src/components/panels/TempchartPanel.vue b/src/components/panels/TempchartPanel.vue
@@ -7,7 +7,7 @@
 <template>
     <v-card>
         <v-list-item>
-            <v-list-item-avatar color="grey"><v-icon dark>fa-thermometer-three-quarters</v-icon></v-list-item-avatar>
+            <v-list-item-avatar color="grey"><v-icon dark>mdi-thermometer</v-icon></v-list-item-avatar>
             <v-list-item-content>
                 <v-list-item-title class="headline">Temperature Chart</v-list-item-title>
                 <v-list-item-subtitle>

diff --git a/src/components/panels/ToolsPanel.vue b/src/components/panels/ToolsPanel.vue
@@ -7,7 +7,7 @@
 <template>
     <v-card>
         <v-list-item>
-            <v-list-item-avatar color="grey"><v-icon dark>fa-thermometer-three-quarters</v-icon></v-list-item-avatar>
+            <v-list-item-avatar color="grey"><v-icon dark>mdi-thermometer</v-icon></v-list-item-avatar>
             <v-list-item-content>
                 <v-list-item-title class="headline">Heaters</v-list-item-title>
                 <v-list-item-subtitle>

diff --git a/src/main.js b/src/main.js
@@ -6,7 +6,6 @@ import VueResource from 'vue-resource'
 import './components'
 import store from './store'
 import router from './plugins/router'
-import 'vue-toast-notification/dist/index.css';
 import vueHeadful from 'vue-headful';
 
 Vue.config.productionTip = false;

diff --git a/src/pages/Files.vue b/src/pages/Files.vue
@@ -225,15 +225,11 @@
                     }
                 ).then((result) => {
                     this.$store.commit('setLoadingGcodeUpload', false);
-                    toast.success("Upload of "+result.data.result+" successful!", {
-                        icon: 'fa-check'
-                    });
+                    toast.success("Upload of "+result.data.result+" successful!");
                 })
                 .catch(() => {
                     this.$store.commit('setLoadingGcodeUpload', false);
-                    toast.error("Cannot upload the file!", {
-                        icon: 'fa-exclamation-triangle'
-                    });
+                    toast.error("Cannot upload the file!");
                 });
             },
             clickUploadButton: function() {
@@ -296,14 +292,10 @@
             removeFile() {
                 axios.delete(
                     'http://'+ this.hostname + ':' + this.port +'/printer/files/'+this.contextMenu.item.filename
-                ).then(() => {
-                    this.$toast(this.contextMenu.item.filename+" successfully deleted.", {
-                        icon: 'fa-trash'
-                    });
+                ).then((result) => {
+                    this.$toast.success(result.data.result+" successfully deleted.");
                 }).catch(() => {
-                    this.$toast.error("Error! Cannot delete file.", {
-                        icon: 'fa-warning'
-                    });
+                    this.$toast.error("Error! Cannot delete file.");
                 });
             },
             startPrint(filename = "") {

diff --git a/src/plugins/vuetify.js b/src/plugins/vuetify.js
@@ -1,7 +1,14 @@
-import '@fortawesome/fontawesome-free/css/all.css'
+import '@mdi/font/css/materialdesignicons.css'
 import Vue from 'vue';
 import Vuetify, { VSnackbar, VBtn, VIcon } from 'vuetify/lib';
-import VuetifyToast from 'vuetify-toast-snackbar'
+
+//vue-toast-notification
+import VueToast from 'vue-toast-notification';
+import 'vue-toast-notification/dist/theme-sugar.css';
+
+Vue.use(VueToast, {
+  duration: 3000,
+});
 
 
 Vue.use(Vuetify,{
@@ -12,15 +19,8 @@ Vue.use(Vuetify,{
   }
 });
 
-Vue.use(VuetifyToast, {
-  x: 'right',
-  y: 'bottom',
-  timeout: 3000,
-});
-
 export default new Vuetify({
-
   icons: {
-    iconfont: 'fa',
+    iconfont: 'mdi',
   },
 });