Added server metrics on admin information

sunengine · May 24, 2020 · a3b8c57 · a3b8c57
1 parent 97ea61c
commit a3b8c57
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 57 deletions.
diff --git a/Client/package.json b/Client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sunengine-client",
-    "version": "2.11.5",
+    "version": "2.11.6",
     "description": "SunEngine - web engine with support of blog, forum and articles functionality",
     "productName": "SunEngine",
     "author": "Dmitrij Polianin",

diff --git a/Client/src/admin/AdminInformation.vue b/Client/src/admin/AdminInformation.vue
@@ -37,6 +37,11 @@
 		</q-expansion-item>
 
 		<q-markup-table>
+			<thead>
+				<tr class="admin-information__thead">
+					<td colspan="2">{{ $tl("sunEngineInfo") }}</td>
+				</tr>
+			</thead>
 			<tbody>
 				<tr v-if="siteName">
 					<td>{{ $tl("siteName") }}</td>
@@ -70,18 +75,6 @@
 					<td>{{ $tl("clientVersion") }}</td>
 					<td>{{ clientVersion }}</td>
 				</tr>
-				<tr v-if="dotNetVersion">
-					<td>{{ $tl("dotNetVersion") }}</td>
-					<td>{{ dotNetVersion }}</td>
-				</tr>
-				<tr v-if="quasarVersion">
-					<td>{{ $tl("quasarVersion") }}</td>
-					<td>{{ quasarVersion }}</td>
-				</tr>
-				<tr v-if="vueJsVersion">
-					<td>{{ $tl("vueJsVersion") }}</td>
-					<td>{{ vueJsVersion }}</td>
-				</tr>
 				<tr v-if="serverInfo && serverInfo.Maintainer">
 					<td>{{ $tl("maintainer") }}</td>
 					<td>{{ serverInfo.Maintainer }}</td>
@@ -117,51 +110,48 @@
 						<td>{{ value }}</td>
 					</tr>
 				</template>
-				<tr>
-					<td>{{ $tl("sunEngineRepository") }}</td>
-					<td>
-						<a
-							class="link"
-							href="https://github.com/sunengine/SunEngine"
-							target="_blank"
-							>https://github.com/sunengine/SunEngine</a
-						>
-					</td>
+			</tbody>
+			<thead>
+				<tr class="admin-information__thead">
+					<td colspan="2">{{ $tl("systemInfo") }}</td>
 				</tr>
-				<tr>
-					<td>{{ $tl("sunEngineSkinsRepository") }}</td>
-					<td>
-						<a
-							class="link"
-							href="https://github.com/sunengine/SunEngine.Skins"
-							target="_blank"
-							>https://github.com/sunengine/SunEngine.Skins</a
-						>
-					</td>
+			</thead>
+			<tbody>
+				<tr v-if="dotNetVersion">
+					<td>{{ $tl("dotNetVersion") }}</td>
+					<td>{{ dotNetVersion }}</td>
+				</tr>
+				<tr v-if="quasarVersion">
+					<td>{{ $tl("quasarVersion") }}</td>
+					<td>{{ quasarVersion }}</td>
+				</tr>
+				<tr v-if="vueJsVersion">
+					<td>{{ $tl("vueJsVersion") }}</td>
+					<td>{{ vueJsVersion }}</td>
 				</tr>
 				<tr>
-					<td>{{ $tl("AppUptime") }}</td>
+					<td>{{ $tl("appUptime") }}</td>
 					<td>
 						<time>
-						{{ $formatDate(appUptime) }}
+							{{ $formatDate(appUptime) }}
 						</time>
 					</td>
 				</tr>
 				<tr>
-					<td>{{ $tl("SystemUptime") }}</td>
+					<td>{{ $tl("systemUptime") }}</td>
 					<td>
 						<time>
-						{{ $formatDate(systemUptime) }}
+							{{ $formatDate(systemUptime) }}
 						</time>
 					</td>
 				</tr>
 				<tr>
-					<td>{{ $tl("OperationSystem") }}</td>
+					<td>{{ $tl("operationSystem") }}</td>
 					<td>{{ operationSystem }}</td>
 				</tr>
 				<!-- Fix layout of table -->
 				<tr v-if="loadAverage">
-					<td rowspan="2">{{ $tl("LoadAverage") }}</td>
+					<td rowspan="2">{{ $tl("loadAverage") }}</td>
 					<td class="text-center">1 minutes</td>
 					<td class="text-center">5 minutes</td>
 					<td class="text-center">15 minutes</td>
@@ -170,16 +160,47 @@
 					<td v-for="load of loadAverage" class="text-center">{{ load }}</td>
 				</tr>
 			</tbody>
+			<thead>
+				<tr class="admin-information__thead">
+					<td colspan="2">{{ $tl("links") }}</td>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>{{ $tl("sunEngineRepository") }}</td>
+					<td>
+						<a
+							class="link"
+							href="https://github.com/sunengine/SunEngine"
+							target="_blank"
+							>https://github.com/sunengine/SunEngine</a
+						>
+					</td>
+				</tr>
+				<tr>
+					<td>{{ $tl("sunEngineSkinsRepository") }}</td>
+					<td>
+						<a
+							class="link"
+							href="https://github.com/sunengine/SunEngine.Skins"
+							target="_blank"
+							>https://github.com/sunengine/SunEngine.Skins</a
+						>
+					</td>
+				</tr>
+			</tbody>
 		</q-markup-table>
 	</SunPage>
 </template>
 
 <script>
 import { Page } from "mixins";
 import Vue from "vue";
+import Thread from "../modules/forum/Thread";
 
 export default {
 	name: "AdminInformation",
+	components: { Thread },
 	mixins: [Page],
 	data() {
 		return {
@@ -227,7 +248,7 @@ export default {
 			return Vue.version;
 		},
 		loadAverage() {
-			return !(this.loadAverage) == null ? this.loadAverage : true;
+			return !this.loadAverage == null ? this.loadAverage : true;
 		}
 	},
 	methods: {
@@ -260,7 +281,7 @@ export default {
 					this.operationSystem = response.data.osVersion;
 					this.loadAverage = response.data.loadAverage;
 				}
-			)
+			);
 		}
 	},
 	async created() {
@@ -273,4 +294,10 @@ export default {
 };
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+ .admin-information__thead {
+  text-align: center;
+  font-size: 1.1em;
+  background-color: $lime-2;
+ }
+</style>
diff --git a/Client/src/i18n/en-us/admin.js b/Client/src/i18n/en-us/admin.js
@@ -306,10 +306,13 @@ export default {
 		sunEngineRepository: "SunEngine repository",
 		sunEngineSkinsRepository: "SunEngine skins repository",
 		additionalData: "Additional data",
-		AppUptime: "Time start SunEngine",
-		SystemUptime: "Time start operation system",
-		OperationSystem: "Operation system install on server",
-		LoadAverage: "Load Average"
+		sunEngineInfo: "SunEngine",
+		systemInfo: "System",
+		links: "Links",
+		appUptime: "Time start SunEngine",
+		systemUptime: "Time start operation system",
+		operationSystem: "Operation system install on server",
+		loadAverage: "Load Average"
 	},
 	AdminPanel: {
 		title: "Admin panel"

diff --git a/Client/src/i18n/ru/admin.js b/Client/src/i18n/ru/admin.js
@@ -336,12 +336,13 @@ export default {
 		sunEngineRepository: "Репозиторий SunEngine",
 		sunEngineSkinsRepository: "Репозиторий тем оформления",
 		additionalData: "Дополнительная информация",
-
-		AppUptime: "Время старта SunEngine",
-		SystemUptime: "Время старта ОС",
-		OperationSystem: "ОС установленная на сервере",
-		LoadAverage: "Load Average"
-
+		sunEngineInfo: "SunEngine",
+		systemInfo: "Система",
+		links: "Ссылки",
+		appUptime: "Время старта SunEngine",
+		systemUptime: "Время старта ОС",
+		operationSystem: "ОС установленная на сервере",
+		loadAverage: "Load Average"
 	},
 	AdminPanel: {
 		title: "Админка"

diff --git a/README.RU.md b/README.RU.md
@@ -9,7 +9,7 @@
 
 # SunEngine
 
-<a href="#"><img src="https://img.shields.io/static/v1?label=%D0%92%D0%B5%D1%80%D1%81%D0%B8%D1%8F&message=v2.11.5&color=green"></a>
+<a href="#"><img src="https://img.shields.io/static/v1?label=%D0%92%D0%B5%D1%80%D1%81%D0%B8%D1%8F&message=v2.11.6&color=green"></a>
 <a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/.NET%20Core/badge.svg" ></a>
 <a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/Quasar/badge.svg" ></a>
 <br/>

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Build on: AspNet Core, VueJS, Quasar.</h3>
 
 # SunEngine
 
-<a href="#"><img src="https://img.shields.io/static/v1?label=Version&message=v2.11.5&color=green"></a>
+<a href="#"><img src="https://img.shields.io/static/v1?label=Version&message=v2.11.6&color=green"></a>
 <a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/.NET%20Core/badge.svg" ></a>
 <a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/Quasar/badge.svg" ></a>
 <br/>

diff --git a/Server/SunEngine.Cli/SunEngine.Cli.csproj b/Server/SunEngine.Cli/SunEngine.Cli.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
         <LangVersion>latest</LangVersion>
-        <Version>2.11.5</Version>
+        <Version>2.11.6</Version>
         <Title>SunEngine</Title>
         <Authors>Dmitrij Polianin</Authors>
         <Description>Site engine with blog, forum and articles functionalities on Asp.Net Core and Vue.Js.</Description>

diff --git a/Server/SunEngine.Core/SunEngine.Core.csproj b/Server/SunEngine.Core/SunEngine.Core.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
-        <Version>2.11.5</Version>
+        <Version>2.11.6</Version>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 

diff --git a/SunEngine.md b/SunEngine.md
@@ -1,5 +1,5 @@
 # SunEngine
-**Version 2.11.5**
+**Version 2.11.6**
 ***************************************************************
 Do not delete this file! This file need to detect project root.
 ***************************************************************