Merge pull request #10 from Coding/dashboard

Dashboard

Author: 春秋一语

app/changelog.html

@@ -522,7 +522,7 @@
                 <div id="pc-has-not-login" class="right">
                     <a href="https://cloud.tencent.com/register" target="_blank" rel="noopener noreferrer">注册</a>
                     <span class="divide">|</span>
-                    <a href="https://dev.tencent.com/login" target="_blank" rel="noopener noreferrer">登录</a>
+                    <a href="https://dev.tencent.com/login?return_url=https://studio.dev.tencent.com/changelog" target="_blank" rel="noopener noreferrer">登录</a>
                 </div>
                 <div id="pc-has-login" class="right" style="display: none;">
                     <div className="title">
@@ -600,7 +600,7 @@
                     </a>
                 </div>
                 <div id="mobile-has-not-login">
-                    <a class="title" href="https://dev.tencent.com/login" target="_blank" rel="noopener noreferrer">登录</a>
+                    <a class="title" href="https://dev.tencent.com/login?return_url=https://studio.dev.tencent.com/changelog" target="_blank" rel="noopener noreferrer">登录</a>
                     <a class="title" href="https://cloud.tencent.com/register" target="_blank" rel="noopener noreferrer">注册</a>
                 </div>
                 <div class="blank"></div>

app/commands/commandBindings/file.js

@@ -5,7 +5,7 @@ import * as Modal from '../../components/Modal/actions'
 import uniqueId from 'lodash/uniqueId'
 import TabStore from 'components/Tab/store'
 import TabState from 'components/Tab/state'
-import FileState from 'commons/File/state'
+import FileState, { extState } from 'commons/File/state'
 import FileStore from 'commons/File/store'
 import { notify, NOTIFY_TYPE } from '../../components/Notification/actions'
 import i18n from 'utils/createI18n'
@@ -158,6 +158,9 @@ export function openFile (obj, callback) {
   return api.readFile(path, encoding || currentEncoding).then((data) => {
     FileStore.loadNodeData(data)
     FileState.initData.set(path, {})
+    for (const listener of extState.didOpenListeners) {
+      listener(FileState.entities.get(path))
+    }
     return data
   }).then(() => {
     const activeTabGroup = TabStore.getState().activeTabGroup

app/commons/File/state.js

@@ -20,7 +20,12 @@ const state = observable({
   get root () {
     return this.entities.get(ROOT_PATH)
   },
+})
+
+// for plugin
+const extState = observable({
   createdListeners: [],
+  didOpenListeners: [],
 })
 
 // state.entities.intercept((change) => {
@@ -45,8 +50,8 @@ class FileNode {
     }
     state.entities.set(this.path, this)
     // 文件创建钩子
-    if (state.createdListeners && state.createdListeners.length > 0) {
-      for (const createdListener of state.createdListeners) {
+    if (extState.createdListeners && extState.createdListeners.length > 0) {
+      for (const createdListener of extState.createdListeners) {
         createdListener(this)
       }
     }
@@ -171,4 +176,4 @@ function hydrate (json) {
 }
 
 export default state
-export { state, FileNode, hydrate }
+export { state, FileNode, hydrate, extState }

app/dashboard/i18n/en_US/global.json

@@ -50,7 +50,7 @@
     "lastModified": "Last modified {{days}} days ago",
     "lastModifiedToday": "Last modified Today",
     "deletedDaysAgo": "Deleted {{days}} days ago",
-    "deletedTime": "Deleted {{hours}} hours {{minutes}} minutes {{seconds}} seconds ago",
+    "deletedTime": "Deleted {{hours}} hours {{minutes}} minutes ago",
     "copyed": "Copyed",
     "noDesc": "[No Description]",
     "manage": "Manage",

app/dashboard/i18n/zh_CN/global.json

@@ -50,7 +50,7 @@
     "lastModified": "最后更新于 {{days}} 天前",
     "lastModifiedToday": "最后更新于 今天",
     "deletedDaysAgo": "删除于 {{days}} 天前",
-    "deletedTime": "删除于 {{hours}} 小时 {{minutes}} 分 {{seconds}} 秒前",
+    "deletedTime": "删除于 {{hours}} 小时 {{minutes}} 分钟前",
     "copyed": "复制完成",
     "noDesc": "[暂无描述]",
     "manage": "管理",

app/dashboard/utils/date.js

@@ -4,34 +4,33 @@ const twoDigit = (num) => {
     return num < 10 ? `0${num}` : num;
 }
 
-export const getModifiedTime = (now, lastModified) => {
-    const ms = now - lastModified;
-    const d = Math.floor(ms / 3600000 / 24);
+export const getModifiedTime = (lastModified) => {
+    const ms = new Date(new Date().setHours(0, 0, 0, 0)).getTime() - lastModified;
+    const d = ms / 3600000 / 24;
     if (d > 0) {
-        return i18n('global.lastModified', { days: d });
+        return i18n('global.lastModified', { days: Math.ceil(d) });
     } else {
         return i18n('global.lastModifiedToday');
     }
 }
 
-export const getDeletedTime = (now, lastModified) => {
-    const ms = now - lastModified;
-    const d = Math.floor(ms / 3600000 / 24);
+export const getDeletedTime = (lastModified) => {
+    const ms = new Date(new Date().setHours(0, 0, 0, 0)).getTime() - lastModified;
+    const d = ms / 3600000 / 24;
     if (d > 0) {
-        return i18n('global.deletedDaysAgo', { days: d });
+        return i18n('global.deletedDaysAgo', { days: Math.ceil(d) });
     } else {
-        let h = Math.floor(ms / 3600000 % 24);
+        const timestamp = Date.now() - lastModified;
+        let h = Math.floor(timestamp / 3600000 % 24);
         h = h < 0 ? 0 : h;
-        let m = Math.floor(ms / 60000 % 24);
+        let m = Math.floor(timestamp / 60000 % 24);
         m = m < 0 ? 0 : m;
-        let s = Math.floor(ms / 1000 % 60);
-        s = s < 0 ? 0 : s;
-        return i18n('global.deletedTime', { hours: h, minutes: m, seconds: s });
+        return i18n('global.deletedTime', { hours: h, minutes: m });
     }
 }
 
-export const getCreatedTime = (now) => {
-    const date = new Date(now);
+export const getCreatedTime = (time) => {
+    const date = new Date(time);
     const y = date.getFullYear();
     const m = twoDigit(date.getMonth() + 1);
     const d = twoDigit(date.getDate());
@@ -41,8 +40,8 @@ export const getCreatedTime = (now) => {
     return `Created: ${y}-${m}-${d} ${h}:${n}:${s}`;
 }
 
-export const getFormatTime = (now) => {
-    const date = new Date(now);
+export const getFormatTime = (time) => {
+    const date = new Date(time);
     const y = date.getFullYear();
     const m = twoDigit(date.getMonth() + 1);
     const d = twoDigit(date.getDate());

app/dashboard/view/plugin/card/Card.js

@@ -0,0 +1,45 @@
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+
+import './card.css';
+
+import i18n from '../../../utils/i18n';
+import config from '../../../utils/config';
+import parseStatus from '../../pluginSet/status';
+
+class MCard extends Component {
+    render() {
+        const { id, pluginName, remark, createdBy, repoName, pluginVersions } = this.props;
+        const { version, status, hasPrePublish, preStatus } = parseStatus(pluginVersions);
+        const marketHref = window === window.top ? `${window.location.origin}/plugins/detail/${id}` : `${config.studioOrigin}/plugins/detail/${id}`;
+        const wsHref = `${window === window.top ? window.location.origin : config.studioOrigin}/ws/?ownerName=${createdBy}&projectName=${repoName}`;
+        return (
+            <div className = "plugin-card">
+                <div className="top">
+                    {
+                        status === 5 ? (
+                            <a className="name" href={marketHref} target="_blank" rel="noopener noreferrer">{pluginName}</a>
+                        ) : <span className="name">{pluginName}</span>
+                    }
+                    <div className="right">
+                        {status === 5 && <div className="version">v{version}</div>}
+                        {
+                            (hasPrePublish && preStatus === 2) ? (
+                                <div className="tag">{i18n('plugin.prePublish')}</div>
+                            ) : (status === 5 && <div className="tag">{i18n('plugin.published')}</div>)
+                        }
+                    </div>
+                </div>
+                <div className="desc">
+                    <span>{remark}</span>
+                </div>
+                <div className="control">
+                    <Link className="button" to={`/dashboard/plugin/mine/${id}`}>{i18n('global.manage')}</Link>
+                    <a className="button" href={wsHref} target="_blank" rel="noopener noreferrer">{i18n('global.workspace')}</a>
+                </div>
+            </div>
+        );
+    }
+}
+
+export default MCard;

app/dashboard/view/plugin/card/index.js

@@ -53,7 +53,8 @@
     overflow: hidden;
     position: relative;
 }
-.plugin-list .plugin-card .desc .ellipsis {
+.plugin-list .plugin-card .desc::after {
+    content: '';
     width: 60px;
     height: 20px;
     background: linear-gradient(to right, transparent, #3b3b3b);