Skip to content

Commit 0849a81

Browse files
committed
add angular ui
1 parent 6f40960 commit 0849a81

File tree

168 files changed

+10890
-6316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+10890
-6316
lines changed

.gitignore

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
# Created by .ignore support plugin (hsz.mobi)
2-
explorer/node_modules
3-
explorer/dist
41
dist/*
52
app/assets/bindata.go
63
data
7-
admin/build
8-
admin/node_modules
94
vendor
105
runtime
116
.glide
12-
fork
7+
backoffice
8+
node_modules
9+
.DS_Store
10+
.vscode

Makefile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ define back
1313
$(call docker,back,$(1))
1414
endef
1515

16+
define front
17+
$(call docker,front,$(1))
18+
endef
19+
1620
define docker
1721
if [ ! -f /.dockerenv ]; then \
1822
docker-compose run $(1) /bin/bash -c "$(2)"; \
@@ -21,12 +25,16 @@ define docker
2125
fi
2226
endef
2327

24-
shell:
28+
back:
2529
docker-compose run back /bin/bash
2630

31+
front:
32+
docker-compose run front /bin/bash
33+
2734
install:
2835
$(call back,glide install)
2936
$(call back,go get github.com/wadey/gocovmerge && go get golang.org/x/tools/cmd/cover && go get golang.org/x/tools/cmd/goimports && go get -u github.com/jteeuwen/go-bindata/...)
37+
$(call front,yarn)
3038

3139
test:
3240
$(call back,./app/assets/bindata.sh && go test -v $(GONODE_CORE) $(GONODE_MODULES) ./test/modules)
@@ -39,6 +47,7 @@ format:
3947

4048
run:
4149
docker-compose kill
50+
mkdir -p gui/dist
4251
docker-compose up
4352

4453
load: ## Load fixtures

app/assets/bindata.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ GO_BINDATA_PATHS="${GOPATH}/src/github.com/rande/gonode/modules/..."
44
GO_BINDATA_IGNORE="(.*)\.(go|DS_Store)"
55
GO_BINDATA_OUTPUT="${GOPATH}/src/github.com/rande/gonode/app/assets/bindata.go"
66
GO_BINDATA_PACKAGE="assets"
7+
GUI_PATH="${GOPATH}/src/github.com/rande/gonode/gui/dist"
78

89
echo "Generating bindata file..."
9-
cd ${GOPATH}/src && go-bindata -dev -prefix ${GOPATH}/src -o ${GO_BINDATA_OUTPUT} -pkg ${GO_BINDATA_PACKAGE} -ignore ${GO_BINDATA_IGNORE} ${GO_BINDATA_PATHS}
10+
cd ${GOPATH}/src && go-bindata -dev -prefix ${GOPATH}/src -o ${GO_BINDATA_OUTPUT} -pkg ${GO_BINDATA_PACKAGE} -ignore ${GO_BINDATA_IGNORE} ${GUI_PATH} ${GO_BINDATA_PATHS}
1011

1112
echo "Done!"

app/server.toml.dist

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ path = "/tmp/gnode"
6969
[bindata.assets.explorer]
7070
index = "index.html"
7171
public = "/explorer"
72-
private = "github.com/rande/gonode/explorer/dist"
72+
fallback = "/index.html"
73+
private = "github.com/rande/gonode/gui/dist"
7374

7475
[media]
7576
[media.image]

backoffice/.babelrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

backoffice/.gitignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

backoffice/README.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

backoffice/package.json

Lines changed: 0 additions & 58 deletions
This file was deleted.

backoffice/src/app.tsx

Lines changed: 0 additions & 189 deletions
This file was deleted.

0 commit comments

Comments
 (0)