Skip to content

Commit

Permalink
Add YAML support for DAG editor (#459)
Browse files Browse the repository at this point in the history
* rename pakcage

* add watch command

* rename admin dir to ui

* add YAML editor support

* fix build error
  • Loading branch information
yohamta committed Aug 10, 2023
1 parent c09deaf commit b341e31
Show file tree
Hide file tree
Showing 108 changed files with 5,190 additions and 5,231 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ jobs:

- name: Yarn install
run: yarn install
working-directory: admin
working-directory: ui

- name: Build web UI
run: yarn build
working-directory: admin
working-directory: ui

- name: Copy web assets
run: |
cp admin/dist/bundle.js ./internal/admin/handlers/web/assets/js/
cp ui/dist/bundle.js ./internal/web/handlers/assets/js/
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ jobs:

- name: Yarn install
run: yarn install
working-directory: admin
working-directory: ui

- name: Build web UI
run: yarn build
working-directory: admin
working-directory: ui

- name: Copy web assets
run: |
cp admin/dist/bundle.js ./internal/admin/handlers/web/assets/js/
cp ui/dist/bundle.js ./internal/web/handlers/assets/js/
- name: Cache Go modules
uses: actions/cache@v1
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# build
bin/*
dist/
internal/admin/handlers/web/assets/fonts/*
internal/admin/handlers/web/assets/js/*
internal/web/handlers/assets/fonts/*
internal/web/handlers/assets/js/*
!internal/web/handlers/assets/js/.gitkeep
internal/**/*.pb.go

# NVM
Expand Down
17 changes: 13 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ VERSION=
DOCKER_CMD := docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --build-arg VERSION=$(VERSION) --push --no-cache

### Commands ###
watch:
nodemon --watch . --ext go,gohtml --verbose --signal SIGINT --exec 'make server'

gen-pb:
protoc -I=$(SRC_DIR) --go_out=$(DST_DIR) $(SRC_DIR)/internal/proto/*.proto

Expand All @@ -28,12 +31,12 @@ scheduler: build-dir
build-dir:
@mkdir -p ./bin

build: build-admin build-dir gen-pb build-bin
build: build-ui build-dir gen-pb build-bin

build-admin:
@cd admin; \
build-ui:
@cd ui; \
yarn && yarn build
@cp admin/dist/bundle.js ./internal/admin/handlers/web/assets/js/
@cp ui/dist/bundle.js ./internal/web/handlers/assets/js/

test:
@go test -v ./...
Expand Down Expand Up @@ -93,3 +96,9 @@ gencert-check:

server-tls:
@DAGU_CERT_FILE=./cert/server-cert.pem DAGU_KEY_FILE=./cert/server-key.pem go run . server

install-tools:
brew install protobuf
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
npm install -g nodemon
46 changes: 0 additions & 46 deletions admin/webpack.common.js

This file was deleted.

Loading

0 comments on commit b341e31

Please sign in to comment.