diff --git a/internal/app/server/routes.go b/internal/app/server/routes.go index 8d9aad6..4c25cb7 100644 --- a/internal/app/server/routes.go +++ b/internal/app/server/routes.go @@ -3,9 +3,9 @@ package server import ( "net/http" - "go.ybk.im/homepage/internal/app/res" - "go.ybk.im/homepage/internal/app/res/compilers/raw" "go.ybk.im/homepage/internal/app/server/handlers" + "go.ybk.im/homepage/internal/app/skins/res" + "go.ybk.im/homepage/internal/app/skins/res/compilers/raw" ) const CssPath = "skin/style.css" diff --git a/internal/app/res/compilers/compiler.go b/internal/app/skins/res/compilers/compiler.go similarity index 100% rename from internal/app/res/compilers/compiler.go rename to internal/app/skins/res/compilers/compiler.go diff --git a/internal/app/res/compilers/raw/raw.go b/internal/app/skins/res/compilers/raw/raw.go similarity index 65% rename from internal/app/res/compilers/raw/raw.go rename to internal/app/skins/res/compilers/raw/raw.go index 7a8f1b7..5d18fb7 100644 --- a/internal/app/res/compilers/raw/raw.go +++ b/internal/app/skins/res/compilers/raw/raw.go @@ -1,12 +1,14 @@ package raw -import "go.ybk.im/homepage/internal/app/res/compilers" +import ( + compilers2 "go.ybk.im/homepage/internal/app/skins/res/compilers" +) type Compiler struct { contentType string } -func NewCompiler(contentType string) compilers.Compiler { +func NewCompiler(contentType string) compilers2.Compiler { return &Compiler{ contentType: contentType, } diff --git a/internal/app/res/compilers/scss/scss_compiler.go b/internal/app/skins/res/compilers/scss/scss_compiler.go similarity index 85% rename from internal/app/res/compilers/scss/scss_compiler.go rename to internal/app/skins/res/compilers/scss/scss_compiler.go index 0d9be0a..50b4f66 100644 --- a/internal/app/res/compilers/scss/scss_compiler.go +++ b/internal/app/skins/res/compilers/scss/scss_compiler.go @@ -3,7 +3,7 @@ package scss import ( "bytes" - "go.ybk.im/homepage/internal/app/res/compilers" + compilers2 "go.ybk.im/homepage/internal/app/skins/res/compilers" "github.com/wellington/go-libsass" ) @@ -12,7 +12,7 @@ type Compiler struct { basePath string } -func NewCompiler(basePath string) compilers.Compiler { +func NewCompiler(basePath string) compilers2.Compiler { return &Compiler{ basePath: basePath, } diff --git a/internal/app/res/handler.go b/internal/app/skins/res/handler.go similarity index 86% rename from internal/app/res/handler.go rename to internal/app/skins/res/handler.go index 500e6f0..0aeef04 100644 --- a/internal/app/res/handler.go +++ b/internal/app/skins/res/handler.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "go.ybk.im/homepage/internal/app/res/compilers" + compilers2 "go.ybk.im/homepage/internal/app/skins/res/compilers" ) type Handler struct { @@ -15,7 +15,7 @@ type Handler struct { contentType string } -func NewHandler(fileName string, compiler compilers.Compiler) *Handler { +func NewHandler(fileName string, compiler compilers2.Compiler) *Handler { fileName = filepath.Clean(fileName) _, err := os.Stat(fileName)