React bo

.gitignore

@@ -1,12 +1,10 @@
-# Created by .ignore support plugin (hsz.mobi)
-explorer/node_modules
-explorer/dist
 dist/*
 app/assets/bindata.go
 data
-admin/build
-admin/node_modules
 vendor
 runtime
 .glide
-fork
+backoffice
+node_modules
+.DS_Store
+.vscode

Makefile

@@ -13,6 +13,10 @@ define back
     $(call docker,back,$(1))
 endef
 
+define front
+    $(call docker,front,$(1))
+endef
+
 define docker
     if [ ! -f /.dockerenv ]; then \
         docker-compose run $(1) /bin/bash -c "$(2)"; \
@@ -21,12 +25,16 @@ define docker
     fi
 endef
 
-shell:
+back:
 	docker-compose run back /bin/bash
 
+front:
+	docker-compose run front /bin/bash
+
 install:
 	$(call back,glide install)
 	$(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/...)
+	$(call front,yarn)
 
 test:
 	$(call back,./app/assets/bindata.sh && go test -v $(GONODE_CORE) $(GONODE_MODULES) ./test/modules)
@@ -39,6 +47,7 @@ format:
 
 run:
 	docker-compose kill
+	mkdir -p gui/dist
 	docker-compose up
 
 load:    ## Load fixtures

app/assets/bindata.sh

@@ -4,8 +4,9 @@ GO_BINDATA_PATHS="${GOPATH}/src/github.com/rande/gonode/modules/..."
 GO_BINDATA_IGNORE="(.*)\.(go|DS_Store)"
 GO_BINDATA_OUTPUT="${GOPATH}/src/github.com/rande/gonode/app/assets/bindata.go"
 GO_BINDATA_PACKAGE="assets"
+GUI_PATH="${GOPATH}/src/github.com/rande/gonode/gui/dist"
 
 echo "Generating bindata file..."
-cd ${GOPATH}/src && go-bindata -dev -prefix ${GOPATH}/src -o ${GO_BINDATA_OUTPUT} -pkg ${GO_BINDATA_PACKAGE} -ignore ${GO_BINDATA_IGNORE} ${GO_BINDATA_PATHS}
+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}
 
 echo "Done!"

app/server.toml.dist

@@ -36,7 +36,7 @@ path = "/tmp/gnode"
     ]
 
     [security.cors]
-    allowed_origins = ["http://localhost:8000"]
+    allowed_origins = ["*"]
     allowed_methods = ["GET", "PUT", "POST"]
     allowed_headers = ["Origin", "Accept", "Content-Type", "Authorization"]
 
@@ -69,7 +69,8 @@ path = "/tmp/gnode"
         [bindata.assets.explorer]
         index = "index.html"
         public = "/explorer"
-        private = "github.com/rande/gonode/explorer/dist"
+        fallback = "/index.html"
+        private = "github.com/rande/gonode/gui/dist"
 
 [media]
     [media.image]