feat: Merge branch 'testing'

Meta-Network · Dec 22, 2021 · 79fadfa · 79fadfa · vercel · Dec 22, 2021
2 parents 6ce7985 + e039805
commit 79fadfa
Show file tree

Hide file tree

Showing 35 changed files with 794 additions and 502 deletions.
diff --git a/config/index.ts b/config/index.ts
@@ -20,6 +20,6 @@ export const OSS_MATATAKI_FEUSE = 'https://ssimg.frontenduse.top';
 export const OSS_MATATAKI = 'https://smartsignature-img.oss-cn-hongkong.aliyuncs.com';
 
 // Gun Config
-export const GUN_PEERS = ['http://gun-manhattan.herokuapp.com/gun'];
+export const GUN_PEERS = ['https://gun-manhattan.herokuapp.com/gun'];
 export const KEY_GUN_ROOT = 'meta.io_v7';
 export const KEY_GUN_ROOT_DRAFT = 'cms_draft';
diff --git a/src/app.tsx b/src/app.tsx
@@ -15,6 +15,7 @@ import { queryCurrentUser, queryInvitations, refreshTokens } from './services/ap
 import type { SiderMenuProps } from '@ant-design/pro-layout/lib/components/SiderMenu/SiderMenu';
 import { getDefaultSiteConfigAPI } from './helpers/index';
 import { FetchPostsStorageParamsState } from './services/constants';
+import MenuFeedbackButton from './components/menu/MenuFeedbackButton';
 
 const { Text } = Typography;
 
@@ -195,6 +196,10 @@ export const layout: RunTimeLayoutConfig = ({ initialState }) => {
         history.push('/user/login');
       }
     },
-    links: [<MenuLanguageSwitch key="MenuLanguageSwitch" />, <MenuMoreInfo key="MenuMoreInfo" />],
+    links: [
+      <MenuLanguageSwitch key="MenuLanguageSwitch" />,
+      <MenuMoreInfo key="MenuMoreInfo" />,
+      <MenuFeedbackButton key="MenuFeedbackButton" />,
+    ],
   };
 };
diff --git a/src/components/Editor/index.tsx b/src/components/Editor/index.tsx
@@ -33,7 +33,12 @@ const Editor: React.FC<Props> = React.memo(function Editor({ asyncContentToDB })
   }, []);
 
   const init = useCallback(() => {
+    const _height =
+      window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
+
     const vditor = new Vditor('vditor', {
+      width: '100%',
+      height: _height - 206,
       cache: {
         enable: false,
       },

diff --git a/src/components/Guide/StoreSetting.tsx b/src/components/Guide/StoreSetting.tsx
@@ -56,8 +56,12 @@ export default () => {
       return Promise.resolve();
     };
   const updateRepoSettings = async (values: { storeRepo: string; publishRepo: string }) => {
-    setStoreSetting((prev) => ({ ...prev, repos: values }));
-    message.success(intl.formatMessage({ id: 'messages.store.setRepoName' }, values));
+    if (values.storeRepo !== values.publishRepo) {
+      setStoreSetting((prev) => ({ ...prev, repos: values }));
+      message.success(intl.formatMessage({ id: 'messages.store.setRepoName' }, values));
+    } else {
+      message.error(intl.formatMessage({ id: 'messages.store.form.sameRepoName' }, values));
+    }
   };
 
   return (

diff --git a/src/components/Icon/index.tsx b/src/components/Icon/index.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import Icon from '@ant-design/icons';
+
+const MatrixSvg = () => (
+  <svg
+    className="icon"
+    viewBox="0 0 1024 1024"
+    version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+    p-id="2475"
+  >
+    <path
+      fill="currentColor"
+      d="M691.8144 616.2432v108.544H161.5872l-18.432 15.9744-55.9104 48.3328V353.28h116.3264v-65.536H21.7088v644.9152l164.2496-142.336h571.392v-174.08h-65.536z"
+      p-id="2476"
+    />
+    <path
+      fill="currentColor"
+      d="M138.24 91.3408v590.4384h671.1296l192.9216 167.1168V91.3408H138.24z m798.5152 614.1952l-84.5824-73.3184-18.432-15.9744H203.776V156.8768h732.9792v548.6592z"
+      p-id="2477"
+    />
+    <path
+      fill="currentColor"
+      d="M365.7728 287.744h65.536v180.0192h-65.536zM691.8144 287.744h65.536v180.0192h-65.536z"
+      p-id="2478"
+    />
+  </svg>
+);
+export const MatrixIcon: React.FC = (props) => <Icon component={MatrixSvg} {...props} />;
+
+const TelegramSvg = () => (
+  <svg className="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <path d="M881.706667 158.592l-756.48 291.712c-51.626667 20.736-51.328 49.536-9.472 62.378667l194.218666 60.586666 449.365334-283.52c21.248-12.928 40.661333-5.973333 24.704 8.192l-364.074667 328.576h-0.085333l0.085333 0.042667-13.397333 200.192c19.626667 0 28.288-9.002667 39.296-19.626667l94.336-91.733333 196.224 144.938667c36.181333 19.925333 62.165333 9.685333 71.168-33.493334l128.810666-607.061333c13.184-52.864-20.181333-76.8-54.698666-61.184z" />
+  </svg>
+);
+export const TelegramIcon: React.FC<any> = (props) => <Icon component={TelegramSvg} {...props} />;
+
+const DiscordSvg = () => (
+  <svg
+    className="icon"
+    viewBox="0 0 1024 1024"
+    version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+    p-id="2969"
+  >
+    <path
+      d="M606.4 428.8c-28.8 0-52.8 25.6-52.8 57.6s24 57.6 52.8 57.6c28.8 0 52.8-25.6 52.8-57.6s-24-57.6-52.8-57.6zM419.2 428.8c-28.8 0-52.8 25.6-52.8 57.6s24 57.6 52.8 57.6c28.8 0 52.8-25.6 52.8-57.6s-24-57.6-52.8-57.6z"
+      p-id="2970"
+    />
+    <path
+      d="M854.4 0H169.6C110.4 0 64 46.4 64 105.6v692.8c0 57.6 46.4 105.6 105.6 105.6h580.8l-27.2-94.4 65.6 60.8 62.4 57.6 108.8 96V105.6C960 46.4 913.6 0 854.4 0zM657.6 668.8s-19.2-22.4-33.6-41.6c67.2-19.2 92.8-60.8 92.8-60.8-20.8 14.4-41.6 24-59.2 30.4-25.6 11.2-49.6 17.6-73.6 22.4-49.6 9.6-94.4 6.4-132.8 0-28.8-6.4-54.4-14.4-75.2-22.4-11.2-4.8-24-9.6-36.8-17.6-1.6-1.6-3.2-1.6-4.8-3.2-1.6 0-1.6-1.6-1.6-1.6-9.6-4.8-14.4-8-14.4-8s24 41.6 89.6 60.8c-16 19.2-33.6 43.2-33.6 43.2-113.6-3.2-156.8-78.4-156.8-78.4 0-164.8 73.6-299.2 73.6-299.2 73.6-56 144-54.4 144-54.4l4.8 6.4C347.2 272 304 312 304 312s11.2-6.4 30.4-14.4c54.4-24 97.6-30.4 116.8-32 3.2 0 6.4-1.6 8-1.6 32-4.8 67.2-4.8 104-1.6 48 6.4 100.8 19.2 153.6 49.6 0 0-40-38.4-128-65.6l6.4-8s70.4-1.6 144 54.4c0 0 73.6 134.4 73.6 299.2 1.6-1.6-41.6 73.6-155.2 76.8z"
+      p-id="2971"
+    />
+  </svg>
+);
+export const DiscordIcon: React.FC<any> = (props) => <Icon component={DiscordSvg} {...props} />;
+const MetaLogoSvg = () => (
+  <svg viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      d="M49.394 88.1062C72.7502 88.1062 91.6842 69.1722 91.6842 45.816C91.6842 22.4598 72.7502 3.52588 49.394 3.52588C26.0378 3.52588 7.10388 22.4598 7.10388 45.816C7.10388 69.1722 26.0378 88.1062 49.394 88.1062Z"
+      fill="white"
+    />
+    <path
+      fill="currentColor"
+      d="M49.9999 0C22.3857 0 0 22.3858 0 50C0 77.6143 22.3858 100 49.9999 100C77.6143 100 100 77.6143 100 50C100 22.3857 77.6143 0 49.9999 0ZM73.7947 64.8052C66.5275 75.5416 52.6565 80.4029 39.9203 75.7673C31.8547 72.8317 25.891 66.6844 22.9377 59.2958C22.4279 58.0205 23.6577 56.7345 24.9544 57.1886C31.117 59.3465 39.5324 61.1463 48.8966 62.1096C57.7716 63.0225 65.964 63.0256 72.3065 62.2929C73.6706 62.1355 74.5645 63.6679 73.7947 64.8052ZM85.2557 54.0063C80.3157 56.2153 65.3244 56.6576 49.7185 55.052C33.9936 53.4348 19.3188 49.9592 15.0316 46.7692C14.003 46.0039 13.4768 45.2473 13.5512 44.525C13.6975 43.1005 17.7006 42.1534 21.742 41.4678C21.9812 40.5236 22.2701 39.5821 22.6105 38.6469C28.0812 23.6162 44.7008 15.8664 59.7313 21.337C70.9851 25.4331 78.1561 35.779 78.7538 47.0285C83.2632 48.6474 87.4369 50.502 87.2764 52.0605C87.1997 52.8055 86.4873 53.4559 85.2557 54.0063Z"
+    />
+  </svg>
+);
+export const MetaLogoIcon: React.FC = (props) => <Icon component={MetaLogoSvg} {...props} />;
+
+const ElementSvg = () => (
+  <svg viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      fill="currentColor"
+      d="M64 0C28.656 0 0 28.656 0 64C0 99.344 28.656 128 64 128C99.344 128 128 99.344 128 64C128 28.656 99.344 0 64 0ZM56.992 25.1467C74.5333 25.1467 88.7573 39.3333 88.7573 56.8427C88.7573 58.086 88.2634 59.2784 87.3842 60.1576C86.5051 61.0368 85.3127 61.5307 84.0693 61.5307C82.826 61.5307 81.6336 61.0368 80.7544 60.1576C79.8752 59.2784 79.3813 58.086 79.3813 56.8427C79.3743 50.9112 77.0116 45.2255 72.8129 41.0358C68.6143 36.8461 62.9234 34.4957 56.992 34.5013C56.359 34.5316 55.7264 34.433 55.1326 34.2116C54.5388 33.9902 53.9961 33.6505 53.5374 33.2132C53.0787 32.7759 52.7135 32.25 52.464 31.6675C52.2146 31.0849 52.0859 30.4577 52.0859 29.824C52.0859 29.1903 52.2146 28.5631 52.464 27.9805C52.7135 27.398 53.0787 26.8721 53.5374 26.4348C53.9961 25.9975 54.5388 25.6578 55.1326 25.4364C55.7264 25.215 56.359 25.1164 56.992 25.1467ZM29.8347 75.8347C28.5932 75.8347 27.4024 75.3422 26.5235 74.4654C25.6447 73.5885 25.1495 72.3988 25.1467 71.1573C25.1502 66.9896 25.9746 62.8634 27.5729 59.0143C29.1713 55.1652 31.5121 51.6687 34.4619 48.7244C37.4116 45.7801 40.9125 43.4457 44.7645 41.8545C48.6165 40.2633 52.7443 39.4465 56.912 39.4507C58.1045 39.5205 59.2253 40.0434 60.0449 40.9124C60.8645 41.7814 61.3211 42.9308 61.3211 44.1253C61.3211 45.3199 60.8645 46.4693 60.0449 47.3383C59.2253 48.2073 58.1045 48.7302 56.912 48.8C50.9791 48.7958 45.2875 51.1481 41.0889 55.3398C36.8902 59.5315 34.5283 65.2191 34.5227 71.152C34.5198 72.394 34.0249 73.5842 33.1461 74.4619C32.2674 75.3396 31.0766 75.8333 29.8347 75.8347ZM71.088 102.859C53.5413 102.859 39.3173 88.6613 39.3173 71.1573C39.3748 69.9527 39.8938 68.8164 40.7667 67.9842C41.6396 67.1519 42.7993 66.6877 44.0053 66.6877C45.2114 66.6877 46.3711 67.1519 47.244 67.9842C48.1168 68.8164 48.6359 69.9527 48.6933 71.1573C48.6968 74.0947 49.2789 77.0027 50.4062 79.7152C51.5335 82.4276 53.1841 84.8915 55.2636 86.9661C57.3432 89.0407 59.811 90.6853 62.5261 91.8062C65.2413 92.9271 68.1506 93.5022 71.088 93.4987C71.7256 93.4614 72.3641 93.5548 72.9643 93.7731C73.5645 93.9914 74.1138 94.3301 74.5784 94.7683C75.0431 95.2066 75.4132 95.7351 75.6662 96.3216C75.9193 96.908 76.0498 97.54 76.0498 98.1787C76.0498 98.8174 75.9193 99.4493 75.6662 100.036C75.4132 100.622 75.0431 101.151 74.5784 101.589C74.1138 102.027 73.5645 102.366 72.9643 102.584C72.3641 102.803 71.7256 102.896 71.088 102.859ZM71.088 88.5493C69.8469 88.5493 68.6564 88.0578 67.7768 87.1822C66.8973 86.3067 66.4003 85.1184 66.3947 83.8773C66.3975 82.6344 66.8932 81.4434 67.7731 80.5655C68.6529 79.6877 69.8451 79.1947 71.088 79.1947C77.0209 79.2003 82.713 76.8493 86.9127 72.6586C91.1124 68.468 93.4756 62.7809 93.4827 56.848C93.4827 55.6047 93.9766 54.4123 94.8558 53.5331C95.7349 52.6539 96.9273 52.16 98.1707 52.16C99.414 52.16 100.606 52.6539 101.486 53.5331C102.365 54.4123 102.859 55.6047 102.859 56.848C102.859 74.352 88.6347 88.5493 71.088 88.5493Z"
+    />
+  </svg>
+);
+export const ElementIcon: React.FC = (props) => <Icon component={ElementSvg} {...props} />;
diff --git a/src/components/menu/MenuFeedbackButton/index.tsx b/src/components/menu/MenuFeedbackButton/index.tsx
@@ -0,0 +1,18 @@
+import { MatrixIcon } from '../../Icon/index';
+import { Tooltip } from 'antd';
+
+const feedbackLink = 'https://forms.gle/1HAZ8puQ9vhBSqMGA';
+
+export default () => {
+  return (
+    <div
+      onClick={() => {
+        window.open(feedbackLink, '_blank');
+      }}
+    >
+      <Tooltip placement="right" title="Feedback">
+        <MatrixIcon />
+      </Tooltip>
+    </div>
+  );
+};
diff --git a/src/components/menu/MenuLanguageSwitch/index.tsx b/src/components/menu/MenuLanguageSwitch/index.tsx
@@ -1,7 +1,8 @@
+import { setLocale } from 'umi';
+import { useState } from 'react';
 import { GlobalOutlined } from '@ant-design/icons';
 import { Dropdown, Menu, Typography } from 'antd';
 import style from './index.less';
-import { setLocale } from 'umi';
 
 const languages = [
   {
@@ -29,13 +30,25 @@ const menu = (
   </Menu>
 );
 
-export default () => (
-  <Dropdown
-    overlay={menu}
-    placement="topLeft"
-    overlayClassName={style.menuLanguageSwitch}
-    trigger={['click']}
-  >
-    <GlobalOutlined />
-  </Dropdown>
-);
+export default () => {
+  const [visible, setVisible] = useState(false);
+
+  return (
+    <div
+      onClick={() => {
+        setVisible((v) => !v);
+        return;
+      }}
+    >
+      <Dropdown
+        overlay={menu}
+        placement="topLeft"
+        visible={visible}
+        onVisibleChange={(isVisible) => setVisible(isVisible)}
+        overlayClassName={style.menuLanguageSwitch}
+      >
+        <GlobalOutlined />
+      </Dropdown>
+    </div>
+  );
+};