Browse Source

Fix the name of the default database, app specific JS and CSS files

pull/489/head
James Mills 1 month ago
parent
commit
034009eb85
Signed by: prologic GPG Key ID: AC4C014F1440EBD6
  1. 6
      .gitignore
  2. 8
      Makefile
  3. 2
      internal/options.go
  4. 0
      internal/theme/static/css/99-yarn.css
  5. 0
      internal/theme/static/js/99-yarn.js
  6. 8
      internal/theme/templates/base.html

6
.gitignore

@ -38,10 +38,10 @@
/docs/_errors/
/docs/.jekyll-cache/
/internal/theme/static/css/twtxt.min.css
/internal/theme/static/js/twtxt.min.js
/internal/theme/static/css/yarn.min.css
/internal/theme/static/js/yarn.min.js
bench-twtxt.txt
bench-yarn.txt
.task/
/doc/

8
Makefile

@ -41,8 +41,8 @@ generate:
@if [ x"$(DEBUG)" = x"1" ]; then \
echo 'Running in debug mode...'; \
else \
minify -b -o ./internal/theme/static/css/twtxt.min.css ./internal/theme/static/css/[0-9]*-*.css; \
minify -b -o ./internal/theme/static/js/twtxt.min.js ./internal/theme/static/js/[0-9]*-*.js; \
minify -b -o ./internal/theme/static/css/yarn.min.css ./internal/theme/static/css/[0-9]*-*.css; \
minify -b -o ./internal/theme/static/js/yarn.min.js ./internal/theme/static/js/[0-9]*-*.js; \
fi
install: build
@ -64,10 +64,10 @@ release:
test:
@$(GOCMD) test -v -cover -race ./...
bench: bench-twtxt.txt
bench: bench-yarn.txt
go test -race -benchtime=1x -cpu 16 -benchmem -bench "^(Benchmark)" git.mills.io/yarnsocial/yarn/types
bench-twtxt.txt:
bench-yarn.txt:
curl -s https://twtxt.net/user/prologic/twtxt.txt > $@
clean:

2
internal/options.go

@ -19,7 +19,7 @@ const (
DefaultData = "./data"
// DefaultStore is the default data store used for accounts, sessions, etc
DefaultStore = "bitcask://twtxt.db"
DefaultStore = "bitcask://yarn.db"
// DefaultBaseURL is the default Base URL for the app used to construct feed URLs
DefaultBaseURL = "http://0.0.0.0:8000"

0
internal/theme/static/css/99-twtxt.css → internal/theme/static/css/99-yarn.css

0
internal/theme/static/js/99-twtxt.js → internal/theme/static/js/99-yarn.js

8
internal/theme/templates/base.html

@ -6,10 +6,10 @@
<link href="/css/01-pico.css" rel="stylesheet" />
<link href="/css/02-icss.css" rel="stylesheet" />
<link href="/css/03-icons.css" rel="stylesheet" />
<link href="/css/99-twtxt.css" rel="stylesheet" />
<link href="/css/99-yarn.css" rel="stylesheet" />
<link rel="icon" type="image/png" href="/img/favicon.png" />
{{ else }}
<link href="/css/{{ .Commit }}/twtxt.min.css" rel="stylesheet" />
<link href="/css/{{ .Commit }}/yarn.min.css" rel="stylesheet" />
<link rel="icon" type="image/png" href="/img/{{ .Commit}}/favicon.png" />
{{ end }}
@ -128,10 +128,10 @@
<script type="application/javascript" src="/js/01-umbrella.js"></script>
<script type="application/javascript" src="/js/02-polyfill.js"></script>
<script type="application/javascript" src="/js/03-twix.js"></script>
<script type="application/javascript" src="/js/99-twtxt.js"></script>
<script type="application/javascript" src="/js/99-yarn.js"></script>
<script type="application/javascript" src="/js/ie11CustomProperties.min.js"></script>
{{ else }}
<script type="application/javascript" src="/js/{{ .Commit }}/twtxt.min.js"></script>
<script type="application/javascript" src="/js/{{ .Commit }}/yarn.min.js"></script>
{{ end }}
</body>
</html>

Loading…
Cancel
Save