Rename group dashboard to 'About Post'

This commit is contained in:
Pico2x 2022-08-29 17:01:41 +01:00
parent 6372d262cb
commit eca2c8f441
5 changed files with 43 additions and 47 deletions

View File

@ -10,7 +10,7 @@ export type Group = {
anyoneCanJoin: boolean
contractIds: string[]
dashboardId?: string
aboutPostId?: string
chatDisabled?: boolean
mostRecentChatActivityTime?: number
mostRecentContractAddedTime?: number

View File

@ -160,7 +160,7 @@ service cloud.firestore {
allow update: if request.auth.uid == resource.data.creatorId
&& request.resource.data.diff(resource.data)
.affectedKeys()
.hasOnly(['name', 'about', 'contractIds', 'memberIds', 'anyoneCanJoin', 'dashboardId' ]);
.hasOnly(['name', 'about', 'contractIds', 'memberIds', 'anyoneCanJoin', 'aboutPostId' ]);
allow update: if (request.auth.uid in resource.data.memberIds || resource.data.anyoneCanJoin)
&& request.resource.data.diff(resource.data)
.affectedKeys()

View File

@ -8,72 +8,72 @@ import { Group } from 'common/group'
import { deleteFieldFromGroup, updateGroup } from 'web/lib/firebase/groups'
import PencilIcon from '@heroicons/react/solid/PencilIcon'
import { DocumentRemoveIcon } from '@heroicons/react/solid'
import { createDashboard } from 'web/lib/firebase/api'
import { Dashboard } from 'common/dashboard'
import { deleteDashboard, updateDashboard } from 'web/lib/firebase/dashboards'
import { createPost } from 'web/lib/firebase/api'
import { Post } from 'common/post'
import { deletePost, updatePost } from 'web/lib/firebase/posts'
import { useRouter } from 'next/router'
import { useState } from 'react'
export function GroupDashboard(props: {
export function GroupAboutPost(props: {
group: Group
isCreator: boolean
dashboard: Dashboard
post: Post
}) {
const { group, isCreator, dashboard } = props
const { group, isCreator, post } = props
const isAdmin = useAdmin()
if (group.dashboardId == null && !isCreator) {
return <p className="text-center">No dashboard has been created </p>
if (group.aboutPostId == null && !isCreator) {
return <p className="text-center">No post has been created </p>
}
return (
<div className="rounded-md bg-white p-4">
{isCreator || isAdmin ? (
<RichEditGroupDashboard group={group} dashboard={dashboard} />
<RichEditGroupAboutPost group={group} post={post} />
) : (
<Content content={dashboard.content} />
<Content content={post.content} />
)}
</div>
)
}
function RichEditGroupDashboard(props: { group: Group; dashboard: Dashboard }) {
const { group, dashboard } = props
function RichEditGroupAboutPost(props: { group: Group; post: Post }) {
const { group, post } = props
const [editing, setEditing] = useState(false)
const [isSubmitting, setIsSubmitting] = useState(false)
const router = useRouter()
const { editor, upload } = useTextEditor({
defaultValue: dashboard.content,
defaultValue: post.content,
disabled: isSubmitting,
})
async function saveDashboard() {
async function savePost() {
if (!editor) return
const newDashboard = {
name: group.name,
const newPost = {
title: group.name,
content: editor.getJSON(),
}
if (group.dashboardId == null) {
const result = await createDashboard(newDashboard).catch((e) => {
if (group.aboutPostId == null) {
const result = await createPost(newPost).catch((e) => {
console.error(e)
return e
})
await updateGroup(group, {
dashboardId: result.dashboard.id,
aboutPostId: result.post.id,
})
} else {
await updateDashboard(dashboard, {
content: newDashboard.content,
await updatePost(post, {
content: newPost.content,
})
}
await router.replace(router.asPath)
}
async function deleteGroupDashboard() {
await deleteDashboard(dashboard)
await deleteFieldFromGroup(group, 'dashboardId')
async function deleteGroupAboutPost() {
await deletePost(post)
await deleteFieldFromGroup(group, 'aboutPostId')
await router.replace(router.asPath)
}
@ -85,7 +85,7 @@ function RichEditGroupDashboard(props: { group: Group; dashboard: Dashboard }) {
<Button
onClick={async () => {
setIsSubmitting(true)
await saveDashboard()
await savePost()
setEditing(false)
setIsSubmitting(false)
}}
@ -99,12 +99,12 @@ function RichEditGroupDashboard(props: { group: Group; dashboard: Dashboard }) {
</>
) : (
<>
{group.dashboardId == null ? (
{group.aboutPostId == null ? (
<div className="text-center text-gray-500">
<p className="text-sm">
No dashboard has been created yet.
No post has been added yet.
<Spacer h={2} />
<Button onClick={() => setEditing(true)}>Create a dashboard</Button>
<Button onClick={() => setEditing(true)}>Add a post</Button>
</p>
</div>
) : (
@ -126,7 +126,7 @@ function RichEditGroupDashboard(props: { group: Group; dashboard: Dashboard }) {
color="gray"
size="xs"
onClick={() => {
deleteGroupDashboard()
deleteGroupAboutPost()
}}
>
<DocumentRemoveIcon className="inline h-4 w-4" />
@ -134,7 +134,7 @@ function RichEditGroupDashboard(props: { group: Group; dashboard: Dashboard }) {
</Button>
</div>
<Content content={dashboard.content} />
<Content content={post.content} />
<Spacer h={2} />
</div>
)}

View File

@ -18,7 +18,6 @@ import {
} from './utils'
import { Contract } from 'common/contract'
import { updateContract } from 'web/lib/firebase/contracts'
import * as admin from 'firebase-admin'
export const groups = coll<Group>('groups')
@ -30,7 +29,6 @@ export function groupPath(
| 'about'
| typeof GROUP_CHAT_SLUG
| 'leaderboards'
| 'dashboard'
) {
return `/group/${groupSlug}${subpath ? `/${subpath}` : ''}`
}

View File

@ -45,9 +45,9 @@ import { Button } from 'web/components/button'
import { listAllCommentsOnGroup } from 'web/lib/firebase/comments'
import { GroupComment } from 'common/comment'
import { REFERRAL_AMOUNT } from 'common/economy'
import { GroupDashboard } from 'web/components/groups/group-dashboard'
import { getDashboard } from 'web/lib/firebase/dashboards'
import { Dashboard } from 'common/dashboard'
import { GroupAboutPost } from 'web/components/groups/group-about-post'
import { getPost } from 'web/lib/firebase/posts'
import { Post } from 'common/post'
import { Spacer } from 'web/components/layout/spacer'
export const getStaticProps = fromPropz(getStaticPropz)
@ -61,10 +61,8 @@ export async function getStaticPropz(props: { params: { slugs: string[] } }) {
const contracts =
(group && (await listContractsByGroupSlug(group.slug))) ?? []
const dashboard =
group &&
group.dashboardId != null &&
(await getDashboard(group.dashboardId))
const aboutPost =
group && group.aboutPostId != null && (await getPost(group.aboutPostId))
const bets = await Promise.all(
contracts.map((contract: Contract) => listAllBets(contract.id))
)
@ -91,7 +89,7 @@ export async function getStaticPropz(props: { params: { slugs: string[] } }) {
creatorScores,
topCreators,
messages,
dashboard,
aboutPost,
},
revalidate: 60, // regenerate after a minute
@ -130,7 +128,7 @@ export default function GroupPage(props: {
creatorScores: { [userId: string]: number }
topCreators: User[]
messages: GroupComment[]
dashboard: Dashboard
aboutPost: Post
}) {
props = usePropz(props, getStaticPropz) ?? {
group: null,
@ -149,7 +147,7 @@ export default function GroupPage(props: {
topTraders,
creatorScores,
topCreators,
dashboard,
aboutPost,
} = props
const router = useRouter()
@ -187,11 +185,11 @@ export default function GroupPage(props: {
const aboutTab = (
<Col>
{group.dashboardId != null || isCreator ? (
<GroupDashboard
{group.aboutPostId != null || isCreator ? (
<GroupAboutPost
group={group}
isCreator={!!isCreator}
dashboard={dashboard}
post={aboutPost}
/>
) : (
<div></div>