Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2/community group #95

Merged
merged 3 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
'use client'
import UniversityCard from '@/components/molecules/UniversityCard'
import PostContainer from '@/components/organisms/PostsContainer'
import UserPostContainer from '@/components/organisms/UserPostContainer'
import { PostInputType } from '@/types/constants'
import { useParams } from 'next/navigation'
import React from 'react'
import { PostInputType, PostType } from '@/types/constants'

export default function Page({ params }: { params: { id: string } }) {
const communityID = params.id[0]
const communityGroupID = params.id[1]

const Community = () => {
const { id } = useParams()
return (
<>
<UniversityCard
Expand All @@ -19,11 +18,11 @@ const Community = () => {
'Official community page for Lorem University. For inquiries contact the Human Resources Department in B-Wing of Northern Campus.'
}
memberCount={200}
communityID={communityID}
communityGroupID={communityGroupID}
/>
<UserPostContainer type={PostInputType.Community} />
<PostContainer communityId={id} />
<UserPostContainer communityID={communityID} communityGroupID={communityGroupID} type={PostInputType.Community} />
<PostContainer communityID={communityID} communityGroupID={communityGroupID} type={PostType.Community} />
</>
)
}

export default Community
4 changes: 2 additions & 2 deletions src/app/(withLayout)/timeline/page.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import PostContainer from '@/components/organisms/PostsContainer'
import UserPostContainer from '@/components/organisms/UserPostContainer'
import { PostInputType } from '@/types/constants'
import { PostInputType, PostType } from '@/types/constants'
import React from 'react'

export default function Timeline() {
return (
<>
<UserPostContainer type={PostInputType.Timeline} />
<PostContainer isTimeline={true} />
<PostContainer type={PostType.Timeline} />
</>
)
}
62 changes: 0 additions & 62 deletions src/app/old-community/[id]/connections/page.tsx

This file was deleted.

195 changes: 0 additions & 195 deletions src/app/old-community/[id]/page.tsx

This file was deleted.

11 changes: 0 additions & 11 deletions src/app/old-community/loading.tsx

This file was deleted.

54 changes: 0 additions & 54 deletions src/app/old-community/page.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/atoms/Input/InputBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ type Props = {
placeholder?: string
className?: string
type: string
err: boolean
err?: boolean
}
const InputBox = forwardRef<HTMLInputElement, Props>(({ placeholder, className, type, err, ...rest }, ref) => {
return (
Expand Down
Loading
Loading