UniqueSoft/serpbear
2
0
Fork 0
mirror of https://github.com/towfiqi/serpbear synced 2025-06-26 18:15:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Fixes Position and View Sort.

Browse Source 
fixes #46
This commit is contained in:
towfiqi 2023-01-11 13:15:09 +06:00
parent cb24696a1f
commit 8139e399c1
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/keywords/KeywordFilter.tsx
View File

@ -82,10 +82,10 @@ const KeywordFilters = (props: KeywordFilterProps) => {
{ value: 'alpha_desc', label: 'Alphabetically(Z-A)' },
];
if (integratedConsole) {
sortOptionChoices.push({ value: 'imp_asc', label: `Most Viewed${isConsole ? ' (Default)' : ''}` });
sortOptionChoices.push({ value: 'imp_desc', label: 'Least Viewed' });
sortOptionChoices.push({ value: 'visits_asc', label: 'Most Visited' });
sortOptionChoices.push({ value: 'visits_desc', label: 'Least Visited' });
sortOptionChoices.push({ value: 'imp_desc', label: `Most Viewed${isConsole ? ' (Default)' : ''}` });
sortOptionChoices.push({ value: 'imp_asc', label: 'Least Viewed' });
sortOptionChoices.push({ value: 'visits_desc', label: 'Most Visited' });
sortOptionChoices.push({ value: 'visits_asc', label: 'Least Visited' });
}
if (isConsole) {
sortOptionChoices.splice(2, 2);

2
components/keywords/SCKeywordsTable.tsx
View File

@ -26,7 +26,7 @@ const SCKeywordsTable = ({ domain, keywords = [], isLoading = true, isConsoleInt
const [device, setDevice] = useState<string>('desktop');
const [selectedKeywords, setSelectedKeywords] = useState<string[]>([]);
const [filterParams, setFilterParams] = useState<KeywordFilters>({ countries: [], tags: [], search: '' });
const [sortBy, setSortBy] = useState<string>('imp_asc');
const [sortBy, setSortBy] = useState<string>('imp_desc');
const [isMobile, setIsMobile] = useState<boolean>(false);
const [SCListHeight, setSCListHeight] = useState(500);
const { keywordsData } = useFetchKeywords(router);

8
styles/globals.css
View File

@ -84,8 +84,8 @@ body {
.domKeywords_head--alpha_desc .domKeywords_head_keyword::after,
.domKeywords_head--pos_desc .domKeywords_head_position::after,
.domKeywords_head--imp_desc .domKeywords_head_imp::after,
.domKeywords_head--visits_desc .domKeywords_head_visits::after,
.domKeywords_head--imp_asc .domKeywords_head_imp::after,
.domKeywords_head--visits_asc .domKeywords_head_visits::after,
.domKeywords_head--ctr_desc .domKeywords_head_ctr::after {
content: "↓";
display: inline-block;
@ -98,8 +98,8 @@ body {
.domKeywords_head--alpha_asc .domKeywords_head_keyword::after,
.domKeywords_head--pos_asc .domKeywords_head_position::after,
.domKeywords_head--imp_asc .domKeywords_head_imp::after,
.domKeywords_head--visits_asc .domKeywords_head_visits::after,
.domKeywords_head--imp_desc .domKeywords_head_imp::after,
.domKeywords_head--visits_desc .domKeywords_head_visits::after,
.domKeywords_head--ctr_asc .domKeywords_head_ctr::after {
content: "↑";
display: inline-block;

16
utils/SCsortFilter.ts
View File

@ -9,16 +9,16 @@ export const SCsortKeywords = (theKeywords:SCKeywordType[], sortBy:string) : SCK
const keywords = theKeywords.map((k) => ({ ...k, position: k.position === 0 ? 111 : k.position }));
switch (sortBy) {
case 'imp_asc':
sortedItems = theKeywords.sort((a: SCKeywordType, b: SCKeywordType) => b.impressions - a.impressions);
sortedItems = theKeywords.sort((a: SCKeywordType, b: SCKeywordType) => (a.impressions > b.impressions ? 1 : -1));
break;
case 'imp_desc':
sortedItems = theKeywords.sort((a: SCKeywordType, b: SCKeywordType) => a.impressions - b.impressions);
sortedItems = theKeywords.sort((a: SCKeywordType, b: SCKeywordType) => (b.impressions > a.impressions ? 1 : -1));
break;
case 'visits_asc':
sortedItems = theKeywords.sort((a: SCKeywordType, b: SCKeywordType) => b.clicks - a.clicks);
sortedItems = theKeywords.sort((a: SCKeywordType, b: SCKeywordType) => (a.clicks > b.clicks ? 1 : -1));
break;
case 'visits_desc':
sortedItems = theKeywords.sort((a: SCKeywordType, b: SCKeywordType) => a.clicks - b.clicks);
sortedItems = theKeywords.sort((a: SCKeywordType, b: SCKeywordType) => (b.clicks > a.clicks ? 1 : -1));
break;
case 'ctr_asc':
sortedItems = theKeywords.sort((a: SCKeywordType, b: SCKeywordType) => b.ctr - a.ctr);
@ -27,17 +27,17 @@ export const SCsortKeywords = (theKeywords:SCKeywordType[], sortBy:string) : SCK
sortedItems = theKeywords.sort((a: SCKeywordType, b: SCKeywordType) => a.ctr - b.ctr);
break;
case 'pos_asc':
sortedItems = keywords.sort((a: SCKeywordType, b: SCKeywordType) => (b.position > a.position ? 1 : -1));
sortedItems = keywords.sort((a: SCKeywordType, b: SCKeywordType) => (b.position < a.position ? 1 : -1));
sortedItems = sortedItems.map((k) => ({ ...k, position: k.position === 111 ? 0 : k.position }));
break;
case 'pos_desc':
sortedItems = keywords.sort((a: SCKeywordType, b: SCKeywordType) => (a.position > b.position ? 1 : -1));
sortedItems = keywords.sort((a: SCKeywordType, b: SCKeywordType) => (a.position < b.position ? 1 : -1));
sortedItems = sortedItems.map((k) => ({ ...k, position: k.position === 111 ? 0 : k.position }));
break;
case 'alpha_asc':
case 'alpha_desc':
sortedItems = theKeywords.sort((a: SCKeywordType, b: SCKeywordType) => (b.keyword > a.keyword ? 1 : -1));
break;
case 'alpha_desc':
case 'alpha_asc':
sortedItems = theKeywords.sort((a: SCKeywordType, b: SCKeywordType) => (a.keyword > b.keyword ? 1 : -1));
break;
default:

28
utils/sortFilter.ts
View File

@ -28,7 +28,7 @@ export const sortKeywords = (theKeywords:KeywordType[], sortBy:string, scDataTyp
case 'alpha_desc':
sortedItems = theKeywords.sort((a: KeywordType, b: KeywordType) => (a.keyword > b.keyword ? 1 : -1));
break;
case 'imp_asc':
case 'imp_desc':
if (scDataType) {
sortedItems = theKeywords.sort((a: KeywordType, b: KeywordType) => {
const bImpressionData = b.scData?.impressions[scDataType as keyof KeywordSCDataChild] || 0;
@ -37,7 +37,7 @@ export const sortKeywords = (theKeywords:KeywordType[], sortBy:string, scDataTyp
});
}
break;
case 'imp_desc':
case 'imp_asc':
if (scDataType) {
sortedItems = theKeywords.sort((a: KeywordType, b: KeywordType) => {
const bImpressionData = b.scData?.impressions[scDataType as keyof KeywordSCDataChild] || 0;
@ -46,21 +46,21 @@ export const sortKeywords = (theKeywords:KeywordType[], sortBy:string, scDataTyp
});
}
break;
case 'visits_asc':
if (scDataType) {
sortedItems = theKeywords.sort((a: KeywordType, b: KeywordType) => {
const bImpressionData = b.scData?.visits[scDataType as keyof KeywordSCDataChild] || 0;
const aImpressionData = a.scData?.visits[scDataType as keyof KeywordSCDataChild] || 0;
return aImpressionData > bImpressionData ? 1 : -1;
});
}
break;
case 'visits_desc':
if (scDataType) {
sortedItems = theKeywords.sort((a: KeywordType, b: KeywordType) => {
const bImpressionData = b.scData?.visits[scDataType as keyof KeywordSCDataChild] || 0;
const aImpressionData = a.scData?.visits[scDataType as keyof KeywordSCDataChild] || 0;
return bImpressionData > aImpressionData ? 1 : -1;
const bVisitsData = b.scData?.visits[scDataType as keyof KeywordSCDataChild] || 0;
const aVisitsData = a.scData?.visits[scDataType as keyof KeywordSCDataChild] || 0;
return aVisitsData > bVisitsData ? 1 : -1;
});
}
break;
case 'visits_asc':
if (scDataType) {
sortedItems = theKeywords.sort((a: KeywordType, b: KeywordType) => {
const bVisitsData = b.scData?.visits[scDataType as keyof KeywordSCDataChild] || 0;
const aVisitsData = a.scData?.visits[scDataType as keyof KeywordSCDataChild] || 0;
return bVisitsData > aVisitsData ? 1 : -1;
});
}
break;