Procházet zdrojové kódy

d02 Обновление вендоринга

SVI před 2 roky
rodič
revize
cf7cd1df4f
5 změnil soubory, kde provedl 9 přidání a 11 odebrání
  1. 2 8
      Makefile
  2. 0 2
      dev_desk.sh
  3. 1 1
      dev_serv.sh
  4. 2 0
      go.mod
  5. 4 0
      go.sum

+ 2 - 8
Makefile

@@ -20,15 +20,9 @@ runner.build:
 serv.run:
 	clear
 	go fmt ./...
-	go build -o ./bin/dev_serv ./cmd/server/main.go
+	go build -race -o ./bin/dev_serv ./cmd/server/main.go
+	GOARCH=wasm GOOS=js go build -o ./bin/web/app.wasm ./cmd/server/main.go
 	./dev_serv.sh
-pwa.run:
-	clear
-	go fmt ./...
-	go build -race -o ./bin/pwa-race ./cmd/pwa/main.go
-	GOARCH=wasm GOOS=js go build -o ./bin/web/app.wasm ./cmd/pwa/main.go
-	cd ./bin && \
-	./pwa-race
 test.run:
 	clear
 	go fmt ./...

+ 0 - 2
dev_desk.sh

@@ -1,2 +0,0 @@
-cd ./bin && \
-./dev_desktop

+ 1 - 1
dev_serv.sh

@@ -1,5 +1,5 @@
 # Адрес сервер-бота
-export SERVER_RPC_URL="localhost:18060"
+export SERVER_HTTP_PORT=":18060"
 
 
 cd ./bin && \

+ 2 - 0
go.mod

@@ -4,6 +4,7 @@ go 1.20
 
 require (
 	github.com/charmbracelet/bubbletea v0.24.1
+	github.com/maxence-charriere/go-app/v9 v9.6.7
 	github.com/sirupsen/logrus v1.9.2
 	github.com/syndtr/goleveldb v1.0.0
 )
@@ -12,6 +13,7 @@ require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect

+ 4 - 0
go.sum

@@ -12,6 +12,8 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
@@ -23,6 +25,8 @@ github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+Ei
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/maxence-charriere/go-app/v9 v9.6.7 h1:t+wofnLjVsptBB7MNevsFymMYaMIX2hGjLdWgsIFgq4=
+github.com/maxence-charriere/go-app/v9 v9.6.7/go.mod h1:UlniES44R5JoD4HsjMNrAqWXSzyw0smM0Ox+QwnO/IE=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=