Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix&style: some litter fix of devbox plugin and web #5236

Merged
merged 106 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
aef3179
feat(vscode/devbox): plugin transform init
mlhiter Oct 28, 2024
d4b0974
chore(devbox): adjust folder position
mlhiter Oct 28, 2024
eb6591d
fix: package-lock and sanitized bug
mlhiter Oct 28, 2024
693e717
fix: another try
mlhiter Oct 28, 2024
ba3705e
fix: some rebase fix
mlhiter Nov 5, 2024
f4716fe
feat: db and network basic show
mlhiter Nov 6, 2024
f844e16
fix: rebase cause svg lose
mlhiter Nov 6, 2024
5e72a83
feat: devboxListView refactor
mlhiter Nov 6, 2024
ac6d92f
fix: open devbox bug
mlhiter Nov 6, 2024
139cdb2
feat: delete ssh config
mlhiter Nov 6, 2024
b97218e
fix: refresh devboxList after connect
mlhiter Nov 7, 2024
6700bf2
fix: some type bug
mlhiter Nov 7, 2024
e38f1cd
fix: typo bug
mlhiter Nov 7, 2024
569607c
chore: svg rename
mlhiter Nov 7, 2024
90d4b8f
chore: svg rename
mlhiter Nov 7, 2024
c151d3e
feat: default runtime svg
mlhiter Nov 7, 2024
95bc0c7
fix: refresh devboxlist and convert sshconfig to version 2
mlhiter Nov 7, 2024
c67bf20
fix: form update runtimeVersion unchanged bug
mlhiter Nov 7, 2024
f93f754
feat: default runtime version
mlhiter Nov 7, 2024
9dc223f
feat: params goto
mlhiter Nov 7, 2024
200dfc9
feat: create new devbox
mlhiter Nov 7, 2024
11fad1d
fix: runtimeNamespace bug
mlhiter Nov 7, 2024
bfebd11
fix: api url bug,I deeeeead
mlhiter Nov 7, 2024
dcbaa21
perf: file deal
mlhiter Nov 7, 2024
d4f9ea5
chore: remove unused code
mlhiter Nov 7, 2024
8d8d4cf
fix: write ssh_config bug
mlhiter Nov 7, 2024
a4dba07
chore: package adjust
mlhiter Nov 7, 2024
37b9198
chore: change some file
mlhiter Nov 7, 2024
6659db0
feat: copy connection string
mlhiter Nov 7, 2024
5303496
fix: support remote-ssh customConfigFile
mlhiter Nov 8, 2024
e761333
feat: different region support
mlhiter Nov 8, 2024
9059067
perf: some code adjust
mlhiter Nov 8, 2024
09d66fd
feat: refresh button of db and network
mlhiter Nov 8, 2024
b397be9
chore: add svg
mlhiter Nov 8, 2024
3fd4bbb
chore: theme adaptation
mlhiter Nov 8, 2024
4010989
feat: adjust devboxList show
mlhiter Nov 8, 2024
5b5db10
feat: settings to custom apiUrl
mlhiter Nov 8, 2024
411ee0d
fix: 缓兵之计,devbox 硬调整
mlhiter Nov 8, 2024
4582365
feat: status un used version,haha
mlhiter Nov 8, 2024
5c2340f
fix: adjust vscode and code position
mlhiter Nov 12, 2024
3c624aa
feat: devbox status
mlhiter Nov 12, 2024
1331f46
fix: delete devbox svg and adjust
mlhiter Nov 12, 2024
a10c120
fix: copy button
mlhiter Nov 12, 2024
136b8a2
fix: copy feat adjust
mlhiter Nov 12, 2024
1de828d
chore: some text adjust
mlhiter Nov 12, 2024
3a52151
feat: feedback
mlhiter Nov 12, 2024
14ef299
fix: db view adjust
mlhiter Nov 12, 2024
36b6cf6
feat: open in vscode internal broswer
mlhiter Nov 12, 2024
d8c26d4
fix: file authority problem adjust
mlhiter Nov 13, 2024
16a203a
chore: adjust code position
mlhiter Nov 13, 2024
7863fad
fix: semgrep
mlhiter Nov 13, 2024
f4f919f
feat: web delete will cause local ssh deleted
mlhiter Nov 13, 2024
b8e7100
fix: devboxList cpu/memory tooltip z-index
mlhiter Nov 13, 2024
a596932
chore: 1.0.0
mlhiter Nov 13, 2024
7f420f2
chore: update license
mlhiter Nov 13, 2024
5557647
chore: remove unused code
mlhiter Nov 13, 2024
a775c89
chore: remove png to link
mlhiter Nov 13, 2024
7ae2182
chore: version
mlhiter Nov 13, 2024
d67b6fe
fix: path bug
mlhiter Nov 13, 2024
482a5de
fix: username have space
mlhiter Nov 13, 2024
e4d3879
feat: delete project will delete remote-ssh remotePlatform config item
mlhiter Nov 14, 2024
f9a61ab
feat: delete devbox will delete private key
mlhiter Nov 14, 2024
fe8d9b7
feat: db goto web page
mlhiter Nov 14, 2024
fcced78
fix: connect bug
mlhiter Nov 14, 2024
02f6c9f
fix: path include bug
mlhiter Nov 14, 2024
20a56f5
chore: change version
mlhiter Nov 14, 2024
f9e8cce
feat: create api url
mlhiter Nov 14, 2024
c2de5f7
feat: version change
mlhiter Nov 14, 2024
bf28fc0
fix: devboxList update view
mlhiter Nov 14, 2024
290a359
chore: some adjust
mlhiter Nov 15, 2024
60ee91f
chore: version change
mlhiter Nov 15, 2024
1a343a0
fix: quota bug
mlhiter Nov 15, 2024
0877054
fix: pr issue
mlhiter Nov 15, 2024
a511d7e
fix: ssh_config bug
mlhiter Nov 18, 2024
346c207
fix: test
mlhiter Nov 18, 2024
2a4f261
chore: version change
mlhiter Nov 18, 2024
3e8f0c5
Merge branch 'main' into vscode
mlhiter Nov 18, 2024
dcd1a01
fix: delete old pattern
mlhiter Nov 18, 2024
d6df0be
fix: disable delete automatically and windows permission Control
mlhiter Nov 19, 2024
12c7969
chore: package.json adjust
mlhiter Nov 19, 2024
9816933
fix: delete bug try
mlhiter Nov 20, 2024
19fe256
feat: windsurf ide support
mlhiter Nov 20, 2024
483736c
fix: label undefined bug
mlhiter Nov 20, 2024
170f386
fix: bug
mlhiter Nov 20, 2024
84a5be6
feat: ext support windsurf
mlhiter Nov 20, 2024
23af608
feat: networkView and databaseView style adjust
mlhiter Nov 21, 2024
7fb42fd
chore: update vscode engine
mlhiter Nov 21, 2024
f04e864
fix: create url bug
mlhiter Nov 21, 2024
b515523
style: dbview and network view adjust style
mlhiter Nov 21, 2024
ce73ecb
chore: text perf
mlhiter Nov 21, 2024
6368992
chore: remove unused code
mlhiter Nov 21, 2024
464c1a6
fix: icon can not show and remove some unused code
mlhiter Nov 21, 2024
bf0cb10
feat: i18n support
mlhiter Nov 22, 2024
e668218
chore: adjust ide list order
mlhiter Nov 22, 2024
5592c4a
fix: stop and wait 3s to release
mlhiter Nov 22, 2024
252b3db
feat: open web database terminal
mlhiter Nov 22, 2024
883158d
fix: terminal add to detail
mlhiter Nov 22, 2024
393aa83
feat: Logger system
mlhiter Nov 22, 2024
5c7ae27
chore: text adjust
mlhiter Nov 22, 2024
5604904
style: custom domain adjust style
mlhiter Nov 22, 2024
0bfbaf2
fix: prefetch bug
mlhiter Nov 23, 2024
ab880c7
chore: cursor show message
mlhiter Nov 25, 2024
32546c7
fix: custom domain bug
mlhiter Nov 25, 2024
e9c5ebb
chore: little adjust
mlhiter Nov 25, 2024
724cd44
fix: undefined bug
mlhiter Nov 25, 2024
536f64c
fix: logfile removed
mlhiter Nov 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion extensions/ide/vscode/devbox/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ node_modules
*.vsix

.env
!.vscode/
!.vscode/
resources/codicons/
2 changes: 1 addition & 1 deletion extensions/ide/vscode/devbox/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"preLaunchTask": "${defaultBuildTask}",
"env": {
"NODE_ENV": "development"
// "NODE_ENV": "development"
}
}
]
Expand Down
1 change: 1 addition & 0 deletions extensions/ide/vscode/devbox/images/cloud.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion extensions/ide/vscode/devbox/images/dark/globe.svg

This file was deleted.

1 change: 0 additions & 1 deletion extensions/ide/vscode/devbox/images/light/globe.svg

This file was deleted.

2 changes: 1 addition & 1 deletion extensions/ide/vscode/devbox/images/network.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions extensions/ide/vscode/devbox/l10n/bundle.l10n.zh-CN.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"Type": "数据库类型",
"Username": "用户名",
"Password": "密码",
"Host": "主机",
"Port": "端口",
"Copy Password": "复制密码",
"Copy Connection String": "复制连接串",
"Connection string copied to clipboard!": "连接串已复制到剪贴板!",
"Please select a region,RegionList are added by your each connection.": "请选择一个可用区,可用区来自于您的每个连接。",
"Only Devbox can be opened.": "只能打开 Devbox。",
"Are you sure to delete?": "确定删除Devbox?",
"This action will only delete the devbox ssh config in the local environment.": "此操作只会删除本地环境中的 Devbox SSH 配置。",
"Delete Devbox failed.": "删除 Devbox 失败。",
"Give us a feedback in our GitHub repository.": "在 GitHub 仓库反馈。",
"Give us a feedback in our help desk system.": "在工单系统反馈。",
"Protocol": "协议",
"Address": "地址",
"Open in Browser": "在浏览器中打开",
"Preview in Editor": "在编辑器中预览",
"Open Database Web Terminal": "打开数据库 Web 终端"
}
12 changes: 9 additions & 3 deletions extensions/ide/vscode/devbox/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

92 changes: 34 additions & 58 deletions extensions/ide/vscode/devbox/package.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
{
"name": "devbox-aio",
"displayName": "Devbox",
"description": "help code for cloud devbox in sailos/sealos",
"version": "1.1.9",
"displayName": "%displayName%",
"description": "%description%",
"version": "1.2.2024112203",
"keywords": [
"devbox",
"remote development",
"remote"
],
"bugs": {
"url": "https://github.com/mlhiter/devbox/issues"
"url": "https://github.com/labring/sealos/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/mlhiter/devbox"
"url": "https://github.com/labring/sealos"
},
"homepage": "https://github.com/mlhiter/devbox/blob/master/README.md",
"homepage": "https://github.com/labring/sealos/blob/main/extensions/ide/vscode/devbox/README.md",
"publisher": "labring",
"license": "MIT",
"license": "Apache-2.0",
"icon": "images/icon.png",
"engines": {
"vscode": "^1.91.0"
},
"l10n": "./l10n",
"categories": [
"Other"
],
Expand All @@ -37,87 +38,71 @@
"commands": [
{
"command": "devbox.connectRemoteSSH",
"title": "Devbox: Connect to Remote SSH"
"title": "%devbox.connectRemoteSSH.title%"
},
{
"command": "devboxDashboard.refresh",
"title": "Refresh Devbox",
"title": "%devbox.refresh.title%",
"icon": {
"light": "images/light/refresh.svg",
"dark": "images/dark/refresh.svg"
}
},
{
"command": "devboxDashboard.createDevbox",
"title": "Create Devbox",
"title": "%devbox.create.title%",
"icon": {
"light": "images/light/create.svg",
"dark": "images/dark/create.svg"
}
},
{
"command": "devboxDashboard.openDevbox",
"title": "Open Devbox",
"title": "%devbox.open.title%",
"icon": {
"light": "images/light/open.svg",
"dark": "images/dark/open.svg"
}
},
{
"command": "devboxDashboard.deleteDevbox",
"title": "Delete Devbox",
"title": "%devbox.delete.title%",
"icon": {
"light": "images/light/delete.svg",
"dark": "images/dark/delete.svg"
}
},
{
"command": "devbox.openExternalLink",
"title": "Devbox:Open in Browser"
"title": "%devbox.openInBrowser.title%"
},
{
"command": "devbox.copy",
"title": "Copy Connection String",
"title": "%devbox.copy.title%",
"icon": {
"light": "images/light/copy.svg",
"dark": "images/dark/copy.svg"
}
},
{
"command": "devbox.refreshDatabase",
"title": "Refresh Database",
"title": "%devbox.refreshDatabase.title%",
"icon": {
"light": "images/light/refresh.svg",
"dark": "images/dark/refresh.svg"
}
},
{
"command": "devbox.refreshNetwork",
"title": "Refresh Network",
"title": "%devbox.refreshNetwork.title%",
"icon": {
"light": "images/light/refresh.svg",
"dark": "images/dark/refresh.svg"
}
},
{
"command": "devbox.openInIntegratedBrowser",
"title": "Open in Integrated Browser",
"icon": {
"light": "images/light/globe.svg",
"dark": "images/dark/globe.svg"
}
},
{
"command": "devbox.openInExternalBrowser",
"title": "Open in External Browser",
"icon": {
"light": "images/light/link-external.svg",
"dark": "images/dark/link-external.svg"
}
},
{
"command": "devbox.gotoDatabaseWebPage",
"title": "Goto Database Web Page",
"title": "%devbox.gotoDatabaseWebPage.title%",
"icon": {
"light": "images/light/link-external.svg",
"dark": "images/dark/link-external.svg"
Expand All @@ -128,51 +113,55 @@
"devboxListView": [
{
"id": "devboxDashboard",
"name": "My Projects"
"name": "%devbox.myProjects.title%"
},
{
"id": "devboxFeedback",
"name": "Feedback"
"name": "%devbox.feedback.title%"
}
],
"networkView": [
{
"id": "networkView",
"name": "Network"
"name": "%devbox.network.title%",
"type": "webview",
"when": "remoteName == ssh-remote"
}
],
"dbView": [
{
"type": "webview",
"id": "dbView",
"name": "Database"
"name": "%devbox.database.title%",
"when": "remoteName == ssh-remote"
}
]
},
"viewsContainers": {
"activitybar": [
{
"id": "devboxListView",
"title": "Devbox",
"title": "%devbox.devbox.title%",
"icon": "images/explorer.svg"
}
],
"panel": [
{
"id": "networkView",
"title": "Network",
"title": "%devbox.network.title%",
"icon": "images/network.svg"
},
{
"id": "dbView",
"title": "Database",
"title": "%devbox.database.title%",
"icon": "images/database.svg"
}
]
},
"viewsWelcome": [
{
"view": "devboxDashboard",
"contents": "View and manage your devboxes,Now you can create a new devbox."
"contents": "%devbox.welcome.title%"
}
],
"menus": {
Expand Down Expand Up @@ -213,21 +202,6 @@
"command": "devboxDashboard.deleteDevbox",
"when": "view == devboxDashboard && viewItem == devbox",
"group": "inline@2"
},
{
"command": "devbox.copy",
"when": "view == dbView && viewItem == database",
"group": "inline"
},
{
"command": "devbox.openInIntegratedBrowser",
"when": "view == networkView && viewItem == network",
"group": "inline@1"
},
{
"command": "devbox.openInExternalBrowser",
"when": "view == networkView && viewItem == network",
"group": "inline@2"
}
]
}
Expand All @@ -238,11 +212,12 @@
"scripts": {
"vscode:prepublish": "npm run package",
"compile": "webpack",
"watch": "webpack --watch",
"package": "webpack --mode production --devtool hidden-source-map",
"watch": "npm run copy-codicons && webpack --watch",
"package": "npm run copy-codicons && webpack --mode production --devtool hidden-source-map",
"compile-tests": "tsc -p . --outDir out",
"watch-tests": "tsc -p . -w --outDir out",
"pretest": "npm run compile-tests && npm run compile && npm run lint",
"copy-codicons": "mkdir -p resources/codicons && cp -r node_modules/@vscode/codicons/dist/* resources/codicons/",
"lint": "eslint src",
"test": "vscode-test"
},
Expand All @@ -261,6 +236,7 @@
"webpack-cli": "^5.1.4"
},
"dependencies": {
"@vscode/codicons": "^0.0.36",
"axios": "^1.7.5",
"execa": "^9.5.1",
"ssh-config": "^5.0.0"
Expand Down
20 changes: 20 additions & 0 deletions extensions/ide/vscode/devbox/package.nls.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"displayName": "Devbox",
"description": "help code for cloud devbox in sailos/sealos",
"devbox.connectRemoteSSH.title": "Devbox: Connect to Remote SSH",
"devbox.refresh.title": "Devbox: Refresh",
"devbox.create.title": "Devbox: Create new Devbox",
"devbox.open.title": "Devbox: Open Devbox",
"devbox.delete.title": "Devbox: Delete Devbox",
"devbox.openInBrowser.title": "Devbox: Open in Browser",
"devbox.copy.title": "Devbox: Copy",
"devbox.refreshDatabase.title": "Devbox: Refresh Database",
"devbox.refreshNetwork.title": "Devbox: Refresh Network",
"devbox.gotoDatabaseWebPage.title": "Devbox: Open Database Web Page",
"devbox.myProjects.title": "My Devboxes",
"devbox.feedback.title": "Feedback",
"devbox.network.title": "Network",
"devbox.database.title": "Database",
"devbox.devbox.title": "Devbox",
"devbox.welcome.title": "No Devbox yet, please create a new devbox.\n [Create Devbox](command:devboxDashboard.createDevbox)\n To learn more about how to use Devbox, please visit [Devbox Documentation](https://sailos.io/docs/quick-start)."
}
20 changes: 20 additions & 0 deletions extensions/ide/vscode/devbox/package.nls.zh-CN.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"displayName": "Devbox",
"description": "用于 sailos/sealos 中云Devbox的辅助工具",
"devbox.connectRemoteSSH.title": "Devbox: 连接远程 SSH",
"devbox.refresh.title": "Devbox: 刷新",
"devbox.create.title": "Devbox: 创建",
"devbox.open.title": "Devbox: 打开",
"devbox.delete.title": "Devbox: 删除",
"devbox.openInBrowser.title": "Devbox: 在浏览器中打开",
"devbox.copy.title": "Devbox: 复制",
"devbox.refreshDatabase.title": "Devbox: 刷新数据库",
"devbox.refreshNetwork.title": "Devbox: 刷新网络",
"devbox.gotoDatabaseWebPage.title": "Devbox: 打开数据库网页",
"devbox.myProjects.title": "我的项目",
"devbox.feedback.title": "反馈",
"devbox.network.title": "网络",
"devbox.database.title": "数据库",
"devbox.devbox.title": "Devbox",
"devbox.welcome.title": "还没有Devbox,请创建一个新的Devbox。\n [创建Devbox](command:devboxDashboard.createDevbox)\n 要了解更多关于如何使用Devbox的信息,请访问[Devbox文档](https://sailos.io/docs/quick-start)。"
}
Loading
Loading