Andrew71/hibiscus
Andrew71/hibiscus
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Packages Wiki Activity

Compare commits

base: Andrew71:6e1095019fb7c0f07096cdddf046292759b03d88
Branches Tags
Andrew71:master
Andrew71:v2
Andrew71:v1.1.4
Andrew71:v1.1.3
Andrew71:v1.1.2
Andrew71:v1.1.1
...
compare: Andrew71:a66e26477c2d52332099c0ecba26ea31520aeeaf
Branches Tags
Andrew71:v2
Andrew71:master
Andrew71:v1.1.4
Andrew71:v1.1.3
Andrew71:v1.1.2
Andrew71:v1.1.1

2 commits
6e1095019f ... a66e26477c

Author SHA1 Message Date
Andrew-71
a66e26477c Clean up HTML&CSS 2024-03-29 14:58:24 +03:00
Andrew-71
1ba9c87184 Treat today differently in previous day view 2024-03-29 14:48:55 +03:00
6 changed files with 13 additions and 11 deletions
Show stats Expand all files Collapse all files

8
pages/base.html
View file

@ -1,11 +1,10 @@
{{define "header"}} {{define "header"}}
<header> <header>
<h1>🌺 Hibiscus.txt</h1> <h1>🌺 Hibiscus.txt</h1>
<p id="status">Today is <span id="today-date">a place</span></p> <p>Today is <span id="today-date">a place</span></p>
</header> </header>
{{end}} {{end}}
{{define "base"}} {{define "base"}}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -23,10 +22,7 @@
{{template "main" .}} {{template "main" .}}
</main> </main>
{{template "footer" .}} {{template "footer" .}}
<script defer> <script defer>updateDate();beginDateUpdater()</script>
updateDate()
beginDateUpdater()
</script>
</body> </body>
</html> </html>
{{end}} {{end}}

2
pages/day.html
View file

@ -1,4 +1,4 @@
{{define "main"}} {{define "main"}}
<h2 style="margin-bottom:0;"><label for="day">Viewing {{ .Date }}</label> | <a href="/day">Go back</a></h2> <h2><label for="day">{{ .Date }}</label> | <a href="/day">Go back</a></h2>
<textarea id="day" cols="40" rows="15" readonly>{{ .Day }}</textarea> <textarea id="day" cols="40" rows="15" readonly>{{ .Day }}</textarea>
{{end}} {{end}}

2
pages/days.html
View file

@ -1,6 +1,6 @@
{{define "main"}} {{define "main"}}
<h2>{{.Title}}</h2> <h2>{{.Title}}</h2>
<ul id="days"> <ul>
{{range .Entries}} {{range .Entries}}
<li><a href="/day/{{.Link}}">{{.Name}}</a></li> <li><a href="/day/{{.Link}}">{{.Name}}</a></li>
{{end}} {{end}}

2
pages/index.html
View file

@ -1,6 +1,6 @@
{{define "main"}} {{define "main"}}
<form method="POST"> <form method="POST">
<h2 style="margin-bottom:0;"><label for="day">Your day so far:</label></h2> <h2><label for="day">Your day so far:</label></h2>
<textarea id="day" cols="40" rows="15" name="day">{{ .Day }}</textarea> <textarea id="day" cols="40" rows="15" name="day">{{ .Day }}</textarea>
<button type="submit">Save</button> <button type="submit">Save</button>
</form> </form>

3
public/main.css
View file

@ -12,8 +12,7 @@ body {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
h2 { margin-bottom:12px; }
/* Red links! */
a, a:visited { color: #f85552; } a, a:visited { color: #f85552; }
a:hover, a:visited:hover { color: #e66868; } a:hover, a:visited:hover { color: #e66868; }

7
routes.go
View file

@ -89,6 +89,9 @@ func GetDays(w http.ResponseWriter, r *http.Request) {
if err == nil { if err == nil {
dayString = t.Format("02 Jan 2006") dayString = t.Format("02 Jan 2006")
} }
if v == time.Now().Format(time.DateOnly) {
dayString = "Today"
}
daysFormatted = append(daysFormatted, ListEntry{Name: dayString, Link: v}) daysFormatted = append(daysFormatted, ListEntry{Name: dayString, Link: v})
} }
@ -116,6 +119,10 @@ func GetDay(w http.ResponseWriter, r *http.Request) {
HandleWrite(w.Write([]byte("day not specified"))) HandleWrite(w.Write([]byte("day not specified")))
return return
} }
if dayString == time.Now().Format(time.DateOnly) { // today can still be edited
http.Redirect(w, r, "/", 302)
return
}
day, err := ReadFile("day/" + dayString) day, err := ReadFile("day/" + dayString)
if err != nil { if err != nil {
slog.Error("error reading day's file", "error", err, "day", dayString) slog.Error("error reading day's file", "error", err, "day", dayString)