prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "try adding rule count to tagline"

Browse source 
This reverts commit 00d0d15264.
This commit is contained in:
Collin M. Barrett 2018-06-07 12:59:00 -05:00
parent 00d0d15264
commit efbb58d01b
2 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/FilterLists.Api/V1/Controllers/RulesController.cs
View file

@ -14,6 +14,6 @@ public RulesController(RuleService ruleService)
}
[HttpGet]
public async Task<IActionResult> Index() => Json(await _ruleService.GetCountAllActiveRules());
public async Task<IActionResult> Index() => Json(new {Count = await _ruleService.GetCountAllActiveRules()});
}
}

28
src/FilterLists.Web/ClientApp/components/Home.tsx
View file

@ -7,9 +7,7 @@ import ListDetails from "./ListDetails";
interface IFilterListsState {
filterLists: IFilterListSummaryDto[];
loadingLists: boolean;
ruleCount: number;
loadingRuleCount: boolean;
loading: boolean;
}
export class Home extends React.Component<RouteComponentProps<{}>, IFilterListsState> {
@ -17,19 +15,17 @@ export class Home extends React.Component<RouteComponentProps<{}>, IFilterListsS
super(props);
this.state = {
filterLists: [],
loadingLists: true,
ruleCount: 0,
loadingRuleCount: true
loading: true
};
}
render() {
const contents = this.state.loadingLists || this.state.loadingRuleCount
const contents = this.state.loading
? <p>
<em>Loading...</em>
</p>
: <div>
{Home.renderTagline(this.state.filterLists, this.state.ruleCount)}
{Home.renderTagline(this.state.filterLists)}
{Home.renderFilterListsTable(this.state.filterLists)}
</div>;
return <div>
@ -43,24 +39,14 @@ export class Home extends React.Component<RouteComponentProps<{}>, IFilterListsS
.then(data => {
this.setState({
filterLists: data,
loadingLists: false
});
});
fetch("https://filterlists.com/api/v1/rules")
.then(response => response.json() as Promise<number>)
.then(data => {
this.setState({
ruleCount: data,
loadingRuleCount: false
loading: false
});
});
}
private static renderTagline(filterLists: IFilterListSummaryDto[], ruleCount: number) {
private static renderTagline(filterLists: IFilterListSummaryDto[]) {
return <p className="ml-2 mr-2">
The independent, comprehensive directory of <strong>{filterLists.length
}</strong> filter and host lists containing <strong>{ruleCount
}</strong> unique rules for advertisements, trackers, malware, and annoyances.
The independent, comprehensive directory of <strong>{filterLists.length}</strong> filter and host lists for advertisements, trackers, malware, and annoyances.
</p>;
}