From e609ad55725a77bb1842edf05d28db766219d126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B0=D1=82=D0=BE=D0=BB=D0=B8=D0=B9=20=D0=A2?= =?UTF-8?q?=D1=83=D1=85=D1=82=D0=B0=D1=80=D0=BE=D0=B2?= Date: Sun, 9 Mar 2025 08:34:02 +0500 Subject: [PATCH] v1.0.2 --- app.go | 4 +- frontend/index.html | 18 ++++----- frontend/src/App.svelte | 5 +-- frontend/src/servers.js | 86 ++++++++++++++++++++--------------------- frontend/src/style.css | 26 ++++++------- go.mod | 20 ++++------ go.sum | 24 ++++++------ main.go | 1 + 8 files changed, 89 insertions(+), 95 deletions(-) diff --git a/app.go b/app.go index 8c77334..e5ad2c4 100644 --- a/app.go +++ b/app.go @@ -74,7 +74,7 @@ func (a *App) StartServer(s string) string { } func (a *App) Weed() { - os.Chdir("d:\\projects\\sw4-nano\\util") + os.Chdir("d:\\projects\\nano\\sw4-nano\\util") //s := subprocess.New(".\\"+name+".exe") cmd := "py scanpics.py" s := subprocess.New(cmd) @@ -86,7 +86,7 @@ func (a *App) Weed() { } func getCountPics(dir string) int { - pics, err := os.ReadDir("d:\\pics") + pics, err := os.ReadDir(dir) if err != nil { return -1 } diff --git a/frontend/index.html b/frontend/index.html index daee15f..96bb84d 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,13 +1,13 @@ - + - - - + + + server - - -
- - + + +
+ + diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index c63a40a..56ab17d 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -106,10 +106,7 @@ stroke-width="3" stroke-linecap="round" stroke-linejoin="round" - class=" - feather feather-refresh-ccw - - cursor-pointer"> + class="feather feather-refresh-ccw cursor-pointer"> diff --git a/frontend/src/servers.js b/frontend/src/servers.js index 76703f4..b59d536 100644 --- a/frontend/src/servers.js +++ b/frontend/src/servers.js @@ -1,46 +1,46 @@ const servers = [ - { - name: "books-web:3000", - dir: "d:\\projects\\books-web", - cmd: ".\\books-web.exe", - port: "3000", - run: "idle" - }, - { - name: "nano-tw:5321", - dir: "d:\\projects\\nano-tw", - cmd: ".\\nano-tw.exe", - port: "5321", - run: "idle" - }, - { - name: "trans-web:4322", - dir: "d:\\projects\\trans-web", - cmd: ".\\trans-web.exe", - port: "4322", - run: "idle" - }, - { - name: "stem:4323", - dir: "d:\\projects\\stem", - cmd: ".\\stem.exe", - port: "4323", - run: "idle" - }, - { - name: "sw4-nano:4321", - dir: "d:\\projects\\sw4-nano", - cmd: ".\\sw4-nano.exe", - port: "4321", - run: "idle" - }, - { - name: "pionier:4327", - dir: "d:\\projects\\pionier-daisy", - cmd: ".\\pionier-daisy.exe", - port: "4327", - run: "idle" - }, + { + name: "books-web:3000", + dir: "d:\\projects\\books\\books-web", + cmd: ".\\books-web.exe", + port: "3000", + run: "idle" + }, + { + name: "nano-tw:5321", + dir: "d:\\projects\\nano\\nano-tw", + cmd: ".\\nano-tw.exe", + port: "5321", + run: "idle" + }, + { + name: "trans-web:4322", + dir: "d:\\projects\\trans\\trans-web", + cmd: ".\\trans-web.exe", + port: "4322", + run: "idle" + }, + { + name: "stem:4323", + dir: "d:\\projects\\stem\\stem-work", + cmd: ".\\stem.exe", + port: "4323", + run: "idle" + }, + { + name: "sw4-nano:4321", + dir: "d:\\projects\\nano\\sw4-nano", + cmd: ".\\sw4-nano.exe", + port: "4321", + run: "idle" + }, + { + name: "pionier:4327", + dir: "d:\\projects\\pionier\\pionier-daisy", + cmd: ".\\pionier-daisy.exe", + port: "4327", + run: "idle" + }, ]; -export default servers; \ No newline at end of file +export default servers; diff --git a/frontend/src/style.css b/frontend/src/style.css index 3940d6c..3e3ea4a 100644 --- a/frontend/src/style.css +++ b/frontend/src/style.css @@ -1,26 +1,26 @@ html { - background-color: rgba(27, 38, 54, 1); - text-align: center; - color: white; + background-color: rgba(27, 38, 54, 1); + text-align: center; + color: white; } body { - margin: 0; - color: white; - font-family: "Nunito", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", + margin: 0; + color: white; + font-family: "Nunito", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; } @font-face { - font-family: "Nunito"; - font-style: normal; - font-weight: 400; - src: local(""), + font-family: "Nunito"; + font-style: normal; + font-weight: 400; + src: local(""), url("assets/fonts/nunito-v16-latin-regular.woff2") format("woff2"); } #app { - height: 100vh; - text-align: center; -} + height: 100vh; + text-align: center; +} \ No newline at end of file diff --git a/go.mod b/go.mod index ce273e7..6c0cdec 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,10 @@ -module changeme +module server -go 1.21 - -toolchain go1.22.0 +go 1.23.1 require ( github.com/estebangarcia21/subprocess v0.0.0-20230526204252-a1a6de4773be - github.com/wailsapp/wails/v2 v2.8.0 + github.com/wailsapp/wails/v2 v2.9.2 ) require ( @@ -30,13 +28,11 @@ require ( github.com/tkrajina/go-reflector v0.5.6 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - github.com/wailsapp/go-webview2 v1.0.10 // indirect + github.com/wailsapp/go-webview2 v1.0.16 // indirect github.com/wailsapp/mimetype v1.4.1 // indirect - golang.org/x/crypto v0.18.0 // indirect + golang.org/x/crypto v0.23.0 // indirect golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/sys v0.16.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect ) - -// replace github.com/wailsapp/wails/v2 v2.8.0 => C:\Users\admin\go\pkg\mod diff --git a/go.sum b/go.sum index 767a8a0..170e777 100644 --- a/go.sum +++ b/go.sum @@ -59,19 +59,19 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/wailsapp/go-webview2 v1.0.10 h1:PP5Hug6pnQEAhfRzLCoOh2jJaPdrqeRgJKZhyYyDV/w= -github.com/wailsapp/go-webview2 v1.0.10/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= +github.com/wailsapp/go-webview2 v1.0.16 h1:wffnvnkkLvhRex/aOrA3R7FP7rkvOqL/bir1br7BekU= +github.com/wailsapp/go-webview2 v1.0.16/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo= github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs= github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o= -github.com/wailsapp/wails/v2 v2.8.0 h1:b2NNn99uGPiN6P5bDsnPwOJZWtAOUhNLv7Vl+YxMTr4= -github.com/wailsapp/wails/v2 v2.8.0/go.mod h1:EFUGWkUX3KofO4fmKR/GmsLy3HhPH7NbyOEaMt8lBF0= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +github.com/wailsapp/wails/v2 v2.9.2 h1:Xb5YRTos1w5N7DTMyYegWaGukCP2fIaX9WF21kPPF2k= +github.com/wailsapp/wails/v2 v2.9.2/go.mod h1:uehvlCwJSFcBq7rMCGfk4rxca67QQGsbg5Nm4m9UnBs= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc= golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -82,12 +82,12 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index 2f726fd..f74969b 100644 --- a/main.go +++ b/main.go @@ -40,6 +40,7 @@ func main() { if err != nil { println("Error:", err.Error()) + os.Exit(1) } }