Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Merge branch 'main' of https://github.com/getfider/fider into mentions

Matt Robertse3b02dda42e6
diff --cc app/cmd/routes.go
index 49ccd6359,f8a1b4b7c..299a2edac
--- a/app/cmd/routes.go
+++ b/app/cmd/routes.go
@@@ -201,9 -201,9 +201,10 @@@ func routes(r *web.Engine) *web.Engine
membersApi.Post("/api/v1/posts/:number/comments", apiv1.PostComment())
membersApi.Put("/api/v1/posts/:number/comments/:id", apiv1.UpdateComment())
membersApi.Delete("/api/v1/posts/:number/comments/:id", apiv1.DeleteComment())
+ membersApi.Get("/api/v1/taggable-users", apiv1.ListTaggableUsers())
membersApi.Post("/api/v1/posts/:number/votes", apiv1.AddVote())
membersApi.Delete("/api/v1/posts/:number/votes", apiv1.RemoveVote())
+ membersApi.Post("/api/v1/posts/:number/votes/toggle", apiv1.ToggleVote())
membersApi.Post("/api/v1/posts/:number/subscription", apiv1.Subscribe())
membersApi.Delete("/api/v1/posts/:number/subscription", apiv1.Unsubscribe())
diff --cc public/pages/Home/components/PostFilter.tsx
index e0ab51180,aef8e79bd..77470703c
--- a/public/pages/Home/components/PostFilter.tsx
+++ b/public/pages/Home/components/PostFilter.tsx
@@@ -1,49 -1,97 +1,97 @@@
- import React, { useState } from "react"
- import { PostStatus } from "@fider/models"
- import { Dropdown } from "@fider/components"
+ import React from "react"
+ import { PostStatus, Tag } from "@fider/models"
+ import { Checkbox, Dropdown, Icon } from "@fider/components"
import { HStack } from "@fider/components/layout"
+ import HeroIconFilter from "@fider/assets/images/heroicons-filter.svg"
+
import { useFider } from "@fider/hooks"
-import { t } from "@lingui/macro"
+import { i18n } from "@lingui/core"
- import { Trans } from "@lingui/react/macro"
- interface PostFilterProps {
- activeView: string
- countPerStatus: { [key: string]: number }
- viewChanged: (name: string) => void
- }
+ import { FilterState } from "./PostsContainer"
+
+ type FilterType = "tag" | "status" | "myVotes"
interface OptionItem {
- value: string
+ value: string | boolean
label: string
count?: number
+ type: FilterType
+ }
+
+ interface PostFilterProps {
+ activeFilter: FilterState
+ countPerStatus: { [key: string]: number }
+ filtersChanged: (filter: FilterState) => void
+ tags: Tag[]
+ }
+
+ export interface FilterItem {
+ type: FilterType
+ value: string | boolean
+ }
+
+ const FilterStateToFilterItems = (filterState: FilterState): FilterItem[] => {
+ const filterItems: FilterItem[] = []
+ filterState.statuses.forEach((s) => {
+ filterItems.push({ type: "status", value: s })
+ })
+ filterState.tags.forEach((t) => {
+ filterItems.push({ type: "tag", value: t })
+ })
+ if (filterState.myVotes) {
+ filterItems.push({ type: "myVotes", value: true })
+ }
+ return filterItems
+ }
+
+ const FilterItemsToFilterState = (filterItems: FilterItem[]): FilterState => {
+ const filterState: FilterState = { tags: [], statuses: [], myVotes: false }
+ filterItems.forEach((i) => {
+ if (i.type === "tag") {
+ filterState.tags.push(i.value as string)
+ } else if (i.type === "status") {
+ filterState.statuses.push(i.value as string)
+ } else if (i.type === "myVotes") {
+ filterState.myVotes = true
+ }
+ })
+ return filterState
}
export const PostFilter = (props: PostFilterProps) => {
const fider = useFider()
- const [view, setView] = useState<string>(props.activeView)
- const handleChangeView = (item: OptionItem) => () => {
- setView(item.value)
- props.viewChanged(item.value)
- }
+ const filterItems: FilterItem[] = FilterStateToFilterItems(props.activeFilter)
- const options: OptionItem[] = [
- { value: "trending", label: i18n._("home.postfilter.option.trending", { message: "Trending" }) },
- { value: "recent", label: i18n._("home.postfilter.option.recent", { message: "Recent" }) },
- { value: "most-wanted", label: i18n._("home.postfilter.option.mostwanted", { message: "Most Wanted" }) },
- { value: "most-discussed", label: i18n._("home.postfilter.option.mostdiscussed", { message: "Most Discussed" }) },
- ]
+ const handleChangeFilter = (item: OptionItem) => () => {
+ const exists = filterItems.find((i) => i.type === item.type && i.value === item.value)
+ const newFilter = exists
+ ? filterItems.filter((i) => !(i.type === item.type && i.value === item.value))
+ : [...filterItems, { type: item.type, value: item.value }]
+
+ props.filtersChanged(FilterItemsToFilterState(newFilter))
+ }
+ const options: OptionItem[] = []
if (fider.session.isAuthenticated) {
- options.push({ value: "my-votes", label: i18n._("home.postfilter.option.myvotes", { message: "My Votes" }) })
- options.push({ value: true, label: t({ id: "home.postfilter.option.myvotes", message: "My Votes" }), type: "myVotes" })
++ options.push({ value: true, label: i18n._("home.postfilter.option.myvotes", { message: "My Votes" }), type: "myVotes" })
}
PostStatus.All.filter((s) => s.filterable && props.countPerStatus[s.value]).forEach((s) => {
const id = `enum.poststatus.${s.value.toString()}`
options.push({
- label: t({ id, message: s.title }),
+ label: i18n._(id, { message: s.title }),
value: s.value,
count: props.countPerStatus[s.value],
+ type: "status",
+ })
+ })
+
+ props.tags.forEach((t) => {
+ options.push({
+ label: t.name,
+ value: t.slug,
+ type: "tag",
})
})
diff --cc public/pages/Home/components/PostsContainer.tsx
index 9f2b4341f,ebd5ea0eb..5e42a30e6
--- a/public/pages/Home/components/PostsContainer.tsx
+++ b/public/pages/Home/components/PostsContainer.tsx
@@@ -9,9 -9,8 +9,9 @@@ import IconSearch from "@fider/assets/i
import IconX from "@fider/assets/images/heroicons-x.svg"
import { PostFilter } from "./PostFilter"
import { ListPosts } from "./ListPosts"
- import { TagsFilter } from "./TagsFilter"
-import { t, Trans } from "@lingui/macro"
+import { i18n } from "@lingui/core"
+import { Trans } from "@lingui/react/macro"
+ import { PostsSort } from "./PostsSort"
interface PostsContainerProps {
user?: CurrentUser
diff --cc public/pages/ShowPost/ShowPost.page.tsx
index cf78f738b,ba8ac8e64..c10d80c18
--- a/public/pages/ShowPost/ShowPost.page.tsx
+++ b/public/pages/ShowPost/ShowPost.page.tsx
@@@ -20,19 -20,21 +20,21 @@@ import
Icon,
Header,
PoweredByFider,
+ Avatar,
+ Dropdown,
} from "@fider/components"
- import { ResponseForm } from "./components/ResponseForm"
- import { TagsPanel } from "./components/TagsPanel"
- import { NotificationsPanel } from "./components/NotificationsPanel"
- import { ModerationPanel } from "./components/ModerationPanel"
import { DiscussionPanel } from "./components/DiscussionPanel"
- import { VotesPanel } from "./components/VotesPanel"
import IconX from "@fider/assets/images/heroicons-x.svg"
- import IconPencilAlt from "@fider/assets/images/heroicons-pencil-alt.svg"
- import IconCheck from "@fider/assets/images/heroicons-check.svg"
+ import IconThumbsUp from "@fider/assets/images/heroicons-thumbsup.svg"
import { HStack, VStack } from "@fider/components/layout"
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
+ import { TagsPanel } from "./components/TagsPanel"
+ import { FollowButton } from "./components/FollowButton"
+ import { VoteSection } from "./components/VoteSection"
+ import { DeletePostModal } from "./components/DeletePostModal"
+ import { ResponseModal } from "./components/ResponseModal"
+ import { VotesPanel } from "./components/VotesPanel"
interface ShowPostPageProps {
post: Post
diff --cc public/pages/ShowPost/components/DeletePostModal.tsx
index c0775ba96,0aaa9d746..f7817d08a
--- a/public/pages/ShowPost/components/DeletePostModal.tsx
+++ b/public/pages/ShowPost/components/DeletePostModal.tsx
@@@ -3,17 -3,16 +3,17 @@@ import { PostStatus, Post } from "@fide
import { actions, navigator, Failure } from "@fider/services"
import { Form, Modal, Button, TextArea } from "@fider/components"
import { useFider } from "@fider/hooks"
- import { VStack } from "@fider/components/layout"
-import { t, Trans } from "@lingui/macro"
+import { i18n } from "@lingui/core"
+import { Trans } from "@lingui/react/macro"
- interface ModerationPanelProps {
+ interface DeletePostModalProps {
post: Post
+ showModal: boolean
+ onModalClose: () => void
}
- export const ModerationPanel = (props: ModerationPanelProps) => {
+ export const DeletePostModal = (props: DeletePostModalProps) => {
const fider = useFider()
- const [showConfirmation, setShowConfirmation] = useState(false)
const [text, setText] = useState("")
const [error, setError] = useState<Failure>()
diff --cc public/pages/ShowPost/components/DiscussionPanel.tsx
index 5511326d0,279881746..3d7425eac
--- a/public/pages/ShowPost/components/DiscussionPanel.tsx
+++ b/public/pages/ShowPost/components/DiscussionPanel.tsx
@@@ -2,10 -2,8 +2,8 @@@ import React from "react
import { CurrentUser, Comment, Post } from "@fider/models"
import { ShowComment } from "./ShowComment"
import { CommentInput } from "./CommentInput"
- import PostIllustration from "@fider/assets/images/undraw-post.svg"
- import { Icon } from "@fider/components"
import { VStack } from "@fider/components/layout"
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
interface DiscussionPanelProps {
user?: CurrentUser
diff --cc public/pages/ShowPost/components/ResponseModal.tsx
index abad95ee4,c94a79d83..7aee896e4
--- a/public/pages/ShowPost/components/ResponseModal.tsx
+++ b/public/pages/ShowPost/components/ResponseModal.tsx
@@@ -1,20 -1,19 +1,20 @@@
import React from "react"
- import { Modal, Button, DisplayError, Select, Form, TextArea, Field, SelectOption, Icon } from "@fider/components"
+ import { Modal, Button, DisplayError, Select, Form, TextArea, Field, SelectOption } from "@fider/components"
import { Post, PostStatus } from "@fider/models"
- import { actions, Failure, Fider } from "@fider/services"
+ import { actions, Failure } from "@fider/services"
import { PostSearch } from "./PostSearch"
- import IconSpeakerPhone from "@fider/assets/images/heroicons-speakerphone.svg"
- import { Trans } from "@lingui/react/macro"
-import { t, Trans } from "@lingui/macro"
+import { i18n } from "@lingui/core"
++import { Trans } from "@lingui/react/macro"
- interface ResponseFormProps {
+ interface ResponseModalProps {
post: Post
+ showModal: boolean
+ onCloseModal: () => void
}
- interface ResponseFormState {
- showModal: boolean
+ interface ResponseModalState {
status: string
text: string
originalNumber: number
diff --cc public/pages/ShowPost/components/TagsPanel.tsx
index 4eae6fe9f,8fbb3e098..57e3c53fe
--- a/public/pages/ShowPost/components/TagsPanel.tsx
+++ b/public/pages/ShowPost/components/TagsPanel.tsx
@@@ -5,12 -5,10 +5,10 @@@ import { ShowTag, Button } from "@fider
import { TagListItem } from "./TagListItem"
import { useFider } from "@fider/hooks"
- import IconPencilAlt from "@fider/assets/images/heroicons-pencil-alt.svg"
- import IconCheckCircle from "@fider/assets/images/heroicons-check-circle.svg"
import { HStack, VStack } from "@fider/components/layout"
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
- interface TagsPanelProps {
+ export interface TagsPanelProps {
post: Post
tags: Tag[]
}