diff --git a/package.json b/package.json index 02c304b1..5cbaae03 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "remark-rehype": "^10.1.0", "sortablejs": "^1.15.0", "ua-parser-js": "^1.0.2", - "unidata.js": "^0.6.3", + "unidata.js": "^0.6.5", "unified": "^10.1.2", "unist-builder": "^3.0.0", "unist-util-visit": "^4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 74f1e35e..1005a65c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -81,7 +81,7 @@ specifiers: tailwindcss: ^3.0.24 typescript: ^4.5.5 ua-parser-js: ^1.0.2 - unidata.js: ^0.6.3 + unidata.js: ^0.6.5 unified: ^10.1.2 unist-builder: ^3.0.0 unist-util-visit: ^4.1.0 @@ -144,7 +144,7 @@ dependencies: remark-rehype: 10.1.0 sortablejs: 1.15.0 ua-parser-js: 1.0.2 - unidata.js: 0.6.3 + unidata.js: 0.6.5 unified: 10.1.2 unist-builder: 3.0.0 unist-util-visit: 4.1.0 @@ -7739,8 +7739,8 @@ packages: engines: {node: '>=12.18'} dev: false - /unidata.js/0.6.3: - resolution: {integrity: sha512-w2vWxsJGIZ+t2CLO9yxBStHbuMijmoaPKw4jBhfrUtVuUjD0MMGIUZ5mVbDbbvaNDKCWli5JqaNZjaSmCCmaYw==} + /unidata.js/0.6.5: + resolution: {integrity: sha512-AixbsW0FxWo572YNmEbEY/KC5PyTuMTrFKedywvA668Y9CJn0GeleyfxK1eSKUmkYgvho3k8wO52u4aZ3rKDUQ==} dependencies: '@types/lodash': 4.14.182 '@urql/core': 2.5.0_graphql@16.5.0 diff --git a/src/components/dashboard/SettingsLayout.tsx b/src/components/dashboard/SettingsLayout.tsx index 88671d99..6985c961 100644 --- a/src/components/dashboard/SettingsLayout.tsx +++ b/src/components/dashboard/SettingsLayout.tsx @@ -20,6 +20,7 @@ export const SettingsLayout: React.FC<{ href: `/dashboard/${subdomain}/settings/navigation`, }, { text: "Domains", href: `/dashboard/${subdomain}/settings/domains` }, + { text: "Custom CSS", href: `/dashboard/${subdomain}/settings/css` }, ] : [{ text: "Profile", href: `/dashboard/${subdomain}/account/profile` }] ).map((item) => ({ ...item, active: router.asPath === item.href })) diff --git a/src/components/site/SiteLayout.tsx b/src/components/site/SiteLayout.tsx index 25aa36b5..613c3cdf 100644 --- a/src/components/site/SiteLayout.tsx +++ b/src/components/site/SiteLayout.tsx @@ -52,6 +52,7 @@ export const SiteLayout: React.FC = ({ subscribed={!!subscription} viewer={viewer} /> +
{children}
diff --git a/src/lib/types.ts b/src/lib/types.ts index 4a608a35..a8e3e011 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -82,6 +82,7 @@ export type Notes = { export type Profile = UniProfile & { navigation?: SiteNavigationItem[] + css?: string } export type Profiles = { diff --git a/src/models/site.model.ts b/src/models/site.model.ts index 3952c307..090bd8c8 100644 --- a/src/models/site.model.ts +++ b/src/models/site.model.ts @@ -63,10 +63,8 @@ export const getSite = async (input: string) => { }); const site: Profile = profiles.list?.sort((a, b) => +new Date(b.date_updated || 0) - +new Date(a.date_updated || 0))?.[0] - const navigation = site.tags?.find(tag => tag.startsWith('navigation:'))?.replace('navigation:', "") - if (navigation) { - site.navigation = JSON.parse(navigation) - } + site.navigation = site.metadata?.raw?.['_crosslog_navigation'] || [{ id: nanoid(), label: "Archives", url: "/archives" }] + site.css = site.metadata?.raw?.['_crosslog_css'] || '' site.name = site.name || site.username return site @@ -98,6 +96,7 @@ export async function updateSite( icon?: string | null subdomain?: string navigation?: SiteNavigationItem[] + css?: string }, ) { return await unidata.profiles.set({ @@ -110,7 +109,8 @@ export async function updateSite( ...(payload.description && { bio: payload.description }), ...(payload.icon && { avatars: [payload.icon] }), ...(payload.subdomain && { username: payload.subdomain }), - ...(payload.navigation && { tags: ['navigation:' + JSON.stringify(payload.navigation)] }), + ...(payload.navigation && { _crosslog_navigation: payload.navigation }), + ...(payload.css && { _crosslog_css: payload.css }), }) } diff --git a/src/pages/dashboard/[subdomain]/settings/css.tsx b/src/pages/dashboard/[subdomain]/settings/css.tsx new file mode 100644 index 00000000..23115081 --- /dev/null +++ b/src/pages/dashboard/[subdomain]/settings/css.tsx @@ -0,0 +1,78 @@ +import { useRouter } from "next/router" +import { useEffect, useState } from "react" +import { useForm } from "react-hook-form" +import toast from "react-hot-toast" +import { DashboardLayout } from "~/components/dashboard/DashboardLayout" +import { SettingsLayout } from "~/components/dashboard/SettingsLayout" +import { Button } from "~/components/ui/Button" +import { Input } from "~/components/ui/Input" +import { OUR_DOMAIN } from "~/lib/env" +import { useGetSite, useUpdateSite } from "~/queries/site" + +export default function SettingsDomainsPage() { + const router = useRouter() + const subdomain = router.query.subdomain as string + + const updateSite = useUpdateSite() + const site = useGetSite(subdomain) + + const form = useForm({ + defaultValues: { + css: "", + }, + }) + + const handleSubmit = form.handleSubmit((values) => { + updateSite.mutate({ + site: subdomain, + css: values.css, + }) + }) + + useEffect(() => { + if (updateSite.isSuccess) { + if (updateSite.data?.code === 0) { + toast.success("Saved!") + } else { + toast.error("Failed to update site" + ": " + updateSite.data.message) + } + } else if (updateSite.isError) { + toast.error("Failed to update site") + } + }, [updateSite.isSuccess, updateSite.isError, router]) + + useEffect(() => { + if (site.isSuccess && site.data) { + form.setValue("css", site.data.css || "") + } + }, [form, site.data, site.isSuccess]) + + const title = "Site Settings" + return ( + + +
+
+ +
+
+ +
+
+
+
+ ) +} diff --git a/src/pages/dashboard/[subdomain]/settings/domains.tsx b/src/pages/dashboard/[subdomain]/settings/domains.tsx index 315f3296..949ad66b 100644 --- a/src/pages/dashboard/[subdomain]/settings/domains.tsx +++ b/src/pages/dashboard/[subdomain]/settings/domains.tsx @@ -27,10 +27,6 @@ export default function SettingsDomainsPage() { site: subdomain, subdomain: values.subdomain, }) - updateSite.mutate({ - site: subdomain, - subdomain: values.subdomain, - }) }) useEffect(() => { diff --git a/src/pages/dashboard/[subdomain]/settings/navigation.tsx b/src/pages/dashboard/[subdomain]/settings/navigation.tsx index 0f9db613..8629ce01 100644 --- a/src/pages/dashboard/[subdomain]/settings/navigation.tsx +++ b/src/pages/dashboard/[subdomain]/settings/navigation.tsx @@ -113,7 +113,7 @@ export default function SiteSettingsNavigationPage() { } else if (updateSite.isError) { toast.error("Failed to save") } - }, [updateSite, router]) + }, [updateSite.isSuccess, updateSite.isError, router]) const removeItem: RemoveItem = (id) => { setItems((items) => items.filter((item) => item.id !== id)) diff --git a/src/queries/site.ts b/src/queries/site.ts index 7789d8e0..300f7029 100644 --- a/src/queries/site.ts +++ b/src/queries/site.ts @@ -20,14 +20,7 @@ export const useGetSite = (input: string) => { export function useUpdateSite() { const queryClient = useQueryClient(); const mutation = useMutation(async ( - payload: { - site: string - name?: string - description?: string - icon?: string | null - subdomain?: string - navigation?: SiteNavigationItem[] - }) => { + payload: Parameters[0]) => { return siteModel.updateSite(payload) }, { onSuccess: (data, variables) => {