Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: better 404 page #119

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+79 −3
Open

feat: better 404 page #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
597e174
feat: better 404 page
yxuko Jun 2, 2024
fcff2c4
Merge branch 'glanceapp:main' into feature/404-page
yxuko Jun 3, 2024
b1d548c
Merge branch 'glanceapp:main' into feature/404-page
yxuko Jul 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions internal/assets/static/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,20 @@ body {
font-size: 2rem;
}

.page-404-container {
margin: 50px auto;
width: fit-content;
font-size: 2rem;
text-align: center;
}

.logo-404 {
height: 100%;
line-height: var(--header-height);
font-size: 2rem;
color: var(--color-text-highlight);
}

@keyframes loadingContainerEntrance {
from {
opacity: 0;
Expand Down
1 change: 1 addition & 0 deletions internal/assets/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (

var (
PageTemplate = compileTemplate("page.html", "document.html", "page-style-overrides.gotmpl")
Page404Template = compileTemplate("404.html", "document.html", "page-style-overrides.gotmpl")
PageContentTemplate = compileTemplate("content.html")
CalendarTemplate = compileTemplate("calendar.html", "widget-base.html")
ClockTemplate = compileTemplate("clock.html", "widget-base.html")
Expand Down
52 changes: 52 additions & 0 deletions internal/assets/templates/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{{ template "document.html" . }}

{{ define "document-title" }}{{ .Page.Title }} - Glance{{ end }}

{{ define "document-head-before" }}
<script>
const pageData = {
slug: "{{ .Page.Slug }}",
};
</script>
{{ end }}

{{ define "document-root-attrs" }}{{ if .App.Config.Theme.Light }}class="light-scheme"{{ end }}{{ end }}
{{ define "document-head-after" }}
{{ template "page-style-overrides.gotmpl" . }}
{{ if ne "" .App.Config.Theme.CustomCSSFile }}
<link rel="stylesheet" href="{{ .App.Config.Theme.CustomCSSFile }}?v={{ .App.Config.Server.StartedAt.Unix }}">
{{ end }}
{{ end }}

{{ define "navigation-links" }}
{{ range .App.Config.Pages }}
<a href="/{{ .Slug }}" class="nav-item{{ if eq .Slug $.Page.Slug }} nav-item-current{{ end }}">{{ .Title }}</a>
{{ end }}
{{ end }}

{{ define "document-body" }}
<div class="content-bounds">
<div class="page">
<div class="page-404-container">
<!-- TODO: Replace G with actual logo, first need an actual logo -->
<div class="logo-404">G</div>
<div class="margin-top-15">
<span>Page Not Found</span>
<div class="margin-top-5 size-h5 color-primary">
<a href="/home" rel="noreferrer">Go back to home</a>
</div>
</div>
</div>
</div>
</div>

<div class="footer flex items-center flex-column">
<div>
<span class="size-h3">Glance</span> ({{ .App.Version }})
</div>
<ul class="list-horizontal-text margin-top-5 size-h5 color-primary">
<li><a href="https://github.com/glanceapp/glance/issues" target="_blank" rel="noreferrer">Report issue</a></li>
<li><a href="https://github.com/glanceapp/glance/discussions" target="_blank" rel="noreferrer">Submit feedback</a></li>
</ul>
</div>
{{ end }}
15 changes: 12 additions & 3 deletions internal/glance/glance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,18 @@ func (a *Application) HandlePageContentRequest(w http.ResponseWriter, r *http.Re
}

func (a *Application) HandleNotFound(w http.ResponseWriter, r *http.Request) {
// TODO: add proper not found page
w.WriteHeader(http.StatusNotFound)
w.Write([]byte("Page not found"))
pageData := templateData{
App: a,
Page: &Page{
Title: "Page Not Found",
Slug: "404",
},
}

var responseBytes bytes.Buffer
assets.Page404Template.Execute(&responseBytes, pageData)

w.Write(responseBytes.Bytes())
}

func FileServerWithCache(fs http.FileSystem, cacheDuration time.Duration) http.Handler {
Expand Down