fix: https://community.nssurge.com/d/2037-nginx-web-dashboard-v201

geekdada · Sep 19, 2023 · 745dbd9 · 745dbd9
1 parent c2fe047
commit 745dbd9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/components/PageLayout/index.tsx b/src/components/PageLayout/index.tsx
@@ -15,8 +15,8 @@ const PageLayout: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({
       )}
       {...props}
     >
-      <div className="relative max-w-4xl w-full bg-background">
-        <div className="border-l border-r border-gray-200 dark:border-gray-800">
+      <div className="flex flex-1 relative max-w-4xl w-full bg-background">
+        <div className="w-full border-l border-r border-gray-200 dark:border-gray-800">
           {children}
         </div>
       </div>

diff --git a/src/pages/Landing/Regular.tsx b/src/pages/Landing/Regular.tsx
@@ -97,7 +97,7 @@ const Page: React.FC = () => {
 
       const surgeHost = getSurgeHost()
       const protocol = data.useTls ? 'https:' : 'http:'
-      let newProfile: any
+      let newProfile
 
       try {
         const res = await tryHost(protocol, data.host, data.port, data.key)

diff --git a/src/pages/Landing/utils.ts b/src/pages/Landing/utils.ts
@@ -50,15 +50,21 @@ export const getSurgeHost = (): {
   hostname: string
   port: string
 } => {
-  const protocol = window.location.protocol
+  if (process.env.NODE_ENV !== 'production') {
+    const protocol = window.location.protocol
+    const port = window.location.port
+      ? window.location.port
+      : protocol === 'https:'
+      ? '443'
+      : '80'
 
-  if (process.env.NODE_ENV === 'production') {
     return {
       protocol,
       hostname: window.location.hostname,
-      port: window.location.port,
+      port,
     }
   }
+
   return {
     protocol: process.env.REACT_APP_PROTOCOL as string,
     hostname: process.env.REACT_APP_HOST as string,