Merge pull request #1896 from thematters/stage

Release: v3.20.1
thematters · Mar 11, 2021 · 3cf0884 · 3cf0884
2 parents 4207e86 + 400db17
commit 3cf0884
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 253 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matters-web",
-  "version": "3.20.0",
+  "version": "3.20.1",
   "description": "codebase of Matters' website",
   "sideEffects": false,
   "author": "Matters <[email protected]>",

diff --git a/public/static/images/circle-cover-bottom-left.svg b/public/static/images/circle-cover-bottom-left.svg
diff --git a/public/static/images/circle-cover-inner.svg b/public/static/images/circle-cover-inner.svg
diff --git a/public/static/images/circle-cover-mask.svg b/public/static/images/circle-cover-mask.svg
diff --git a/public/static/images/circle-cover-top-left.svg b/public/static/images/circle-cover-top-left.svg
diff --git a/public/static/images/circle-cover-top-right.svg b/public/static/images/circle-cover-top-right.svg
diff --git a/src/common/enums/errorCode.ts b/src/common/enums/errorCode.ts
@@ -52,6 +52,7 @@ export const ERROR_CODES = {
 
   // Circle
   DUPLICATE_CIRCLE: 'DUPLICATE_CIRCLE',
+  DUPLICATE_CIRCLE_SUBSCRIPTION: 'DUPLICATE_CIRCLE_SUBSCRIPTION',
 
   // Verification Code
   CODE_INVALID: 'CODE_INVALID',

diff --git a/src/common/enums/text.ts b/src/common/enums/text.ts
@@ -78,6 +78,7 @@ export const TEXT = {
     DRAFT_NOT_FOUND: '草稿不存在',
     draft: '草稿',
     DUPLICATE_CIRCLE: '圍爐名稱已被使用',
+    DUPLICATE_CIRCLE_SUBSCRIPTION: '無法重複訂閱此圍爐',
     DUPLICATE_TAG: '標籤名稱已被使用',
     edit: '編輯',
     editArticle: '修訂作品',
@@ -397,6 +398,7 @@ export const TEXT = {
     DRAFT_NOT_FOUND: '草稿不存在',
     draft: '草稿',
     DUPLICATE_CIRCLE: '围炉名称已被使用',
+    DUPLICATE_CIRCLE_SUBSCRIPTION: '无法重复订阅此围炉',
     DUPLICATE_TAG: '标签名称已被使用',
     edit: '编辑',
     editArticle: '修订作品',
@@ -722,6 +724,7 @@ export const TEXT = {
     DRAFT_NOT_FOUND: 'Draft not found',
     draft: 'Draft',
     DUPLICATE_CIRCLE: 'Circle is subscribed or already exists.',
+    DUPLICATE_CIRCLE_SUBSCRIPTION: 'Already subscribed this circle.',
     DUPLICATE_TAG: 'The tag name is already in use.',
     edit: 'Edit',
     editArticle: 'Edit',

diff --git a/src/common/styles/variables/z-index.css b/src/common/styles/variables/z-index.css
@@ -9,6 +9,7 @@
   --z-index-sticky-tabs: 110;
 
   /* bottom bar */
+  --z-index-global-bottom-bar: 149;
   --z-index-bottom-bar: 150;
   --z-index-over-bottom-bar: 151;
 

diff --git a/src/components/CircleCover/index.tsx b/src/components/CircleCover/index.tsx
diff --git a/src/components/CircleCover/styles.css b/src/components/CircleCover/styles.css
diff --git a/src/components/FileUploader/CoverUploader/index.tsx b/src/components/FileUploader/CoverUploader/index.tsx
@@ -3,7 +3,6 @@ import { useState } from 'react'
 
 import {
   Button,
-  CircleCover,
   Cover,
   CoverProps,
   IconCamera24,
@@ -170,13 +169,9 @@ export const CoverUploader = ({
         </Cover>
       )}
       {isCircle && (
-        <CircleCover
-          cover={cover}
-          fallbackCover={fallbackCover}
-          inEditor={inEditor}
-        >
+        <Cover cover={cover} fallbackCover={fallbackCover} inEditor={inEditor}>
           <Mask />
-        </CircleCover>
+        </Cover>
       )}
 
       <VisuallyHidden>

diff --git a/src/components/Layout/NavBar/styles.css b/src/components/Layout/NavBar/styles.css
@@ -6,7 +6,7 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: var(--z-index-bottom-bar);
+  z-index: var(--z-index-global-bottom-bar);
   min-height: var(--global-nav-height);
   padding: var(--spacing-base) var(--spacing-x-loose);
   background: var(--color-white);

diff --git a/src/components/Root/index.tsx b/src/components/Root/index.tsx
@@ -113,7 +113,7 @@ const Root = ({
       })
 
       // timeout to mark private fetched as true
-      await sleep(1000)
+      await sleep(2000)
       if (!privateFetched) {
         setPrivateFetched(true)
       }

diff --git a/src/components/index.tsx b/src/components/index.tsx
@@ -30,7 +30,6 @@ export * from './PullToRefresh'
 export * from './Avatar'
 export * from './CircleAvatar'
 export * from './Cover'
-export * from './CircleCover'
 
 /**
  * Compositions