Merge pull request #1 from IGoRFonin/master

change admin ui to MegaFon team implementation

Author: IGoRFonin

.circleci/config.yml

@@ -0,0 +1,44 @@
+name: test and release
+
+on: push
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.16.7
+
+      - name: Install statik
+        run: |
+          GO111MODULE=off go get github.com/rakyll/statik
+
+      - name: Build ui
+        run: make build-ui
+
+      - name: Build
+        run: GIT_TAG_NAME=master-$GITHUB_RUN_NUMBER make build
+
+      - name: Install gox
+        run: |
+          GO111MODULE=off go get github.com/mitchellh/gox
+
+      - name: Build cross platform releases
+        if: startsWith(github.ref, 'refs/tags/')
+        env:
+          GOPATH: /home/runner/go
+        run: |
+          GIT_TAG_NAME=master-$GITHUB_RUN_NUMBER SHELL=/bin/bash ./build-release.sh
+
+      - name: Release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v1
+        with:
+          files: target/hoverfly_bundle_*

.github/workflows/ci.yml

@@ -39,11 +39,11 @@ build:
 	go build -ldflags "-X main.hoverctlVersion=$(GIT_TAG_NAME)" -o ../target/hoverctl
 
 build-ui:
-	wget https://github.com/SpectoLabs/hoverfly-ui/releases/download/$(GIT_TAG_NAME)/$(GIT_TAG_NAME).zip
-	unzip $(GIT_TAG_NAME).zip -d hoverfly-ui	
+	wget https://github.com/MegafonWebLab/hoverfly-ui/releases/download/v0.1.2/release.zip
+	unzip release.zip -d hoverfly-ui
 	cd core && \
-	statik -src=../hoverfly-ui
-	rm -rf $(GIT_TAG_NAME).zip
+	statik -src=../hoverfly-ui/build
+	rm -rf release.zip
 	rm -rf hoverfly-ui
 
 benchmark:

Makefile

@@ -82,8 +82,10 @@ func (this *AdminApi) addDashboardRoutes(router *bone.Mux) *bone.Mux {
 		w.WriteHeader(200)
 	}
 
-	router.HandleFunc("/dashboard", indexHandler)
-	router.HandleFunc("/login", indexHandler)
+	router.HandleFunc("/simulations/edit/:id", indexHandler)
+	router.HandleFunc("/simulations/new", indexHandler)
+	router.HandleFunc("/simulations", indexHandler)
+	router.HandleFunc("/settings", indexHandler)
 	router.Handle("/", http.FileServer(statikFS))
 	router.Handle("/*.js", http.FileServer(statikFS))
 	router.Handle("/*.css", http.FileServer(statikFS))