quick fixes

pull/57/head v0.5
Hunter Long 2018-08-22 00:16:24 -07:00
parent 7dc8ae71ef
commit 40b31d3ccd
2 changed files with 5 additions and 8 deletions

View File

@ -69,13 +69,13 @@ build-alpine: clean compile
$(XGO) --targets=linux/amd64 -ldflags="-X main.VERSION=$(VERSION) -X main.COMMIT=$(TRAVIS_COMMIT) -linkmode external -extldflags -static" -out alpine ./cmd $(XGO) --targets=linux/amd64 -ldflags="-X main.VERSION=$(VERSION) -X main.COMMIT=$(TRAVIS_COMMIT) -linkmode external -extldflags -static" -out alpine ./cmd
docker: docker:
docker build -t hunterlong/statup:latest . docker build --no-cache -t hunterlong/statup:latest .
docker-run: docker docker-run: docker
docker run -it -p 8080:8080 hunterlong/statup:latest docker run -it -p 8080:8080 hunterlong/statup:latest
docker-dev: clean docker-base docker-dev: clean docker-build-base
docker build -t hunterlong/statup:dev -f dev/Dockerfile-dev . docker build -t hunterlong/statup:dev --no-cache -f dev/Dockerfile-dev .
docker-push-dev: docker-push-dev:
docker push hunterlong/statup:dev docker push hunterlong/statup:dev
@ -103,7 +103,7 @@ docker-push-base:
docker-build-base: clean docker-build-base: clean
wget -q https://assets.statup.io/sass && chmod +x sass 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 $(XGO) --targets=linux/amd64 -ldflags="-X main.VERSION=$(VERSION) -linkmode external -extldflags -static" -out alpine ./cmd
docker build -t hunterlong/statup:base -f dev/Dockerfile-base . docker build -t hunterlong/statup:base --no-cache -f dev/Dockerfile-base .
docker tag hunterlong/statup:base hunterlong/statup:base-v$(VERSION) docker tag hunterlong/statup:base hunterlong/statup:base-v$(VERSION)
docker-build-latest: docker-build-latest:

View File

@ -139,6 +139,7 @@
{{if USE_CDN}} {{if USE_CDN}}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://assets.statup.io/sortable.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script> <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
<script src="https://assets.statup.io/main.js"></script> <script src="https://assets.statup.io/main.js"></script>
{{ else }} {{ else }}
@ -153,7 +154,6 @@
forcePlaceholderSize: true, forcePlaceholderSize: true,
hoverClass: 'sortable_drag' hoverClass: 'sortable_drag'
}); });
sortable('.sortable')[0].addEventListener('sortupdate', function(e) { sortable('.sortable')[0].addEventListener('sortupdate', function(e) {
var i = 0; var i = 0;
var newOrder = []; var newOrder = [];
@ -163,11 +163,8 @@
var o = {service: parseInt(d.id), order: i} var o = {service: parseInt(d.id), order: i}
newOrder.push(o); newOrder.push(o);
}); });
$.post("/services/reorder", JSON.stringify(newOrder), function(data, status){ $.post("/services/reorder", JSON.stringify(newOrder), function(data, status){
console.log("Data: " + data + "\nStatus: " + status);
}); });
console.log(newOrder);
}); });
</script> </script>