Skip to content

Commit

Permalink
Merge pull request #4131 from thematters/feat/sync-web-next
Browse files Browse the repository at this point in the history
Sync web next
  • Loading branch information
wlliaml authored Jan 11, 2024
2 parents 14dded4 + 6483a8b commit dbc33cb
Show file tree
Hide file tree
Showing 57 changed files with 332 additions and 357 deletions.
6 changes: 3 additions & 3 deletions .env.prod
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ NEXT_PUBLIC_CLOUDFLARE_TURNSTILE_SITE_KEY=0x4AAAAAAAKVODkJMwfIxG78
DEBUG=false
NEXT_PUBLIC_GOOGLE_CLIENT_ID=751677068109-rkml7q9ujf8ems09cclh7qckf14svcgs.apps.googleusercontent.com
NEXT_PUBLIC_TWITTER_CLIENT_ID=cmdKbUlyd1ZZZDZYa3dTampidGo6MTpjaQ
NEXT_PUBLIC_FACEBOOK_CLIENT_ID=161556310354354
NEXT_PUBLIC_NOMAD_MATTERS_CAMPAIGN_LINK_EN=
NEXT_PUBLIC_NOMAD_MATTERS_CAMPAIGN_LINK=
NEXT_PUBLIC_FACEBOOK_CLIENT_ID=687698420193159
NEXT_PUBLIC_NOMAD_MATTERS_CAMPAIGN_LINK_EN=/@hi176/476405-a-guide-to-invite
NEXT_PUBLIC_NOMAD_MATTERS_CAMPAIGN_LINK=/@hi176/476404
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
uses: actions/checkout@master

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '16.14'
node-version: '18'
cache: 'npm'

- name: Install Dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
uses: actions/checkout@master

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '16.14'
node-version: '18'
cache: 'npm'

- name: Install Dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
uses: actions/checkout@master

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '16.14'
node-version: '18'
cache: 'npm'

- name: Install Dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
uses: actions/checkout@master

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '16.14'
node-version: '18'
cache: 'npm'

- name: Install Dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
uses: actions/checkout@master

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '16.14'
node-version: '18'
cache: 'npm'

- name: Install Dependencies
Expand Down
14 changes: 14 additions & 0 deletions lang/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
"defaultMessage": "Last 1 month",
"description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
},
"/GCoTA": {
"defaultMessage": "Clear"
},
"/GyMKa": {
"defaultMessage": "Share Article"
},
Expand All @@ -59,6 +62,10 @@
"defaultMessage": "Unknown error. Please try again later.",
"description": "UNKNOWN_ERROR"
},
"/agKbX": {
"defaultMessage": "Write a comment",
"description": "src/components/Comment/FooterActions/ReplyButton/index.tsx"
},
"/faseS": {
"defaultMessage": "Share link copied"
},
Expand Down Expand Up @@ -1170,10 +1177,17 @@
"defaultMessage": "Move to bottom",
"description": "src/components/ArticleDigest/DropdownActions/SetBottomCollectionButton.tsx"
},
"UgpqlF": {
"defaultMessage": "Reply",
"description": "src/components/Comment/FooterActions/ReplyButton/index.tsx"
},
"UjKkhq": {
"defaultMessage": "Tags added",
"description": "src/views/TagDetail/DropdownActions/index.tsx"
},
"Up5U7K": {
"defaultMessage": "Block"
},
"V5OMr4": {
"defaultMessage": "What is a digital wallet?",
"description": "src/components/Forms/SelectAuthMethodForm/WalletFeed.tsx"
Expand Down
14 changes: 14 additions & 0 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
"defaultMessage": "Last 1 month",
"description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
},
"/GCoTA": {
"defaultMessage": "Clear"
},
"/GyMKa": {
"defaultMessage": "Share Article"
},
Expand All @@ -59,6 +62,10 @@
"defaultMessage": "Unknown error. Please try again later.",
"description": "UNKNOWN_ERROR"
},
"/agKbX": {
"defaultMessage": "Write a comment",
"description": "src/components/Comment/FooterActions/ReplyButton/index.tsx"
},
"/faseS": {
"defaultMessage": "Share link copied"
},
Expand Down Expand Up @@ -1170,10 +1177,17 @@
"defaultMessage": "Move to bottom",
"description": "src/components/ArticleDigest/DropdownActions/SetBottomCollectionButton.tsx"
},
"UgpqlF": {
"defaultMessage": "Reply",
"description": "src/components/Comment/FooterActions/ReplyButton/index.tsx"
},
"UjKkhq": {
"defaultMessage": "Tags added",
"description": "src/views/TagDetail/DropdownActions/index.tsx"
},
"Up5U7K": {
"defaultMessage": "Block"
},
"V5OMr4": {
"defaultMessage": "What is a digital wallet?",
"description": "src/components/Forms/SelectAuthMethodForm/WalletFeed.tsx"
Expand Down
16 changes: 15 additions & 1 deletion lang/zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
"defaultMessage": "最近 1 个月",
"description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
},
"/GCoTA": {
"defaultMessage": "清空"
},
"/GyMKa": {
"defaultMessage": "分享作品"
},
Expand All @@ -59,6 +62,10 @@
"defaultMessage": "不知道哪里出错了,过几分钟看看",
"description": "UNKNOWN_ERROR"
},
"/agKbX": {
"defaultMessage": "回复评论",
"description": "src/components/Comment/FooterActions/ReplyButton/index.tsx"
},
"/faseS": {
"defaultMessage": "已复制分享连结"
},
Expand Down Expand Up @@ -1170,10 +1177,17 @@
"defaultMessage": "移至底部",
"description": "src/components/ArticleDigest/DropdownActions/SetBottomCollectionButton.tsx"
},
"UgpqlF": {
"defaultMessage": "回复",
"description": "src/components/Comment/FooterActions/ReplyButton/index.tsx"
},
"UjKkhq": {
"defaultMessage": "作品已添加标签",
"description": "src/views/TagDetail/DropdownActions/index.tsx"
},
"Up5U7K": {
"defaultMessage": "屏蔽"
},
"V5OMr4": {
"defaultMessage": "什么是数字钱包?",
"description": "src/components/Forms/SelectAuthMethodForm/WalletFeed.tsx"
Expand Down Expand Up @@ -1455,7 +1469,7 @@
"defaultMessage": "追踪中"
},
"cQ+Lyq": {
"defaultMessage": "游牧者计画纪念徽章",
"defaultMessage": "游牧者计划纪念徽章",
"description": "src/views/User/UserProfile/Badges/index.tsx"
},
"cQYXjl": {
Expand Down
14 changes: 14 additions & 0 deletions lang/zh-Hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
"defaultMessage": "最近 1 個月",
"description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
},
"/GCoTA": {
"defaultMessage": "清空"
},
"/GyMKa": {
"defaultMessage": "分享作品"
},
Expand All @@ -59,6 +62,10 @@
"defaultMessage": "不知道哪裏出錯了,過幾分鐘看看",
"description": "UNKNOWN_ERROR"
},
"/agKbX": {
"defaultMessage": "回覆評論",
"description": "src/components/Comment/FooterActions/ReplyButton/index.tsx"
},
"/faseS": {
"defaultMessage": "已複製分享連結"
},
Expand Down Expand Up @@ -1170,10 +1177,17 @@
"defaultMessage": "移至底部",
"description": "src/components/ArticleDigest/DropdownActions/SetBottomCollectionButton.tsx"
},
"UgpqlF": {
"defaultMessage": "回覆",
"description": "src/components/Comment/FooterActions/ReplyButton/index.tsx"
},
"UjKkhq": {
"defaultMessage": "作品已添加標籤",
"description": "src/views/TagDetail/DropdownActions/index.tsx"
},
"Up5U7K": {
"defaultMessage": "封鎖"
},
"V5OMr4": {
"defaultMessage": "什麼是數字錢包?",
"description": "src/components/Forms/SelectAuthMethodForm/WalletFeed.tsx"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "matters-web",
"version": "4.28.2",
"version": "4.28.5",
"description": "codebase of Matters' website",
"author": "Matters <[email protected]>",
"engines": {
"node": ">=16.14 <17.0"
"node": ">=16.14 <19.0"
},
"license": "Apache-2.0",
"sideEffects": false,
Expand Down
Loading

1 comment on commit dbc33cb

@vercel
Copy link

@vercel vercel bot commented on dbc33cb Jan 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.