diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..bbb26763 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,11 @@ +.git +.gitignore +Dockerfile +Dockerfile-dev +Makefile +.travis.yml +.travis +servers +build +logs +coverage.out \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 961003ad..563a3851 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,19 +34,19 @@ matrix: before_deploy: - git config --local user.name "hunterlong" - git config --local user.email "info@socialeck.com" - - git tag "v$VERSION" --force + - make tag deploy: - provider: releases api_key: $GH_TOKEN file: - - "cmd/build/statup-osx-x64.tar.gz" - - "cmd/build/statup-osx-x32.tar.gz" - - "cmd/build/statup-linux-x64.tar.gz" - - "cmd/build/statup-linux-x32.tar.gz" - - "cmd/build/statup-linux-arm64.tar.gz" - - "cmd/build/statup-linux-arm7.tar.gz" - - "cmd/build/statup-linux-alpine.tar.gz" - - "cmd/build/statup-windows-x64.zip" + - "build/statup-osx-x64.tar.gz" + - "build/statup-osx-x32.tar.gz" + - "build/statup-linux-x64.tar.gz" + - "build/statup-linux-x32.tar.gz" + - "build/statup-linux-arm64.tar.gz" + - "build/statup-linux-arm7.tar.gz" + - "build/statup-linux-alpine.tar.gz" + - "build/statup-windows-x64.zip" skip_cleanup: true notifications: @@ -55,24 +55,15 @@ notifications: before_script: - mysql -e 'CREATE DATABASE IF NOT EXISTS test;' - psql -c 'create database test;' -U postgres - - go get github.com/stretchr/testify/assert - - go get golang.org/x/tools/cmd/cover - - go get github.com/mattn/goveralls - - go install github.com/mattn/goveralls - - go get github.com/rendon/testcli - - go get github.com/karalabe/xgo - - go get github.com/GeertJohan/go.rice - - go get github.com/GeertJohan/go.rice/rice - - cd cmd && go get && cd $GOPATH/src/github.com/hunterlong/statup + - make deps script: - - /bin/bash -c .travis/compile.sh - - go test -v ./... -p 1 -ldflags="-X main.VERSION=$VERSION" -covermode=count -coverprofile=coverage.out - - if [[ "$TRAVIS_BRANCH" == "master" ]]; then $GOPATH/bin/goveralls -coverprofile=coverage.out -service=travis -repotoken $COVERALLS; fi + - make test + - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make coverage; fi after_success: - if [[ "$TRAVIS_BRANCH" == "master" ]]; then travis_wait 30 docker pull karalabe/xgo-latest; fi - - if [[ "$TRAVIS_BRANCH" == "master" ]]; then /bin/bash -c .travis/build.sh; fi + - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make release; fi after_deploy: - /bin/bash -c .travis/deploy.sh diff --git a/Makefile b/Makefile index 1d87ea1e..6a119831 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ VERSION=0.37 -GOPATH=$(HOME)/go GOCMD=/usr/local/bin/go GOBUILD=$(GOCMD) build GOCLEAN=$(GOCMD) clean @@ -14,7 +13,7 @@ PATH:=/usr/local/bin:$(GOPATH)/bin:$(PATH) all: deps compile install clean -release: build-all compress +release: deps build-all compress install: build mv $(BINARY_NAME) $(GOPATH)/bin/$(BINARY_NAME) @@ -30,14 +29,15 @@ compile: cd source && $(GOPATH)/bin/rice embed-go $(GOPATH)/bin/wt compile source/scss/base.scss -b source/css -test: test-env +test: compile test-env $(GOTEST) ./... -p 1 -ldflags="-X main.VERSION=$(VERSION)" -coverprofile=coverage.out -v -test-all: test-env - docker run --name statup_postgres -p 5432:5432 -e POSTGRES_PASSWORD=password123 -e POSTGRES_USER=root -e POSTGRES_DB=root -d postgres - docker run --name statup_mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password123 -e MYSQL_DATABASE=root -d mysql +test-all: compile test-env databases $(GOTEST) ./... -p 1 -ldflags="-X main.VERSION=$(VERSION)" -coverprofile=coverage.out -v +coverage: + $(GOPATH)/bin/goveralls -coverprofile=coverage.out -service=travis -repotoken $(COVERALLS) + build-all: clean compile mkdir build $(XGO) $(BUILDVERSION) --targets=darwin/amd64 ./cmd @@ -56,10 +56,15 @@ docker-dev: $(DOCKER) build -t hunterlong/statup:dev -f Dockerfile-dev . docker-run: docker - $(DOCKER) run -it -p 8080:8080 hunterlong/statup:latest + $(DOCKER) run -t -p 8080:8080 hunterlong/statup:latest docker-dev-run: docker-dev - $(DOCKER) run -it -p 8080:8080 hunterlong/statup:dev + $(DOCKER) run -t -p 8080:8080 hunterlong/statup:dev + +databases: + $(DOCKER) run --name statup_postgres -p 5432:5432 -e POSTGRES_PASSWORD=password123 -e POSTGRES_USER=root -e POSTGRES_DB=root -d postgres + $(DOCKER) run --name statup_mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password123 -e MYSQL_DATABASE=root -d mysql + sleep 30 deps: $(GOGET) github.com/wellington/wellington/wt @@ -121,6 +126,4 @@ compress: mv build/cmd-linux-arm-7 build/$(BINARY_NAME) tar -czvf build/$(BINARY_NAME)-linux-arm7.tar.gz build/$(BINARY_NAME) && rm -f build/$(BINARY_NAME) mv build/cmd-linux-arm64 build/$(BINARY_NAME) - tar -czvf build/$(BINARY_NAME)-linux-arm64.tar.gz build/$(BINARY_NAME) && rm -f build/$(BINARY_NAME) - -.PHONY: deps compile build-all \ No newline at end of file + tar -czvf build/$(BINARY_NAME)-linux-arm64.tar.gz build/$(BINARY_NAME) && rm -f build/$(BINARY_NAME) \ No newline at end of file diff --git a/source/css/base.css b/source/css/base.css index 89fcbd40..71954ad5 100644 --- a/source/css/base.css +++ b/source/css/base.css @@ -319,6 +319,7 @@ HTML, BODY { transform: scale(1); } 100% { transform: scale(1); } } + .pulse { animation-name: pulse_animation; animation-duration: 1500ms; @@ -335,6 +336,7 @@ HTML, BODY { 100% { transform: scale(2); opacity: 0; } } + .pulse-glow { animation-name: glow-grown; animation-duration: 100ms; @@ -357,66 +359,49 @@ HTML, BODY { @media (max-width: 767px) { HTML, BODY { background-color: #fcfcfc; } - .sm-container { margin-top: 40px !important; padding: 0 !important; } - .list-group-item H5 { font-size: 0.9rem; } - .container { padding: 0 !important; } - .navbar { margin-left: 0px; margin-top: 0px; width: 100%; margin-bottom: 0; } - .btn-sm { line-height: 0.9rem; font-size: 0.65rem; } - .full-col-12 { padding-left: 0px; padding-right: 0px; } - .card { border: 0; border-radius: 0rem; padding: 0; background-color: #ffffff; } - .card-body { font-size: 6pt; padding: 5px 5px; } - .lg_number { font-size: 1.5rem; } - .stats_area { margin-top: 1.5rem !important; margin-bottom: 1.5rem !important; } - .stats_area .col-4 { padding-left: 0; padding-right: 0; font-size: 0.6rem; } - .list-group-item { border-top: 1px solid #e4e4e4; border: 0px; } - .list-group-item:first-child { border-top-left-radius: 0; border-top-right-radius: 0; } - .list-group-item:last-child { border-bottom-right-radius: 0; border-bottom-left-radius: 0; } - .list-group-item P { font-size: 0.7rem; } } - -/*# sourceMappingURL=base.css.map */ diff --git a/source/css/base.css.map b/source/css/base.css.map deleted file mode 100644 index f42dd11c..00000000 --- a/source/css/base.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "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", -"sources": ["../scss/variables.scss","../scss/base.scss","../scss/mobile.scss"], -"names": [], -"file": "base.css" -} diff --git a/source/source.go b/source/source.go index 729422ba..88bf5228 100644 --- a/source/source.go +++ b/source/source.go @@ -28,20 +28,20 @@ func Assets() { func CompileSASS(folder string) error { sassBin := os.Getenv("SASS") - shell := os.Getenv("CMD_FILE") scssFile := fmt.Sprintf("%v/%v", folder, "assets/scss/base.scss") baseFile := fmt.Sprintf("%v/%v", folder, "assets/css/base.css") utils.Log(1, fmt.Sprintf("Compiling SASS %v into %v", scssFile, baseFile)) command := fmt.Sprintf("%v %v %v", sassBin, scssFile, baseFile) - testCmd := exec.Command(shell, command) - _, err := testCmd.Output() + testCmd := exec.Command("bash", "-c", command) + out, err := testCmd.Output() if err != nil { utils.Log(3, fmt.Sprintf("Failed to compile assets with SASS %v", err)) utils.Log(3, fmt.Sprintf("%v %v %v", sassBin, scssFile, baseFile)) return err } + utils.Log(1, string(out)) utils.Log(1, "SASS Compiling is complete!") return err } diff --git a/source/source_test.go b/source/source_test.go index 6d65fe62..9ede0e33 100644 --- a/source/source_test.go +++ b/source/source_test.go @@ -29,7 +29,7 @@ func TestCreateAssets(t *testing.T) { func TestCompileSASS(t *testing.T) { t.SkipNow() - os.Setenv("SASS", "sass") + //os.Setenv("SASS", "sass") os.Setenv("CMD_FILE", dir+"/cmd.sh") assert.Nil(t, CompileSASS(dir)) assert.True(t, HasAssets(dir)) diff --git a/utils/log.go b/utils/log.go index bfe85607..2c81a163 100644 --- a/utils/log.go +++ b/utils/log.go @@ -19,9 +19,13 @@ var ( func InitLogs() error { var err error - - if _, err := os.Stat(Directory + "/logs"); os.IsNotExist(err) { - os.Mkdir(Directory+"/logs", 0777) + _, err = os.Stat(Directory + "/logs") + if err != nil { + if os.IsNotExist(err) { + os.Mkdir(Directory+"/logs", 0777) + } else { + fmt.Println(err) + } } file, err := os.Create(Directory + "/logs/statup.log")