Skip to content

fix default selected cards #98

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.

Sign up for GitHub

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

Merged
Chouikane merged 1 commit into from
Nov 8, 2022
Merged

fix default selected cards #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/features/cards/components/devtoCard/DevtoCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function DevtoCard({ withAds, meta }: CardPropsType) {

useEffect(() => {
if (selectedTag) {
setCardSettings(meta.label.toLowerCase(), { language: selectedTag.label })
setCardSettings(meta.value, { language: selectedTag.label })
}
}, [selectedTag, meta, setCardSettings])

Expand Down
6 changes: 3 additions & 3 deletions src/features/cards/components/freecodecampCard/FreecodecampCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ export function FreecodecampCard({ meta, withAds }: CardPropsType) {

useEffect(() => {
if (selectedTag) {
setCardSettings(meta.label.toLowerCase(), { language: selectedTag.label })
setCardSettings(meta.value, { language: selectedTag.label })
}
}, [meta.label, setCardSettings, selectedTag])
}, [meta.value, setCardSettings, selectedTag])

const getQueryTags = () => {
if (!selectedTag) {
Expand Down Expand Up @@ -67,7 +67,7 @@ export function FreecodecampCard({ meta, withAds }: CardPropsType) {
selectedTag={selectedTag}
setSelectedTag={setSelectedTag}
fallbackTag={GLOBAL_TAG}
cardSettings={cardsSettings?.devto?.language}
cardSettings={cardsSettings?.freecodecamp?.language}
trackEvent={(tag: Tag) => trackCardLanguageSelect(meta.analyticsTag, tag.value)}
data={userSelectedTags.map((tag) => ({
label: tag.label,
Expand Down
24 changes: 16 additions & 8 deletions src/features/cards/components/githubCard/GithubCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,30 @@ const dateRanges: DateRangeType[] = [
{ label: 'the month', value: 'monthly' },
]

const getInitialDateRange = (value: string | undefined) => {
let initialDateRange = dateRanges.find((t) => t.value === value)
if (initialDateRange) return initialDateRange
return dateRanges[0]
}

export function GithubCard({ meta, withAds }: CardPropsType) {
const { userSelectedTags, cardsSettings, setCardSettings } = useUserPreferences()
const [selectedTag, setSelectedTag] = useState<Tag>()
const [selectedDateRange, setSelectedDateRange] = useState<DateRangeType>(dateRanges[0])
const [selectedDateRange, setSelectedDateRange] = useState<DateRangeType>(
getInitialDateRange(cardsSettings?.github?.dateRange)
)

useEffect(() => {
if (selectedTag) {
setCardSettings(meta.label.toLowerCase(), { language: selectedTag.label })
setCardSettings(meta.value, { language: selectedTag.label })
}
}, [meta.label, selectedTag, setCardSettings])
}, [meta.value, selectedTag, setCardSettings])

useEffect(() => {
if (selectedDateRange) {
setCardSettings(meta.label.toLowerCase(), { language: selectedDateRange.value })
setCardSettings(meta.value, { ...cardsSettings.github, dateRange: selectedDateRange.value })
}
}, [meta.label, selectedDateRange, setCardSettings])
}, [meta.value, selectedDateRange, setCardSettings])

const getQueryTags = () => {
if (!selectedTag) {
Expand All @@ -59,7 +67,7 @@ export function GithubCard({ meta, withAds }: CardPropsType) {
tags: getQueryTags(),
dateRange: selectedDateRange.value,
config: {
enabled: !!selectedTag?.githubValues,
enabled: !!selectedTag?.githubValues
},
})

Expand Down Expand Up @@ -93,7 +101,7 @@ export function GithubCard({ meta, withAds }: CardPropsType) {
selectedTag={selectedTag}
setSelectedTag={setSelectedTag}
fallbackTag={GLOBAL_TAG}
cardSettings={cardsSettings?.repos?.language}
cardSettings={cardsSettings?.github?.language}
trackEvent={(tag: Tag) => trackCardLanguageSelect(meta.analyticsTag, tag.value)}
data={userSelectedTags.map((tag) => ({
label: tag.label,
Expand All @@ -109,7 +117,7 @@ export function GithubCard({ meta, withAds }: CardPropsType) {
trackEvent={(tag: DateRangeType) =>
trackCardDateRangeSelect(meta.analyticsTag, tag.value)
}
cardSettings={cardsSettings?.repos?.dateRange}
cardSettings={cardsSettings?.github?.dateRange}
data={dateRanges}
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/features/cards/components/hashnodeCard/HashnodeCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ export function HashnodeCard({ withAds, meta }: CardPropsType) {

useEffect(() => {
if (selectedTag) {
setCardSettings(meta.label.toLowerCase(), { language: selectedTag.label })
setCardSettings(meta.value, { language: selectedTag.label })
}
}, [selectedTag, meta.label, setCardSettings])
}, [selectedTag, meta.value, setCardSettings])

const getQueryTags = () => {
if (!selectedTag) {
Expand Down
2 changes: 1 addition & 1 deletion src/features/cards/components/mediumCard/MediumCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function MediumCard({ meta, withAds }: CardPropsType) {

useEffect(() => {
if (selectedTag) {
setCardSettings(meta.label.toLowerCase(), { language: selectedTag.label })
setCardSettings(meta.value, { language: selectedTag.label })
}
}, [selectedTag, meta, setCardSettings])

Expand Down