From 1f2782cab8246d0af16eb58b1834f1538ba5ba2e Mon Sep 17 00:00:00 2001 From: Atridad Lahiji Date: Sun, 3 Mar 2024 01:11:53 -0700 Subject: [PATCH] Cleaned up dirs --- .air.toml | 4 ++-- go.mod | 4 ++-- go.sum | 12 ++++-------- {stylegen => lib/stylegen}/base.css | 0 {stylegen => lib/stylegen}/gen.sh | 0 {stylegen => lib/stylegen}/tw/linux-arm64 | Bin {stylegen => lib/stylegen}/tw/linux-x64 | Bin {stylegen => lib/stylegen}/tw/macos | Bin {stylegen => lib/stylegen}/tw/windows-arm64.exe | Bin {stylegen => lib/stylegen}/tw/windows-x64.exe | Bin main.go | 7 +------ 11 files changed, 9 insertions(+), 18 deletions(-) rename {stylegen => lib/stylegen}/base.css (100%) rename {stylegen => lib/stylegen}/gen.sh (100%) rename {stylegen => lib/stylegen}/tw/linux-arm64 (100%) rename {stylegen => lib/stylegen}/tw/linux-x64 (100%) rename {stylegen => lib/stylegen}/tw/macos (100%) rename {stylegen => lib/stylegen}/tw/windows-arm64.exe (100%) rename {stylegen => lib/stylegen}/tw/windows-x64.exe (100%) diff --git a/.air.toml b/.air.toml index d25d5ee..6d6ed43 100644 --- a/.air.toml +++ b/.air.toml @@ -6,9 +6,9 @@ tmp_dir = "tmp" args_bin = ["-ip", "127.0.0.1", "-port", "3000"] bin = "./tmp/main" pre_cmd = [] - cmd = "go build -o ./tmp/main . & cd stylegen && ./gen.sh" + cmd = "go build -o ./tmp/main . & cd lib/stylegen && ./gen.sh" delay = 1000 - exclude_dir = ["assets", "tmp", "vendor", "testdata", "stylegen"] + exclude_dir = ["assets", "tmp", "vendor", "testdata", "lib/stylegen"] exclude_file = [] exclude_regex = ["_test.go"] exclude_unchanged = false diff --git a/go.mod b/go.mod index 117d717..29b4ea1 100644 --- a/go.mod +++ b/go.mod @@ -8,12 +8,12 @@ require ( github.com/alecthomas/repr v0.3.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/dlclark/regexp2 v1.10.0 // indirect + github.com/dlclark/regexp2 v1.11.0 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/labstack/gommon v0.4.2 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - golang.org/x/crypto v0.19.0 // indirect + golang.org/x/crypto v0.20.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect ) diff --git a/go.sum b/go.sum index aefa46f..e3c752c 100644 --- a/go.sum +++ b/go.sum @@ -19,8 +19,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= -github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0= -github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI= +github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= @@ -46,10 +46,6 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwyKk= -github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= -github.com/redis/go-redis/v9 v9.5.0 h1:Xe9TKMmZv939gwTBcvc0n1tzK5l2re0pKw/W/tN3amw= -github.com/redis/go-redis/v9 v9.5.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8= github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/resendlabs/resend-go v1.7.0 h1:DycOqSXtw2q7aB+Nt9DDJUDtaYcrNPGn1t5RFposas0= @@ -69,8 +65,8 @@ github.com/yuin/goldmark v1.7.0 h1:EfOIvIMZIzHdB/R/zVrikYLPPwJlfMcNczJFMs1m6sA= github.com/yuin/goldmark v1.7.0/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc h1:+IAOyRda+RLrxa1WC7umKOZRsGq4QrFFMYApOeHzQwQ= github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc/go.mod h1:ovIvrum6DQJA4QsJSovrkC4saKHQVs7TvcaeO8AIl5I= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg= +golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/stylegen/base.css b/lib/stylegen/base.css similarity index 100% rename from stylegen/base.css rename to lib/stylegen/base.css diff --git a/stylegen/gen.sh b/lib/stylegen/gen.sh similarity index 100% rename from stylegen/gen.sh rename to lib/stylegen/gen.sh diff --git a/stylegen/tw/linux-arm64 b/lib/stylegen/tw/linux-arm64 similarity index 100% rename from stylegen/tw/linux-arm64 rename to lib/stylegen/tw/linux-arm64 diff --git a/stylegen/tw/linux-x64 b/lib/stylegen/tw/linux-x64 similarity index 100% rename from stylegen/tw/linux-x64 rename to lib/stylegen/tw/linux-x64 diff --git a/stylegen/tw/macos b/lib/stylegen/tw/macos similarity index 100% rename from stylegen/tw/macos rename to lib/stylegen/tw/macos diff --git a/stylegen/tw/windows-arm64.exe b/lib/stylegen/tw/windows-arm64.exe similarity index 100% rename from stylegen/tw/windows-arm64.exe rename to lib/stylegen/tw/windows-arm64.exe diff --git a/stylegen/tw/windows-x64.exe b/lib/stylegen/tw/windows-x64.exe similarity index 100% rename from stylegen/tw/windows-x64.exe rename to lib/stylegen/tw/windows-x64.exe diff --git a/main.go b/main.go index cee8139..fab6386 100644 --- a/main.go +++ b/main.go @@ -7,8 +7,6 @@ import ( "fmt" "log" "net/http" - "path/filepath" - "time" "github.com/joho/godotenv" "github.com/labstack/echo/v4" @@ -60,11 +58,8 @@ func main() { })) e.Use(middleware.RateLimiter(middleware.NewRateLimiterMemoryStore(50))) - // Generate the deployment time when the application starts - deploymentTime := fmt.Sprintf("%d", time.Now().UnixNano()) - // Static server - fs := http.FS(PublicFS) + fs := http.FS(PublicFS) e.GET("/public/*", echo.WrapHandler(http.FileServer(fs))) // Page routes