Fixed #312, #311

- Fixed issue in #312: The dashboard will automatically get the actual Dashboard version number.
- Fixed issue in #311: WGDashboard was not treating restricted peers correctly.

src/static/app/src/components/configurationComponents/newPeersComponents/allowedIPsInput.vue

@@ -36,8 +36,11 @@ export default {
 		addAllowedIp(ip){
 			if(this.store.checkCIDR(ip)){
 				this.data.allowed_ips.push(ip);
+				this.customAvailableIp = ''
 				return true;
 			}
+			this.allowedIpFormatError = true;
+			this.dashboardStore.newMessage('WGDashboard', 'Allowed IP is invalid', 'danger')
 			return false;
 		}
 	},
@@ -80,10 +83,7 @@ export default {
 				       :disabled="bulk">
 				<button class="btn btn-outline-success btn-sm rounded-end-3"
 				        :disabled="bulk || !this.customAvailableIp"
-				        @click="this.addAllowedIp(this.customAvailableIp) 
-				            ? this.customAvailableIp = '' : 
-				            this.allowedIpFormatError = true;
-				            this.dashboardStore.newMessage('WGDashboard', 'Allowed IP is invalid', 'danger')"
+				        @click="this.addAllowedIp(this.customAvailableIp)"
 				        type="button" id="button-addon2">
 					<i class="bi bi-plus-lg"></i>
 				</button>

src/static/app/src/components/configurationComponents/peerList.vue

@@ -200,7 +200,8 @@ export default {
 					})
 					this.loading = false;
 					if (this.configurationPeers.length > 0){
-						const sent = this.configurationPeers.map(x => x.total_sent + x.cumu_sent).reduce((x,y) => x + y).toFixed(4);
+						const sent = this.configurationPeers.map(x => x.total_sent + x.cumu_sent)
+							.reduce((x,y) => x + y).toFixed(4);
 						const receive = this.configurationPeers.map(x => x.total_receive + x.cumu_receive).reduce((x,y) => x + y).toFixed(4);
 						if (
 							this.historyDataSentDifference[this.historyDataSentDifference.length - 1] !== sent
@@ -259,13 +260,13 @@ export default {
 				connectedPeers: this.configurationPeers.filter(x => x.status === "running").length,
 				totalUsage: this.configurationPeers.length > 0 ? 
 					this.configurationPeers.filter(x => !x.restricted)
-						.map(x => x.total_data + x.cumu_data).reduce((a, b) => a + b).toFixed(4) : 0,
+						.map(x => x.total_data + x.cumu_data).reduce((a, b) => a + b, 0).toFixed(4) : 0,
 				totalReceive: this.configurationPeers.length > 0 ? 
 					this.configurationPeers.filter(x => !x.restricted)
-						.map(x => x.total_receive + x.cumu_receive).reduce((a, b) => a + b).toFixed(4) : 0,
+						.map(x => x.total_receive + x.cumu_receive).reduce((a, b) => a + b, 0).toFixed(4) : 0,
 				totalSent: this.configurationPeers.length > 0 ? 
 					this.configurationPeers.filter(x => !x.restricted)
-						.map(x => x.total_sent + x.cumu_sent).reduce((a, b) => a + b).toFixed(4) : 0
+						.map(x => x.total_sent + x.cumu_sent).reduce((a, b) => a + b, 0).toFixed(4) : 0
 			}
 			
 			return k

src/static/app/src/views/signin.vue

@@ -11,16 +11,22 @@ export default {
 		const store = DashboardConfigurationStore()
 		let theme = "dark"
 		let totpEnabled = false;
+		let version = undefined;
 		if (!store.IsElectronApp){
-			await fetchGet("/api/getDashboardTheme", {}, (res) => {
-				theme = res.data
-			});
-			await fetchGet("/api/isTotpEnabled", {}, (res) => {
-				totpEnabled = res.data
-			});
+			await Promise.all([
+				fetchGet("/api/getDashboardTheme", {}, (res) => {
+					theme = res.data
+				}),
+				fetchGet("/api/isTotpEnabled", {}, (res) => {
+					totpEnabled = res.data
+				}),
+				fetchGet("/api/getDashboardVersion", {}, (res) => {
+					version = res.data
+				})
+			]);
 		}
 		store.removeActiveCrossServer();
-		return {store, theme, totpEnabled}
+		return {store, theme, totpEnabled, version}
 	},
 	data(){
 		return {
@@ -146,7 +152,7 @@ export default {
 			</div>
 		</div>
 		<small class="text-muted pb-3 d-block w-100 text-center mt-3">
-			WGDashboard v4.0 | Developed with ❤️ by 
+			WGDashboard {{ this.version }} | Developed with ❤️ by 
 			<a href="https://github.com/donaldzou" target="_blank"><strong>Donald Zou</strong></a>
 		</small>
 		<div class="messageCentre text-body position-absolute end-0 m-3">