@jant/core 0.3.36 → 0.3.38
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/commands/export.js +1 -1
- package/bin/commands/import-site.js +529 -0
- package/bin/commands/reset-password.js +3 -2
- package/dist/client/assets/heic-to-DIRPI3VF.js +1 -0
- package/dist/client/assets/url-FWFqPJPb.js +1 -0
- package/dist/client/client.css +1 -1
- package/dist/client/client.js +4012 -3276
- package/dist/index.js +10285 -5809
- package/package.json +11 -3
- package/src/__tests__/helpers/app.ts +9 -9
- package/src/__tests__/helpers/db.ts +91 -93
- package/src/app.tsx +157 -27
- package/src/auth.ts +20 -2
- package/src/client/archive-nav.js +187 -0
- package/src/client/audio-player.ts +478 -0
- package/src/client/audio-processor.ts +84 -0
- package/src/client/avatar-upload.ts +3 -2
- package/src/client/components/__tests__/jant-compose-dialog.test.ts +645 -49
- package/src/client/components/__tests__/jant-compose-editor.test.ts +208 -16
- package/src/client/components/__tests__/jant-post-form.test.ts +19 -9
- package/src/client/components/__tests__/jant-settings-avatar.test.ts +2 -2
- package/src/client/components/__tests__/jant-settings-general.test.ts +3 -3
- package/src/client/components/collection-sidebar-types.ts +7 -9
- package/src/client/components/compose-types.ts +101 -4
- package/src/client/components/jant-collection-form.ts +43 -7
- package/src/client/components/jant-collection-sidebar.ts +88 -84
- package/src/client/components/jant-compose-dialog.ts +1655 -219
- package/src/client/components/jant-compose-editor.ts +732 -168
- package/src/client/components/jant-compose-fullscreen.ts +23 -78
- package/src/client/components/jant-media-lightbox.ts +2 -0
- package/src/client/components/jant-nav-manager.ts +24 -284
- package/src/client/components/jant-post-form.ts +89 -9
- package/src/client/components/jant-post-menu.ts +1019 -0
- package/src/client/components/jant-settings-avatar.ts +3 -3
- package/src/client/components/jant-settings-general.ts +38 -4
- package/src/client/components/jant-text-preview.ts +232 -0
- package/src/client/components/nav-manager-types.ts +4 -19
- package/src/client/components/post-form-template.ts +107 -12
- package/src/client/components/post-form-types.ts +11 -4
- package/src/client/compose-bridge.ts +410 -109
- package/src/client/image-processor.ts +26 -8
- package/src/client/media-metadata.ts +247 -0
- package/src/client/multipart-upload.ts +160 -0
- package/src/client/post-form-bridge.ts +52 -1
- package/src/client/settings-bridge.ts +0 -12
- package/src/client/thread-context.ts +140 -0
- package/src/client/tiptap/create-editor.ts +46 -0
- package/src/client/tiptap/extensions.ts +5 -0
- package/src/client/tiptap/image-node.ts +2 -8
- package/src/client/tiptap/paste-image.ts +2 -13
- package/src/client/tiptap/slash-commands.ts +173 -63
- package/src/client/toast.ts +101 -3
- package/src/client/types/sortablejs.d.ts +15 -0
- package/src/client/upload-with-metadata.ts +54 -0
- package/src/client/video-processor.ts +207 -0
- package/src/client.ts +5 -2
- package/src/db/__tests__/migrations.test.ts +118 -0
- package/src/db/index.ts +52 -0
- package/src/db/migrations/0000_baseline.sql +269 -0
- package/src/db/migrations/0001_fts_setup.sql +31 -0
- package/src/db/migrations/meta/0000_snapshot.json +703 -119
- package/src/db/migrations/meta/0001_snapshot.json +1337 -0
- package/src/db/migrations/meta/_journal.json +4 -39
- package/src/db/schema.ts +409 -145
- package/src/i18n/__tests__/detect.test.ts +115 -0
- package/src/i18n/context.tsx +2 -2
- package/src/i18n/detect.ts +85 -1
- package/src/i18n/i18n.ts +1 -1
- package/src/i18n/index.ts +2 -1
- package/src/i18n/locales/en.po +487 -1217
- package/src/i18n/locales/en.ts +1 -1
- package/src/i18n/locales/zh-Hans.po +613 -996
- package/src/i18n/locales/zh-Hans.ts +1 -1
- package/src/i18n/locales/zh-Hant.po +624 -1007
- package/src/i18n/locales/zh-Hant.ts +1 -1
- package/src/i18n/middleware.ts +6 -0
- package/src/index.ts +5 -7
- package/src/lib/__tests__/blurhash-placeholder.test.ts +75 -0
- package/src/lib/__tests__/constants.test.ts +0 -1
- package/src/lib/__tests__/markdown-to-tiptap.test.ts +358 -0
- package/src/lib/__tests__/nanoid.test.ts +26 -0
- package/src/lib/__tests__/schemas.test.ts +181 -63
- package/src/lib/__tests__/slug.test.ts +126 -0
- package/src/lib/__tests__/sse.test.ts +6 -6
- package/src/lib/__tests__/summary.test.ts +264 -0
- package/src/lib/__tests__/theme.test.ts +1 -1
- package/src/lib/__tests__/timeline.test.ts +33 -30
- package/src/lib/__tests__/tiptap-to-markdown.test.ts +346 -0
- package/src/lib/__tests__/view.test.ts +141 -66
- package/src/lib/blurhash-placeholder.ts +102 -0
- package/src/lib/constants.ts +3 -1
- package/src/lib/emoji-catalog.ts +885 -68
- package/src/lib/errors.ts +11 -8
- package/src/lib/feed.ts +78 -32
- package/src/lib/html.ts +2 -1
- package/src/lib/icon-catalog.ts +5033 -1
- package/src/lib/icons.ts +3 -2
- package/src/lib/index.ts +0 -1
- package/src/lib/markdown-to-tiptap.ts +286 -0
- package/src/lib/media-helpers.ts +12 -3
- package/src/lib/nanoid.ts +29 -0
- package/src/lib/navigation.ts +1 -1
- package/src/lib/render.tsx +20 -2
- package/src/lib/resolve-config.ts +6 -2
- package/src/lib/schemas.ts +224 -55
- package/src/lib/search-snippet.ts +34 -0
- package/src/lib/slug.ts +96 -0
- package/src/lib/sse.ts +6 -6
- package/src/lib/storage.ts +115 -7
- package/src/lib/summary.ts +66 -0
- package/src/lib/theme.ts +11 -8
- package/src/lib/timeline.ts +74 -34
- package/src/lib/tiptap-render.ts +5 -10
- package/src/lib/tiptap-to-markdown.ts +305 -0
- package/src/lib/upload.ts +190 -29
- package/src/lib/url.ts +31 -0
- package/src/lib/view.ts +204 -37
- package/src/middleware/__tests__/auth.test.ts +191 -11
- package/src/middleware/__tests__/onboarding.test.ts +12 -10
- package/src/middleware/auth.ts +63 -9
- package/src/middleware/onboarding.ts +1 -1
- package/src/middleware/secure-headers.ts +40 -0
- package/src/preset.css +45 -2
- package/src/routes/__tests__/compose.test.ts +17 -24
- package/src/routes/api/__tests__/collections.test.ts +109 -61
- package/src/routes/api/__tests__/nav-items.test.ts +46 -29
- package/src/routes/api/__tests__/posts.test.ts +132 -68
- package/src/routes/api/__tests__/search.test.ts +15 -2
- package/src/routes/api/__tests__/upload-multipart.test.ts +534 -0
- package/src/routes/api/collections.ts +51 -42
- package/src/routes/api/custom-urls.ts +80 -0
- package/src/routes/api/export.ts +31 -0
- package/src/routes/api/nav-items.ts +23 -19
- package/src/routes/api/posts.ts +43 -39
- package/src/routes/api/search.ts +3 -4
- package/src/routes/api/upload-multipart.ts +245 -0
- package/src/routes/api/upload.ts +85 -19
- package/src/routes/auth/__tests__/setup.test.ts +20 -60
- package/src/routes/auth/setup.tsx +26 -33
- package/src/routes/auth/signin.tsx +3 -7
- package/src/routes/compose.tsx +10 -55
- package/src/routes/dash/__tests__/settings-avatar.test.ts +1 -1
- package/src/routes/dash/custom-urls.tsx +414 -0
- package/src/routes/dash/settings.tsx +304 -232
- package/src/routes/feed/__tests__/rss.test.ts +27 -28
- package/src/routes/feed/rss.ts +6 -4
- package/src/routes/feed/sitemap.ts +2 -12
- package/src/routes/pages/__tests__/collections.test.ts +5 -6
- package/src/routes/pages/__tests__/featured.test.ts +41 -22
- package/src/routes/pages/archive.tsx +175 -39
- package/src/routes/pages/collection.tsx +22 -10
- package/src/routes/pages/collections.tsx +3 -3
- package/src/routes/pages/featured.tsx +28 -4
- package/src/routes/pages/home.tsx +16 -15
- package/src/routes/pages/latest.tsx +1 -11
- package/src/routes/pages/new.tsx +39 -0
- package/src/routes/pages/page.tsx +95 -49
- package/src/routes/pages/search.tsx +1 -1
- package/src/services/__tests__/api-token.test.ts +135 -0
- package/src/services/__tests__/collection.test.ts +275 -227
- package/src/services/__tests__/custom-url.test.ts +213 -0
- package/src/services/__tests__/media.test.ts +162 -22
- package/src/services/__tests__/navigation.test.ts +109 -68
- package/src/services/__tests__/post-timeline.test.ts +205 -32
- package/src/services/__tests__/post.test.ts +713 -234
- package/src/services/__tests__/search.test.ts +67 -10
- package/src/services/api-token.ts +166 -0
- package/src/services/auth.ts +17 -2
- package/src/services/collection.ts +397 -131
- package/src/services/custom-url.ts +188 -0
- package/src/services/export.ts +802 -0
- package/src/services/index.ts +26 -19
- package/src/services/media.ts +100 -22
- package/src/services/navigation.ts +158 -47
- package/src/services/path.ts +339 -0
- package/src/services/post.ts +687 -154
- package/src/services/search.ts +160 -75
- package/src/styles/components.css +58 -7
- package/src/styles/tokens.css +84 -6
- package/src/styles/ui.css +2964 -457
- package/src/types/bindings.ts +4 -1
- package/src/types/config.ts +12 -4
- package/src/types/constants.ts +15 -3
- package/src/types/entities.ts +74 -35
- package/src/types/operations.ts +11 -24
- package/src/types/props.ts +51 -16
- package/src/types/views.ts +45 -22
- package/src/ui/color-themes.ts +133 -23
- package/src/ui/compose/ComposeDialog.tsx +239 -17
- package/src/ui/compose/ComposePrompt.tsx +1 -1
- package/src/ui/dash/CrudPageHeader.tsx +1 -1
- package/src/ui/dash/ListItemRow.tsx +1 -1
- package/src/ui/dash/StatusBadge.tsx +3 -1
- package/src/ui/dash/appearance/AdvancedContent.tsx +22 -1
- package/src/ui/dash/appearance/ColorThemeContent.tsx +22 -2
- package/src/ui/dash/appearance/FontThemeContent.tsx +1 -1
- package/src/ui/dash/appearance/NavigationContent.tsx +5 -45
- package/src/ui/dash/index.ts +0 -3
- package/src/ui/dash/settings/AccountContent.tsx +3 -57
- package/src/ui/dash/settings/AccountMenuContent.tsx +147 -0
- package/src/ui/dash/settings/ApiTokensContent.tsx +232 -0
- package/src/ui/dash/settings/AvatarContent.tsx +8 -0
- package/src/ui/dash/settings/SessionsContent.tsx +159 -0
- package/src/ui/dash/settings/SettingsRootContent.tsx +45 -15
- package/src/ui/feed/LinkCard.tsx +89 -40
- package/src/ui/feed/NoteCard.tsx +39 -25
- package/src/ui/feed/PostStatusBadges.tsx +67 -0
- package/src/ui/feed/QuoteCard.tsx +38 -23
- package/src/ui/feed/ThreadPreview.tsx +90 -26
- package/src/ui/feed/TimelineFeed.tsx +3 -2
- package/src/ui/feed/TimelineItem.tsx +15 -6
- package/src/ui/feed/__tests__/thread-preview.test.ts +107 -0
- package/src/ui/feed/thread-preview-state.ts +61 -0
- package/src/ui/font-themes.ts +2 -2
- package/src/ui/layouts/BaseLayout.tsx +2 -2
- package/src/ui/layouts/SiteLayout.tsx +105 -92
- package/src/ui/pages/ArchivePage.tsx +923 -98
- package/src/ui/pages/ComposePage.tsx +54 -0
- package/src/ui/pages/PostPage.tsx +30 -45
- package/src/ui/pages/SearchPage.tsx +181 -37
- package/src/ui/shared/AdminBreadcrumb.tsx +29 -0
- package/src/ui/shared/CollectionsSidebar.tsx +47 -37
- package/src/ui/shared/MediaGallery.tsx +445 -149
- package/src/ui/shared/PostFooter.tsx +204 -0
- package/src/ui/shared/StarRating.tsx +27 -0
- package/src/ui/shared/__tests__/format-chars.test.ts +35 -0
- package/src/ui/shared/index.ts +0 -1
- package/dist/client/assets/url-8Dj-5CLW.js +0 -1
- package/src/client/media-upload.ts +0 -161
- package/src/client/page-slug-bridge.ts +0 -42
- package/src/db/migrations/0000_square_wallflower.sql +0 -118
- package/src/db/migrations/0001_add_search_fts.sql +0 -34
- package/src/db/migrations/0002_add_media_attachments.sql +0 -3
- package/src/db/migrations/0003_add_navigation_links.sql +0 -8
- package/src/db/migrations/0004_add_storage_provider.sql +0 -3
- package/src/db/migrations/0005_v2_schema_migration.sql +0 -268
- package/src/db/migrations/0006_rename_slug_to_path.sql +0 -5
- package/src/db/migrations/0007_post_collections_m2m.sql +0 -94
- package/src/db/migrations/0008_add_collection_dividers.sql +0 -8
- package/src/db/migrations/0009_drop_collection_show_divider.sql +0 -2
- package/src/db/migrations/0010_add_performance_indexes.sql +0 -16
- package/src/db/migrations/0011_add_path_registry.sql +0 -23
- package/src/db/migrations/0012_add_tiptap_columns.sql +0 -2
- package/src/db/migrations/0013_replace_featured_with_visibility.sql +0 -8
- package/src/db/migrations/meta/0003_snapshot.json +0 -821
- package/src/lib/__tests__/sqid.test.ts +0 -65
- package/src/lib/sqid.ts +0 -79
- package/src/routes/api/__tests__/pages.test.ts +0 -218
- package/src/routes/api/pages.ts +0 -73
- package/src/routes/dash/__tests__/pages.test.ts +0 -226
- package/src/routes/dash/index.tsx +0 -109
- package/src/routes/dash/media.tsx +0 -135
- package/src/routes/dash/pages.tsx +0 -245
- package/src/routes/dash/posts.tsx +0 -338
- package/src/routes/dash/redirects.tsx +0 -263
- package/src/routes/pages/post.tsx +0 -59
- package/src/services/__tests__/page.test.ts +0 -298
- package/src/services/__tests__/path-registry.test.ts +0 -165
- package/src/services/__tests__/redirect.test.ts +0 -159
- package/src/services/page.ts +0 -216
- package/src/services/path-registry.ts +0 -160
- package/src/services/redirect.ts +0 -97
- package/src/ui/dash/PageForm.tsx +0 -187
- package/src/ui/dash/PostList.tsx +0 -95
- package/src/ui/dash/media/MediaListContent.tsx +0 -206
- package/src/ui/dash/media/ViewMediaContent.tsx +0 -208
- package/src/ui/dash/pages/PagesContent.tsx +0 -75
- package/src/ui/dash/posts/PostForm.tsx +0 -260
- package/src/ui/layouts/DashLayout.tsx +0 -247
- package/src/ui/pages/SinglePage.tsx +0 -23
- package/src/ui/shared/ThreadView.tsx +0 -136
|
@@ -0,0 +1,414 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Custom URLs Routes
|
|
3
|
+
*
|
|
4
|
+
* Mounted under /settings/custom-urls
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
import { Hono } from "hono";
|
|
8
|
+
import { useLingui } from "@lingui/react/macro";
|
|
9
|
+
import type { Bindings, CustomUrl } from "../../types.js";
|
|
10
|
+
import type { AppVariables } from "../../types/app-context.js";
|
|
11
|
+
import { EmptyState, ListItemRow, ActionButtons } from "../../ui/dash/index.js";
|
|
12
|
+
import { dsRedirect } from "../../lib/sse.js";
|
|
13
|
+
import { parseIdParam } from "../../lib/errors.js";
|
|
14
|
+
import { CreateCustomUrlSchema, parseValidated } from "../../lib/schemas.js";
|
|
15
|
+
import { renderPublicPage } from "../../lib/render.js";
|
|
16
|
+
import { getNavigationData } from "../../lib/navigation.js";
|
|
17
|
+
import { AdminBreadcrumb } from "../../ui/shared/AdminBreadcrumb.js";
|
|
18
|
+
import { PagePagination } from "../../ui/shared/Pagination.js";
|
|
19
|
+
import { DEFAULT_PAGE_SIZE } from "../../lib/constants.js";
|
|
20
|
+
|
|
21
|
+
type Env = { Bindings: Bindings; Variables: AppVariables };
|
|
22
|
+
|
|
23
|
+
export const customUrlsRoutes = new Hono<Env>();
|
|
24
|
+
|
|
25
|
+
function targetBadge(targetType: CustomUrl["targetType"]) {
|
|
26
|
+
switch (targetType) {
|
|
27
|
+
case "post":
|
|
28
|
+
return "Post";
|
|
29
|
+
case "collection":
|
|
30
|
+
return "Collection";
|
|
31
|
+
case "redirect":
|
|
32
|
+
return "Redirect";
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
function CustomUrlsListContent({
|
|
37
|
+
customUrls,
|
|
38
|
+
targetSlugs,
|
|
39
|
+
currentPage,
|
|
40
|
+
totalPages,
|
|
41
|
+
}: {
|
|
42
|
+
customUrls: CustomUrl[];
|
|
43
|
+
targetSlugs: Record<string, string>;
|
|
44
|
+
currentPage: number;
|
|
45
|
+
totalPages: number;
|
|
46
|
+
}) {
|
|
47
|
+
const { t } = useLingui();
|
|
48
|
+
|
|
49
|
+
return (
|
|
50
|
+
<>
|
|
51
|
+
<div class="flex items-center justify-between mb-6">
|
|
52
|
+
<h2 class="text-lg font-medium">
|
|
53
|
+
{t({
|
|
54
|
+
message: "Custom URLs",
|
|
55
|
+
comment: "@context: Settings section heading",
|
|
56
|
+
})}
|
|
57
|
+
</h2>
|
|
58
|
+
<a href="/settings/custom-urls/new" class="btn">
|
|
59
|
+
{t({
|
|
60
|
+
message: "New Custom URL",
|
|
61
|
+
comment: "@context: Button to create new custom URL",
|
|
62
|
+
})}
|
|
63
|
+
</a>
|
|
64
|
+
</div>
|
|
65
|
+
|
|
66
|
+
{customUrls.length === 0 ? (
|
|
67
|
+
<EmptyState
|
|
68
|
+
message={t({
|
|
69
|
+
message:
|
|
70
|
+
"No custom URLs yet. Create one to add redirects or custom paths for posts.",
|
|
71
|
+
comment: "@context: Empty state message",
|
|
72
|
+
})}
|
|
73
|
+
ctaText={t({
|
|
74
|
+
message: "New Custom URL",
|
|
75
|
+
comment: "@context: Button to create new custom URL",
|
|
76
|
+
})}
|
|
77
|
+
ctaHref="/settings/custom-urls/new"
|
|
78
|
+
/>
|
|
79
|
+
) : (
|
|
80
|
+
<>
|
|
81
|
+
<div class="flex flex-col divide-y">
|
|
82
|
+
{customUrls.map((cu) => (
|
|
83
|
+
<ListItemRow
|
|
84
|
+
key={cu.id}
|
|
85
|
+
actions={
|
|
86
|
+
<ActionButtons
|
|
87
|
+
deleteAction={`/settings/custom-urls/${cu.id}/delete`}
|
|
88
|
+
deleteLabel={t({
|
|
89
|
+
message: "Delete",
|
|
90
|
+
comment: "@context: Button to delete custom URL",
|
|
91
|
+
})}
|
|
92
|
+
/>
|
|
93
|
+
}
|
|
94
|
+
>
|
|
95
|
+
<div class="flex items-center gap-2">
|
|
96
|
+
<code class="text-sm bg-muted px-1 rounded">/{cu.path}</code>
|
|
97
|
+
<span class="text-muted-foreground">→</span>
|
|
98
|
+
{cu.targetType === "redirect" ? (
|
|
99
|
+
<code class="text-sm bg-muted px-1 rounded">
|
|
100
|
+
{cu.toPath}
|
|
101
|
+
</code>
|
|
102
|
+
) : (
|
|
103
|
+
<code class="text-sm bg-muted px-1 rounded">
|
|
104
|
+
/
|
|
105
|
+
{cu.targetId
|
|
106
|
+
? (targetSlugs[cu.targetId] ?? cu.targetId)
|
|
107
|
+
: "?"}
|
|
108
|
+
</code>
|
|
109
|
+
)}
|
|
110
|
+
<span class="badge-outline">
|
|
111
|
+
{targetBadge(cu.targetType)}
|
|
112
|
+
</span>
|
|
113
|
+
{cu.targetType === "redirect" && cu.redirectType && (
|
|
114
|
+
<span class="badge-outline">{cu.redirectType}</span>
|
|
115
|
+
)}
|
|
116
|
+
</div>
|
|
117
|
+
</ListItemRow>
|
|
118
|
+
))}
|
|
119
|
+
</div>
|
|
120
|
+
<PagePagination
|
|
121
|
+
baseUrl="/settings/custom-urls"
|
|
122
|
+
currentPage={currentPage}
|
|
123
|
+
totalPages={totalPages}
|
|
124
|
+
/>
|
|
125
|
+
</>
|
|
126
|
+
)}
|
|
127
|
+
</>
|
|
128
|
+
);
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
function NewCustomUrlContent() {
|
|
132
|
+
const { t } = useLingui();
|
|
133
|
+
|
|
134
|
+
return (
|
|
135
|
+
<>
|
|
136
|
+
<h2 class="text-lg font-medium mb-6">
|
|
137
|
+
{t({ message: "New Custom URL", comment: "@context: Page heading" })}
|
|
138
|
+
</h2>
|
|
139
|
+
|
|
140
|
+
<form
|
|
141
|
+
data-signals="{path: '', targetType: 'redirect', targetId: '', toPath: '', redirectType: '301'}"
|
|
142
|
+
data-on:submit__prevent="@post('/settings/custom-urls')"
|
|
143
|
+
data-indicator="_loading"
|
|
144
|
+
class="flex flex-col gap-4 max-w-lg"
|
|
145
|
+
>
|
|
146
|
+
<div class="field">
|
|
147
|
+
<label class="label">
|
|
148
|
+
{t({
|
|
149
|
+
message: "Path",
|
|
150
|
+
comment: "@context: Custom URL form field",
|
|
151
|
+
})}
|
|
152
|
+
</label>
|
|
153
|
+
<input
|
|
154
|
+
type="text"
|
|
155
|
+
data-bind="path"
|
|
156
|
+
class="input"
|
|
157
|
+
placeholder="blog/my-post"
|
|
158
|
+
required
|
|
159
|
+
/>
|
|
160
|
+
<p class="text-xs text-muted-foreground mt-1">
|
|
161
|
+
{t({
|
|
162
|
+
message: "The custom URL path (without leading slash)",
|
|
163
|
+
comment: "@context: Custom URL path help text",
|
|
164
|
+
})}
|
|
165
|
+
</p>
|
|
166
|
+
</div>
|
|
167
|
+
|
|
168
|
+
<div class="field">
|
|
169
|
+
<label class="label">
|
|
170
|
+
{t({
|
|
171
|
+
message: "Type",
|
|
172
|
+
comment: "@context: Custom URL form field",
|
|
173
|
+
})}
|
|
174
|
+
</label>
|
|
175
|
+
<select data-bind="targetType" class="select">
|
|
176
|
+
<option value="redirect">
|
|
177
|
+
{t({
|
|
178
|
+
message: "Redirect",
|
|
179
|
+
comment: "@context: Custom URL type option",
|
|
180
|
+
})}
|
|
181
|
+
</option>
|
|
182
|
+
<option value="post">
|
|
183
|
+
{t({
|
|
184
|
+
message: "Post",
|
|
185
|
+
comment: "@context: Custom URL type option",
|
|
186
|
+
})}
|
|
187
|
+
</option>
|
|
188
|
+
<option value="collection">
|
|
189
|
+
{t({
|
|
190
|
+
message: "Collection",
|
|
191
|
+
comment: "@context: Custom URL type option",
|
|
192
|
+
})}
|
|
193
|
+
</option>
|
|
194
|
+
</select>
|
|
195
|
+
</div>
|
|
196
|
+
|
|
197
|
+
<div data-show="$targetType === 'redirect'" class="flex flex-col gap-4">
|
|
198
|
+
<div class="field">
|
|
199
|
+
<label class="label">
|
|
200
|
+
{t({
|
|
201
|
+
message: "Destination",
|
|
202
|
+
comment: "@context: Redirect destination field",
|
|
203
|
+
})}
|
|
204
|
+
</label>
|
|
205
|
+
<input
|
|
206
|
+
type="text"
|
|
207
|
+
data-bind="toPath"
|
|
208
|
+
class="input"
|
|
209
|
+
placeholder="/new-path or https://..."
|
|
210
|
+
/>
|
|
211
|
+
</div>
|
|
212
|
+
|
|
213
|
+
<div class="field">
|
|
214
|
+
<label class="label">
|
|
215
|
+
{t({
|
|
216
|
+
message: "Redirect Type",
|
|
217
|
+
comment: "@context: Redirect type field",
|
|
218
|
+
})}
|
|
219
|
+
</label>
|
|
220
|
+
<select data-bind="redirectType" class="select">
|
|
221
|
+
<option value="301">
|
|
222
|
+
{t({
|
|
223
|
+
message: "301 (Permanent)",
|
|
224
|
+
comment: "@context: Redirect type option",
|
|
225
|
+
})}
|
|
226
|
+
</option>
|
|
227
|
+
<option value="302">
|
|
228
|
+
{t({
|
|
229
|
+
message: "302 (Temporary)",
|
|
230
|
+
comment: "@context: Redirect type option",
|
|
231
|
+
})}
|
|
232
|
+
</option>
|
|
233
|
+
</select>
|
|
234
|
+
</div>
|
|
235
|
+
</div>
|
|
236
|
+
|
|
237
|
+
<div
|
|
238
|
+
data-show="$targetType === 'post' || $targetType === 'collection'"
|
|
239
|
+
class="field"
|
|
240
|
+
>
|
|
241
|
+
<label class="label">
|
|
242
|
+
{t({
|
|
243
|
+
message: "Target Slug",
|
|
244
|
+
comment: "@context: Custom URL target slug field",
|
|
245
|
+
})}
|
|
246
|
+
</label>
|
|
247
|
+
<input
|
|
248
|
+
type="text"
|
|
249
|
+
data-bind="targetId"
|
|
250
|
+
class="input"
|
|
251
|
+
placeholder="my-post-slug"
|
|
252
|
+
/>
|
|
253
|
+
<p class="text-xs text-muted-foreground mt-1">
|
|
254
|
+
{t({
|
|
255
|
+
message: "The slug of the target post or collection",
|
|
256
|
+
comment: "@context: Custom URL target slug help text",
|
|
257
|
+
})}
|
|
258
|
+
</p>
|
|
259
|
+
</div>
|
|
260
|
+
|
|
261
|
+
<div class="flex gap-2">
|
|
262
|
+
<button type="submit" class="btn" data-attr:disabled="$_loading">
|
|
263
|
+
<svg
|
|
264
|
+
data-show="$_loading"
|
|
265
|
+
style="display:none"
|
|
266
|
+
class="animate-spin size-4"
|
|
267
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
268
|
+
viewBox="0 0 24 24"
|
|
269
|
+
fill="none"
|
|
270
|
+
stroke="currentColor"
|
|
271
|
+
stroke-width="2"
|
|
272
|
+
stroke-linecap="round"
|
|
273
|
+
stroke-linejoin="round"
|
|
274
|
+
role="status"
|
|
275
|
+
>
|
|
276
|
+
<path d="M21 12a9 9 0 1 1-6.219-8.56" />
|
|
277
|
+
</svg>
|
|
278
|
+
{t({
|
|
279
|
+
message: "Create Custom URL",
|
|
280
|
+
comment: "@context: Button to save new custom URL",
|
|
281
|
+
})}
|
|
282
|
+
</button>
|
|
283
|
+
<a href="/settings/custom-urls" class="btn-outline">
|
|
284
|
+
{t({
|
|
285
|
+
message: "Cancel",
|
|
286
|
+
comment: "@context: Button to cancel form",
|
|
287
|
+
})}
|
|
288
|
+
</a>
|
|
289
|
+
</div>
|
|
290
|
+
</form>
|
|
291
|
+
</>
|
|
292
|
+
);
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
// List custom URLs
|
|
296
|
+
customUrlsRoutes.get("/", async (c) => {
|
|
297
|
+
const pageParam = c.req.query("page");
|
|
298
|
+
const currentPage = Math.max(1, parseInt(pageParam || "1", 10) || 1);
|
|
299
|
+
|
|
300
|
+
const [total, customUrlsList] = await Promise.all([
|
|
301
|
+
c.var.services.customUrls.count(),
|
|
302
|
+
c.var.services.customUrls.list({
|
|
303
|
+
limit: DEFAULT_PAGE_SIZE,
|
|
304
|
+
offset: (currentPage - 1) * DEFAULT_PAGE_SIZE,
|
|
305
|
+
}),
|
|
306
|
+
]);
|
|
307
|
+
|
|
308
|
+
const totalPages = Math.max(1, Math.ceil(total / DEFAULT_PAGE_SIZE));
|
|
309
|
+
|
|
310
|
+
// Resolve target UUIDs → slugs for display
|
|
311
|
+
const targetSlugs: Record<string, string> = {};
|
|
312
|
+
for (const cu of customUrlsList) {
|
|
313
|
+
if (!cu.targetId || cu.targetType === "redirect") continue;
|
|
314
|
+
if (cu.targetType === "post") {
|
|
315
|
+
const post = await c.var.services.posts.getById(cu.targetId);
|
|
316
|
+
if (post) targetSlugs[cu.targetId] = post.slug;
|
|
317
|
+
} else if (cu.targetType === "collection") {
|
|
318
|
+
const col = await c.var.services.collections.getById(cu.targetId);
|
|
319
|
+
if (col) targetSlugs[cu.targetId] = col.slug;
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
const navData = await getNavigationData(c);
|
|
324
|
+
|
|
325
|
+
return renderPublicPage(c, {
|
|
326
|
+
title: `Custom URLs - ${navData.siteName}`,
|
|
327
|
+
navData,
|
|
328
|
+
content: (
|
|
329
|
+
<>
|
|
330
|
+
<AdminBreadcrumb
|
|
331
|
+
parent="Settings"
|
|
332
|
+
parentHref="/settings"
|
|
333
|
+
current="Custom URLs"
|
|
334
|
+
/>
|
|
335
|
+
<CustomUrlsListContent
|
|
336
|
+
customUrls={customUrlsList}
|
|
337
|
+
targetSlugs={targetSlugs}
|
|
338
|
+
currentPage={currentPage}
|
|
339
|
+
totalPages={totalPages}
|
|
340
|
+
/>
|
|
341
|
+
</>
|
|
342
|
+
),
|
|
343
|
+
});
|
|
344
|
+
});
|
|
345
|
+
|
|
346
|
+
// New custom URL form
|
|
347
|
+
customUrlsRoutes.get("/new", async (c) => {
|
|
348
|
+
const navData = await getNavigationData(c);
|
|
349
|
+
|
|
350
|
+
return renderPublicPage(c, {
|
|
351
|
+
title: `New Custom URL - ${navData.siteName}`,
|
|
352
|
+
navData,
|
|
353
|
+
content: (
|
|
354
|
+
<>
|
|
355
|
+
<AdminBreadcrumb
|
|
356
|
+
parent="Settings"
|
|
357
|
+
parentHref="/settings"
|
|
358
|
+
current="Custom URLs"
|
|
359
|
+
/>
|
|
360
|
+
<NewCustomUrlContent />
|
|
361
|
+
</>
|
|
362
|
+
),
|
|
363
|
+
});
|
|
364
|
+
});
|
|
365
|
+
|
|
366
|
+
// Create custom URL
|
|
367
|
+
customUrlsRoutes.post("/", async (c) => {
|
|
368
|
+
const body = parseValidated(CreateCustomUrlSchema, await c.req.json());
|
|
369
|
+
|
|
370
|
+
const redirectType = body.redirectType
|
|
371
|
+
? (parseInt(body.redirectType, 10) as 301 | 302)
|
|
372
|
+
: undefined;
|
|
373
|
+
|
|
374
|
+
// Resolve slug → ID for post/collection targets
|
|
375
|
+
let targetId = body.targetId;
|
|
376
|
+
if (body.targetType === "post" && body.targetId) {
|
|
377
|
+
const post = await c.var.services.posts.getBySlug(body.targetId);
|
|
378
|
+
if (!post) {
|
|
379
|
+
return c.json(
|
|
380
|
+
{ error: `Post with slug "${body.targetId}" not found` },
|
|
381
|
+
404,
|
|
382
|
+
);
|
|
383
|
+
}
|
|
384
|
+
targetId = post.id;
|
|
385
|
+
}
|
|
386
|
+
if (body.targetType === "collection" && body.targetId) {
|
|
387
|
+
const col = await c.var.services.collections.getBySlug(body.targetId);
|
|
388
|
+
if (!col) {
|
|
389
|
+
return c.json(
|
|
390
|
+
{ error: `Collection with slug "${body.targetId}" not found` },
|
|
391
|
+
404,
|
|
392
|
+
);
|
|
393
|
+
}
|
|
394
|
+
targetId = col.id;
|
|
395
|
+
}
|
|
396
|
+
|
|
397
|
+
await c.var.services.customUrls.create({
|
|
398
|
+
path: body.path,
|
|
399
|
+
targetType: body.targetType,
|
|
400
|
+
targetId,
|
|
401
|
+
toPath: body.toPath,
|
|
402
|
+
redirectType,
|
|
403
|
+
});
|
|
404
|
+
|
|
405
|
+
return dsRedirect("/settings/custom-urls");
|
|
406
|
+
});
|
|
407
|
+
|
|
408
|
+
// Delete custom URL
|
|
409
|
+
customUrlsRoutes.post("/:id/delete", async (c) => {
|
|
410
|
+
const id = parseIdParam(c.req.param("id"));
|
|
411
|
+
await c.var.services.customUrls.delete(id);
|
|
412
|
+
|
|
413
|
+
return dsRedirect("/settings/custom-urls");
|
|
414
|
+
});
|