Merge pull request #480 from Coding/remove-beta

去掉 beta 字样

Author: 马蹄疾

app/components/MenuBar/menuBarItems.jsx

@@ -13,7 +13,7 @@ const divider = { isDivider: true };
 const menuBarItems = observable([
   {
     key: 'meta',
-    name: (<div className="menu-bar-item-logo"><img className="logo" src={logo} alt="logo" /><div className='beta'>beta</div></div>),
+    name: (<div className="menu-bar-item-logo"><img className="logo" src={logo} alt="" /></div>),
     className: 'coding-logo',
     items: [
       {

app/components/Modal/modals/About.jsx

@@ -7,7 +7,6 @@ const Alert = () => {
     <div className='modal-content about'>
       <div className='title'>
         <div className='logo'></div>
-        <span className='beta'>beta</span>
       </div>
       <div className='logos'>
         <div className='logo-item'>

app/components/Tab/WelcomePage.jsx

@@ -11,7 +11,7 @@ class WelcomePage extends PureComponent {
         return (
             <div className='welcome-page'>
                 <div className='header'></div>
-                <h1>欢迎使用 <div className='logo'><span className='beta'>beta</span></div></h1>
+                <h1>欢迎使用<div className='logo'></div></h1>
                 <div className='subtitle'>您将获得前所未有的云端开发体验</div>
                 <div className='quick-start'>
                     <div className="video-btn" onClick={this.handleVideo}>

app/dashboard/api/global.js

@@ -1,5 +1,9 @@
 import axios from './axios';
 
+export const getUserProfile = () => {
+    return axios.get('/user/current', { 'Accept': 'application/vnd.coding.v1+json' });
+}
+
 export const getNotification = () => {
     return axios.get('/workspaces/notification?page=1&pageSize=10');
 }
@@ -11,7 +15,3 @@ export const markReaded = (data) => {
 export const getMessage = () => {
     return axios.get('/workspaces/message?page=1&pageSize=10');
 }
-
-export const renameGlobalKey = (data) => {
-    return axios.post('/user/modify-new-global-key', data);
-}

app/dashboard/api/ws.js

@@ -1,9 +1,5 @@
 import axios from './axios';
 
-export const getUserProfile = () => {
-    return axios.get('/user/current', { 'Accept': 'application/vnd.coding.v1+json' });
-}
-
 export const getWorkspace = () => {
     return axios.get('/ws/list?page=0&size=100', { 'Accept': 'application/vnd.coding.v1+json' });
 }

app/dashboard/view/about/About.js

@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 
 import './about.css';
 import cloudstudio from '../../static/cloudstudio.svg';
@@ -8,66 +8,41 @@ import tencentcloud from './img/tencentcloud.png';
 import i18n from '../../utils/i18n';
 import config from '../../utils/config';
 
-class About extends Component {
-    state = {
-        width: '100%',
-        height: '100%',
-    }
+const url = window === window.top ? '/changelog' : `${config.studioOrigin}/changelog`;
 
-    render() {
-        const { width, height } = this.state;
-        const url = window === window.top ? '/changelog' : `${config.studioOrigin}/changelog`;
-        return (
-            <div className="dash-about" style={{ width, height }}>
-                <div className="up"></div>
-                <div className="center">
-                    <div className="logo">
-                        <img src={cloudstudio} alt="cloudstudio" />
-                        <div className="beta">beta</div>
-                    </div>
-                    <div className="desc">
-                        <span className="version">V 3.4</span>
-                        <a href={url} target="_blank" rel="noopener noreferrer">{i18n('global.changelog')}</a>
-                    </div>
+const About = () => {
+    return (
+        <div className="dash-about">
+            <div className="up"></div>
+            <div className="center">
+                <div className="logo">
+                    <img src={cloudstudio} alt="" />
                 </div>
-                <div className="below">
-                    <div className="produce">
-                        <div className="corp">
-                            <div className="role">{i18n('global.produce')}</div>
-                            <a href="https://coding.net" target="_blank" rel="noopener noreferrer">
-                                <img src={coding} alt="Coding Logo" />
-                            </a>
-                        </div>
-                        <div className="x">＋</div>
-                        <div className="corp">
-                            <div className="role">{i18n('global.computeSupport')}</div>
-                            <a href="https://cloud.tencent.com/" target="_blank" rel="noopener noreferrer">
-                                <img src={tencentcloud} alt="Tencent Logo" />
-                            </a>
-                        </div>
+                <div className="desc">
+                    <span className="version">V 3.4</span>
+                    <a href={url} target="_blank" rel="noopener noreferrer">{i18n('global.changelog')}</a>
+                </div>
+            </div>
+            <div className="below">
+                <div className="produce">
+                    <div className="corp">
+                        <div className="role">{i18n('global.produce')}</div>
+                        <a href="https://coding.net" target="_blank" rel="noopener noreferrer">
+                            <img src={coding} alt="" />
+                        </a>
+                    </div>
+                    <div className="x">＋</div>
+                    <div className="corp">
+                        <div className="role">{i18n('global.computeSupport')}</div>
+                        <a href="https://cloud.tencent.com/" target="_blank" rel="noopener noreferrer">
+                            <img src={tencentcloud} alt="" />
+                        </a>
                     </div>
-                    <div className="copyright">Copyright @ 2015-{new Date().getFullYear()}. {i18n('global.copyright')}</div>
                 </div>
+                <div className="copyright">Copyright @ 2015-{new Date().getFullYear()}. {i18n('global.copyright')}</div>
             </div>
-        );
-    }
-
-    componentDidMount() {
-        this.handleResize();
-        window.addEventListener('resize', this.handleResize);
-    }
-
-    handleResize = () => {
-        const w = document.documentElement.clientWidth - 60;
-        this.setState({
-            width: w > 860 - 60 ? w - 200 : w,
-            height: document.documentElement.clientHeight - 50 - 60,
-        });
-    }
-
-    componentWillUnmount() {
-        window.removeEventListener('resize', this.handleResize);
-    }
+        </div>
+    );
 }
 
 export default About;

app/dashboard/view/about/about.css

@@ -2,8 +2,8 @@
     display: flex;
     flex-wrap: wrap;
     align-content: space-between;
-    width: 100%;
-    height: 100%;
+    width: calc(100vw - 260px);
+    height: calc(100vh - 110px);
 }
 .dash-about .up,
 .dash-about .center,
@@ -12,25 +12,13 @@
 }
 .dash-about .center .logo {
     width: 27%;
-    min-width: 200px;
-    max-width: 400px;
+    min-width: 260px;
+    max-width: 500px;
     margin: 0 auto;
-    position: relative;
 }
 .dash-about .center .logo img {
     width: 100%;
 }
-.dash-about .center .logo .beta {
-    height: 15px;
-    padding: 0 2px;
-    line-height: 15px;
-    border-radius: 3px;
-    color: #000;
-    background-color: #fff;
-    position: absolute;
-    top: 10px;
-    right: -10px;
-}
 .dash-about .center .desc {
     display: flex;
     justify-content: center;
@@ -69,16 +57,9 @@
     text-align: center;
     color: #5f5f5f;
 }
-
-@media screen and (max-width: 1440px) {
-    .dash-about .center .logo .beta {
-        top: 0;
-        right: -15px;
-    }
-}
 @media screen and (max-width: 860px) {
-    .dash-about .center .logo .beta {
-        top: -5px;
-        right: -20px;
+    .dash-about {
+        width: calc(100vw - 40px);
+        height: calc(100vh - 90px);
     }
 }

app/dashboard/view/home/Home.js

@@ -40,10 +40,7 @@ class Home extends Component {
         return (
             <div id="dash-container" onClick={this.turnOffPanel}>
                 <div className="dash-mbar">
-                    <div className="logo">
-                        <Link to="/dashboard/workspace" onClick={hideMbar}><img src={cloudstudio} alt="logo" /></Link>
-                        <span className="beta">beta</span>
-                    </div>
+                    <Link className="logo" to="/dashboard/workspace" onClick={hideMbar}><img src={cloudstudio} alt="" /></Link>
                     <Stripe />
                 </div>
                 <div className={`dash-mnav${isMbarOn ? ' on' : ''}`}>
@@ -56,10 +53,7 @@ class Home extends Component {
                     <a className="nav-item" href="https://feedback.coding.net/" target="_blank" rel="noopener noreferrer" onClick={hideMbar}>{i18n('global.feedback')}</a>
                 </div>
                 <div className="dash-sidebar">
-                    <div className="logo">
-                        <Link to="/dashboard/workspace"><img src={cloudstudio} alt="logo" /></Link>
-                        <span className="beta">beta</span>
-                    </div>
+                    <Link className="logo" to="/dashboard/workspace"><img src={cloudstudio} alt="" /></Link>
                     <div className="nav">
                         <NavLink className="nav-item" activeClassName="active" to="/dashboard/workspace">{i18n('global.workspace')} ({wsCount})</NavLink>
                         <NavLink className="nav-item" activeClassName="active" to="/dashboard/plugin">{i18n('global.plugin')}</NavLink>

app/dashboard/view/home/home.css

@@ -18,15 +18,6 @@
 }
 .dash-mbar .logo img {
     width: 150px;
-    padding-left: 8px;
-}
-.dash-mbar .logo .beta {
-    height: 15px;
-    padding: 0 2px;
-    line-height: 15px;
-    border-radius: 3px;
-    color: #3b3b3b;
-    background-color: #ddd;
 }
 .dash-mnav {
     display: flex;
@@ -69,16 +60,8 @@
     border-bottom: 1px solid #2d2d2d;
 }
 .dash-sidebar .logo img {
-    width: 145px;
-    padding-left: 8px;
-}
-.dash-sidebar .logo .beta {
-    height: 15px;
-    padding: 0 2px;
-    line-height: 15px;
-    border-radius: 3px;
-    color: #3b3b3b;
-    background-color: #ddd;
+    width: 100%;
+    padding: 0 8px;
 }
 .dash-sidebar .nav {
     display: flex;

app/dashboard/view/pluginSet/PluginSet.js

@@ -23,7 +23,6 @@ class PluginSet extends Component {
         pluginType: '',
         avgScore: 0,
         countScoreUser: 0,
-        spaceKey: '',
         repoName: '',
         repoUrl: '',
         historyVersions: [],
@@ -41,8 +40,9 @@ class PluginSet extends Component {
     timer = null
 
     render() {
-        const { pluginId, pluginName, remark, historyVersions, status, version, spaceKey, hasPrePublish, preStatus, preLog, tab } = this.state;
+        const { pluginId, pluginName, remark, historyVersions, status, version, createdBy, repoName, hasPrePublish, preStatus, preLog, tab } = this.state;
         const prePublishProps = { hasPrePublish, preStatus, preLog };
+        const settingProps = { pluginId, pluginName, remark, createdBy, repoName };
         return (
             <div className="dash-pluginset">
                 <Overview {...this.state} cancelRelease={this.cancelPrePublish} />
@@ -58,7 +58,7 @@ class PluginSet extends Component {
                     </div>
                 )}
                 {tab === 2 && pluginName && <History historyVersions={historyVersions} />}
-                {tab === 3 && pluginName && <Setting pluginId={pluginId} pluginName={pluginName} spaceKey={spaceKey} remark={remark} refresh={this.fetchPlugin} />}
+                {tab === 3 && pluginName && <Setting {...settingProps} refresh={this.fetchPlugin} />}
             </div>
         );
     }
@@ -74,7 +74,7 @@ class PluginSet extends Component {
         const { pluginId } = this.state;
         api.getPluginInfo(pluginId).then(res => {
             if (res.code === 0) {
-                const { createdBy, pluginName, remark, avgScore, countScoreUser, pluginTypes, pluginVersions, spaceKey, repoName, repoUrl } = res.data;
+                const { createdBy, pluginName, remark, avgScore, countScoreUser, pluginTypes, pluginVersions, repoName, repoUrl } = res.data;
                 const { historyVersions, status, version, versionId, log, auditRemark, hasPrePublish, preStatus, preVersionId, preLog } = parseStatus(pluginVersions);
                 this.setState({
                     createdBy,
@@ -83,7 +83,6 @@ class PluginSet extends Component {
                     avgScore,
                     countScoreUser,
                     pluginType: pluginTypes[0].typeName,
-                    spaceKey,
                     repoName,
                     repoUrl,
                     historyVersions,