diff --git a/etc/init.shy b/etc/init.shy index 1d34eeba..531cd4a7 100644 --- a/etc/init.shy +++ b/etc/init.shy @@ -28,7 +28,7 @@ ~web.chat.macos applications install "dream" web.dream icon "usr/icons/Mission Control.png" - applications install "repos" web.code.git.repos icon "usr/icons/git.jpg" + applications install "repos" web.code.git.status icon "usr/icons/git.jpg" applications install "compile" web.code.compile icon "usr/icons/go.png" applications install "Activity" cli.procinfo icon "usr/icons/Activity Monitor.png" applications install "Settings" web.chat.macos.opens args "System Settings" icon "usr/icons/System Settings.png" diff --git a/etc/miss.sh b/etc/miss.sh index 990a768b..64fd7118 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -23,5 +23,7 @@ ish_miss_prepare go-qrcode ish_miss_prepare websocket ish_miss_prepare webview ish_miss_prepare matrix +ish_miss_prepare word-dict +ish_miss_prepare wubi-dict ish_miss_make diff --git a/src/main.js b/src/main.js index 0f613e02..08377b41 100644 --- a/src/main.js +++ b/src/main.js @@ -6,7 +6,7 @@ Volcanos({river: { studio: {name: "研发 studio", icon: "bi bi-git", index: ["web.code.vimer", "web.code.git.status", "web.chat.favor", "web.team.plan", "web.wiki.word"]}, }}, profile: {name: "测试群", icon: "bi bi-list-columns", type: aaa.TECH, storm: { - release: {name: "发布 release", icon: "bi bi-list-check", index: ["web.code.compile", "web.code.publish", "web.code.pprof", "web.code.bench", "web.dream", "web.space", "web.code.git.service", "web.code.git.status"]}, + issue: {name: "发布 issue", icon: "bi bi-list-check", index: ["web.code.compile", "web.code.publish", "web.code.bench", "web.code.pprof", "web.dream", "web.space", "web.code.git.service", "web.code.git.status"]}, }}, operate: {name: "运维群", icon: "bi bi-gear", type: aaa.TECH, storm: { web: {name: "应用 web", icon: "bi bi-browser-chrome", index: ["broad", "serve", "space", "dream", "share"]}, diff --git a/src/main.sh b/src/main.sh index 7bfb5699..b0fdd98b 100644 --- a/src/main.sh +++ b/src/main.sh @@ -8,11 +8,9 @@ main() { ;; dev) # 开发环境 shift && prepare_system; require miss.sh; [ -f ~/.gitconfig ] || ish_dev_git_prepare - if [ -n "$ctx_pod" ]; then - git clone $ctx_dev/chat/pod/$ctx_pod; cd $ctx_pod && source etc/miss.sh dev dev "$@" - else - git clone $ctx_dev contexts; cd contexts && source etc/miss.sh dev dev "$@" - fi + git config --global "url.$ctx_dev/x/.insteadof" "${ctx_repos%/*}/" + git clone $ctx_repos ${ctx_repos##*/}; cd ${ctx_repos##*/} && source etc/miss.sh + ish_miss_serve_log dev dev "$@" ;; cmd) # 命令环境 ish_sys_dev_init >/dev/null; shift; [ -n "$*" ] && ish_sys_dev_run "$@" diff --git a/src/template/web.chat.header/dark.css b/src/template/web.chat.header/dark.css index 1e35c025..61119b1b 100644 --- a/src/template/web.chat.header/dark.css +++ b/src/template/web.chat.header/dark.css @@ -15,6 +15,8 @@ body.dark { --panel-output-fg-color:var(--body-fg-color); --plugin-bg-color:var(--body-bg-color); --plugin-fg-color:var(--body-fg-color); + /* --plugin-border-color:dimgray; */ + --plugin-border-color:#404141; --plugin-radius:var(--input-radius); --float-fg-color:var(--plugin-fg-color); diff --git a/src/template/web.code.docker.client/DockerFile b/src/template/web.code.docker.client/DockerFile deleted file mode 100644 index 95348be4..00000000 --- a/src/template/web.code.docker.client/DockerFile +++ /dev/null @@ -1,6 +0,0 @@ -FROM alpine - -WORKDIR /root/contexts -COPY ice.linux.amd64 bin/ice.bin - -CMD ./bin/ice.bin forever start dev dev diff --git a/src/template/web.code.publish/app.sh b/src/template/web.code.publish/app.sh new file mode 100644 index 00000000..3065b2dc --- /dev/null +++ b/src/template/web.code.publish/app.sh @@ -0,0 +1 @@ +export ctx_dev={{.Option "domain"}}{{.Option "ctx_env"}}; temp=$(mktemp); if curl -h &>/dev/null; then curl -o $temp -fsSL $ctx_dev; else wget -O $temp -q $ctx_dev; fi; source $temp app username {{.Option "user.name"}} usernick "{{.Option "user.nick"}}" {{.OptionArgs "token"}} diff --git a/src/template/web.code.publish/dev.sh b/src/template/web.code.publish/dev.sh new file mode 100644 index 00000000..70319fa1 --- /dev/null +++ b/src/template/web.code.publish/dev.sh @@ -0,0 +1 @@ +export ctx_dev={{.Option "domain"}} ctx_repos={{.Option "source"}}{{.Option "ctx_env"}}; temp=$(mktemp); if curl -h &>/dev/null; then curl -o $temp -fsSL $ctx_dev; else wget -O $temp -q $ctx_dev; fi; source $temp dev username {{.Option "user.name"}} usernick "{{.Option "user.nick"}}" {{.OptionArgs "token"}} diff --git a/usr/local/export/web.chat.favor/hash.json b/usr/local/export/web.chat.favor/hash.json index 6747152d..0facdbcd 100644 --- a/usr/local/export/web.chat.favor/hash.json +++ b/usr/local/export/web.chat.favor/hash.json @@ -7,6 +7,14 @@ "type": "link" } }, + "343e1f": { + "meta": { + "name": "192.168.10.16:9020", + "text": "http://192.168.10.16:9020/", + "time": "2023-07-15 13:51:23.120", + "type": "link" + } + }, "417770": { "meta": { "name": "localhost:20001", diff --git a/usr/local/export/web.chat.macos.dock/hash.json b/usr/local/export/web.chat.macos.dock/hash.json index 15bfc02b..7ddab75e 100644 --- a/usr/local/export/web.chat.macos.dock/hash.json +++ b/usr/local/export/web.chat.macos.dock/hash.json @@ -7,14 +7,6 @@ "time": "2023-07-12 10:16:45.614" } }, - "72d11d": { - "meta": { - "icon": "/require/usr/icons/git.jpg", - "index": "web.code.git.repos", - "name": "repos", - "time": "2023-07-12 10:16:45.614" - } - }, "7b06e7": { "meta": { "icon": "usr/icons/Safari.png", @@ -54,5 +46,13 @@ "name": "Terminal", "time": "2023-05-24 15:32:00.614" } + }, + "eac248": { + "meta": { + "icon": "/require/usr/icons/git.jpg", + "index": "web.code.git.status", + "name": "status", + "time": "2023-07-15 14:31:26.486" + } } }