Skip to content

Commit 9fefc00

Browse files
author
veedrin
committed
Merge branch 'dashboard' of github.com:Coding/WebIDE-Frontend into dashboard
2 parents 40bf0e3 + 0b0c741 commit 9fefc00

File tree

5 files changed

+69
-51
lines changed

5 files changed

+69
-51
lines changed

‎app/export.html

Lines changed: 43 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
<body>
220220
<script src="//cdn.staticfile.org/mithril/1.1.6/mithril.min.js"></script>
221221
<script>
222-
var STATIC_PATH = '<%= webpackConfig.output.publicPath %>/'
222+
var STATIC_PATH = '<%= webpackConfig.output.publicPath %>export/'
223223
var BASE_URL = '/backend/'
224224
var IMG_URL = 'https://coding.net'
225225
var REDIRECT_URL = 'https://studio.dev.tencent.com'
@@ -300,29 +300,16 @@
300300
},[
301301
m('span', '为了优化 Cloud Studio 运行的基础设施，给用户提供体验更好、更稳定的产品服务， Cloud Studio 现已在'),
302302
m('a', { href: 'https://dev.tencent.com/'}, '腾讯云开发者平台'),
303-
m('span', '中全面升级，用户可长期免费使用。升级后，此版本后续不再做功能升级及维护。为避免影响您的后续使用，建议您将该版本数据导出，并迁移至新版'),
304-
m('a', { href: 'https://studio.dev.tencent.com/intro' }, ' Cloud Studio'),
305-
m('span', '，迁移教程可参考'),
306-
m('a', { href: 'https://dev.tencent.com/help/cloud-studio/how-to-migrate-cs' }, '这里'),
307-
m('span', '。'),
308-
m('br'),
309-
m('br'),
310-
m('span', '如您已在 Cloud Studio 付费购买小主机，我们将在 2018 年 11 月 15 日前将已使用的金额返还至您的腾讯云账户中：'),
311-
m('br'),
312-
m('br'),
313-
m('strong', [
314-
m('span', '已支付现金部分，全额退还到您的腾讯云账户中，您可操作提现；'),
315-
m('br'),
316-
m('span', '已使用的代金券部分，返还等额通用代金券，发放于您的腾讯云账户中。')
317-
]),
303+
m('span', '中全面升级，用户可长期免费使用，您可以前往'),
304+
m('a', { href: 'https://studio.dev.tencent.com/intro' }, ' 腾讯云开发者平台 Cloud Studio'),
318305
m('br'),
319306
m('br'),
320307
m('span', '如给您造成了不便，敬请谅解。我们将在新的平台，给您提供更优质的服务。感谢您的理解和支持。')
321308
]),
322309
m('a', {
323-
href: '?/list',
310+
href: 'https://studio.dev.tencent.com/intro',
324311
class: 'button start-btn'
325-
}, '开始导出')
312+
}, '前往体验')
326313
]),
327314
m(Footer)
328315
]
@@ -540,38 +527,44 @@
540527
}
541528
}
542529

543-
try{
544-
ajax(function(xhr) {
545-
var result = JSON.parse(xhr.responseText)
546-
if (result.contents && result.contents.length) {
547-
var lists = result.contents
548-
549-
lists.map(function(item) {
550-
var project = item.project
551-
var iconUrl = project.iconUrl
552-
553-
wsList.push({
554-
spaceKey: item.spaceKey,
555-
name: item.owner.globalKey + '/' + project.name,
556-
time: formatDate(item.lastModifiedDate),
557-
checked: true,
558-
img: iconUrl.includes('http') ? iconUrl : IMG_URL + iconUrl,
559-
ownerName: item.owner.globalKey
560-
})
561-
})
562-
563-
m.route.prefix('?')
564-
m.route(document.body, '/home', {
565-
'/list': List,
566-
'/home': Home,
567-
})
568-
} else {
569-
location.href = REDIRECT_URL
570-
}
571-
}, BASE_URL + 'workspaces?page=0&size=5&sort=lastModifiedDate,desc')
572-
} catch (e) {
573-
location.href = REDIRECT_URL
574-
}
530+
m.route.prefix('?')
531+
m.route(document.body, '/home', {
532+
'/list': List,
533+
'/home': Home,
534+
})
535+
536+
// try{
537+
// ajax(function(xhr) {
538+
// var result = JSON.parse(xhr.responseText)
539+
// if (result.contents && result.contents.length) {
540+
// var lists = result.contents
541+
542+
// lists.map(function(item) {
543+
// var project = item.project
544+
// var iconUrl = project.iconUrl
545+
546+
// wsList.push({
547+
// spaceKey: item.spaceKey,
548+
// name: item.owner.globalKey + '/' + project.name,
549+
// time: formatDate(item.lastModifiedDate),
550+
// checked: true,
551+
// img: iconUrl.includes('http') ? iconUrl : IMG_URL + iconUrl,
552+
// ownerName: item.owner.globalKey
553+
// })
554+
// })
555+
556+
// m.route.prefix('?')
557+
// m.route(document.body, '/home', {
558+
// '/list': List,
559+
// '/home': Home,
560+
// })
561+
// } else {
562+
// location.href = REDIRECT_URL
563+
// }
564+
// }, BASE_URL + 'workspaces?page=0&size=5&sort=lastModifiedDate,desc')
565+
// } catch (e) {
566+
// location.href = REDIRECT_URL
567+
// }
575568
</script>
576569
</body>
577570
</html>

‎static/changelog/changelog.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
## 2018/11/28 更新 v3.4.2
2+
3+
插件市场增加面包屑导航
4+
修复新建文件时会创建两个的 BUG
5+
Cloud Studio iPad 适配优化
6+
优化左右侧边栏菜单过多的显示问题
7+
添加 event-stream 事件影响公告
8+
9+
## 2018/11/22 更新 v3.4.1
10+
11+
插件预发布与发布逻辑优化
12+
Dashboard 增加协作空间和仓库链接
13+
创建插件自动推送到项目
14+
修复工作空间更新/删除时间不对的问题
15+
插件市场中的图片可以点击放大
16+
117
## 2018/11/9 更新 v3.4
218

319
插件中心相关功能上线

‎static/changelog/version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.01
1+
3.4

‎webpack_configs/devServer.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ module.exports = function (options) {
2121
{ from: /\/changelog/, to: '/changelog.html' },
2222
{ from: /\/maintain/, to: '/maintain.html' },
2323
{ from: /\/iframe/, to: '/iframe-test.html' },
24+
{ from: /\/export/, to: '/export.html' },
2425
]
2526
}
2627
},

‎webpack_configs/webpack.dev.config.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,14 @@ const config = merge(
123123
iframeUrl: str('ide.test:8060/intro'),
124124
template: path.join(PROJECT_ROOT, 'app/iframe-test.html'),
125125

126+
}),
127+
new HtmlWebpackPlugin({
128+
title: 'Coding WebIDE',
129+
inject: false,
130+
filename: (staticDir ? '../' : '') + exportEntryHtmlName,
131+
iframeUrl: str('ide.test:8060/intro'),
132+
template: path.join(PROJECT_ROOT, 'app/export.html'),
133+
126134
}),
127135

128136
// new HtmlWebpackPlugin({

0 commit comments

Comments
 (0)