Merge pull request #4922 from thematters/develop

Release: v5.6.5
thematters · Oct 29, 2024 · 5e3e4f0 · 5e3e4f0
2 parents ceaf97f + f1103f0
commit 5e3e4f0
Show file tree

Hide file tree

Showing 30 changed files with 509 additions and 114 deletions.
diff --git a/lang/default.json b/lang/default.json
@@ -440,6 +440,9 @@
     "defaultMessage": "liked your deleted moment",
     "description": "src/components/Notice/MomentNotice/MomentLiked.tsx"
   },
+  "5SgH7l": {
+    "defaultMessage": "The article has been added to the Featured"
+  },
   "5UglrB": {
     "defaultMessage": "Successfully delivered"
   },
@@ -1341,9 +1344,6 @@
     "defaultMessage": "Topics",
     "description": "src/components/Dialogs/TagListDialog/index.tsx"
   },
-  "KkHQZ+": {
-    "defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information. (Application confirmation usually takes a few minutes for review. Your avatar will then appear among the writers.)"
-  },
   "KlJEP9": {
     "defaultMessage": "Wallet connected",
     "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
@@ -1659,6 +1659,9 @@
   "Q8Qw5B": {
     "defaultMessage": "Description"
   },
+  "QFCfA7": {
+    "defaultMessage": "Add featured on Free Write"
+  },
   "QQSdHP": {
     "defaultMessage": "View More"
   },
@@ -1731,6 +1734,10 @@
   "Rc4Oij": {
     "defaultMessage": "Firebolt"
   },
+  "RkyEBL": {
+    "defaultMessage": "Featured",
+    "description": "src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx"
+  },
   "RnKPVm": {
     "defaultMessage": "{articleCount} articles"
   },
@@ -2168,6 +2175,9 @@
   "ZEMcZ6": {
     "defaultMessage": "Article Management"
   },
+  "ZN1IzT": {
+    "defaultMessage": "Remove featured from Free Write"
+  },
   "ZNK0I9": {
     "defaultMessage": "liked your comment"
   },
@@ -2669,6 +2679,9 @@
     "defaultMessage": "Reviewing...",
     "description": "type:apply"
   },
+  "jXDxa6": {
+    "defaultMessage": "The article has been removed from the Featured"
+  },
   "jiB0Z2": {
     "defaultMessage": "Unable to bind wallet",
     "description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
@@ -2760,6 +2773,9 @@
     "defaultMessage": "Last step: Set Matters ID",
     "description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
   },
+  "l0tvVM": {
+    "defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information."
+  },
   "l2eEyp": {
     "defaultMessage": "Transaction Password successfully changed."
   },
@@ -2813,6 +2829,10 @@
   "ll/ufR": {
     "defaultMessage": "Trending"
   },
+  "lo8eLY": {
+    "defaultMessage": "Your article {articleTitle} has been listed as a feature of Free Write in 7 days. Come and view more wonderful articles!",
+    "description": "src/components/Notice/CampaignArticleNotice/CampaignArticleFeaturedNotice.tsx"
+  },
   "lqdpsm": {
     "defaultMessage": "Back to subscribe"
   },

diff --git a/lang/en.json b/lang/en.json
@@ -440,6 +440,9 @@
     "defaultMessage": "liked your deleted moment",
     "description": "src/components/Notice/MomentNotice/MomentLiked.tsx"
   },
+  "5SgH7l": {
+    "defaultMessage": "The article has been added to the Featured"
+  },
   "5UglrB": {
     "defaultMessage": "Successfully delivered"
   },
@@ -1341,9 +1344,6 @@
     "defaultMessage": "Topics",
     "description": "src/components/Dialogs/TagListDialog/index.tsx"
   },
-  "KkHQZ+": {
-    "defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information. (Application confirmation usually takes a few minutes for review. Your avatar will then appear among the writers.)"
-  },
   "KlJEP9": {
     "defaultMessage": "Wallet connected",
     "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
@@ -1659,6 +1659,9 @@
   "Q8Qw5B": {
     "defaultMessage": "Description"
   },
+  "QFCfA7": {
+    "defaultMessage": "Add featured on Free Write"
+  },
   "QQSdHP": {
     "defaultMessage": "View More"
   },
@@ -1731,6 +1734,10 @@
   "Rc4Oij": {
     "defaultMessage": "Firebolt"
   },
+  "RkyEBL": {
+    "defaultMessage": "Featured",
+    "description": "src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx"
+  },
   "RnKPVm": {
     "defaultMessage": "{articleCount} articles"
   },
@@ -2168,6 +2175,9 @@
   "ZEMcZ6": {
     "defaultMessage": "Article Management"
   },
+  "ZN1IzT": {
+    "defaultMessage": "Remove featured from Free Write"
+  },
   "ZNK0I9": {
     "defaultMessage": "liked your comment"
   },
@@ -2669,6 +2679,9 @@
     "defaultMessage": "Reviewing...",
     "description": "type:apply"
   },
+  "jXDxa6": {
+    "defaultMessage": "The article has been removed from the Featured"
+  },
   "jiB0Z2": {
     "defaultMessage": "Unable to bind wallet",
     "description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
@@ -2760,6 +2773,9 @@
     "defaultMessage": "Last step: Set Matters ID",
     "description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
   },
+  "l0tvVM": {
+    "defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information."
+  },
   "l2eEyp": {
     "defaultMessage": "Transaction Password successfully changed."
   },
@@ -2813,6 +2829,10 @@
   "ll/ufR": {
     "defaultMessage": "Trending"
   },
+  "lo8eLY": {
+    "defaultMessage": "Your article {articleTitle} has been listed as a feature of Free Write in 7 days. Come and view more wonderful articles!",
+    "description": "src/components/Notice/CampaignArticleNotice/CampaignArticleFeaturedNotice.tsx"
+  },
   "lqdpsm": {
     "defaultMessage": "Back to subscribe"
   },

diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
@@ -440,6 +440,9 @@
     "defaultMessage": "喜欢你已删除的动态",
     "description": "src/components/Notice/MomentNotice/MomentLiked.tsx"
   },
+  "5SgH7l": {
+    "defaultMessage": "作品已添加至自由写精选"
+  },
   "5UglrB": {
     "defaultMessage": "送出成功"
   },
@@ -1341,9 +1344,6 @@
     "defaultMessage": "标签",
     "description": "src/components/Dialogs/TagListDialog/index.tsx"
   },
-  "KkHQZ+": {
-    "defaultMessage": "现在报名，写作之旅将于数天后开始，活动细则可查看公告。（报名确认通常需要几分钟审核时间，之后你的头像将出现在作者之中）"
-  },
   "KlJEP9": {
     "defaultMessage": "钱包已绑定",
     "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
@@ -1659,6 +1659,9 @@
   "Q8Qw5B": {
     "defaultMessage": "描述"
   },
+  "QFCfA7": {
+    "defaultMessage": "添加到自由写精选"
+  },
   "QQSdHP": {
     "defaultMessage": "查看更多"
   },
@@ -1731,6 +1734,10 @@
   "Rc4Oij": {
     "defaultMessage": "火闪电"
   },
+  "RkyEBL": {
+    "defaultMessage": "精华",
+    "description": "src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx"
+  },
   "RnKPVm": {
     "defaultMessage": "{articleCount} 篇文章"
   },
@@ -2168,6 +2175,9 @@
   "ZEMcZ6": {
     "defaultMessage": "作品管理"
   },
+  "ZN1IzT": {
+    "defaultMessage": "从自由写精华中移除"
+  },
   "ZNK0I9": {
     "defaultMessage": "喜欢你的评论"
   },
@@ -2669,6 +2679,9 @@
     "defaultMessage": "报名处理中⋯",
     "description": "type:apply"
   },
+  "jXDxa6": {
+    "defaultMessage": "作品已从自由写精华中移除"
+  },
   "jiB0Z2": {
     "defaultMessage": "无法绑定钱包",
     "description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
@@ -2760,6 +2773,9 @@
     "defaultMessage": "最后一步：设置 Matters ID",
     "description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
   },
+  "l0tvVM": {
+    "defaultMessage": "现在报名，写作之旅将于数天后开始，活动细则可查看公告。"
+  },
   "l2eEyp": {
     "defaultMessage": "交易密码重置成功"
   },
@@ -2813,6 +2829,10 @@
   "ll/ufR": {
     "defaultMessage": "热门"
   },
+  "lo8eLY": {
+    "defaultMessage": "你的作品 {articleTitle} 已被列为七日书精选之作，快来看看更多精彩好文！",
+    "description": "src/components/Notice/CampaignArticleNotice/CampaignArticleFeaturedNotice.tsx"
+  },
   "lqdpsm": {
     "defaultMessage": "回到订阅"
   },

diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
@@ -440,6 +440,9 @@
     "defaultMessage": "喜歡你已刪除的動態",
     "description": "src/components/Notice/MomentNotice/MomentLiked.tsx"
   },
+  "5SgH7l": {
+    "defaultMessage": "作品已添加至自由寫精華"
+  },
   "5UglrB": {
     "defaultMessage": "送出成功"
   },
@@ -1341,9 +1344,6 @@
     "defaultMessage": "標籤",
     "description": "src/components/Dialogs/TagListDialog/index.tsx"
   },
-  "KkHQZ+": {
-    "defaultMessage": "現在報名，寫作之旅將於數天後開始，活動細則可查看公告。（報名確認通常需要幾分鐘審核時間，之後你的頭像將出現在作者之中）"
-  },
   "KlJEP9": {
     "defaultMessage": "錢包已綁定",
     "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
@@ -1659,6 +1659,9 @@
   "Q8Qw5B": {
     "defaultMessage": "描述"
   },
+  "QFCfA7": {
+    "defaultMessage": "添加到自由寫精華"
+  },
   "QQSdHP": {
     "defaultMessage": "查看更多"
   },
@@ -1731,6 +1734,10 @@
   "Rc4Oij": {
     "defaultMessage": "火閃電"
   },
+  "RkyEBL": {
+    "defaultMessage": "精華",
+    "description": "src/views/CampaignDetail/ArticleFeeds/Tabs/index.tsx"
+  },
   "RnKPVm": {
     "defaultMessage": "{articleCount} 篇文章"
   },
@@ -2168,6 +2175,9 @@
   "ZEMcZ6": {
     "defaultMessage": "作品管理"
   },
+  "ZN1IzT": {
+    "defaultMessage": "从自由寫精華中移除"
+  },
   "ZNK0I9": {
     "defaultMessage": "喜歡你的評論"
   },
@@ -2669,6 +2679,9 @@
     "defaultMessage": "報名處理中⋯",
     "description": "type:apply"
   },
+  "jXDxa6": {
+    "defaultMessage": "作品已從自由寫精華中移除"
+  },
   "jiB0Z2": {
     "defaultMessage": "無法綁定錢包",
     "description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
@@ -2760,6 +2773,9 @@
     "defaultMessage": "最後一步：設置 Matters ID",
     "description": "src/components/Dialogs/SetUserNameDialog/Content.tsx"
   },
+  "l0tvVM": {
+    "defaultMessage": "Apply now. The writing journey will begin in a few days. For event details, please check the Event Information."
+  },
   "l2eEyp": {
     "defaultMessage": "交易密碼重置成功"
   },
@@ -2813,6 +2829,10 @@
   "ll/ufR": {
     "defaultMessage": "熱門"
   },
+  "lo8eLY": {
+    "defaultMessage": "你的作品 {articleTitle} 已被列為七日書精選之作，快來看看更多精彩好文！",
+    "description": "src/components/Notice/CampaignArticleNotice/CampaignArticleFeaturedNotice.tsx"
+  },
   "lqdpsm": {
     "defaultMessage": "回到訂閱"
   },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matters-web",
-  "version": "5.6.4",
+  "version": "5.6.5",
   "description": "codebase of Matters' website",
   "author": "Matters <[email protected]>",
   "engines": {

diff --git a/public/static/icons/24px/star.svg b/public/static/icons/24px/star.svg
diff --git a/src/common/enums/csp.ts b/src/common/enums/csp.ts
@@ -143,19 +143,10 @@ const CONNECT_SRC = [
   '*.alchemy.com',
 
   // IPFS Gateways
-  'gateway.ipfs.io/ipfs/',
+  'gw3.io/ipfs/',
   'cloudflare-ipfs.com/ipfs/',
   'ipfs.io/ipfs/',
-  '*.cf-ipfs.com',
-  'cf-ipfs.com/ipfs/',
   '4everland.io/ipfs/',
-  '*.4everland.io',
-  'storry.tv/ipfs/',
-  '*.storry.tv',
-  'ipfs.runfission.com/ipfs/',
-  'konubinix.eu/ipfs/',
-  'starbase.gw3.io/ipfs/',
-  '*.gw3.io',
 ]
 
 const FRAME_SRC = [

diff --git a/src/common/enums/test.ts b/src/common/enums/test.ts
@@ -139,6 +139,7 @@ export enum TEST_ID {
   NOTICE_MOMENT_MENTIONED = 'notice/moment-mentioned',
   NOTICE_MOMENT_LIKED = 'notice/moment-liked',
   NOTICE_COLLECTION_TITLE = 'notice/collection/title',
+  NOTICE_CAMPAIGN_ARTICLE_FEATURED = 'notice/campaign-article-featured',
   // me
   ME_WALLET_TRANSACTIONS_ITEM = 'me/wallet/transactions/item',
   ME_WALLET_TRANSACTIONS_ITEM_AMOUNT = 'me/wallet/transactions/item/amount',

diff --git a/src/common/styles/variables/colors.css b/src/common/styles/variables/colors.css
@@ -41,6 +41,7 @@
   --color-free-write-green-text: #398449;
   --color-free-write-green-bg: #d9f8dd;
   --color-free-write-green-bg-hover: #bdf4c4;
+  --color-free-write-green-label: #94d09c;
 
   /* others */
   --color-noir: #000;