Skip to content

Commit

Permalink
Merge pull request #1987 from thematters/stage
Browse files Browse the repository at this point in the history
Release: v3.22.0
  • Loading branch information
robertu7 authored Apr 16, 2021
2 parents 4da6017 + e154d8a commit 77c3396
Show file tree
Hide file tree
Showing 129 changed files with 3,553 additions and 3,177 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- name: Cache Dependencies
id: cache
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- name: Cache Dependencies
id: cache
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- name: Cache Dependencies
id: cache
uses: actions/[email protected].4
uses: actions/[email protected].5
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
4 changes: 4 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ const URL_PUSH_SW = isProd
: './firebase-messaging-sw-develop.js'

const nextConfig = {
future: {
// webpack5: true,
strictPostcssConfiguration: true,
},
/**
* Runtime configs
*
Expand Down
4,513 changes: 2,475 additions & 2,038 deletions package-lock.json

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "matters-web",
"version": "3.21.0",
"version": "3.22.0",
"description": "codebase of Matters' website",
"sideEffects": false,
"author": "Matters <[email protected]>",
Expand Down Expand Up @@ -44,10 +44,10 @@
"@reach/alert": "^0.10.5",
"@reach/dialog": "^0.10.5",
"@reach/visually-hidden": "^0.10.4",
"@sentry/browser": "^6.2.1",
"@sentry/browser": "^6.2.5",
"@stripe/react-stripe-js": "^1.4.0",
"@stripe/stripe-js": "^1.13.1",
"@tippyjs/react": "^4.2.3",
"@stripe/stripe-js": "^1.13.2",
"@tippyjs/react": "^4.2.5",
"apollo-cache-inmemory": "^1.6.6",
"apollo-cache-persist": "^0.1.1",
"apollo-client": "^2.6.10",
Expand All @@ -58,9 +58,9 @@
"apollo-link-ws": "^1.0.20",
"apollo-utilities": "^1.3.4",
"autosize": "^4.0.2",
"classnames": "^2.2.6",
"classnames": "^2.3.1",
"date-fns": "^2.19.0",
"embla-carousel": "^4.3.0",
"embla-carousel": "^4.3.2",
"express": "^4.17.1",
"fastest-levenshtein": "^1.0.12",
"fingerprintjs2": "^2.1.4",
Expand All @@ -72,17 +72,17 @@
"isomorphic-unfetch": "^3.1.0",
"jump.js": "^1.0.2",
"lodash": "^4.17.21",
"next": "^10.0.7",
"next": "^10.1.3",
"next-with-apollo": "^5.1.1",
"nprogress": "^0.2.0",
"number-precision": "^1.5.0",
"path-to-regexp": "^6.2.0",
"pulltorefreshjs": "^0.1.22",
"query-string": "^6.14.1",
"react": "^17.0.1",
"react-beautiful-dnd": "^13.0.0",
"react": "^17.0.2",
"react-beautiful-dnd": "^13.1.0",
"react-copy-to-clipboard": "^5.0.3",
"react-dom": "^17.0.1",
"react-dom": "^17.0.2",
"react-focus-lock": "^2.5.0",
"react-remove-scroll": "^2.4.1",
"react-spring": "^9.0.0-rc.3",
Expand All @@ -95,29 +95,29 @@
},
"devDependencies": {
"@apollo/react-testing": "^3.1.3",
"@babel/plugin-proposal-optional-chaining": "^7.13.8",
"@storybook/addon-a11y": "^6.1.21",
"@storybook/addon-actions": "^6.1.21",
"@storybook/addon-essentials": "^6.1.21",
"@storybook/addon-links": "^6.1.21",
"@storybook/react": "^6.1.21",
"@babel/plugin-proposal-optional-chaining": "^7.13.12",
"@storybook/addon-a11y": "^6.2.3",
"@storybook/addon-actions": "^6.2.3",
"@storybook/addon-essentials": "^6.2.3",
"@storybook/addon-links": "^6.2.3",
"@storybook/react": "^6.2.3",
"@svgr/webpack": "^5.5.0",
"@testing-library/react": "^11.2.5",
"@testing-library/react": "^11.2.6",
"@types/autosize": "^3.0.7",
"@types/classnames": "^2.2.11",
"@types/express": "^4.17.9",
"@types/fingerprintjs2": "^2.0.0",
"@types/grecaptcha": "^3.0.1",
"@types/helmet": "4.0.0",
"@types/jest": "^26.0.20",
"@types/jest": "^26.0.22",
"@types/jump.js": "^1.0.3",
"@types/lodash": "^4.14.168",
"@types/nprogress": "0.2.0",
"@types/pulltorefreshjs": "^0.1.4",
"@types/react": "^17.0.2",
"@types/react": "^17.0.3",
"@types/react-beautiful-dnd": "^13.0.0",
"@types/react-copy-to-clipboard": "^5.0.0",
"@types/react-dom": "^17.0.1",
"@types/react-dom": "^17.0.3",
"@types/react-responsive": "^8.0.2",
"@types/react-virtualized": "^9.21.11",
"@types/segment-analytics": "0.0.33",
Expand All @@ -130,12 +130,12 @@
"babel-plugin-dynamic-import-node": "^2.3.3",
"babel-polyfill": "^6.26.0",
"chromedriver": "^89.0.0",
"core-js": "^3.9.1",
"core-js": "^3.10.0",
"cucumber": "^6.0.5",
"cucumber-pretty": "^6.0.0",
"cz-conventional-changelog": "^3.3.0",
"file-loader": "^6.2.0",
"geckodriver": "^1.22.1",
"geckodriver": "^1.22.3",
"husky": "^4.3.8",
"identity-obj-proxy": "^3.0.0",
"imagemin-mozjpeg": "^9.0.0",
Expand All @@ -144,20 +144,20 @@
"next-compose-plugins": "^2.2.1",
"next-offline": "^5.0.3",
"next-optimized-images": "^2.6.2",
"nightwatch": "^1.5.1",
"nightwatch": "^1.6.2",
"nightwatch-api": "^3.0.2",
"node-fetch": "^2.6.1",
"postcss-calc": "^7.0.5",
"postcss-color-function": "^4.1.0",
"postcss-mixins": "^6.2.3",
"postcss-preset-env": "^6.7.0",
"prettier": "^2.2.1",
"react-is": "^17.0.1",
"react-is": "^17.0.2",
"styled-jsx-plugin-postcss": "^3.0.2",
"stylelint": "^13.11.0",
"stylelint": "^13.12.0",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-recess-order": "^2.3.0",
"stylelint-config-standard": "^20.0.0",
"stylelint-config-standard": "^21.0.0",
"stylelint-prettier": "^1.2.0",
"ts-jest": "^26.5.3",
"ts-node": "^9.1.1",
Expand Down
4 changes: 4 additions & 0 deletions public/static/icons/16px/badge-architect.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/static/icons/16px/badge-golden-motor.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
3 changes: 3 additions & 0 deletions public/static/icons/16px/limited-free.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/static/icons/16px/paywall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 0 additions & 8 deletions public/static/icons/24px/view-mode-comfortable.svg

This file was deleted.

6 changes: 0 additions & 6 deletions public/static/icons/24px/view-mode-compact.svg

This file was deleted.

4 changes: 0 additions & 4 deletions public/static/icons/24px/view-mode-default.svg

This file was deleted.

9 changes: 9 additions & 0 deletions public/static/icons/architect-ring.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file modified public/static/images/intro.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 17 additions & 17 deletions public/static/manifest.json
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
{
"name": "Matters",
"short_name": "Matters",
"start_url": "/?utm_source=homescreen",
"description": "一個自由、自主、永續的創作與公共討論空間",
"theme_color": "#ffffff",
"Scope": "/",
"background_color": "#ffffff",
"description": "Matters 致力搭建去中心化的寫作社群與內容生態。基於 IPFS 技術,令創作不受制於任何平台,獨立性得到保障;引入加密貨幣,以收入的形式回饋給作者;代碼開源,建立創作者自治社區。",
"display": "standalone",
"orientation": "portrait",
"Scope": "/",
"splash_pages": null,
"gcm_sender_id": "103953800507",
"icons": [
{
"src": "./icon-72x72.png",
"sizes": "72x72",
"src": "./icon-72x72.png",
"type": "image/png"
},
{
"src": "./icon-96x96.png",
"sizes": "96x96",
"src": "./icon-96x96.png",
"type": "image/png"
},
{
"src": "./icon-128x128.png",
"sizes": "128x128",
"src": "./icon-128x128.png",
"type": "image/png"
},
{
"src": "./icon-144x144.png",
"sizes": "144x144",
"src": "./icon-144x144.png",
"type": "image/png"
},
{
"src": "./icon-152x152.png",
"sizes": "152x152",
"src": "./icon-152x152.png",
"type": "image/png"
},
{
"src": "./icon-192x192.png",
"sizes": "192x192",
"src": "./icon-192x192.png",
"type": "image/png"
},
{
"src": "./icon-384x384.png",
"sizes": "384x384",
"src": "./icon-384x384.png",
"type": "image/png"
},
{
"src": "./icon-512x512.png",
"sizes": "512x512",
"src": "./icon-512x512.png",
"type": "image/png"
}
],
"gcm_sender_id": "103953800507"
"name": "Matters",
"orientation": "portrait",
"short_name": "Matters",
"splash_pages": null,
"start_url": "/?utm_source=homescreen",
"theme_color": "#ffffff"
}
2 changes: 0 additions & 2 deletions src/common/enums/storage.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
export const STORAGE_KEY_PUSH = '__PUSH'

export const STORAGE_KEY_VIEW_MODE = '__VIEW_MODE'

export const STORAGE_KEY_AGENT_HASH = '__AGENT_HASH'

export const STORAGE_KEY_AUTH_TOKEN = '__TOKEN'
Expand Down
18 changes: 0 additions & 18 deletions src/common/enums/text.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ export const TEXT = {
LIKER_EMAIL_EXISTS: 'Liker ID 電子信箱已被其他人使用',
LIKER_NOT_FOUND: 'Liker ID 不存在',
LIKER_USER_ID_EXISTS: 'Liker ID 已被其他人使用',
limitedFree: '限免',
login: '登入',
loginPassword: '登入密碼',
logout: '登出',
Expand Down Expand Up @@ -271,7 +270,6 @@ export const TEXT = {
successTopUp: '儲值成功',
successUnblock: '已取消封鎖。該用戶現在可以評論你的作品和圍爐。',
successUploadImage: '圖片上傳成功',
switchViewMode: '切換瀏覽視圖',
TAG_EDITORS_REACH_LIMIT: '一個標籤最多僅可有 4 名協作者共同管理',
TAG_NOT_FOUND: '標籤不存在',
tag: '標籤',
Expand Down Expand Up @@ -317,10 +315,6 @@ export const TEXT = {
viewAll: '查看全部',
viewAppreciators: '查看讚賞',
viewDonators: '查看支持者',
viewMode: '瀏覽視圖',
viewModeComfortable: '標準(小圖)',
viewModeCompact: '緊湊(無圖)',
viewModeDefault: '默認(大圖)',
waitingForPublish: '正在等待發布,星際通道有點擁擠',
walletBalance: '錢包餘額',
walletBalanceInsufficient: '錢包餘額不足',
Expand Down Expand Up @@ -488,7 +482,6 @@ export const TEXT = {
LIKER_EMAIL_EXISTS: 'Liker ID 邮箱已被其他人使用',
LIKER_NOT_FOUND: 'Liker ID 不存在',
LIKER_USER_ID_EXISTS: 'Liker ID 已被其他人使用',
limitedFree: '限免',
login: '登录',
loginPassword: '登录密码',
logout: '登出',
Expand Down Expand Up @@ -598,7 +591,6 @@ export const TEXT = {
successTopUp: '储值成功',
successUnblock: '已取消屏蔽。该用户现在可以评论你的作品和围炉。',
successUploadImage: '图片上传成功',
switchViewMode: '切换浏览视图',
TAG_EDITORS_REACH_LIMIT: '一个标签最多仅可有 4 名协作者共同管理',
TAG_NOT_FOUND: '标签不存在',
tag: '标签',
Expand Down Expand Up @@ -644,10 +636,6 @@ export const TEXT = {
viewAll: '查看全部',
viewAppreciators: '查看赞赏',
viewDonators: '查看支持者',
viewMode: '浏览视图',
viewModeComfortable: '标准(小图)',
viewModeCompact: '紧凑(无图)',
viewModeDefault: '默认(大图)',
waitingForPublish: '正在等待发布,星际通道有点拥挤',
walletBalance: '钱包余额',
walletBalanceInsufficient: '钱包余额不足',
Expand Down Expand Up @@ -832,7 +820,6 @@ export const TEXT = {
LIKER_EMAIL_EXISTS: 'Liker ID email is already used by others.',
LIKER_NOT_FOUND: 'Liker ID not found',
LIKER_USER_ID_EXISTS: 'Liker ID is already used by others.',
limitedFree: 'Limited Free',
login: 'Log in',
loginPassword: 'Password',
logout: 'Log Out',
Expand Down Expand Up @@ -949,7 +936,6 @@ export const TEXT = {
successTopUp: 'Top up successfully.',
successUnblock: 'User unblocked and can reply your articles now.',
successUploadImage: 'Image uploaded',
switchViewMode: 'Switch view mode',
TAG_EDITORS_REACH_LIMIT: 'One tag can have most 4 editors.',
TAG_NOT_FOUND: 'Tag not found',
tag: 'Tag',
Expand Down Expand Up @@ -1002,10 +988,6 @@ export const TEXT = {
viewAll: 'Show More',
viewAppreciators: 'Likers',
viewDonators: 'Donors',
viewMode: 'View Mode',
viewModeComfortable: 'Comfort, small pictures',
viewModeCompact: 'Compact, no pictures',
viewModeDefault: 'Standard, big pictures',
waitingForPublish: 'Waiting for publish, please wait.',
walletBalance: 'Balance',
walletBalanceInsufficient: 'Insufficient balance',
Expand Down
Loading

0 comments on commit 77c3396

Please sign in to comment.