Skip to content

Commit

Permalink
Embed static assets using the 'embed' package
Browse files Browse the repository at this point in the history
  • Loading branch information
thijzert committed Jan 16, 2023
1 parent f923cc6 commit fdc9f1b
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 23 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
journal.txt
*~
/bin/journal-server/assets.go
/bin/journal-server/assets/.sass-cache
/bin/journal-server/assets/css
/journal-server
Expand Down
20 changes: 20 additions & 0 deletions bin/journal-server/assets.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package main

import (
"embed"
"io"
)

// embeddedAssets holds static web assets
//go:embed assets
var embeddedAssets embed.FS

func Asset(name string) ([]byte, error) {
f, err := embeddedAssets.Open(name)
if err != nil {
return nil, err
}
defer f.Close()

return io.ReadAll(f)
}
10 changes: 2 additions & 8 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
#!/bin/sh

# This script assumes you've run
# go get -u github.com/jteeuwen/go-bindata/...
# at least once.

cd bin/journal-server
cd assets
sass --update --style=compressed scss:css
cd ..
go generate
cd ../..
cd ../../..

go build -o jrnl bin/jrnl/*.go
go build -o journal-server bin/journal-server/*.go
exec go build -o journal-server bin/journal-server/*.go

14 changes: 0 additions & 14 deletions dev-build.sh

This file was deleted.

0 comments on commit fdc9f1b

Please sign in to comment.