pull/130/head v0.80.37
hunterlong 2019-01-16 20:59:07 -08:00
parent 0e4bcc3759
commit 3b014eb891
4 changed files with 10 additions and 10 deletions

View File

@ -103,7 +103,7 @@ func UsingAssets(folder string) bool {
// SaveAsset will save an asset to the '/assets/' folder.
func SaveAsset(data []byte, folder, file string) error {
utils.Log(1, fmt.Sprintf("Saving %v/assets/%v", folder, file))
utils.Log(1, fmt.Sprintf("Saving %v", folder+"/assets/"+file))
err := ioutil.WriteFile(folder+"/assets/"+file, data, 0744)
if err != nil {
utils.Log(3, fmt.Sprintf("Failed to save %v/%v, %v", folder, file, err))
@ -132,11 +132,11 @@ func CreateAllAssets(folder string) error {
MakePublicFolder(folder + "/assets/font")
MakePublicFolder(folder + "/assets/files")
utils.Log(1, "Inserting scss, css, and javascript files into assets folder")
CopyAllToPublic(ScssBox, "scss/")
CopyAllToPublic(FontBox, "font/")
CopyAllToPublic(CssBox, "css/")
CopyAllToPublic(JsBox, "js/")
CopyToPublic(FontBox, folder+"/assets/font/", "all.css")
CopyAllToPublic(ScssBox, "scss")
CopyAllToPublic(FontBox, "font")
CopyAllToPublic(CssBox, "css")
CopyAllToPublic(JsBox, "js")
CopyToPublic(FontBox, folder+"/assets/font", "all.css")
CopyToPublic(TmplBox, folder+"/assets", "robots.txt")
CopyToPublic(TmplBox, folder+"/assets", "banner.png")
CopyToPublic(TmplBox, folder+"/assets", "favicon.ico")

View File

@ -40,8 +40,8 @@ func TestCore_UsingAssets(t *testing.T) {
func TestCreateAssets(t *testing.T) {
assert.Nil(t, CreateAllAssets(dir))
assert.True(t, UsingAssets(dir))
assert.FileExists(t, "./assets/css/base.css")
assert.FileExists(t, "./assets/scss/base.scss")
assert.FileExists(t, dir+"/assets/css/base.css")
assert.FileExists(t, dir+"/assets/scss/base.scss")
}
func TestCompileSASS(t *testing.T) {

View File

@ -1,6 +1,6 @@
// Code generated by go generate; DO NOT EDIT.
// This file was generated by robots at
// 2019-01-16 20:16:38.525778 -0800 PST m=+0.697813595
// 2019-01-16 20:48:58.36586 -0800 PST m=+0.534954367
//
// This contains the most recently Markdown source for the Statping Wiki.
package source

View File

@ -31,7 +31,7 @@ func TestCreateLog(t *testing.T) {
func TestInitLogs(t *testing.T) {
assert.Nil(t, InitLogs())
assert.FileExists(t, "./logs/statup.log")
assert.FileExists(t, Directory+"/logs/statup.log")
}
func TestDir(t *testing.T) {