Skip to content

Commit 2980d7a

Browse files
topi314topi314
committed
fix assets
1 parent be0a779 commit 2980d7a

File tree

8 files changed

+57
-52
lines changed

8 files changed

+57
-52
lines changed

‎main.go

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func main() {
6060
cfg, err := server.LoadConfig(*cfgPath)
6161
if err != nil {
6262
slog.Error("Error while loading config", tint.Err(err))
63-
os.Exit(1)
63+
return
6464
}
6565

6666
setupLogger(cfg.Log)
@@ -76,12 +76,12 @@ func main() {
7676
tracer, err = newTracer(*cfg.Otel)
7777
if err != nil {
7878
slog.Error("Error while creating tracer", tint.Err(err))
79-
os.Exit(1)
79+
return
8080
}
8181
meter, err = newMeter(*cfg.Otel)
8282
if err != nil {
8383
slog.Error("Error while creating meter", tint.Err(err))
84-
os.Exit(1)
84+
return
8585
}
8686
}
8787

@@ -90,7 +90,7 @@ func main() {
9090
db, err := database.New(ctx, cfg.Database)
9191
if err != nil {
9292
slog.Error("Error while connecting to database", tint.Err(err))
93-
os.Exit(1)
93+
return
9494
}
9595
defer func() {
9696
if closeErr := db.Close(); closeErr != nil {
@@ -108,7 +108,7 @@ func main() {
108108

109109
if err = gomigrate.Migrate(ctx, db, driver, Migrations, gomigrate.WithDirectory("server/migrations")); err != nil {
110110
slog.Error("Error while migrating database", tint.Err(err))
111-
os.Exit(1)
111+
return
112112
}
113113

114114
signer, err := jose.NewSigner(jose.SigningKey{
@@ -117,15 +117,20 @@ func main() {
117117
}, nil)
118118
if err != nil {
119119
slog.Error("Error while creating signer", tint.Err(err))
120-
os.Exit(1)
120+
return
121121
}
122122

123123
var assets http.FileSystem
124124
if cfg.DevMode {
125125
slog.Info("Development mode enabled")
126-
assets = http.Dir(".")
126+
assets = http.Dir("server")
127127
} else {
128-
assets = http.FS(Assets)
128+
sub, err := fs.Sub(Assets, "server")
129+
if err != nil {
130+
slog.Error("Failed to get sub fs for embedded assets", tint.Err(err))
131+
return
132+
}
133+
assets = http.FS(sub)
129134
}
130135

131136
loadEmbeddedStyles()

‎server/assets/style.css

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
@font-face {
22
font-family: "JetBrainsMono";
3-
src: url("/gobin/assetsassets/fonts/JetBrainsMono-VariableFont_wght.ttf");
3+
src: url("/assets/fonts/JetBrainsMono-VariableFont_wght.ttf");
44
}
55

66
@font-face {
77
font-family: "JetBrainsMono";
8-
src: url("/gobin/assetsassets/fonts/JetBrainsMono-Italic-VariableFont_wght.ttf");
8+
src: url("/assets/fonts/JetBrainsMono-Italic-VariableFont_wght.ttf");
99
font-style: italic;
1010
}
1111

@@ -15,41 +15,41 @@
1515
}
1616

1717
.dark {
18-
--arrow-down: url("/gobin/assetsassets/icons/dark/arrow-down.png");
19-
--x: url("/gobin/assetsassets/icons/dark/x.png");
20-
--add: url("/gobin/assetsassets/icons/dark/add.png");
21-
--copy: url("/gobin/assetsassets/icons/dark/copy.png");
22-
--delete: url("/gobin/assetsassets/icons/dark/delete.png");
23-
--edit: url("/gobin/assetsassets/icons/dark/edit.png");
24-
--github: url("/gobin/assetsassets/icons/dark/github.svg");
25-
--language: url("/gobin/assetsassets/icons/dark/language.png");
26-
--new: url("/gobin/assetsassets/icons/dark/new.png");
27-
--raw: url("/gobin/assetsassets/icons/dark/raw.png");
28-
--save: url("/gobin/assetsassets/icons/dark/save.png");
29-
--style: url("/gobin/assetsassets/icons/dark/style.png");
30-
--share: url("/gobin/assetsassets/icons/dark/share.png");
31-
--close: url("/gobin/assetsassets/icons/dark/close.png");
32-
--version: url("/gobin/assetsassets/icons/dark/version.png");
33-
--theme: url("/gobin/assetsassets/icons/dark/theme.png");
18+
--arrow-down: url("/assets/icons/dark/arrow-down.png");
19+
--x: url("/assets/icons/dark/x.png");
20+
--add: url("/assets/icons/dark/add.png");
21+
--copy: url("/assets/icons/dark/copy.png");
22+
--delete: url("/assets/icons/dark/delete.png");
23+
--edit: url("/assets/icons/dark/edit.png");
24+
--github: url("/assets/icons/dark/github.svg");
25+
--language: url("/assets/icons/dark/language.png");
26+
--new: url("/assets/icons/dark/new.png");
27+
--raw: url("/assets/icons/dark/raw.png");
28+
--save: url("/assets/icons/dark/save.png");
29+
--style: url("/assets/icons/dark/style.png");
30+
--share: url("/assets/icons/dark/share.png");
31+
--close: url("/assets/icons/dark/close.png");
32+
--version: url("/assets/icons/dark/version.png");
33+
--theme: url("/assets/icons/dark/theme.png");
3434
}
3535

3636
.light {
37-
--arrow-down: url("/gobin/assetsassets/icons/light/arrow-down.png");
38-
--x: url("/gobin/assetsassets/icons/light/x.png");
39-
--add: url("/gobin/assetsassets/icons/light/add.png");
40-
--copy: url("/gobin/assetsassets/icons/light/copy.png");
41-
--delete: url("/gobin/assetsassets/icons/light/delete.png");
42-
--edit: url("/gobin/assetsassets/icons/light/edit.png");
43-
--github: url("/gobin/assetsassets/icons/light/github.svg");
44-
--language: url("/gobin/assetsassets/icons/light/language.png");
45-
--new: url("/gobin/assetsassets/icons/light/new.png");
46-
--raw: url("/gobin/assetsassets/icons/light/raw.png");
47-
--save: url("/gobin/assetsassets/icons/light/save.png");
48-
--style: url("/gobin/assetsassets/icons/light/style.png");
49-
--share: url("/gobin/assetsassets/icons/light/share.png");
50-
--close: url("/gobin/assetsassets/icons/light/close.png");
51-
--version: url("/gobin/assetsassets/icons/light/version.png");
52-
--theme: url("/gobin/assetsassets/icons/light/theme.png");
37+
--arrow-down: url("/assets/icons/light/arrow-down.png");
38+
--x: url("/assets/icons/light/x.png");
39+
--add: url("/assets/icons/light/add.png");
40+
--copy: url("/assets/icons/light/copy.png");
41+
--delete: url("/assets/icons/light/delete.png");
42+
--edit: url("/assets/icons/light/edit.png");
43+
--github: url("/assets/icons/light/github.svg");
44+
--language: url("/assets/icons/light/language.png");
45+
--new: url("/assets/icons/light/new.png");
46+
--raw: url("/assets/icons/light/raw.png");
47+
--save: url("/assets/icons/light/save.png");
48+
--style: url("/assets/icons/light/style.png");
49+
--share: url("/assets/icons/light/share.png");
50+
--close: url("/assets/icons/light/close.png");
51+
--version: url("/assets/icons/light/version.png");
52+
--theme: url("/assets/icons/light/theme.png");
5353
}
5454

5555
html {
@@ -588,7 +588,7 @@ label[for="expire"] {
588588
}
589589

590590
.loading {
591-
background-image: url(/gobin/assets/icons/loading.gif) !important;
591+
background-image: url(/assets/icons/loading.gif) !important;
592592
}
593593

594594
@media (min-width: 32rem) {

‎server/templates/document.templ

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ templ Document(vars DocumentVars) {
9898
</div>
9999
</main>
100100
@WriteUnsafe(vars.StateJSON())
101-
<script src="/gobin/assets/script.js"></script>
101+
<script src="/assets/script.js"></script>
102102
</body>
103103
</html>
104104
}

‎server/templates/document_templ.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/templates/error.templ

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ templ Error(vars ErrorVars) {
1111
<meta charset="utf-8"/>
1212
<title>gobin</title>
1313

14-
<link rel="stylesheet" type="text/css" href="/gobin/assets/style.css"/>
14+
<link rel="stylesheet" type="text/css" href="/assets/style.css"/>
1515

16-
<link rel="icon" href="/gobin/assets/favicon.png"/>
16+
<link rel="icon" href="/assets/favicon.png"/>
1717
<meta name="viewport" content="width=device-width, initial-scale=1"/>
1818
<meta name="theme-color" content="#282c34"/>
1919
<style>

‎server/templates/error_templ.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/templates/head.templ

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ templ head(vars DocumentVars) {
1010
}
1111
<meta name="description" content="gobin is a simple hastebin compatible paste server written in Go."/>
1212

13-
<link rel="stylesheet" type="text/css" href="/gobin/assets/style.css"/>
13+
<link rel="stylesheet" type="text/css" href="/assets/style.css"/>
1414
<link id="theme-css" rel="stylesheet" type="text/css" href={ vars.ThemeCSSURL() }/>
1515

16-
<link rel="icon" href="/gobin/assets/favicon.png"/>
16+
<link rel="icon" href="/assets/favicon.png"/>
1717
<meta name="viewport" content="width=device-width, initial-scale=1"/>
1818
<meta name="theme-color" content="#1f2228"/>
1919

‎server/templates/head_templ.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)