From 2b767815713d737792eff450c80126fcc6c7ae00 Mon Sep 17 00:00:00 2001
From: Hunter Long <info@socialeck.com>
Date: Sat, 25 Aug 2018 09:10:28 -0700
Subject: [PATCH] updates

---
 Dockerfile                               |  4 ++--
 Makefile                                 |  7 +++----
 dev/test/cypress/integration/services.js |  2 +-
 handlers/index.go                        | 22 ++++++++++++++++++----
 source/css/base.css                      |  2 +-
 source/scss/mobile.scss                  |  4 ++--
 utils/utils.go                           |  9 +++++++++
 7 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6c8cdae9..c8efd72a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM hunterlong/statup:base-v0.5
+FROM hunterlong/statup:base-v0.51
 MAINTAINER "Hunter Long (https://github.com/hunterlong)"
 
 # Locked version of Statup for 'latest' Docker tag
@@ -8,4 +8,4 @@ ENV STATUP_DIR=/app
 WORKDIR /app
 VOLUME /app
 EXPOSE 8080
-CMD ["statup"]
\ No newline at end of file
+CMD ["statup"]
diff --git a/Makefile b/Makefile
index 858e58f4..9bab0f22 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ docker-push-base:
 	docker push hunterlong/statup:base
 	docker push hunterlong/statup:base-v$(VERSION)
 
-docker-build-base: clean
+docker-build-base:
 	wget -q https://assets.statup.io/sass && chmod +x sass
 	$(XGO) --targets=linux/amd64 -ldflags="-X main.VERSION=$(VERSION) -linkmode external -extldflags -static" -out alpine ./cmd
 	docker build -t hunterlong/statup:base --no-cache -f dev/Dockerfile-base .
@@ -135,7 +135,7 @@ dev-deps: dep
 	$(GOCMD) get github.com/mgechev/revive
 
 clean:
-	rm -rf ./{logs,assets,plugins,statup.db,config.yml,.sass-cache,config.yml,statup,build,.sass-cache,statup.db,index.html}
+	rm -rf ./{logs,assets,plugins,statup.db,config.yml,.sass-cache,config.yml,statup,build,.sass-cache,statup.db,index.html,vendor}
 	rm -rf cmd/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
 	rm -rf core/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
 	rm -rf handlers/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
@@ -144,8 +144,7 @@ clean:
 	rm -rf types/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
 	rm -rf utils/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
 	rm -rf dev/test/cypress/videos
-	rm -f coverage.out
-	rm -f coverage.json
+	rm -f coverage.* sass
 
 tag:
 	git tag "v$(VERSION)" --force
diff --git a/dev/test/cypress/integration/services.js b/dev/test/cypress/integration/services.js
index b3a34749..2342a755 100644
--- a/dev/test/cypress/integration/services.js
+++ b/dev/test/cypress/integration/services.js
@@ -95,4 +95,4 @@ context('Service Tests', () => {
     })
 
 
-});
\ No newline at end of file
+});
diff --git a/handlers/index.go b/handlers/index.go
index 7d332f79..8460473f 100644
--- a/handlers/index.go
+++ b/handlers/index.go
@@ -16,7 +16,6 @@
 package handlers
 
 import (
-	"fmt"
 	"github.com/hunterlong/statup/core"
 	"github.com/hunterlong/statup/types"
 	"github.com/hunterlong/statup/utils"
@@ -40,6 +39,23 @@ func TrayHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func DesktopInit(ip string, port int) {
+	var err error
+	exists := utils.FileExists(utils.Directory + "/statup.db")
+	if exists {
+		core.Configs, err = core.LoadConfig()
+		if err != nil {
+			utils.Log(3, err)
+			return
+		}
+		err = core.DbConnection(core.Configs.Connection, false, utils.Directory)
+		if err != nil {
+			utils.Log(3, err)
+			return
+		}
+		core.InitApp()
+		RunHTTPServer(ip, port)
+	}
+
 	config := &core.DbConfig{DbConfig: &types.DbConfig{
 		DbConn:      "sqlite",
 		Project:     "Statup",
@@ -52,9 +68,7 @@ func DesktopInit(ip string, port int) {
 		Location:    utils.Directory,
 	}}
 
-	fmt.Println(config)
-
-	err := config.Save()
+	err = config.Save()
 	if err != nil {
 		utils.Log(4, err)
 	}
diff --git a/source/css/base.css b/source/css/base.css
index 95964b97..d03d545a 100644
--- a/source/css/base.css
+++ b/source/css/base.css
@@ -416,7 +416,7 @@ HTML, BODY {
     padding: 5px 5px; }
 
   .lg_number {
-    font-size: 9vw; }
+    font-size: 8.1vw; }
 
   .stats_area {
     margin-top: 1.5rem !important;
diff --git a/source/scss/mobile.scss b/source/scss/mobile.scss
index ffe10f5c..fb64ae8c 100644
--- a/source/scss/mobile.scss
+++ b/source/scss/mobile.scss
@@ -48,7 +48,7 @@
     }
 
     .lg_number {
-        font-size: 9vw;
+        font-size: 8.1vw;
     }
 
     .stats_area {
@@ -80,4 +80,4 @@
     .list-group-item P {
         font-size: 0.7rem;
     }
-}
\ No newline at end of file
+}
diff --git a/utils/utils.go b/utils/utils.go
index 64d656ea..909ffec2 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -87,6 +87,15 @@ func UnderScoreString(str string) string {
 	return newStr
 }
 
+func FileExists(name string) bool {
+	if _, err := os.Stat(name); err != nil {
+		if os.IsNotExist(err) {
+			return false
+		}
+	}
+	return true
+}
+
 func DeleteFile(file string) error {
 	err := os.Remove(file)
 	if err != nil {