-
Notifications
You must be signed in to change notification settings - Fork 6
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
Feat implement filter to activity feeds 4076 #4084
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
9a8110d
feat: Add a Back to top float button to the proposal page #3958
yk297318720 36acbfc
fix: Update remarks
297318720 63a01a9
fix: use styled-components pull-out style
297318720 f226589
feat: Implement filter to activity feeds (#4076)
297318720 f335601
fix: A space is required after '{'
297318720 ebd6ac5
fix: lint
297318720 dc4c882
Merge branch 'main' into feat-Implement_filter_to_activity_feeds-4076
297318720 66b351b
fix: prettier
297318720 1687939
fix: prettier searchBox.js file
297318720 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 62 additions & 29 deletions
91
packages/next-common/components/fellowship/core/feeds/container.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 66 additions & 4 deletions
70
packages/next-common/components/fellowship/salary/feeds/container.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import PrimaryButton from "next-common/lib/button/primary"; | ||
import { SystemFilter } from "@osn/icons/subsquare"; | ||
|
||
export default function FilterButton(props) { | ||
return ( | ||
<PrimaryButton {...props} iconLeft={<SystemFilter className="w-4 h-4" />}> | ||
Filter | ||
</PrimaryButton> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
packages/next-common/components/styled/containers/titleContainer.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
import { useState } from "react"; | ||
import Select from "next-common/components/select"; | ||
|
||
export default function useEventFilter(events = [],curEvent) { | ||
const options = (events || []).map((event) => ({ | ||
label: String(event), | ||
value: event, | ||
})); | ||
|
||
options.unshift({ | ||
label: "All", | ||
value: null, | ||
}); | ||
|
||
const [event, setEvent] = useState(curEvent || options[0].value); | ||
|
||
|
||
const component = ( | ||
<div className="text12Medium text-textPrimary flex items-center gap-x-2"> | ||
<div>Event</div> | ||
<Select | ||
className="w-40" | ||
small | ||
value={event} | ||
options={options} | ||
onChange={(option) => { | ||
setEvent(option.value); | ||
}} | ||
/> | ||
</div> | ||
); | ||
|
||
return { | ||
event, | ||
component, | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This comment was marked as off-topic.
Sorry, something went wrong.