From af610d8ddddf60b4b41a1c20d2ff243b9e6a68c6 Mon Sep 17 00:00:00 2001
From: Jenny <jenny@dynamsoft.com>
Date: Tue, 15 Aug 2023 13:27:06 +0800
Subject: [PATCH 1/3] 404 pages redirect

---
 _layouts/default-layout.html |  9 +++++++--
 web.config                   | 14 +++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/_layouts/default-layout.html b/_layouts/default-layout.html
index 7b669535..1cb6f223 100644
--- a/_layouts/default-layout.html
+++ b/_layouts/default-layout.html
@@ -41,8 +41,9 @@
                 </div>
                 <div class="main row showRightSideMenu" id="articleContent" data-needh3="{{page.needGenerateH3Content}}">
                     <div class="content markdown-body headCounter {{noTitleIndex}} col-xs-12 col-md-12 col-lg-9 col-xl-10 showRightSideMenu">
-                        {{ content }}
+                        <div class="pageNoteFoundNote" style="display: none; background-color: #fffbe6; border: 1px solid #ffe58f; padding: 8px 20px; margin-top: 5px;"></div>
 
+                        {{ content }}
                     </div>
                     <div class="rightSideMenu col-xs-12 col-md-12 col-lg-3 col-xl-2  hide-md hide-sm hide-xs showRightSideMenu">
                         <div id="feedbackFooter" style="color: #306877;">
@@ -87,7 +88,11 @@
     </script>
 
     <script type="text/javascript">
-
+        var redirectType = getUrlVars(document.URL)["redirect"]
+        if (redirectType != undefined && redirectType == '404') {
+            $(".pageNoteFoundNote").html(`Page not found. Please browse the sidebar to see if you can find the information you're looking for, or contact <a href="mailto:support@dynamsoft.com">support@dynamsoft.com</a> for assistance.`)
+            $(".pageNoteFoundNote").show()
+        }
         $('#txtSearch').keydown(function(e) {
             if (e.keyCode == 13) {
                 window.location.href = '/web-twain/docs/search.html?q=' + $('#txtSearch').val()
diff --git a/web.config b/web.config
index c48481c9..9652d26e 100644
--- a/web.config
+++ b/web.config
@@ -24,36 +24,40 @@
           </conditions>
         </rule>
         
-        <rule name="Redirect rule30 for redirect dnt/kb pages" enabled="true" patternSyntax="ECMAScript">
+        <rule name="Redirect rule30 for redirect dnt/kb pages" enabled="true" patternSyntax="ECMAScript" stopProcessing="true">
           <match url="indepth/troubleshooting/common-errors/activating-the-WebTwain-instance.html" ignoreCase="true" negate="false" />
           <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
             <action type="Redirect" url="https://www.dynamsoft.com/web-twain/docs/indepth/faqs/troubleshooting/activating-the-WebTwain-instance-prompt-doesnt-disappear.html?ver=latest" appendQueryString="false" logRewrittenUrl="false" />
         </rule>
 
-        <rule name="Redirect /indepth/faqs/distribution/How-to-set-the-MIME-type.html" enabled="true" patternSyntax="ECMAScript">
+        <rule name="Redirect /indepth/faqs/distribution/How-to-set-the-MIME-type.html" enabled="true" patternSyntax="ECMAScript" stopProcessing="true">
           <match url="indepth/faqs/distribution/How-to-set-the-MIME-type.html" ignoreCase="true" negate="false" />
           <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
           <action type="Redirect" url="https://www.dynamsoft.com/web-twain/docs/indepth/deployment/server.html#make-sure-the-static-files-can-be-served-correctly" appendQueryString="false" logRewrittenUrl="false" />
         </rule>
         
-        <rule name="Redirect rule59 - https://www.dynamsoft.com/web-twain/docs/about/faqs.html" enabled="true" patternSyntax="ECMAScript">
+        <rule name="Redirect rule59 - https://www.dynamsoft.com/web-twain/docs/about/faqs.html" enabled="true" patternSyntax="ECMAScript" stopProcessing="true">
           <match url="about/faqs.html" ignoreCase="true" negate="false" />
           <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
             <action type="Redirect" url="https://www.dynamsoft.com/web-twain/docs/indepth/faqs/?ver=latest" appendQueryString="false" logRewrittenUrl="false" />
         </rule>
 
-        <rule name="Redirect https://www.dynamsoft.com/web-twain/docs/faq/how-to-enable-remote-scan.html" enabled="true" patternSyntax="ECMAScript">
+        <rule name="Redirect https://www.dynamsoft.com/web-twain/docs/faq/how-to-enable-remote-scan.html" enabled="true" patternSyntax="ECMAScript" stopProcessing="true">
           <match url="faq/how-to-enable-remote-scan.html" ignoreCase="true" negate="false" />
           <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
             <action type="Redirect" url="https://www.dynamsoft.com/remote-scan/docs/introduction/" appendQueryString="false" logRewrittenUrl="false" />
         </rule>
 
-        <rule name="Redirect https://www.dynamsoft.com/web-twain/docs/faq/how-come-would-some-customers-need-local.dynamsoft.com.html" enabled="true" patternSyntax="ECMAScript">
+        <rule name="Redirect https://www.dynamsoft.com/web-twain/docs/faq/how-come-would-some-customers-need-local.dynamsoft.com.html" enabled="true" patternSyntax="ECMAScript" stopProcessing="true">
           <match url="faq/how-come-would-some-customers-need-local.dynamsoft.com.html" ignoreCase="true" negate="false" />
           <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
             <action type="Redirect" url="https://www.dynamsoft.com/web-twain/docs/faq/how-come-would-you-need-local.dynamsoft.com.html" appendQueryString="false" logRewrittenUrl="false" />
         </rule>
       </rules>
     </rewrite>
+    <httpErrors errorMode="DetailedLocalOnly" defaultResponseMode="File" >
+      <remove statusCode="404" />
+      <error statusCode="404" path="https://www.dynamsoft.com/web-twain/docs/about/?redirect=404" />
+    </httpErrors>
   </system.webServer>
 </configuration>

From 8a5e2edc50a353b1590f441fde4b9f1e9bf6dba0 Mon Sep 17 00:00:00 2001
From: Jenny <jenny@dynamsoft.com>
Date: Mon, 21 Aug 2023 09:18:59 +0800
Subject: [PATCH 2/3] update ftp deploy

---
 .github/workflows/full-site-build.yml | 3 +--
 .github/workflows/main.yml            | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/full-site-build.yml b/.github/workflows/full-site-build.yml
index e4693378..0acee142 100644
--- a/.github/workflows/full-site-build.yml
+++ b/.github/workflows/full-site-build.yml
@@ -33,7 +33,6 @@ jobs:
           cp -rfp ./web-twain-docs/* ./DWTDoc/
           cd Docs-Template-Repo-Preview && git pull && cd .. && cp -rfp ./Docs-Template-Repo-Preview/* ./DWTDoc/
           cd DWTDoc && bundle exec jekyll build
-          python3 /home/ubuntu/ftp.py /home/ubuntu/DWTDoc/_site/ ./www.dynamsoft.com/web-twain/docs/ prod
 
       - name: Sync files
         uses: SamKirkland/FTP-Deploy-Action@4.3.0
@@ -43,7 +42,7 @@ jobs:
           password: ${{ secrets.FTP_DYNAMSOFT_LOCAL_PASSWORD }}
           port: 21 
           local-dir: /home/ubuntu/DWTDoc/_site/
-          server-dir: /www.dynamsoft.com/web-twain/docs/core/       
+          server-dir: /www.dynamsoft.com/web-twain/docs/       
           
   Build-Preview:
     if: ${{ github.ref == 'refs/heads/preview' }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 678ea88f..08be30cd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,7 +36,6 @@ jobs:
           cd web-twain-docs && git pull && cd .. && cp -rfp ./web-twain-docs/* ./DWTDoc/
           cd Docs-Template-Repo-Preview && git pull && cd .. && cp -rfp ./Docs-Template-Repo-Preview/* ./DWTDoc/
           cd DWTDoc && bundle exec jekyll build --incremental
-          python3 /home/ubuntu/ftp.py /home/ubuntu/DWTDoc/_site/ ./www.dynamsoft.com/web-twain/docs/ prod
 
       - name: Sync files
         uses: SamKirkland/FTP-Deploy-Action@4.3.0
@@ -46,7 +45,7 @@ jobs:
           password: ${{ secrets.FTP_DYNAMSOFT_LOCAL_PASSWORD }}
           port: 21 
           local-dir: /home/ubuntu/DWTDoc/_site/
-          server-dir: /www.dynamsoft.com/web-twain/docs/core/
+          server-dir: /www.dynamsoft.com/web-twain/docs/
 
   Build-Preview:
     if: ${{ github.ref == 'refs/heads/preview' }}

From 5d3dd89c153a4757575cb6c67d814ad5d774300f Mon Sep 17 00:00:00 2001
From: Jenny <jenny@dynamsoft.com>
Date: Mon, 21 Aug 2023 09:26:48 +0800
Subject: [PATCH 3/3] Revert "404 pages redirect"

This reverts commit af610d8ddddf60b4b41a1c20d2ff243b9e6a68c6.
---
 _layouts/default-layout.html |  9 ++-------
 web.config                   | 14 +++++---------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/_layouts/default-layout.html b/_layouts/default-layout.html
index 1cb6f223..7b669535 100644
--- a/_layouts/default-layout.html
+++ b/_layouts/default-layout.html
@@ -41,9 +41,8 @@
                 </div>
                 <div class="main row showRightSideMenu" id="articleContent" data-needh3="{{page.needGenerateH3Content}}">
                     <div class="content markdown-body headCounter {{noTitleIndex}} col-xs-12 col-md-12 col-lg-9 col-xl-10 showRightSideMenu">
-                        <div class="pageNoteFoundNote" style="display: none; background-color: #fffbe6; border: 1px solid #ffe58f; padding: 8px 20px; margin-top: 5px;"></div>
-
                         {{ content }}
+
                     </div>
                     <div class="rightSideMenu col-xs-12 col-md-12 col-lg-3 col-xl-2  hide-md hide-sm hide-xs showRightSideMenu">
                         <div id="feedbackFooter" style="color: #306877;">
@@ -88,11 +87,7 @@
     </script>
 
     <script type="text/javascript">
-        var redirectType = getUrlVars(document.URL)["redirect"]
-        if (redirectType != undefined && redirectType == '404') {
-            $(".pageNoteFoundNote").html(`Page not found. Please browse the sidebar to see if you can find the information you're looking for, or contact <a href="mailto:support@dynamsoft.com">support@dynamsoft.com</a> for assistance.`)
-            $(".pageNoteFoundNote").show()
-        }
+
         $('#txtSearch').keydown(function(e) {
             if (e.keyCode == 13) {
                 window.location.href = '/web-twain/docs/search.html?q=' + $('#txtSearch').val()
diff --git a/web.config b/web.config
index 9652d26e..c48481c9 100644
--- a/web.config
+++ b/web.config
@@ -24,40 +24,36 @@
           </conditions>
         </rule>
         
-        <rule name="Redirect rule30 for redirect dnt/kb pages" enabled="true" patternSyntax="ECMAScript" stopProcessing="true">
+        <rule name="Redirect rule30 for redirect dnt/kb pages" enabled="true" patternSyntax="ECMAScript">
           <match url="indepth/troubleshooting/common-errors/activating-the-WebTwain-instance.html" ignoreCase="true" negate="false" />
           <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
             <action type="Redirect" url="https://www.dynamsoft.com/web-twain/docs/indepth/faqs/troubleshooting/activating-the-WebTwain-instance-prompt-doesnt-disappear.html?ver=latest" appendQueryString="false" logRewrittenUrl="false" />
         </rule>
 
-        <rule name="Redirect /indepth/faqs/distribution/How-to-set-the-MIME-type.html" enabled="true" patternSyntax="ECMAScript" stopProcessing="true">
+        <rule name="Redirect /indepth/faqs/distribution/How-to-set-the-MIME-type.html" enabled="true" patternSyntax="ECMAScript">
           <match url="indepth/faqs/distribution/How-to-set-the-MIME-type.html" ignoreCase="true" negate="false" />
           <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
           <action type="Redirect" url="https://www.dynamsoft.com/web-twain/docs/indepth/deployment/server.html#make-sure-the-static-files-can-be-served-correctly" appendQueryString="false" logRewrittenUrl="false" />
         </rule>
         
-        <rule name="Redirect rule59 - https://www.dynamsoft.com/web-twain/docs/about/faqs.html" enabled="true" patternSyntax="ECMAScript" stopProcessing="true">
+        <rule name="Redirect rule59 - https://www.dynamsoft.com/web-twain/docs/about/faqs.html" enabled="true" patternSyntax="ECMAScript">
           <match url="about/faqs.html" ignoreCase="true" negate="false" />
           <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
             <action type="Redirect" url="https://www.dynamsoft.com/web-twain/docs/indepth/faqs/?ver=latest" appendQueryString="false" logRewrittenUrl="false" />
         </rule>
 
-        <rule name="Redirect https://www.dynamsoft.com/web-twain/docs/faq/how-to-enable-remote-scan.html" enabled="true" patternSyntax="ECMAScript" stopProcessing="true">
+        <rule name="Redirect https://www.dynamsoft.com/web-twain/docs/faq/how-to-enable-remote-scan.html" enabled="true" patternSyntax="ECMAScript">
           <match url="faq/how-to-enable-remote-scan.html" ignoreCase="true" negate="false" />
           <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
             <action type="Redirect" url="https://www.dynamsoft.com/remote-scan/docs/introduction/" appendQueryString="false" logRewrittenUrl="false" />
         </rule>
 
-        <rule name="Redirect https://www.dynamsoft.com/web-twain/docs/faq/how-come-would-some-customers-need-local.dynamsoft.com.html" enabled="true" patternSyntax="ECMAScript" stopProcessing="true">
+        <rule name="Redirect https://www.dynamsoft.com/web-twain/docs/faq/how-come-would-some-customers-need-local.dynamsoft.com.html" enabled="true" patternSyntax="ECMAScript">
           <match url="faq/how-come-would-some-customers-need-local.dynamsoft.com.html" ignoreCase="true" negate="false" />
           <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
             <action type="Redirect" url="https://www.dynamsoft.com/web-twain/docs/faq/how-come-would-you-need-local.dynamsoft.com.html" appendQueryString="false" logRewrittenUrl="false" />
         </rule>
       </rules>
     </rewrite>
-    <httpErrors errorMode="DetailedLocalOnly" defaultResponseMode="File" >
-      <remove statusCode="404" />
-      <error statusCode="404" path="https://www.dynamsoft.com/web-twain/docs/about/?redirect=404" />
-    </httpErrors>
   </system.webServer>
 </configuration>