From 00ba2e4f35cc35ce5aea663812c2a51075c4e63a Mon Sep 17 00:00:00 2001
From: Adkinsm2020 <3020035335@qq.com>
Date: Sat, 11 Dec 2021 20:42:45 +0800
Subject: [PATCH] UI

---
 .github/workflows/main.yml |  2 +-
 .vscode/launch.json        |  8 +++++++-
 app/assets/css/style.css   | 23 ++++++++---------------
 app/assets/js/renderer.js  | 15 ++++++++++++---
 main.js                    |  2 ++
 5 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a188629..d4d4150 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - main
     tags:
-      - v*
+      - "*"
   pull_request:
 
 jobs:
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 278ca31..6b7092b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,12 +5,18 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
+			"command": "yarn start",
+			"name": "Run yarn start",
+			"request": "launch",
+			"type": "node-terminal"
+		},
+		/*{
 			"type": "node",
 			"request": "launch",
 			"name": "Electron Main",
 			"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
 			"program": "${workspaceFolder}/main.js",
 			"skipFiles": ["<node_internals>/**"]
-		}
+		}*/
 	]
 }
diff --git a/app/assets/css/style.css b/app/assets/css/style.css
index f7b4394..443c456 100644
--- a/app/assets/css/style.css
+++ b/app/assets/css/style.css
@@ -46,8 +46,9 @@ body {
   display: flex;
   flex-direction: row;
   align-items: center;
-  bottom: 0px;
-  width: 97.85%;
+  left: 221.2065px;
+  bottom: 25px;
+  width: 53.85%;
   padding: 5px;
   backdrop-filter: blur(30px);
   background-color: rgba(255, 255, 255, 0.911);
@@ -56,8 +57,6 @@ body {
   padding-left: 10px;
   padding-right: 10px;
   justify-content: flex-start;
-  border-bottom-left-radius: 0px;
-  border-bottom-right-radius: 0px;
   box-shadow: rgba(0, 0, 0, 0.1) 0px 10px 20px;
 }
 
@@ -632,24 +631,17 @@ alert {
   height: 85%;
   backdrop-filter: blur(30px);
   padding: 25px;
-  background-color: rgba(255, 255, 255, 0.26);
+  background-color: #2a2a2a;
 }
 
 #consoleCentre .centreItem {
-  background-color: #d3d3d3f1;
+  background-color: #4c4c4c;
   padding: 10px;
-  width: 20%;
+  width: 48px;
+  height: 48px;
   border-radius: 15px;
 }
 
-#consoleCentre .centreCon {
-  background-color: #202020a9;
-  border-radius: 30px;
-  border: transparent 1px solid;
-  height: 40%;
-  padding: 20px;
-}
-
 hr#showConsoleCentreLine {
   width: 5%;
   position: absolute;
@@ -682,6 +674,7 @@ hr#showConsoleCentreLine {
   border-radius: 5px;
   backdrop-filter: blur(15px);
   color: rgb(255, 255, 255);
+  transition: display .2s;
 }
 
 .dropdown-content a {
diff --git a/app/assets/js/renderer.js b/app/assets/js/renderer.js
index f394fd1..7ca44c7 100644
--- a/app/assets/js/renderer.js
+++ b/app/assets/js/renderer.js
@@ -78,6 +78,7 @@ document.addEventListener('DOMContentLoaded', () => {
 /**
  * Get Date Or Time
  */
+
 (function () {
   setInterval(() => {
     document.querySelector('#dockTime').textContent =
@@ -87,7 +88,7 @@ document.addEventListener('DOMContentLoaded', () => {
     document.querySelector('#dockDate').textContent =
       methods.formatDate(new Date().getFullYear() +
         '/' +
-        new Date().getMonth() +
+        (new Date().getMonth() + 1) +
         '/' +
         new Date().getDate());
   });
@@ -109,6 +110,10 @@ function showLauPad() {
   hideConsoleCentre();
   methods.showElementByFade('#laupad');
   document.querySelector('#dock_time').style.bottom = 'calc(55%)';
+  document.querySelector('#dock_time').style.left = '0px';
+  document.querySelector('#dock_time').style.width = '97.85%';
+  document.querySelector('#dock_time').style.borderBottomLeftRadius = "0px";
+  document.querySelector('#dock_time').style.borderBottomRightRadius = "0px";
   document.querySelector('#sysIco').onclick = function () {
     hideLauPad();
   };
@@ -116,7 +121,11 @@ function showLauPad() {
 
 function hideLauPad() {
   methods.hideElementByFade('#laupad');
-  document.querySelector('#dock_time').style.bottom = '0px';
+  document.querySelector('#dock_time').style.bottom = '25px';
+  document.querySelector('#dock_time').style.left = '221.2065px';
+  document.querySelector('#dock_time').style.width = '53.85%';
+  document.querySelector('#dock_time').style.borderBottomLeftRadius = "25px";
+  document.querySelector('#dock_time').style.borderBottomRightRadius = "25px";
   document.querySelector('#sysIco').onclick = function () {
     showLauPad();
   };
@@ -540,7 +549,7 @@ document.querySelector('#terminalButton').onclick = function () {
  *
  * By `Leng Yi Bai`
  *
- * @param str 'String'
+ * @param str {String}
  */
 
 function displayMessage(str) {
diff --git a/main.js b/main.js
index 6c80d50..235c3c1 100644
--- a/main.js
+++ b/main.js
@@ -29,6 +29,8 @@ function createWindow() {
 
 	mainWindow.loadFile("./app/index.html");
 
+	console.log(app.getVersion());
+
 	/*const template = [
 		{
 			label: "Settings",