git.iko.soy/urbit.org
on master help sign in
Merge pull request #1470 from urbit/mp/grant-tweak
42f0598matildepark
pages/grants/[slug].js+37−2
compare with master
unifiedsplit
@@ -17,6 +17,7 @@ import Header from "../../components/Header";
17import Footer from "../../components/Footer";
17import Footer from "../../components/Footer";
18import SingleColumn from "../../components/SingleColumn";
18import SingleColumn from "../../components/SingleColumn";
19import GrantPreview from "../../components/GrantPreview";
19import GrantPreview from "../../components/GrantPreview";
20+import ob from "urbit-ob";
20import Section from "../../components/Section";
21import Section from "../../components/Section";
21import { DateTime } from "luxon";
22import { DateTime } from "luxon";
22
23
@@ -27,6 +28,24 @@ export default function Grant({ post, markdown, search }) {
27 }
28 }
28 const isOpen = !post?.extra?.completed && post?.extra?.assignee === "";
29 const isOpen = !post?.extra?.completed && post?.extra?.assignee === "";
29 const canApply = isOpen && post?.extra?.work_request_link;
30 const canApply = isOpen && post?.extra?.work_request_link;
31+ const assignee = post?.extra?.assignee;
32+ const mentor = post.extra.mentor || post.extra.champion;
33+ const assigneeLink =
34+ assignee && ob.isValidPatp(assignee) ? (
35+ <Link href={`/ids/${assignee}`} passHref>
36+ <a className="text-green-400">{assignee}</a>
37+ </Link>
38+ ) : (
39+ assignee
40+ );
41+ const mentorLink =
42+ mentor && ob.isValidPatp(mentor) ? (
43+ <Link href={`/ids/${mentor}`} passHref>
44+ <a className="text-green-400">{mentor}</a>
45+ </Link>
46+ ) : (
47+ mentor
48+ );
30
49
31 return (
50 return (
32 <Container>
51 <Container>
@@ -40,7 +59,17 @@ export default function Grant({ post, markdown, search }) {
40 <h1>{post.title}</h1>
59 <h1>{post.title}</h1>
41 {post.extra.assignee ? (
60 {post.extra.assignee ? (
42 <div className="type-ui text-wall-500 mt-4">
61 <div className="type-ui text-wall-500 mt-4">
62+ Grantee: {assigneeLink}
63+ </div>
64+ ) : null}
65+ {post.extra.mentor ? (
66+ <div className="type-ui text-wall-500 mt-4">
67+ Mentor: {mentorLink}
68+ </div>
69+ ) : null}
43− Grantee: {post.extra.assignee}
70+ {post.extra.champion ? (
71+ <div className="type-ui text-wall-500 mt-4">
72+ Champion: {mentorLink}
44 </div>
73 </div>
45 ) : null}
74 ) : null}
46 {post.extra.ship ? (
75 {post.extra.ship ? (
@@ -50,8 +79,14 @@ export default function Grant({ post, markdown, search }) {
50 </a>
79 </a>
51 </Link>
80 </Link>
52 ) : null}
81 ) : null}
53− <div className="type-ui text-wall-500 mt-4 md:mt-8 lg:mt-10">
82+ <div className="type-ui text-wall-500 mt-4 md:mt-8 lg:mt-10 flex items-center space-x-1">
54 {formatDate(DateTime.fromISO(post.date))}
83 {formatDate(DateTime.fromISO(post.date))}
84+ {post?.extra?.grant_id ? (
85+ <>
86+ <p className="ml-1 text-wall-500 type-ui">• ID:</p>
87+ <p className="font-mono type-ui"> {post.extra.grant_id}</p>
88+ </>
89+ ) : null}
55 </div>
90 </div>
56 <div className="flex items-center flex-wrap mt-4 md:mt-8 lg:mt-10">
91 <div className="flex items-center flex-wrap mt-4 md:mt-8 lg:mt-10">
57 {post.taxonomies.grant_type.map((category) => {
92 {post.taxonomies.grant_type.map((category) => {