From 836035eee664051a1e5a9f9c1a7be61293ddcae3 Mon Sep 17 00:00:00 2001
From: "Darren.NET" <Darren.Net@hotmail.com>
Date: Wed, 16 Nov 2022 15:16:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=BD=89=E5=9D=80=20for?=
 =?UTF-8?q?=20Niagara4=20=20js=20=E7=A7=BB=E5=88=B0=20/js/init.js=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/index.html | 12 +-----------
 Frontend/js/init.js | 12 +++++++++++-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Frontend/index.html b/Frontend/index.html
index d807777..ade6287 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -2064,17 +2064,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
     <script src="js/style.js"></script>
     <script src="js/site.js"></script>
     <script src="js/init.js"></script>
-    <script>
-
-        //重新轉址 for Niagara4
-        var temp_cuurent_Url_pathname = window.location.pathname.split("/").slice(0, 3);
-        var redirectionUrl = window.location.origin + "/" +
-            temp_cuurent_Url_pathname[temp_cuurent_Url_pathname.length - 1].replace(":%5E", "/") + "/" +
-            window.location.pathname.split("/").slice(3).join("/");
-        //判斷url是否包含"ord"，如果有重新轉址
-        if (temp_cuurent_Url_pathname.findIndex(x => x == "ord") > -1) {
-            document.location.href = redirectionUrl.substr(0, redirectionUrl.length - 1);
-        }
+    <script>       
 
         var jwt = localStorage.getItem("JWT-Authorization");
         var pageAct = {};  //記錄全頁面已選擇項目
diff --git a/Frontend/js/init.js b/Frontend/js/init.js
index c53c427..0cfa7bb 100644
--- a/Frontend/js/init.js
+++ b/Frontend/js/init.js
@@ -6,4 +6,14 @@ var varApiUrl = "/api/";  //API路徑
 var varPathImg = "/Upload/Images/";
 var varPathFile = "/Upload/Files/";
 var statusArr = { 1: "啟用", 0: "未啟用", 9: "刪除" };
-var objSendData = { Data: null };
\ No newline at end of file
+var objSendData = { Data: null };
+
+//重新轉址 for Niagara4
+var temp_cuurent_Url_pathname = window.location.pathname.split("/").slice(0, 3);
+var redirectionUrl = window.location.origin + "/" +
+    temp_cuurent_Url_pathname[temp_cuurent_Url_pathname.length - 1].replace(":%5E", "/") + "/" +
+    window.location.pathname.split("/").slice(3).join("/");
+//判斷url是否包含"ord"，如果有重新轉址
+if (temp_cuurent_Url_pathname.findIndex(x => x == "ord") > -1) {
+    document.location.href = redirectionUrl.substr(0, redirectionUrl.length - 1);
+}
\ No newline at end of file

From 925c5d72409ee12081c51b6e8348368c1eaad00f Mon Sep 17 00:00:00 2001
From: "Darren.NET" <Darren.Net@hotmail.com>
Date: Wed, 16 Nov 2022 16:30:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?/login.html=20=E4=BF=AE=E6=94=B9=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4=20=E9=83=A8=E5=88=86js=20link=E8=88=87=E5=9C=96?=
 =?UTF-8?q?=E6=AA=94=E8=B7=AF=E5=BE=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/login.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Frontend/login.html b/Frontend/login.html
index 69bfebf..0a0456b 100644
--- a/Frontend/login.html
+++ b/Frontend/login.html
@@ -27,7 +27,7 @@
     <div class="blankpage-form-field">
         <div class="page-logo m-0 w-100 align-items-center justify-content-center rounded border-bottom-left-radius-0 border-bottom-right-radius-0 px-4">
             <div class="page-logo-link press-scale-down d-flex align-items-center">
-                <img src="/img/logo.png" aria-roledescription="logo">
+                <img src="img/logo.png" aria-roledescription="logo">
                 <span class="page-logo-text mr-1">全方位監控系統</span>
             </div>
         </div>
@@ -70,8 +70,8 @@
     </video>
     <!--Base JS-->
     <script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js'></script>
-    <script src="lib//vendors.bundle.js"></script>
-    <script src="lib//app.bundle.js"></script>
+    <script src="lib/vendors.bundle.js"></script>
+    <script src="lib/app.bundle.js"></script>
     <!-- JQuery Validate -->
     <script src="lib/jquery-validation/dist/jquery.validate.js"></script>
     <script src="lib/jquery-validation/dist/additional-methods.min.js"></script>