Updated hqi to github

Makefile

@@ -11,25 +11,27 @@ deploy: docker
 
 backend: distpath 
 	@echo "Building backend... "
-	GOPATH=${CURDIR}/backend/deps:${CURDIR}/backend GO_ENABLED=0 go build -o DIST/bin/server backend/src/simple-web/simple-web.go
+	make -C backend
 
 frontend: distpath 
 	@echo "Building frontend..."
 	@cd frontend/web;node build/build.js
 
 test: backend #Front end has dev server
-	cd DIST;tmux split "DBHOST=localhost PORT=8080 DEVMODE=1 bin/server"
+	make -C backend test
 	cd frontend/web; npm run dev
 
 distpath:
 	@mkdir -p DIST/bin
 	@mkdir -p DIST/public
+
 deps:
-	GOPATH=${CURDIR}/backend/deps:${CURDIR}/backend go get -v simple-web
+	#GOPATH=${CURDIR}/backend/deps:${CURDIR}/backend go get -v simple-web
 	@cd frontend/web;npm i	
 
+clean:
+	@rm -rf DIST
 
-
-.PHONY: all test clean backend frontend docker
+.PHONY: all test clean backend frontend docker clean
 
 

backend/.gitignore

@@ -1,3 +1,4 @@
 pkg
 deps
 bin
+src/vendor

backend/Makefile

@@ -0,0 +1,19 @@
+
+
+all: build
+
+build:
+	GOPATH=${CURDIR}/deps:${CURDIR} GO_ENABLED=0 go build -o ../DIST/bin/server src/simple-web/simple-web.go
+	@#GOPATH=${CURDIR} GO_ENABLED=0 go build -o ../DIST/bin/server src/simple-web/simple-web.go
+
+# Previously	
+deps:
+	@mkdir -p deps
+	GOPATH=${CURDIR}/deps:${CURDIR} go get -v simple-web
+
+test:
+	cd ../DIST;tmux split "DBHOST=localhost PORT=8080 DEVMODE=1 bin/server"
+clean:
+	@rm -rf bin deps pkg
+
+.PHONY: build deps test

backend/src/glide.lock

@@ -0,0 +1,21 @@
+hash: 2e769ebfe799e7d6cb61daf9f93b9a6fa4c8e4ed2885ee6c6fc1b70fad2d6415
+updated: 2017-03-10T01:24:01.455866778-03:00
+imports:
+- name: dev.hexasoftware.com/hxs/prettylog.git
+  version: 4081df3443fcc5b79e78b36a300c83831dd9f28b
+  subpackages:
+  - global
+- name: github.com/gohxs/hqi
+  version: df7fc1d14f0bcbbf89c1eda07a344a9effeaeeac
+  subpackages:
+  - drv/mgodrv
+- name: github.com/google/uuid
+  version: 6a5e28554805e78ea6141142aba763936c4761c0
+- name: gopkg.in/mgo.v2-unstable
+  version: 9a2573d4ae52a2bf9f5b7900a50e2f8bcceeb774
+  subpackages:
+  - bson
+  - internal/json
+  - internal/sasl
+  - internal/scram
+testImports: []

backend/src/glide.yaml

@@ -0,0 +1,10 @@
+package: .
+import:
+- package: dev.hexasoftware.com/hxs/prettylog.git
+  subpackages:
+  - global
+- package: github.com/gohxs/hqi
+  subpackages:
+  - drv/mgodrv
+- package: github.com/google/uuid
+- package: gopkg.in/mgo.v2-unstable

backend/src/simple-web/core/session.go

@@ -3,8 +3,8 @@ package core
 import (
 	"simple-web/core/usersvc"
 
-	hqi "dev.hexasoftware.com/hxs/hqi.git"
-	mgodrv "dev.hexasoftware.com/hxs/hqi.git/drv/mgodrv"
+	"github.com/gohxs/hqi"
+	"github.com/gohxs/hqi/drv/mgodrv"
 
 	mgo "gopkg.in/mgo.v2-unstable"
 )

backend/src/simple-web/core/usersvc/service.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"log"
 
-	hqi "dev.hexasoftware.com/hxs/hqi.git"
+	"github.com/gohxs/hqi"
 
 	"github.com/google/uuid"
 )