Skip to content

Commit

Permalink
Merge branch 'New-Article-Page' into feat/report-article-comment
Browse files Browse the repository at this point in the history
  • Loading branch information
robertu7 committed Feb 28, 2024
2 parents f29a58e + 3cdd8b4 commit cdd7c96
Show file tree
Hide file tree
Showing 169 changed files with 5,922 additions and 1,235 deletions.
2 changes: 1 addition & 1 deletion .env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ NEXT_PUBLIC_USDT_CONTRACT_ADDRESS=0xfe4F5145f6e09952a5ba9e956ED0C25e3Fa4c7F1
NEXT_PUBLIC_CURATION_CONTRACT_ADDRESS=0xa219c6722008aa22828b31a13ab9ba93bb91222c
NEXT_PUBLIC_GOOGLE_CLIENT_ID=315393900359-2r9fundftis7dc0tdeo2hf8630nfdd8h.apps.googleusercontent.com
NEXT_PUBLIC_TWITTER_CLIENT_ID=X3d6Szg5bnVCMm5wRWxSVmhXUTc6MTpjaQ
NEXT_PUBLIC_FACEBOOK_CLIENT_ID=203337806078602
NEXT_PUBLIC_FACEBOOK_CLIENT_ID=1072677713882819
NEXT_PUBLIC_CLOUDFLARE_TURNSTILE_SITE_KEY=0x4AAAAAAAKiedvR5qiLUhIs
NEXT_PUBLIC_NOMAD_MATTERS_CAMPAIGN_LINK=/@rsdyobw/22048-launching-the-nomad-matters-initiative
DEBUG=false
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on:
- develop
types: [closed]

concurrency:
group: ${{ github.workflow }}-${{ github.base_ref }}
cancel-in-progress: true

env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -97,7 +101,7 @@ jobs:
aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
application_name: matters-stage
environment_name: matters-client-develop
environment_name: matters-client-develop-node-v18
version_label: matters-web-develop-${{ hashFiles('deploy.zip') }}
version_description: ${{ github.SHA }}
region: ap-southeast-1
Expand All @@ -124,7 +128,7 @@ jobs:
aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
application_name: matters-prod
environment_name: matters-client-prod
environment_name: matters-client-prod-node-v18
version_label: matters-web-prod-${{ hashFiles('deploy.zip') }}
version_description: ${{ github.SHA }}
region: ap-southeast-1
Expand Down
105 changes: 86 additions & 19 deletions lang/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,16 @@
"defaultMessage": "Asset not found",
"description": "ASSET_NOT_FOUND"
},
"4OMGUj": {
"defaultMessage": "Comment Details"
},
"4RpVDe": {
"defaultMessage": "Delete Draft"
},
"4km7Yc": {
"defaultMessage": "Breaking through history! The torch you've ignited will be the most dazzling support on the Nomad's journey. The Firebolt badge signifies your participation in the Nomad Matters and earning the highest-level Firebolt badge.",
"description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"
},
"4l6vz1": {
"defaultMessage": "Copy"
},
Expand Down Expand Up @@ -388,6 +395,10 @@
"defaultMessage": "After deletion, the {commentType} will be removed immediately",
"description": "src/components/Comment/DropdownActions/DeleteComment/Dialog.tsx"
},
"78qsg6": {
"defaultMessage": "Author",
"description": "src/components/Comment/RoleLabel/index.tsx"
},
"79Ydsg": {
"defaultMessage": "Payout Canceled",
"description": "src/components/Transaction/index.tsx"
Expand All @@ -410,6 +421,10 @@
"defaultMessage": "The article has been added to the Trending",
"description": "src/components/ArticleDigest/DropdownActions/SetTagSelectedButton.tsx"
},
"7ykJ+l": {
"defaultMessage": "Still quiet here. {br}Be the first one to say hello!",
"description": "src/components/Empty/EmptyComment.tsx"
},
"84VOdX": {
"defaultMessage": "Unpin from profile",
"description": "src/views/User/Articles/PinBoard/UnPinButton/index.tsx"
Expand Down Expand Up @@ -465,6 +480,10 @@
"9J0iCw": {
"defaultMessage": "Deleted user"
},
"9OIqBr": {
"defaultMessage": "Edit Comment",
"description": "src/components/Comment/DropdownActions/index.tsx"
},
"9UNFGm": {
"defaultMessage": "Transaction Password"
},
Expand Down Expand Up @@ -636,10 +655,6 @@
"defaultMessage": "Badges",
"description": "src/components/UserProfile/index.tsx"
},
"DdVBFV": {
"defaultMessage": "Wings have sprouted on the badge, and the halo of dreams is beginning to spin. You have gathered 10 companions on the Nomad's path. Invite another 10 fellow travelers to move towards the final destination together, where the highest level of honor awaits you.",
"description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"
},
"DjIpR6": {
"defaultMessage": "Set Cover"
},
Expand Down Expand Up @@ -676,6 +691,9 @@
"defaultMessage": "commented broadcast in {circleName}",
"description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
},
"Eb1U+/": {
"defaultMessage": "Topped up successfully"
},
"EoeUjA": {
"defaultMessage": "You do not have permission to perform this operation",
"description": "FORBIDDEN_BY_STATE"
Expand Down Expand Up @@ -762,10 +780,6 @@
"defaultMessage": "New Followers This Month",
"description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx"
},
"GxTjwK": {
"defaultMessage": "Under the moonlight, dreams are about to come true. The Moonlight Dream badge signifies your participation in the Nomad Matters, whether as a contestant or a supporter of exceptional projects. Next, invite 5 companions to join the journey with you, and you'll earn an even higher-level badge?",
"description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"
},
"H0JBH6": {
"defaultMessage": "Log Out"
},
Expand Down Expand Up @@ -823,6 +837,10 @@
"defaultMessage": "Supporter",
"description": "src/components/Dialogs/SupportersDialog/Content.tsx"
},
"I8+06z": {
"defaultMessage": "Comment has been hidden",
"description": "src/components/CommentBeta/Content/index.tsx"
},
"IKPYe9": {
"defaultMessage": "View",
"description": "src/components/Dialogs/CollectionSelectDialog/index.tsx"
Expand Down Expand Up @@ -905,6 +923,10 @@
"KQi/UZ": {
"defaultMessage": "Archive works"
},
"KTg17G": {
"defaultMessage": "Unpin",
"description": "src/components/Comment/DropdownActions/PinButton.tsx"
},
"KgVypx": {
"defaultMessage": "Topics",
"description": "src/components/Dialogs/TagListDialog/index.tsx"
Expand Down Expand Up @@ -932,6 +954,10 @@
"defaultMessage": "Total",
"description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
},
"L79o74": {
"defaultMessage": "Expand",
"description": "src/components/Expandable/index.tsx"
},
"L7Si5/": {
"defaultMessage": "Manage Community",
"description": "src/views/TagDetail/DropdownActions/index.tsx"
Expand All @@ -951,16 +977,27 @@
"defaultMessage": "{articleCount} Articles",
"description": "src/views/User/CollectionDetail/CollectionProfile/index.tsx"
},
"LUWKnn": {
"defaultMessage": "Wings have sprouted on the badge, and the halo of dreams is beginning to spin. The Nimbus Ferry badge signifies your participation in the Nomad Matters.",
"description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"
},
"LWE7oq": {
"defaultMessage": "Saving draft, are you sure you want to leave?"
},
"LYl9+i": {
"defaultMessage": "Edit",
"description": "src/components/Comment/DropdownActions/index.tsx"
},
"Lb0JsC": {
"defaultMessage": "You have blocked that user"
},
"Lc/azT": {
"defaultMessage": "IPNS Subscription",
"description": "src/components/Dialogs/RssFeedDialog/Content.tsx"
},
"LgbKvU": {
"defaultMessage": "Comment"
},
"Lhhi5l": {
"defaultMessage": "Article published",
"description": "src/views/Me/DraftDetail/PublishState/PublishedState.tsx"
Expand Down Expand Up @@ -1083,6 +1120,10 @@
"OpeFTV": {
"defaultMessage": "Enter a 6-digit payment password."
},
"OsX3KM": {
"defaultMessage": "Comment",
"description": "src/views/ArticleDetail/index.tsx"
},
"PLBmDT": {
"defaultMessage": "Password",
"description": "src/views/Me/Settings/Settings/Password/index.tsx"
Expand All @@ -1108,6 +1149,9 @@
"Q8Qw5B": {
"defaultMessage": "Description"
},
"QQSdHP": {
"defaultMessage": "View More"
},
"QUqfbW": {
"defaultMessage": "Describe more about your Circle",
"description": "src/components/Forms/CreateCircleForm/Profile.tsx"
Expand Down Expand Up @@ -1329,6 +1373,10 @@
"defaultMessage": "Subscribe",
"description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
},
"WsefD2": {
"defaultMessage": "No more comments",
"description": "src/views/User/Articles/UserArticles.tsx"
},
"WuvE8X": {
"defaultMessage": "Followers of {circleName}",
"description": "src/views/Circle/Profile/FollowersDialog/index.tsx"
Expand Down Expand Up @@ -1369,10 +1417,6 @@
"defaultMessage": "Go to Settings",
"description": "src/components/Dialogs/BindEmailHintDialog/index.tsx"
},
"XfkltT": {
"defaultMessage": "The dazzling light of a meteor shower is enough to illuminate the night sky. You have already invited 5 companions to participate in the Nomad Matters. Invite 5 more, and you can continue to level up!",
"description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"
},
"XgdZSb": {
"defaultMessage": "Authors"
},
Expand Down Expand Up @@ -1589,6 +1633,10 @@
"defaultMessage": "Income",
"description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx"
},
"dAPUJp": {
"defaultMessage": "The dazzling light of a meteor shower is enough to illuminate the night sky. The Meteor Canoe badge signifies your participation in the Nomad Matters.",
"description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"
},
"dAvP6d": {
"defaultMessage": "No blocked users yet",
"description": "src/views/Me/Settings/Blocked/SettingsBlocked.tsx"
Expand Down Expand Up @@ -1702,6 +1750,10 @@
"defaultMessage": "are following",
"description": "src/views/TagDetail/Followers/index.tsx"
},
"hgjjhO": {
"defaultMessage": "Comment",
"description": "src/components/Forms/CommentFormBeta/index.tsx"
},
"hk2aiz": {
"defaultMessage": "followed your circle",
"description": "src/components/Notice/CircleNotice/CircleNewUserNotice.tsx"
Expand All @@ -1720,6 +1772,10 @@
"iEJeQH": {
"defaultMessage": "Liker ID"
},
"iTcMqz": {
"defaultMessage": "Under the moonlight, dreams are about to come true. The Moonlight Dream badge signifies your participation in the Nomad Matters.",
"description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"
},
"icdrwy": {
"defaultMessage": "Followed You",
"description": "src/components/Buttons/FollowUser/FollowState.tsx"
Expand Down Expand Up @@ -1748,10 +1804,17 @@
"defaultMessage": "Pin Comment",
"description": "src/components/Comment/DropdownActions/PinButton.tsx"
},
"jc3mW/": {
"defaultMessage": "Supporter",
"description": "src/components/Comment/RoleLabel/index.tsx"
},
"jkrM1r": {
"defaultMessage": "Open IPNS page",
"description": "src/components/UserProfile/WalletLabel/index.tsx"
},
"jwnump": {
"defaultMessage": "Comment..."
},
"jy3tx0": {
"defaultMessage": "broadcast in {circlename}",
"description": "src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx"
Expand Down Expand Up @@ -1933,10 +1996,6 @@
"defaultMessage": "Following",
"description": "src/components/UserProfile/index.tsx"
},
"p0oPHP": {
"defaultMessage": "Breaking through history! The torch you've ignited will be the most dazzling support on the Nomad's journey. Congratulations on reaching the final destination of the Nomad Matters with 20 friends and earning the highest-level Firebolt badge.",
"description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx"
},
"p5qZnJ": {
"defaultMessage": "liked",
"description": "src/components/Notice/ArticleNotice/ArticleNewAppreciationNotice.tsx"
Expand Down Expand Up @@ -2007,6 +2066,10 @@
"qlxeW+": {
"defaultMessage": "Undo downvote"
},
"qxKjcm": {
"defaultMessage": "Pin",
"description": "src/components/Comment/DropdownActions/PinButton.tsx"
},
"r66dXx": {
"defaultMessage": "mentioned you in broadcast comment in {circleName}",
"description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
Expand Down Expand Up @@ -2065,6 +2128,9 @@
"sy+pv5": {
"defaultMessage": "Email"
},
"syEQFE": {
"defaultMessage": "Publish"
},
"tBt9u0": {
"defaultMessage": "Sign in",
"description": "src/components/Forms/EmailLoginForm/index.tsx"
Expand Down Expand Up @@ -2310,6 +2376,10 @@
"defaultMessage": "Enter",
"description": "src/components/CircleDigest/Price/index.tsx"
},
"yexhgj": {
"defaultMessage": "Only one comment can be pinned to the top",
"description": "src/components/CommentBeta/DropdownActions/PinButton.tsx"
},
"yoRaUc": {
"defaultMessage": "Refund",
"description": "src/components/Transaction/index.tsx"
Expand Down Expand Up @@ -2354,9 +2424,6 @@
"defaultMessage": "Preview",
"description": "src/components/Editor/ToggleAccess/SupportSettingDialog/Content.tsx"
},
"znJ06J": {
"defaultMessage": "<a>About Nomad Matters</a>"
},
"zvNfwL": {
"defaultMessage": "Operation too frequent, please try again later.",
"description": "ACTION_LIMIT_EXCEEDED"
Expand Down
Loading

0 comments on commit cdd7c96

Please sign in to comment.