git.iko.soy/urbit.org
on master help sign in
group,id: content / markdown fallback tweak
37ed9deMatilde Park
pages/group/[[...group]].js+2−4
compare with master
unifiedsplit
@@ -114,15 +114,13 @@ const GroupPage = ({ data, markdown, params }) => {
114export const getServerSideProps = async ({ params }) => {
114export const getServerSideProps = async ({ params }) => {
115 let { data, content } = getPage(
115 let { data, content } = getPage(
116 join(process.cwd(), "content/group", params.group?.join("/") || "/")
116 join(process.cwd(), "content/group", params.group?.join("/") || "/")
117− ) || { data: {}, content: {} };
117+ ) || { data: {}, content: "" };
118
118
119 if (!data.title) {
119 if (!data.title) {
120 data = { title: params.group?.join("/"), description: "A group on Urbit." };
120 data = { title: params.group?.join("/"), description: "A group on Urbit." };
121 }
121 }
122
122
123− const markdown = content
124− ? await Markdown({ post: { content: content } })
123+ const markdown = await Markdown({ post: { content: content } });
125− : "";
126
124
127 return {
125 return {
128 props: {
126 props: {
pages/id/[id].js+3−5
@@ -12,6 +12,7 @@ import { decode } from "html-entities";
12import Markdown from "../../components/Markdown";
12import Markdown from "../../components/Markdown";
13import Sigil from "../../components/Sigil";
13import Sigil from "../../components/Sigil";
14import axios from "axios";
14import axios from "axios";
15+import useSWR from "swr";
15
16
16const IdPage = ({ data, markdown, network, params }) => {
17const IdPage = ({ data, markdown, network, params }) => {
17 const { id } = params;
18 const { id } = params;
@@ -128,8 +129,7 @@ const IdPage = ({ data, markdown, network, params }) => {
128export const getServerSideProps = async ({ params }) => {
129export const getServerSideProps = async ({ params }) => {
129 let { data, content } = getPage(
130 let { data, content } = getPage(
130 join(process.cwd(), "content/id/", params.id.slice(1))
131 join(process.cwd(), "content/id/", params.id.slice(1))
131− ) || { data: {}, content: {} };
132+ ) || { data: {}, content: "" };
132− console.log(data);
133
133
134 if (!data.ship && ob.isValidPatp(params.id)) {
134 if (!data.ship && ob.isValidPatp(params.id)) {
135 data = { ship: params.id, description: "An Urbit ID." };
135 data = { ship: params.id, description: "An Urbit ID." };
@@ -143,9 +143,7 @@ export const getServerSideProps = async ({ params }) => {
143 )
143 )
144 .then((res) => res.data);
144 .then((res) => res.data);
145
145
146− const markdown = content
147− ? await Markdown({ post: { content: content } })
146+ const markdown = await Markdown({ post: { content: content } });
148− : "";
149
147
150 return {
148 return {
151 props: {
149 props: {