From 1ac929fb82154554f30b00d875b8d234b7ebcc98 Mon Sep 17 00:00:00 2001
From: Moe Alam <github@m03.ca>
Date: Sun, 7 Feb 2021 13:46:23 -0800
Subject: [PATCH] disable old admin page

---
 libs/webServerPaths.js | 53 +++---------------------------------------
 web/pages/home.ejs     | 11 +++++++++
 2 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/libs/webServerPaths.js b/libs/webServerPaths.js
index 941e2ba4..1e7b1fd4 100644
--- a/libs/webServerPaths.js
+++ b/libs/webServerPaths.js
@@ -171,9 +171,9 @@ module.exports = function(s,config,lang,app,io){
                 return false
             }
             switch(true){
-                case search(config.webPaths.admin):
-                    return 'admin'
-                break;
+                // case search(config.webPaths.admin):
+                //     return 'admin'
+                // break;
                 case search(config.webPaths.super):
                     return 'super'
                 break;
@@ -321,53 +321,6 @@ module.exports = function(s,config,lang,app,io){
                     })
                 break;
                 case'admin':
-                    if(!r.details.sub){
-                        s.knexQuery({
-                            action: "select",
-                            columns: "uid,mail,details",
-                            table: "Users",
-                            where: [
-                                ['ke','=',r.ke],
-                                ['details','LIKE','%"sub"%'],
-                            ]
-                        },(err,rr) => {
-                            s.knexQuery({
-                                action: "select",
-                                columns: "*",
-                                table: "Monitors",
-                                where: [
-                                    ['ke','=',r.ke],
-                                ]
-                            },(err,rrr) => {
-                                renderPage(config.renderPaths.admin,{
-                                    config: s.getConfigWithBranding(req.hostname),
-                                    $user: response,
-                                    $subs: rr,
-                                    $mons: rrr,
-                                    lang: r.lang,
-                                    define: s.getDefinitonFile(r.details.lang),
-                                    customAutoLoad: s.customAutoLoadTree
-                                })
-                            })
-                        })
-                    }else{
-                        //not admin user
-                        var chosenRender = 'home'
-                        if(r.details.landing_page && r.details.landing_page !== '' && config.renderPaths[r.details.landing_page]){
-                            chosenRender = r.details.landing_page
-                        }
-                        renderPage(config.renderPaths[chosenRender],{
-                            $user:response,
-                            config: s.getConfigWithBranding(req.hostname),
-                            lang:r.lang,
-                            define:s.getDefinitonFile(r.details.lang),
-                            addStorage:s.dir.addStorage,
-                            fs:fs,
-                            __dirname:s.mainDirectory,
-                            customAutoLoad: s.customAutoLoadTree
-                        });
-                    }
-                break;
                 default:
                     var chosenRender = 'home'
                     if(r.details.sub && r.details.landing_page && r.details.landing_page !== '' && config.renderPaths[r.details.landing_page]){
diff --git a/web/pages/home.ejs b/web/pages/home.ejs
index e7beaf18..72898070 100644
--- a/web/pages/home.ejs
+++ b/web/pages/home.ejs
@@ -239,3 +239,14 @@
 <% } %>
 
 <% include blocks/onvifDeviceManager.ejs %>
+<%
+    if(!details.sub){ %>
+        <script>
+            $(document).ready(function(){
+                if(`${location.pathname}/` === `<%=config.webPaths.adminApiPrefix%>`){
+                    $('#subAccountManager').modal('show')
+                }
+            })
+        </script>
+    <% }
+%>