tigor/Redmage
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

navigation: added theme select support

Browse source
This commit is contained in:
Tigor Hutasuhut 2024-04-29 13:31:09 +07:00
parent 2f66122be1
commit 33c1b0dd17
7 changed files with 52 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -47,6 +47,11 @@ build-dependencies:
echo "Dayjs Relative Time not found, installing it" echo "Dayjs Relative Time not found, installing it"
curl -o public/dayjs-relativeTime-1.11.10.min.js https://cdnjs.cloudflare.com/ajax/libs/dayjs/1.11.10/plugin/relativeTime.min.js curl -o public/dayjs-relativeTime-1.11.10.min.js https://cdnjs.cloudflare.com/ajax/libs/dayjs/1.11.10/plugin/relativeTime.min.js
fi fi
@if [ ! -f "public/theme-change-2.0.2.min.js" ]; then
mkdir -p public
echo "Theme change not found, installing it"
curl -o public/theme-change-2.0.2.min.js https://cdn.jsdelivr.net/npm/theme-change@2.0.2/index.js
fi
build: build-dependencies prepare build: build-dependencies prepare
go build -o redmage go build -o redmage

32
api/context.go
View file

@ -1,32 +0,0 @@
package api
import (
"context"
"time"
)
type noTimeoutContext struct {
inner context.Context
}
func (no noTimeoutContext) Deadline() (deadline time.Time, ok bool) {
return time.Time{}, false
}
func (no noTimeoutContext) Done() <-chan struct{} {
return nil
}
func (no noTimeoutContext) Err() error {
return nil
}
func (no noTimeoutContext) Value(key any) any {
return no.inner.Value(key)
}
func noCancelContext(ctx context.Context) context.Context {
return noTimeoutContext{
inner: ctx,
}
}

8
api/reddit/check_subreddit.go
View file

@ -65,14 +65,6 @@ func (reddit *Reddit) CheckSubreddit(ctx context.Context, params CheckSubredditP
"response.location", resp.Request.URL.String(), "response.location", resp.Request.URL.String(),
).Code(http.StatusTooManyRequests) ).Code(http.StatusTooManyRequests)
} }
if resp.StatusCode >= 400 {
msg := fmt.Sprintf("unexpected %d status code from reddit", resp.StatusCode)
return actual, errs.Fail(msg,
"params", params,
"url", url,
"response.location", resp.Request.URL.String(),
).Code(http.StatusFailedDependency)
}
if resp.Request.URL.Path == "/subreddits/search.json" { if resp.Request.URL.Path == "/subreddits/search.json" {
return actual, errs.Fail("subreddit not found", return actual, errs.Fail("subreddit not found",

2
views/components/doctype.templ
View file

@ -2,7 +2,7 @@ package components
templ Doctype() { templ Doctype() {
<!DOCTYPE html> <!DOCTYPE html>
<html data-theme="cupcake"> <html data-theme="light">
{ children... } { children... }
</html> </html>
} }

2
views/components/head.templ
View file

@ -13,6 +13,7 @@ templ Head(vc *views.Context, extras ...templ.Component) {
<script src="/public/dayjs-1.11.10.min.js"></script> <script src="/public/dayjs-1.11.10.min.js"></script>
<script src="/public/dayjs-relativeTime-1.11.10.min.js"></script> <script src="/public/dayjs-relativeTime-1.11.10.min.js"></script>
<script>dayjs.extend(window.dayjs_plugin_relativeTime)</script> <script>dayjs.extend(window.dayjs_plugin_relativeTime)</script>
<script src="/public/theme-change-2.0.2.min.js"></script>
if vc.Config.Bool("http.hotreload") { if vc.Config.Bool("http.hotreload") {
<script src="/public/hot_reload.js"></script> <script src="/public/hot_reload.js"></script>
} }
@ -25,4 +26,3 @@ templ Head(vc *views.Context, extras ...templ.Component) {
templ HeadTitle(name string) { templ HeadTitle(name string) {
<title>{ name }</title> <title>{ name }</title>
} }

64
views/components/navigation.templ
View file

@ -9,7 +9,7 @@ templ Navigation(c *views.Context) {
<div class="drawer-content"> <div class="drawer-content">
<header class="navbar bg-base-200 lg:hidden"> <header class="navbar bg-base-200 lg:hidden">
<div class="flex-none"> <div class="flex-none">
<label for="drawer-toggle" class="btn btn-square btn-ghost drawer-button" onclick="console.log(this)"> <label for="drawer-toggle" class="btn btn-square btn-ghost drawer-button">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="inline-block w-5 h-5 stroke-current"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"></path></svg> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="inline-block w-5 h-5 stroke-current"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"></path></svg>
</label> </label>
</div> </div>
@ -80,27 +80,47 @@ templ navLogo() {
} }
templ Navbar(c *views.Context) { templ Navbar(c *views.Context) {
<header class="hidden lg:inline-block bg-base-200 min-w-[200px] w-[15vw] max-w-[300px] min-h-screen"> <header class="hidden lg:inline-block bg-base-200 min-w-[200px] w-[15vw] max-w-[300px]">
<div class="flex flex-col items-center min-w-[180px] max-w-[280px] mx-auto"> <div class="sticky top-0 flex flex-col min-h-screen">
@navLogo() <div class="flex flex-col items-center min-w-[180px] max-w-[280px] mx-auto">
<span class="font-bold">Redmage</span> @navLogo()
<span class="font-bold">Redmage</span>
</div>
<div class="divider"></div>
<nav class="pt-4" hx-boost="true">
<ul class="flex flex-col flex-wrap">
<a href="/" class={ classForNavItem(c, "/") }>
<li class="hover:bg-accent hover:text-neutral-50 py-2 text-center hover:font-bold">Home</li>
</a>
<a href="/about" class={ classForNavItem(c, "/about") }>
<li class="hover:bg-accent hover:text-neutral-50 py-2 text-center hover:font-bold">About</li>
</a>
<a href="/config" class={ classForNavItem(c, "/config") }>
<li class="hover:bg-accent hover:text-neutral-50 py-2 text-center hover:font-bold">Config</li>
</a>
<a href="/browse" class={ classForNavItem(c, "/browse") }>
<li class="hover:bg-accent hover:text-neutral-50 py-2 text-center hover:font-bold">Browse</li>
</a>
</ul>
</nav>
<div class="flex-grow"></div>
@SelectThemeInput()
</div> </div>
<div class="divider"></div>
<nav class="pt-4" hx-boost="true">
<ul class="flex flex-col flex-wrap">
<a href="/" class={ classForNavItem(c, "/") }>
<li class="hover:bg-accent hover:text-neutral-50 py-2 text-center hover:font-bold">Home</li>
</a>
<a href="/about" class={ classForNavItem(c, "/about") }>
<li class="hover:bg-accent hover:text-neutral-50 py-2 text-center hover:font-bold">About</li>
</a>
<a href="/config" class={ classForNavItem(c, "/config") }>
<li class="hover:bg-accent hover:text-neutral-50 py-2 text-center hover:font-bold">Config</li>
</a>
<a href="/browse" class={ classForNavItem(c, "/browse") }>
<li class="hover:bg-accent hover:text-neutral-50 py-2 text-center hover:font-bold">Browse</li>
</a>
</ul>
</nav>
</header> </header>
} }
templ SelectThemeInput() {
<select class="select select-ghost select-bordered w-full" data-choose-theme>
<option value="light">Light (Default)</option>
<option value="dark">Dark</option>
<option value="cupcake">Cupcake</option>
<option value="bumblebee">Bumblebee</option>
<option value="emerald">Emerald</option>
<option value="corporate">Corporate</option>
<option value="synthwave">Synthwave</option>
<option value="retru">Retro</option>
<option value="cyberpunk">Cyberpunk</option>
<option value="valentine">Valentine</option>
<option value="halloween">Halloween</option>
</select>
}

6
views/homeview/recently_added_image.templ
View file

@ -35,10 +35,10 @@ templ RecentlyAddedImageCard(data *models.Image, opts ImageCardOption) {
if !opts.Has(HideTitle) { if !opts.Has(HideTitle) {
<a <a
href={ templ.URL(data.PostURL) } href={ templ.URL(data.PostURL) }
class="card-title font-bold underline text-base text-primary-content" class="card-title font-bold underline text-base text-primary"
>{ data.Title }</a> >{ data.Title }</a>
} }
<a class="text-primary-content underline" href={ templ.URL(data.PosterURL) }>{ data.Poster }</a> <a class="text-primary underline" href={ templ.URL(data.PosterURL) }>{ data.Poster }</a>
<div> <div>
@utils.RelativeTimeNode(fmt.Sprintf("relative-time-%s", data.PostName), data.CreatedAt) @utils.RelativeTimeNode(fmt.Sprintf("relative-time-%s", data.PostName), data.CreatedAt)
</div> </div>
@ -46,7 +46,7 @@ templ RecentlyAddedImageCard(data *models.Image, opts ImageCardOption) {
if data.R.Subreddit != nil { if data.R.Subreddit != nil {
if !opts.Has(HideSubreddit) { if !opts.Has(HideSubreddit) {
<a <a
class="badge badge-outline" class="badge badge-outline badge-primary"
href={ templ.URL(fmt.Sprintf("https://reddit.com/%s/%s", reddit.SubredditType(data.R.Subreddit.Subtype), data.R.Subreddit.Name)) } href={ templ.URL(fmt.Sprintf("https://reddit.com/%s/%s", reddit.SubredditType(data.R.Subreddit.Subtype), data.R.Subreddit.Name)) }
>{ data.R.Subreddit.Name } </a> >{ data.R.Subreddit.Name } </a>
} }