jichan.org/jichan.org-go
jichan.org/jichan.org-go
Archived
1
0
Fork 0
generated from ElnuDev/go-project
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: jichan.org:293941c011dca0dc5b899969b627942b17b5c967
Branches Tags
jichan.org:main
...
compare: jichan.org:3a7d33203b3e875026941ae4914789e500ecd5c4
Branches Tags
jichan.org:main

4 commits
293941c011 ... 3a7d33203b

Author SHA1 Message Date
ElnuDev
3a7d33203b Improved 404 2023-07-24 14:14:15 -07:00
ElnuDev
dee29d1277 Add 404 page 2023-07-24 13:49:28 -07:00
ElnuDev
33ecd1a539 Better part of speech display 2023-07-24 13:25:23 -07:00
ElnuDev
8421aca007 Add htmx to thank you section 2023-07-24 12:24:24 -07:00
7 changed files with 122 additions and 16 deletions
Show stats Expand all files Collapse all files

47
dict/main.go
View file

@ -136,7 +136,12 @@ type Entry struct {
type Definition struct { type Definition struct {
Definition string Definition string
PartOfSpeech []string PartOfSpeech []PartOfSpeech
}
type PartOfSpeech struct {
Description string
Type string
} }
func ParseEntry(entry *jmdict.JmdictEntry, furiganaInfo *string) Entry { func ParseEntry(entry *jmdict.JmdictEntry, furiganaInfo *string) Entry {
@ -159,9 +164,31 @@ func ParseEntry(entry *jmdict.JmdictEntry, furiganaInfo *string) Entry {
definition += "; " + glossary.Content definition += "; " + glossary.Content
} }
} }
pos := make([]PartOfSpeech, len(sense.PartsOfSpeech))
for i, posFull := range sense.PartsOfSpeech {
class := ""
if strings.Contains(posFull, "noun") {
class = "noun"
} else if strings.Contains(posFull, "adjective") {
class = "adjective"
} else if strings.Contains(posFull, "adverb") {
class = "adverb"
} else if strings.Contains(posFull, "verb") {
class = "verb"
} else if strings.Contains(posFull, "particle") {
class = "particle"
} else if strings.Contains(posFull, "phrase") {
class = "phrase"
}
pos[i] = PartOfSpeech{
Description: posFull,
Type: class,
}
}
definitions[i] = Definition{ definitions[i] = Definition{
Definition: definition, Definition: definition,
PartOfSpeech: sense.PartsOfSpeech, PartOfSpeech: pos,
} }
} }
// 1:ねが;3:いた // 1:ねが;3:いた
@ -404,6 +431,20 @@ func main() {
}, },
[]string{http.MethodGet}, []string{http.MethodGet},
)) ))
r.PathPrefix("/").Handler(http.FileServer(http.Dir("static"))) r.NotFoundHandler = http.HandlerFunc(httputils.GenerateHandler(
func(w http.ResponseWriter, r *http.Request) bool { return true },
httputils.NewTemplateSet("index.html", "404.html"),
func(w http.ResponseWriter, r *http.Request) (template string, data any) {
w.WriteHeader(http.StatusNotFound)
return "404.html", nil
},
[]string{http.MethodGet},
))
r.Path("/logo.svg").Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
http.ServeFile(w, r, "static/logo.svg")
}))
r.Path("/overrides.css").Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
http.ServeFile(w, r, "static/overrides.css")
}))
log.Fatal(http.ListenAndServe(":3334", r)) log.Fatal(http.ListenAndServe(":3334", r))
} }

55
dict/static/overrides.css Normal file
View file

@ -0,0 +1,55 @@
:root {
--bg: #282828 !important;
--fg: #ebdbb2 !important;
--box-bg: #3c3836 !important; /* bg1 */
--graphical-fg: #928374 !important; /* gray */
--info-graphical-fg: red !important;
}
chip {
white-space: nowrap;
}
.noun {
--box-bg: #79740e;
--accent: #b8bb26;
--graphical-fg: #98971a;
}
.adjective {
--box-bg: #9d0006;
--accent: #fb4934;
--graphical-fg: #cc241d;
}
.verb, .adverb {
--box-bg: #076678;
--accent: #83a598;
--graphical-fg: #458588;
}
.particle {
--box-bg: #b57614;
--accent: #fabd2f;
--graphical-fg: #d79921;
}
.phrase {
--box-bg: #8f3f71;
--accent: #d3869b;
--graphical-fg: #b16286;
}
li {
margin-top: 0.75em;
}
#results .box h3 a {
color: inherit;
}
#results .box h3 a:not(:hover) {
text-decoration: none;
}

7
dict/templates/404.html Normal file
View file

@ -0,0 +1,7 @@
{{- define "title" }}404 Not Found - {{ template "sitetitle" . }}{{- end -}}
{{- define "results" -}}
{{- template "404" . }}
{{- end -}}
{{- template "index" . -}}

13
dict/templates/index.html
View file

@ -6,17 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{ block "title" . }}{{ template "sitetitle" . }}{{ end }}</title> <title>{{ block "title" . }}{{ template "sitetitle" . }}{{ end }}</title>
<link rel="stylesheet" href="https://unpkg.com/missing.css@1.0.9/dist/missing.min.css"> <link rel="stylesheet" href="https://unpkg.com/missing.css@1.0.9/dist/missing.min.css">
<style> <link rel="stylesheet" href="/overrides.css">
li {
margin-top: 0.75em;
}
#results .box h3 a {
color: inherit;
}
#results .box h3 a:not(:hover) {
text-decoration: none;
}
</style>
<script src="https://unpkg.com/htmx.org@1.9.3"></script> <script src="https://unpkg.com/htmx.org@1.9.3"></script>
</head> </head>
<body hx-boost="true"> <body hx-boost="true">
@ -44,6 +34,7 @@
<li><a href="https://www.edrdg.org/wiki/index.php/JMdict-EDICT_Dictionary_Project" target="_blank"><b>JMdict</b></a> for providing free and open dictionary data</li> <li><a href="https://www.edrdg.org/wiki/index.php/JMdict-EDICT_Dictionary_Project" target="_blank"><b>JMdict</b></a> for providing free and open dictionary data</li>
<li><a href="https://foosoft.net/" target="_blank">Alexei Yatskov</a> a.k.a. Foosoft Productions for providing the <a href="https:/foosoft.net/projects/jmdict">foosoft.net/projects/jmdict</a> Go package for parsing JMdict, and also for creating Yomichan, a great inspiration</li> <li><a href="https://foosoft.net/" target="_blank">Alexei Yatskov</a> a.k.a. Foosoft Productions for providing the <a href="https:/foosoft.net/projects/jmdict">foosoft.net/projects/jmdict</a> Go package for parsing JMdict, and also for creating Yomichan, a great inspiration</li>
<li>Doublevil for providing <a href="https://github.com/Doublevil/JmdictFurigana">JmdictFurigana</a></li> <li>Doublevil for providing <a href="https://github.com/Doublevil/JmdictFurigana">JmdictFurigana</a></li>
<li><a href="https://htmx.org/">htmx</a></li>
</ul> </ul>
{{ end }} {{ end }}
{{ end }} {{ end }}

8
dict/templates/partials/404.html Normal file
View file

@ -0,0 +1,8 @@
{{ define "404" }}
<div class="center">
<br>
<h1>404 Not Found</h1>
<img src="https://tenor.com/view/fumo-touhou-reimu-reimu-peek-peeking-gif-22922061.gif" style="width: 256px" alt="Reimu fumo can't find nothin">
<p>Looks like this page doesn't exist?</p>
</div>
{{ end }}

2
dict/templates/partials/definition.html
View file

@ -1,3 +1,3 @@
{{- define "definition" -}} {{- define "definition" -}}
{{ if .PartOfSpeech }}<small><chip>{{ .PartOfSpeech }}</chip></small><br>{{ end }}{{ highlight .Definition -}} {{ if .PartOfSpeech }}<small>{{ range .PartOfSpeech }}<chip class="{{ .Type }}">{{ .Description }}</chip> {{ end }}</small><br>{{ end }}{{ highlight .Definition -}}
{{ end }} {{ end }}

6
dict/templates/word.html
View file

@ -1,5 +1,9 @@
{{- define "title" }}{{ .Entry.Kanji }} - {{ template "sitetitle" . }}{{- end -}} {{- define "title" }}{{ if .Entry }}{{ .Entry.Kanji }}{{ else }}404 Not Found{{ end }} - {{ template "sitetitle" . }}{{- end -}}
{{- define "results" -}} {{- define "results" -}}
{{- if .Entry -}}
{{- template "entryfull" .Entry -}} {{- template "entryfull" .Entry -}}
{{- else -}}
{{- template "404" . }}
{{- end -}}
{{- end -}} {{- end -}}
{{- template "index" . -}} {{- template "index" . -}}