Merge pull request #275 from thematters/develop

Release: v1.7.0

.env.example

@@ -1,5 +1,6 @@
 ENV=development
 SITE_DOMAIN=http://localhost:3000
+ASSET_DOMAIN=https://assets-develop.matters.news
 API_URL=http://matters-server-develop.ap-southeast-1.elasticbeanstalk.com/
 WS_URL=ws://matters-server-develop.ap-southeast-1.elasticbeanstalk.com/graphql
 SEGMENT_KEY=3gE20MjzN9qncFqlKV0pDvNO7Cp2gWU3

CHANGELOG.md

@@ -5,6 +5,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.7.0] - 2019-05-14
+
+### Added
+
+- Enable dropping image into editor #246
+- Add extend article button in article detail page #252
+- Expandable collectedBy articles #253
+- Audio Support #254
+- Self activation by comment #255
+- Add cover selector #256
+- Events trackers for collection #263
+- Add author picker into signup procedure #266
+- Notice dot for "Follow" page #268
+
+### Changed
+
+- Alter singleFileUpload for asset mapping #251
+- Alter same domain checker for editor #257
+- Simplify publishing procedure #258
+- Update collection expand icon #259
+- Make signup profile step unskipped #260
+- Update password rule #261
+- Fix text copy #262
+- Revise descriptions #264
+- Add "ASSET_DOMAIN" env to fix dups upload image by "createImageMatcher" #265
+- URI munging #267
+- Fix typo #269 #270
+- Alter publishing state toast #271
+- No longer need a cover to publish an article #272
+- Enable collection for all #273
+- Fix audio player button show as playing state #274
+
 ## [1.6.1] - 2019-04-30
 
 ### Added

common/enums/analytics.ts

@@ -1,7 +1,5 @@
 export const GA_TRACKING_ID = 'UA-127561991-1'
 
-export const ANALYTICS = 'analytics'
-
 export const ANALYTIC_TYPES = {
   TRACK: 'track',
   PAGE: 'page',
@@ -20,7 +18,8 @@ export const ANALYTICS_EVENTS = {
   LOG_OUT: 'log-out',
   LOG_IN: 'log-in',
   LOG_IN_FAILED: 'log-in-failed',
-  CLICK_COLLECTION: 'click-collection',
+  OPEN_COLLECTION: 'open-collection',
+  OPEN_COLLECTED: 'open-collected',
   SHARE: 'share'
 }
 
@@ -50,6 +49,7 @@ export const FEED_TYPE = {
   READ_HISTORY: 'read-history',
   RELATED_ARTICLE: 'related-article',
   COLLECTION: 'collection',
+  COLLECTED: 'collected',
   // user
   AUTHORS: 'authors',
   ALL_AUTHORS: 'all-authors',

common/enums/events.ts

@@ -0,0 +1,3 @@
+export const ANALYTICS = 'analytics'
+export const OPEN_MODAL = 'openModal'
+export const ADD_TOAST = 'addToast'

common/enums/fileSizes.ts

@@ -1 +1,3 @@
-export const UPLOAD_FILE_SIZE_LIMIT: number = 5 * 1024 * 1024
+export const UPLOAD_IMAGE_SIZE_LIMIT: number = 5 * 1024 * 1024
+
+export const UPLOAD_AUDIO_SIZE_LIMIT: number = 100 * 1024 * 1024

common/enums/fileTypes.ts

@@ -1,7 +1,9 @@
-export const ACCEPTED_UPLOAD_TYPES: string[] = [
+export const ACCEPTED_UPLOAD_IMAGE_TYPES: string[] = [
   'image/gif',
   'image/png',
   'image/jpeg',
   'image/svg+xml',
   'image/webp'
 ]
+
+export const ACCEPTED_UPLOAD_AUDIO_TYPES: string[] = ['audio/mpeg', 'audio/aac']

common/enums/index.ts

@@ -9,4 +9,5 @@ export * from './fileTypes'
 export * from './fileSizes'
 export * from './errorCode'
 export * from './externalLinks'
-export * from './partners'
+export * from './events'
+export * from './time'

common/enums/text.ts

@@ -1,39 +1,126 @@
 export const TEXT = {
   zh_hant: {
     login: '登入',
+    loginSuccess: '登入成功',
+    logout: '登出',
+    logoutFailed: '登出失敗，請重試',
     register: '註冊',
+    registerSuccess: '註冊成功',
     previousStep: '上一步',
     nextStep: '下一步',
+    welcomeAuthor: '歡迎成為創作者',
     close: '關閉',
     confirm: '確認',
+    email: '電子信箱',
+    yourEmail: '你的電子信箱',
     enterEmail: '請輸入電子信箱',
+    enterNewEmail: '請輸入新電子信箱',
     enterRegisteredEmail: '請輸入你的註冊電子信箱',
     invalidEmail: '電子信箱格式有誤',
+    enterUserName: '請輸入新 Matters ID',
+    enterUserNameAgign: '請再次輸入新 Matters ID',
+    invalidUserName: 'Matters ID 不一致',
+    loginPassword: '登入密碼',
     enterPassword: '請輸入密碼',
     enterPasswordAgain: '請再次輸入密碼',
     forgetPassword: '忘記密碼',
-    passwordHint: '不少於8位，必須包含數字和大小寫字母',
+    changePassword: '修改密碼',
+    changePasswordSuccess: '密碼修改成功',
+    passwordHint: '不少於 8 個字元，支持英文大小寫字母、數字和特殊符號',
     passwordNotMatch: '密碼不一致',
+    userNameHint: '最多輸入至 40 個字元，僅支持英文、數字及 _',
+    displayNameHint: '2-20 個字元，仅支持中英文或数字',
+    descriptionHint: '建議 50 字以內，最長 200 字',
     hasNoAccount: '沒有帳號',
     verificationCode: '驗證碼',
     sendVerificationCode: '發送驗證碼',
+    enterVerificationCode: '請輸入驗證碼',
     resetPassword: '重置密碼',
     resetPasswordSuccess: '密碼重置成功',
     useNewPassword: '請使用新的密碼重新登入',
     required: '必填欄位',
+    about: '關於我們',
+    guide: '社區约章',
+    faq: '常見問題',
     term: '用戶協議',
     termAndPrivacy: '用戶協議與隱私政策',
     termHint: '我們的用戶協議和隱私政策發生了更改，請閱讀並同意後繼續使用。',
     disagree: '我不同意',
     agreeAndContinue: '同意並繼續',
     untitle: '未命名',
     changeEmail: '修改電子信箱',
+    changeEmailSuccess: '電子信箱修改成功',
     changeUserName: '修改 Matters ID',
+    changeUserNameSuccess: 'Matters ID 修改成功',
     accountFrozen: '帳戶已凍結',
     accountArchived: '帳戶已註銷',
     accountBanned: '帳戶已禁言',
-    publish: '發佈文章',
+    publish: '發佈作品',
+    published: '作品已發佈',
+    publishing: '正在發佈',
+    waitingForPublish: '正在等待發佈',
+    publishFailed: '發佈失敗',
+    publishNote: '發佈須知',
     onboardingInfo: '你還不是創作者',
+    articleArchived: '該作品已從站內隱藏',
+    commentDeleted: '評論已被刪除',
+    back: '返回',
+    backToDiscover: '返回發現',
+    discover: '發現',
+    write: '創作',
+    follow: '追蹤',
+    following: '追蹤中',
+    follower: '追蹤者',
+    myFollowees: '我追蹤的',
+    followingMe: '追蹤我的',
+    followingYou: '追蹤了你',
+    mutualFollowing: '互相追蹤',
+    unfollow: '取消追蹤',
+    followed: '已追蹤',
+    followAuthor: '追蹤創作者',
+    authorRecommend: '作者推薦',
+    allAuthors: '全部作者',
+    comment: '評論',
+    article: '作品',
+    readHistory: '瀏覽記錄',
+    myBookmarks: '我的收藏',
+    myComments: '我的評論',
+    myDrafts: '我的草稿',
+    myArticles: '我的作品',
+    myWallet: '我的钱包',
+    myProfile: '个人页面',
+    user: '用戶',
+    tag: '標籤',
+    allTags: '全部標籤',
+    topic: '話題',
+    allTopics: '全部話題',
+    hotTopics: '熱議話題',
+    viewAll: '查看全部',
+    reply: '回覆',
+    retry: '重試',
+    revoke: '撤銷',
+    report: '檢舉',
+    resend: '重新發送',
+    change: '修改',
+    edit: '編輯',
+    save: '儲存',
+    delete: '刪除',
+    cancel: '取消',
+    done: '完成',
+    search: '搜尋',
+    setting: '設定',
+    accountSetting: '帳戶設定',
+    notificationSetting: '通知設定',
+    uiSetting: '介面設定',
+    userProfile: '個人簡介',
+    articleFingerprint: '作品指紋',
+    copySuccess: '複製成功',
+    copy: '複製',
+    pin: '置頂',
+    cancelPin: '取消置頂',
+    emptySearchResults: '没有找到你搜索的内容',
+    uploadImageSuccess: '图片上传成功',
+    uploadImageFailed: '图片上传失败',
     error: {
       UNKNOWN_ERROR: '未知錯誤，請稍候重試',
       NETWORK_ERROR: '網路錯誤，請稍候重試',
@@ -45,7 +132,7 @@ export const TEXT = {
       ENTITY_NOT_FOUND: '實體不存在',
       USER_NOT_FOUND: '用戶不存在',
       COMMENT_NOT_FOUND: '評論不存在',
-      ARTICLE_NOT_FOUND: '文章不存在',
+      ARTICLE_NOT_FOUND: '作品不存在',
       ASSET_NOT_FOUND: '資源不存在',
       DRAFT_NOT_FOUND: '草稿不存在',
       TAG_NOT_FOUND: '標籤不存在',
@@ -70,39 +157,126 @@ export const TEXT = {
 
   zh_hans: {
     login: '登入',
+    loginSuccess: '登入成功',
+    logout: '登出',
+    logoutFailed: '登出失败，请重试',
     register: '注册',
+    registerSuccess: '注册成功',
+    welcomeAuthor: '欢迎成为创作者',
     previousStep: '上一步',
     nextStep: '下一步',
     close: '关闭',
     confirm: '确认',
+    email: '邮箱',
+    yourEmail: '你的邮箱',
     enterEmail: '请输入邮箱',
+    enterNewEmail: '请输入新邮箱',
     enterRegisteredEmail: '请输入你的注册邮箱',
     invalidEmail: '邮箱格式有误',
+    enterUserName: '请输入新 Matters ID',
+    enterUserNameAgign: '请再次输入新 Matters ID',
+    invalidUserName: 'Matters ID 不一致',
+    loginPassword: '登入密码',
     enterPassword: '请输入密码',
     enterPasswordAgain: '请再次输入密码',
     forgetPassword: '忘记密码',
-    passwordHint: '少于8位，必须包含数字和大小写字母',
+    changePassword: '修改密码',
+    changePasswordSuccess: '密碼修改成功',
+    passwordHint: '不少于 8 个字符，支持英文大小写字母、数字和特殊符号',
+    userNameHint: '最多输入至 40 个字符，仅支持英文、数字及 _',
+    displayNameHint: '2-20 个字符，仅支持中英文或数字',
+    descriptionHint: '建议 50 字以内，最长 200 字',
     passwordNotMatch: '密码不一致',
     hasNoAccount: '没有帐号',
     verificationCode: '驗證碼',
     sendVerificationCode: '发送验证码',
+    enterVerificationCode: '请输入验证码',
     resetPassword: '重置密码',
     resetPasswordSuccess: '密码重置成功',
     useNewPassword: '请使用新的密码重新登入',
     required: '必填栏位',
+    about: '关于我们',
+    guide: '社区约章',
+    faq: '常见问题',
     term: '用户协议',
     termAndPrivacy: '用户协议与隐私政策',
     termHint: '我们的用户协议和隐私政策发生了更改，请阅读并同意后继续使用。',
     disagree: '我不同意',
     agreeAndContinue: '同意并继续',
     untitle: '未命名',
     changeEmail: '修改邮箱',
+    changeEmailSuccess: '邮箱修改成功',
     changeUserName: '修改 Matters ID',
+    changeUserNameSuccess: 'Matters ID 修改成功',
     accountFrozen: '账户已冻结',
     accountArchived: '账户已注销',
     accountBanned: '账户已禁言',
-    publish: '发布文章',
+    publish: '发布作品',
+    published: '作品已发布',
+    publishing: '正在发布',
+    waitingForPublish: '正在等待发布',
+    publishNote: '发布须知',
+    publishFailed: '发布失败',
     onboardingInfo: '你还不是创作者',
+    articleArchived: '该作品已从站内隐藏',
+    commentDeleted: '评论已被删除',
+    back: '返回',
+    backToDiscover: '返回发现',
+    discover: '发现',
+    write: '创作',
+    follow: '追踪',
+    following: '追踪中',
+    follower: '追踪者',
+    myFollowees: '我追踪的',
+    followingMe: '追踪我的',
+    followingYou: '追踪了你',
+    mutualFollowing: '互相追踪',
+    unfollow: '取消追踪',
+    followed: '已追踪',
+    followAuthor: '追踪创作者',
+    authorRecommend: '作者推荐',
+    allAuthors: '全部作者',
+    comment: '评论',
+    article: '作品',
+    readHistory: '浏览记录',
+    myBookmarks: '我的收藏',
+    myComments: '我的评论',
+    myDrafts: '我的草稿',
+    myArticles: '我的作品',
+    myWallet: '我的錢包',
+    myProfile: '個人頁面',
+    user: '用戶',
+    tag: '标签',
+    allTags: '全部标签',
+    topic: '话题',
+    allTopics: '全部话题',
+    hotTopics: '热议话题',
+    viewAll: '查看全部',
+    reply: '回复',
+    retry: '重试',
+    revoke: '撤销',
+    report: '检举',
+    resend: '重新发送',
+    change: '修改',
+    edit: '编辑',
+    save: '保存',
+    delete: '删除',
+    cancel: '取消',
+    done: '完成',
+    search: '搜索',
+    setting: '设定',
+    accountSetting: '账户设定',
+    notificationSetting: '通知设定',
+    uiSetting: '界面设定',
+    userProfile: '个人简介',
+    articleFingerprint: '作品指纹',
+    copySuccess: '复制成功',
+    copy: '复制',
+    pin: '置顶',
+    cancelPin: '取消置顶',
+    emptySearchResults: '沒有找到你搜尋的內容',
+    uploadImageSuccess: '圖片上傳成功',
+    uploadImageFailed: '圖片上傳失敗',
     error: {
       UNKNOWN_ERROR: '未知错误，请稍候重试',
       NETWORK_ERROR: '網路錯誤，请稍候重试',
@@ -114,7 +288,7 @@ export const TEXT = {
       ENTITY_NOT_FOUND: '实体不存在',
       USER_NOT_FOUND: '用户不存在',
       COMMENT_NOT_FOUND: '评论不存在',
-      ARTICLE_NOT_FOUND: '文章不存在',
+      ARTICLE_NOT_FOUND: '作品不存在',
       ASSET_NOT_FOUND: '资源不存在',
       DRAFT_NOT_FOUND: '草稿不存在',
       TAG_NOT_FOUND: '标签不存在',

common/enums/time.ts

@@ -0,0 +1 @@
+export const POLL_INTERVAL = 1000 * 10

common/styles/mixins/mixins.css

@@ -108,6 +108,15 @@
   }
 }
 
+@define-mixin unread-dot-loose {
+  @mixin unread-dot;
+
+  &::after {
+    top: -0.25rem;
+    right: calc((var(--spacing-x-tight) + 0.25rem) * -1);
+  }
+}
+
 @define-mixin text-input {
   @mixin all-transition;