[TASK] Add IDE folder to ignore

[TASK] Add info for maxmind
Merge branch 'feature/history_timeline' of xicon/xtr-improved-frontend into master
2020-04-16 01:10:07 +02:00 · 2020-04-16 01:05:46 +02:00 · 2019-12-08 22:49:53 +01:00 · 2019-12-08 21:19:41 +01:00
6 changed files with 64 additions and 54 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
+.idea
 node_modules
--- a/dist/main.js
+++ b/dist/main.js
--- a/package-lock.json
+++ b/package-lock.json
@ -3324,7 +3324,8 @@
        "ansi-regex": {
          "version": "2.1.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "aproba": {
          "version": "1.2.0",
@ -3345,12 +3346,14 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@ -3365,17 +3368,20 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "core-util-is": {
          "version": "1.0.2",
@ -3492,7 +3498,8 @@
        "inherits": {
          "version": "2.0.3",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "ini": {
          "version": "1.3.5",
@ -3504,6 +3511,7 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@ -3518,6 +3526,7 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@ -3525,12 +3534,14 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "minipass": {
          "version": "2.3.5",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.2",
            "yallist": "^3.0.0"
@ -3549,6 +3560,7 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@ -3629,7 +3641,8 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "object-assign": {
          "version": "4.1.1",
@ -3641,6 +3654,7 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@ -3726,7 +3740,8 @@
        "safe-buffer": {
          "version": "5.1.2",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "safer-buffer": {
          "version": "2.1.2",
@ -3762,6 +3777,7 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@ -3781,6 +3797,7 @@
          "version": "3.0.1",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "ansi-regex": "^2.0.0"
          }
@ -3824,12 +3841,14 @@
        "wrappy": {
          "version": "1.0.2",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "yallist": {
          "version": "3.0.3",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        }
      }
    },
@ -7491,10 +7510,11 @@
        "vue-style-loader": "^4.1.0"
      }
    },
-    "vue-loading-button": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/vue-loading-button/-/vue-loading-button-0.2.0.tgz",
-      "integrity": "sha512-HjlNzS2deIaXGr7cZU/J/SiaZfA6OvJC+vzujTohUCs0cF+6G9p4SfTquT4watDFl5m3yO4OBEaxhE99JQLBNA=="
+    "vue-spinners-css": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/vue-spinners-css/-/vue-spinners-css-1.1.3.tgz",
+      "integrity": "sha512-EbWBH2tPj+YjJOYcZ8gyFCYFK0QCxECCH5xFUeOXKxvN4tVgP6Axk5A60ld+GUBcg+YuBn/EYSG/jifEWpzi9Q==",
+      "dev": true
    },
    "vue-style-loader": {
      "version": "4.1.2",
--- a/package.json
+++ b/package.json
@ -22,9 +22,9 @@
    "vue-style-loader": "^4.1.2",
    "vue-template-compiler": "^2.5.17",
    "axios": "^0.19.0",
-    "vue-loading-button": "^0.2.0",
    "webpack": "^4.41.2",
    "webpack-cli": "^3.3.10",
-    "webpack-dev-server": "^3.9.0"
+    "webpack-dev-server": "^3.9.0",
+    "vue-spinners-css": "^1.1.3"
  }
 }
--- a/src/StatusBox.vue
+++ b/src/StatusBox.vue
@ -11,14 +11,11 @@
 			</select>
 			
 			<input v-model="target" placeholder="Enter Ip or Domain">
-			<VueLoadingButton 
-			:id="'vueOwnButtonStyle'"
-			aria-label="Post message"
-			class="button"
-			@click.native="handleClick"
-			:loading="isLoading"
-			:styled="false"
-			>⛟</VueLoadingButton> <br>
+			<button v-on:click="handleClick()">
+				⛟
+			</button>
+<RingLoader :size="10" :loading="isLoading" color="black"></RingLoader>
+			<br>
 			
 			<span class="small">{{infoString}}</span>
 			<div>
@ -55,11 +52,11 @@
 import axios from 'axios';
 import XtrServer from './ModelObjects/XtrServer.js';
 import XtrData from './ModelObjects/XtrData.js';
-import VueLoadingButton from 'vue-loading-button';
+import { RingLoader } from 'vue-spinners-css';

 export default {
 	components: {
-		VueLoadingButton
+		RingLoader
 	},
 	props: {
 		serverlist: Array,
@ -350,16 +347,5 @@ export default {
 		50% { transform: rotate(30deg); } 
 		75% { transform: rotate(0deg); }
 		100% { transform: rotate(-30deg); }
-	}
-
-	button#vueOwnButtonStyle {
-		font-family: inherit;
-		font-size: 0.9rem;
-		line-height: 1.15;
-		margin: 0;
-		overflow: visible;
-		text-transform: none;
-		-webkit-appearance: button;
-	}
-	
+	}	
 </style>
--- a/src/StatusBoxContainer.vue
+++ b/src/StatusBoxContainer.vue
@ -20,6 +20,9 @@
 				Want to run your own master server? <a href="xtrd.pl">Download XTRd</a>. Readme included in source code!<br> 
 				<br>
 				Questions?/Impress? -> <a href="mailto:rest@xicon.de">Friedrich Schrader</a>
+				<br>
+				<br>
+				This product includes GeoLite2 ASN data created by MaxMind, available from <a href="http://www.maxmind.com">http://www.maxmind.com</a>.
 			</div>
 		</div>
 	<div>
@ -148,12 +151,15 @@ export default {
 			});
 		},
 		setActive: function setActive(tableId) {
-			var settedClasses = document.getElementById("tableId_"+tableId).className;
-			if (settedClasses == 'table table-striped') {
-				document.getElementById("tableId_"+tableId).className = 'table table-striped active';
-			} else {
-				document.getElementById("tableId_"+tableId).className = 'table table-striped';
-			}
+			this.$nextTick(() => {
+				var settedClasses = document.getElementById("tableId_"+tableId).className;
+				if (settedClasses == 'table table-striped') {
+					document.getElementById("tableId_"+tableId).className = 'table table-striped active';
+				} else {
+					document.getElementById("tableId_"+tableId).className = 'table table-striped';
+				}
+			});
+			
 		},
 		setActiveFromSession: function setActiveFromSession(tableIds) {
 			tableIds.forEach(tableId => {
@ -220,19 +226,16 @@ export default {
 		padding: 5px;
 	}

-	.info
-	{
+	.info {
 		display: block; position: absolute; right: 10px; top: 10px;
 	}

-	.info:hover .info_box
-	{
+	.info:hover .info_box {
 		visibility: visible;
 		z-index: 4;
 	}
 	
-	.info .info_box
-	{
+	.info .info_box {
 		display: block;
 		position: absolute;
 		right: 0px;
Author	SHA1	Message	Date
XiCoN-Luan	9169ceea9f	[TASK] Add IDE folder to ignore	2020-04-16 01:10:07 +02:00
XiCoN-Luan	62d198792e	[TASK] Add info for maxmind	2020-04-16 01:05:46 +02:00
XiCoN-FJS-	00d4f39260	Merge branch 'feature/history_timeline' of xicon/xtr-improved-frontend into master * history timeline * refactoring * small fixes * gui updates	2019-12-08 22:49:53 +01:00
XiCoN-Luan-	ab8daba952	[TASK] #3 Change overflowing spinner - [FIX] Reload - set active bug	2019-12-08 21:19:41 +01:00