From ae23f756eaa6e5adcfa178d4fc4b793419c848e1 Mon Sep 17 00:00:00 2001
From: sanjayk03-dev <imsanjay003@gmail.com>
Date: Wed, 28 Aug 2024 13:31:32 +0530
Subject: [PATCH] fixing get time

---
 src/js/admin-general-view.js             | 26 ++++++++++++++++++++++--
 src/pug/templates/admin-general-view.pug |  2 +-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/js/admin-general-view.js b/src/js/admin-general-view.js
index 5fbd109..a26c899 100644
--- a/src/js/admin-general-view.js
+++ b/src/js/admin-general-view.js
@@ -39,7 +39,6 @@ module.exports = {
       z_slider: false,
       z_slider_variant: " ",
       config: "",
-      current_date_time: `${new Date()}`.split(" ").slice(1, 5).join(" "),
       selected_date: null,
       selected_hours: `${new Date().getHours()}`,
       selected_minutes: `${new Date().getMinutes()}`,
@@ -50,6 +49,22 @@ module.exports = {
     this.autoCheckUpgrade = this.config.admin["auto-check-upgrade"];
   },
 
+  computed: {
+    get_current_time: async function () {
+      try {
+        const response = await api.get("time");
+        if (response.timeinfo) {
+          const { timeinfo } = response;
+          return timeinfo.split(": ")[1].split(" U")[0];
+        } else {
+          return " ";
+        }
+      } catch (error) {
+        console.error(error);
+      }
+    },
+  },
+
   methods: {
     backup: function () {
       document.getElementById("download-target").src =
@@ -153,6 +168,14 @@ module.exports = {
       if (!this.selected_date || !this.selected_hours || !this.selected_minutes) {
         return;
       }
+      if (
+        this.selected_hours < 0 ||
+        this.selected_hours > 23 ||
+        this.selected_minutes < 0 ||
+        this.selected_minutes > 59
+      ) {
+        return alert("Invalid Time");
+      }
       try {
         const datetime = `${this.selected_date} ${this.selected_hours
           .toString()
@@ -161,7 +184,6 @@ module.exports = {
 
         if (response == "ok") {
           alert("Date/Time updated successfully.");
-          this.current_date_time = `${new Date()}`.split(" ").slice(1, 5).join(" ");
         } else {
           throw response;
         }
diff --git a/src/pug/templates/admin-general-view.pug b/src/pug/templates/admin-general-view.pug
index cea3b29..27f25d4 100644
--- a/src/pug/templates/admin-general-view.pug
+++ b/src/pug/templates/admin-general-view.pug
@@ -67,7 +67,7 @@ script#admin-general-view-template(type="text/x-template")
     h2 Date/Time
     p
       strong Current Date/Time: 
-      |  {{current_date_time}}
+      |  {{get_current_time}}
     .pure-form
       input(id="date" type="date" v-model="selected_date")
       input(id="hours" type="number" v-model="selected_hours" placeholder="HH" maxlength="2" min="0" max="23" style="width:45px")