Steven Fukase 4 лет назад
Родитель
Сommit
307037b10d

+ 2 - 2
config/env.dev.js

@@ -22,6 +22,6 @@ module.exports = {
   // DEV_HTTPS: true,
   // FORCE_WIKI_MODE: 'private', // 'public', 'private', undefined
   // PROMSTER_ENABLED: true,
-  GROWI_CLOUD_URI: 'http://growi.cloud',
-  GROWI_APP_ID_FOR_GROWI_CLOUD: 'demo',
+  // GROWI_CLOUD_URI: 'http://growi.cloud',
+  // GROWI_APP_ID_FOR_GROWI_CLOUD: '012345',
 };

+ 1 - 1
resource/locales/en_US/translation.json

@@ -788,7 +788,7 @@
     "rebuild_description_1": "Click the button to rebuild index and add all page datas.",
     "rebuild_description_2": "This may take a while."
   },
-  "to_cloud_settings": "Open GROWI.Cloud Settings",
+  "to_cloud_settings": "Open GROWI.cloud Settings",
   "login": {
     "Sign in error": "Login error",
     "Registration successful": "Registration successful",

+ 6 - 11
src/client/js/components/Admin/Common/AdminNavigation.jsx

@@ -55,17 +55,9 @@ const AdminNavigation = (props) => {
       ? 'list-group-item list-group-item-action border-0 round-corner'
       : 'dropdown-item px-3 py-2';
 
-    let link = urljoin('/admin', menu);
-    if (isRoot) {
-      link = '/admin';
-    }
-    if (menu === 'cloud') {
-      link = `${adminHomeContainer.state.envVars?.GROWI_CLOUD_URI}/my/apps/${adminHomeContainer.state.envVars?.GROWI_APP_ID_FOR_GROWI_CLOUD}`;
-    }
-
     return (
       <a
-        href={link}
+        href={isRoot ? '/admin' : urljoin('/admin', menu)}
         className={`${pageTransitionClassName} ${isActive ? 'active' : ''}`}
       >
         <MenuLabel menu={menu} />
@@ -93,8 +85,11 @@ const AdminNavigation = (props) => {
         <MenuLink menu="search"       isListGroupItems isActive={isActiveMenu('/search')} />
         {adminHomeContainer.state.envVars?.GROWI_CLOUD_URI != null
           && adminHomeContainer.state.envVars?.GROWI_APP_ID_FOR_GROWI_CLOUD != null
-          && <MenuLink menu="cloud" isListGroupItems />
-        }
+          && (
+            <a href={`${adminHomeContainer.state.envVars?.GROWI_CLOUD_URI}/my/apps/${adminHomeContainer.state.envVars?.GROWI_APP_ID_FOR_GROWI_CLOUD}`}>
+              <MenuLabel menu="cloud" />
+            </a>
+          )}
       </>
     );
   };