Просмотр исходного кода

Merge pull request #3675 from weseek/feat/GW-5768-with-proxy-integration-diagram-component

with proxy integration diagram component
Shun Miyazawa 5 лет назад
Родитель
Сommit
cfedc80bd7

+ 52 - 0
src/client/js/components/Admin/SlackIntegration/CustomBotWithProxyIntegrationCard.jsx

@@ -0,0 +1,52 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+const CustomBotWithProxyIntegrationCard = () => {
+
+  const { t } = useTranslation();
+
+  return (
+    <>
+
+      <div className="d-flex justify-content-center my-5 bot-integration">
+
+        <div className="card rounded shadow border-0 w-50 admin-bot-card">
+          <h5 className="card-title font-weight-bold mt-3 ml-4">Slack</h5>
+          <div className="card-body p-4"></div>
+        </div>
+
+        <div className="text-center w-25">
+          <small
+            className="text-secondary"
+            // eslint-disable-next-line react/no-danger
+            dangerouslySetInnerHTML={{ __html: t('admin:slack_integration.integration_sentence.integration_is_not_complete') }}
+          />
+          <div className="pt-2">
+            <div className="position-relative mt-5">
+              <div className="circle position-absolute bg-primary border-light">
+                <p className="circle-inner text-light font-weight-bold">Proxy Server</p>
+              </div>
+              <hr className="align-self-center admin-border-danger border-danger"></hr>
+            </div>
+          </div>
+        </div>
+
+        <div className="card rounded-lg shadow border-0 w-50 admin-bot-card">
+          <div className="row">
+            <h5 className="card-title font-weight-bold mt-3 ml-4 col">GROWI App</h5>
+            <div className="pull-right mt-3 mr-3">
+              <a className="icon-fw fa fa-repeat fa-2x"></a>
+            </div>
+          </div>
+          <div className="card-body p-4 mb-5 text-center">
+            <a className="btn btn-primary">WESEEK Inner Wiki</a>
+          </div>
+        </div>
+
+      </div>
+
+    </>
+  );
+};
+
+export default CustomBotWithProxyIntegrationCard;

+ 2 - 39
src/client/js/components/Admin/SlackIntegration/CustomBotWithProxySettings.jsx

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import AppContainer from '../../../services/AppContainer';
 import AdminAppContainer from '../../../services/AdminAppContainer';
 import { withUnstatedContainers } from '../../UnstatedUtils';
+import CustomBotWithProxyIntegrationCard from './CustomBotWithProxyIntegrationCard';
 
 const CustomBotWithProxySettings = (props) => {
   // eslint-disable-next-line no-unused-vars
@@ -16,50 +17,12 @@ const CustomBotWithProxySettings = (props) => {
       {/* TODO: GW-5768 */}
       <h2 className="admin-setting-header">{t('admin:slack_integration.custom_bot_with_proxy_integration')}</h2>
 
-      <div className="d-flex justify-content-center my-5 bot-integration">
-
-        <div className="card rounded shadow border-0 w-50 admin-bot-card mb-0">
-          <h5 className="card-title font-weight-bold mt-3 ml-4">Slack</h5>
-          <div className="card-body p-4"></div>
-        </div>
-
-        <div className="text-center w-25 mb-5">
-          <div className="mt-4">
-            <small
-              className="text-secondary m-0"
-              // eslint-disable-next-line react/no-danger
-              dangerouslySetInnerHTML={{ __html: t('admin:slack_integration.integration_sentence.integration_is_not_complete') }}
-            />
-            <div className="row m-0">
-              <hr className="border-danger align-self-center admin-border col"></hr>
-              <div className="circle text-center bg-primary border-light">
-                <p className="text-light font-weight-bold m-0 pt-3">Proxy</p>
-                <p className="text-light font-weight-bold">Server</p>
-              </div>
-              <hr className="border-danger align-self-center admin-border col"></hr>
-            </div>
-          </div>
-        </div>
-
-        <div className="card rounded-lg shadow border-0 w-50 admin-bot-card mb-0">
-          <div className="row m-0">
-            <h5 className="card-title font-weight-bold mt-3 ml-4 col">GROWI App</h5>
-            <div className="pull-right mt-3">
-              <a className="icon-fw fa fa-repeat fa-2x"></a>
-            </div>
-          </div>
-          <div className="card-body p-4 text-center">
-            <a className="btn btn-primary mt-3">WESEEK Inner Wiki</a>
-          </div>
-        </div>
-
-      </div>
+      <CustomBotWithProxyIntegrationCard />
 
     </>
   );
 };
 
-
 const CustomBotWithProxySettingsWrapper = withUnstatedContainers(CustomBotWithProxySettings, [AppContainer, AdminAppContainer]);
 
 CustomBotWithProxySettings.propTypes = {

+ 12 - 1
src/client/styles/scss/_admin.scss

@@ -131,11 +131,22 @@ $slack-work-space-name-card-border: #efc1f6;
       border-width: 3px;
     }
     .circle {
+      top: 50%;
+      left: 50%;
       width: 100px;
       height: 100px;
-      // background: #092c58;
       border: 13px solid;
       border-radius: 50%;
+      -webkit-transform: translate(-50%, -50%);
+      -ms-transform: translate(-50%, -50%);
+      transform: translate(-50%, -50%);
+    }
+    .circle-inner {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      -webkit-transform: translate(-50%, -50%);
+      transform: translate(-50%, -50%);
     }
     .slack-work-space-name-card {
       background-color: $slack-work-space-name-card-background;