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 2

rm comments, organize imports

Browse source
This commit is contained in:
Collin M. Barrett 2019-08-02 20:28:53 -05:00
parent c2601daad4
commit 9cd9dcaa3e
37 changed files with 57 additions and 241 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/FilterLists.Web/src/Router.tsx
View file

@ -1,6 +1,5 @@
import * as React from "react";
import { Route, Redirect, Switch } from "react-router-dom";
import { BrowserRouter } from "react-router-dom";
import { BrowserRouter, Redirect, Route, Switch } from "react-router-dom";
import { Home } from "./modules";
const Routes =

4
src/FilterLists.Web/src/index.tsx
View file

@ -1,7 +1,7 @@
import React from 'react';
import ReactDOM from 'react-dom';
import '../node_modules/bootstrap/dist/css/bootstrap.min.css'
import './index.css';
import '../node_modules/bootstrap/dist/css/bootstrap.min.css';
import App from './App';
import './index.css';
ReactDOM.render(<App />, document.getElementById('root'));

9
src/FilterLists.Web/src/modules/home/Home.tsx
View file

@ -1,20 +1,18 @@
import * as React from "react";
import { ListsTable, Oneliner } from "./components";
import { IColumnVisibility } from "./interfaces/IColumnVisibility";
import { Language } from "./interfaces/Language";
import { ILicense } from "./interfaces/ILicense";
import { IList } from "./interfaces/IList";
import { IMaintainer } from "./interfaces/IMaintainer";
import { ISoftware } from "./interfaces/ISoftware";
import { ISyntax } from "./interfaces/ISyntax";
import { ITag } from "./interfaces/ITag";
import { ListsTable, Oneliner } from "./components";
import { Language } from "./interfaces/Language";
const columnVisibilityDefaults: IColumnVisibility[] = [
{ column: "Software", visible: true },
{ column: "Languages", visible: true },
{ column: "Tags", visible: true },
//{ column: "Updated", visible: false },
//{ column: "Rules", visible: false },
{ column: "License", visible: false },
{ column: "Maintainers", visible: false },
{ column: "Subscribe", visible: false }
@ -25,7 +23,6 @@ interface Props {
licenses: ILicense[];
lists: IList[];
maintainers: IMaintainer[];
//ruleCount: number;
software: ISoftware[];
syntaxes: ISyntax[];
tags: ITag[];
@ -67,7 +64,7 @@ export class Home extends React.Component<Props, IState> {
render() {
return <div>
<Oneliner listCount={this.props.lists.length}/* ruleCount={this.props.ruleCount}*/ />
<Oneliner listCount={this.props.lists.length} />
<ListsTable {...this.props} {...this.state} />
{this.renderColumnVisibilityCheckboxes()}
</div>;

6
src/FilterLists.Web/src/modules/home/HomeContainer.tsx
View file

@ -1,13 +1,13 @@
import * as React from "react";
import axios from "axios";
import { Language } from "./interfaces/Language";
import * as React from "react";
import { Home } from "./Home";
import { ILicense } from "./interfaces/ILicense";
import { IList } from "./interfaces/IList";
import { IMaintainer } from "./interfaces/IMaintainer";
import { ISoftware } from "./interfaces/ISoftware";
import { ISyntax } from "./interfaces/ISyntax";
import { ITag } from "./interfaces/ITag";
import { Home } from "./Home";
import { Language } from "./interfaces/Language";
interface IState {
languages: Language[];

6
src/FilterLists.Web/src/modules/home/components/IListDetails.ts
View file

@ -1,8 +1,8 @@
import { Language } from "../interfaces/Language";
import { ILicense } from "../interfaces/ILicense";
import { ILicense } from "../interfaces/ILicense";
import { IMaintainer } from "../interfaces/IMaintainer";
import { ISyntax } from "../interfaces/ISyntax";
import { ITag } from "../interfaces/ITag";
import { Language } from "../interfaces/Language";
export interface IListDetails {
id: number;
@ -20,11 +20,9 @@ export interface IListDetails {
name: string;
policyUrl: string;
publishedDate: string;
//ruleCount: number;
submissionUrl: string;
syntax: ISyntax;
tags: ITag[];
//updatedDate: string;
viewUrl: string;
viewUrlMirrors: string[];
};

15
src/FilterLists.Web/src/modules/home/components/Oneliner.tsx
View file

@ -1,17 +1,14 @@
import * as React from "react";
interface Props {
listCount: number;
//ruleCount: number;
listCount: number;
};
export const Oneliner = (props: Props) =>
props.listCount > 0/* && props.ruleCount > 0*/
? <p className="ml-2 mr-2">
The independent, comprehensive directory of {/*}<strong>{props.ruleCount.toLocaleString()
}</strong> unique rules across */}<strong>{props.listCount.toLocaleString()
}</strong> filter and host lists for advertisements, trackers, malware, and annoyances.
props.listCount > 0
? <p className="ml-2 mr-2">
The independent, comprehensive directory of <strong>{props.listCount.toLocaleString()}</strong> filter and host lists for advertisements, trackers, malware, and annoyances.
</p>
: <p className="ml-2 mr-2">
The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.
: <p className="ml-2 mr-2">
The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.
</p>;

2
src/FilterLists.Web/src/modules/home/components/TagGroup.tsx
View file

@ -1,6 +1,6 @@
import * as React from "react";
import { ITag } from "../interfaces/ITag";
import { getContrast } from "../../../utils";
import { ITag } from "../interfaces/ITag";
interface Props {
tags: ITag[];

2
src/FilterLists.Web/src/modules/home/components/detailsExpander/DetailsExpander.tsx
View file

@ -1,6 +1,6 @@
import * as React from "react";
import { ISoftware } from "../../interfaces/ISoftware";
import { IColumnVisibility } from "../../interfaces/IColumnVisibility";
import { ISoftware } from "../../interfaces/ISoftware";
import { IListDetails } from "../IListDetails";
import { InfoCard } from "./infoCard";
import { LinkButtonGroup } from "./LinkButtonGroup";

13
src/FilterLists.Web/src/modules/home/components/detailsExpander/LinkButtonGroup.tsx
View file

@ -1,16 +1,5 @@
import * as React from "react";
import {
ChatButton,
DonateButton,
EmailButton,
ForumButton,
HomeButton,
IssuesButton,
PolicyButton,
SubmitButton,
SubscribeButton,
ViewButton
} from "../linkButtons";
import { ChatButton, DonateButton, EmailButton, ForumButton, HomeButton, IssuesButton, PolicyButton, SubmitButton, SubscribeButton, ViewButton } from "../linkButtons";
interface Props {
chatUrl: string;

4
src/FilterLists.Web/src/modules/home/components/detailsExpander/index.ts
View file

@ -1,5 +1,3 @@
import { DetailsExpander } from "./DetailsExpander";
export {
DetailsExpander
};
export { DetailsExpander };

22
src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/InfoCard.tsx
View file

@ -1,19 +1,17 @@
import * as React from "react";
import { IColumnVisibility } from "../../../interfaces/IColumnVisibility";
import { Language } from "../../../interfaces/Language";
import { ILicense, } from "../../../interfaces/ILicense";
import { ISoftware, } from "../../../interfaces/ISoftware";
import { ISyntax, } from "../../../interfaces/ISyntax";
import { ILicense } from "../../../interfaces/ILicense";
import { ISoftware } from "../../../interfaces/ISoftware";
import { ISyntax } from "../../../interfaces/ISyntax";
import { ITag } from "../../../interfaces/ITag";
import { Language } from "../../../interfaces/Language";
import { SoftwareIcon } from "../../softwareIcon";
import { TagGroup } from "../../TagGroup";
import { Description } from "./Description";
import { Languages } from "./Languages";
import { License } from "./License";
import { PublishedDate } from "./PublishedDate";
// import { RuleCount } from "./RuleCount";
import { SoftwareIcon } from "../../softwareIcon";
import { Syntax } from "./Syntax";
import { TagGroup } from "../../TagGroup"
// import { UpdatedDate } from "./UpdatedDate";
interface Props {
columnVisibility: IColumnVisibility[];
@ -23,11 +21,9 @@ interface Props {
license: ILicense;
name: string;
publishedDate: string;
//ruleCount: number;
software: ISoftware[];
syntax: ISyntax;
tags: ITag[];
//updatedDate: string;
};
export const InfoCard = (props: Props) =>
@ -46,12 +42,6 @@ export const InfoCard = (props: Props) =>
<Description {...props} url={props.descriptionSourceUrl} />
<ul className="list-group list-group-flush">
<Languages {...props} />
{/*{props.columnVisibility.filter((c: IColumnVisibility) => c.column === "Rules")[0].visible
? null
: <RuleCount {...props}/>}
{props.columnVisibility.filter((c: IColumnVisibility) => c.column === "Updated")[0].visible
? null
: <UpdatedDate {...props}/>}*/}
<PublishedDate date={props.publishedDate} />
<Syntax {...props} />
{props.columnVisibility.filter((c: IColumnVisibility) => c.column === "License")[0].visible

2
src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/PublishedDate.tsx
View file

@ -1,5 +1,5 @@
import * as React from "react";
import moment from 'moment';
import * as React from "react";
interface Props {
date: string;

2
src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/UpdatedDate.tsx
View file

@ -1,5 +1,5 @@
import * as React from "react";
import moment from 'moment';
import * as React from "react";
interface Props {
updatedDate: string;

4
src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/index.ts
View file

@ -1,5 +1,3 @@
import { InfoCard } from "./InfoCard";
export {
InfoCard
};
export { InfoCard };

20
src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerAdditionalLists.tsx
View file

@ -1,20 +0,0 @@
import * as React from "react";
//interface Props {
// name: string;
// additionalLists: IMaintainerAdditionalListDto[];
//};
export const MaintainerAdditionalLists = (/*props: Props*/) =>
<div className="col-9">
{ /*props.additionalLists && props.additionalLists.length > 0
? <div>
<h4>More by {props.name}:</h4>
<ul>
{props.additionalLists.map(
(l: IMaintainerAdditionalListDto, i: number) => <li key={i}>{l.name}</li>)}
</ul>
</div>
: null*/ }
</div>;

2
src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerInfoCard.tsx
View file

@ -1,6 +1,5 @@
import * as React from "react";
import { IMaintainer } from "../../../interfaces/IMaintainer";
import { MaintainerAdditionalLists } from "./MaintainerAdditionalLists";
import { MaintainerLinkButtonGroup } from "./MaintainerLinkButtonGroup";
interface Props {
@ -14,7 +13,6 @@ export const MaintainerInfoCard = (props: Props) =>
<h3 className="card-header">Maintained by {props.maintainer.name}</h3>
<div className="container pt-1">
<div className="row">
<MaintainerAdditionalLists />
<MaintainerLinkButtonGroup {...props.maintainer} />
</div>
</div>

4
src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/index.ts
View file

@ -1,5 +1,3 @@
import { MaintainersInfoCard } from "./MaintainersInfoCard";
export {
MaintainersInfoCard
};
export { MaintainersInfoCard };

6
src/FilterLists.Web/src/modules/home/components/index.ts
View file

@ -2,8 +2,4 @@
import { ListsTable } from "./listsTable";
import { Oneliner } from "./Oneliner";
export {
DetailsExpander,
ListsTable,
Oneliner
};
export { DetailsExpander, ListsTable, Oneliner };

2
src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/SubscribeButtonGroup.tsx
View file

@ -1,6 +1,6 @@
import * as React from "react";
import { SubscribeButtonGroupDropdown } from "./SubscribeButtonGroupDropdown";
import { SubscribeButton } from "./SubscribeButton";
import { SubscribeButtonGroupDropdown } from "./SubscribeButtonGroupDropdown";
interface Props {
name: string;

2
src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/SubscribeButtonGroupDropdown.tsx
View file

@ -1,5 +1,5 @@
import * as React from "react";
import { DropdownButton, Dropdown } from "react-bootstrap";
import { Dropdown, DropdownButton } from "react-bootstrap";
import { SubscribeButton } from "./SubscribeButton";
interface Props {

4
src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/index.ts
View file

@ -1,5 +1,3 @@
import { SubscribeButtonGroup } from "./SubscribeButtonGroup";
export {
SubscribeButtonGroup as SubscribeButton
};
export { SubscribeButtonGroup as SubscribeButton };

2
src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/ViewButtonGroup.tsx
View file

@ -1,6 +1,6 @@
import * as React from "react";
import { ViewButtonGroupDropdown } from "./ViewButtonGroupDropdown";
import { ViewButton } from "./ViewButton";
import { ViewButtonGroupDropdown } from "./ViewButtonGroupDropdown";
interface Props {
name: string;

2
src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/ViewButtonGroupDropdown.tsx
View file

@ -1,5 +1,5 @@
import * as React from "react";
import { DropdownButton, Dropdown } from "react-bootstrap";
import { Dropdown, DropdownButton } from "react-bootstrap";
import { ViewButton } from "./ViewButton";
interface Props {

4
src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/index.ts
View file

@ -1,5 +1,3 @@
import { ViewButtonGroup } from "./ViewButtonGroup";
export {
ViewButtonGroup as ViewButton
};
export { ViewButtonGroup as ViewButton };

14
src/FilterLists.Web/src/modules/home/components/linkButtons/index.ts
View file

@ -10,16 +10,4 @@ import { SubscribeButton } from "./SubscribeButton";
import { TwitterButton } from "./TwitterButton";
import { ViewButton } from "./ViewButton";
export {
ChatButton,
DonateButton,
EmailButton,
ForumButton,
HomeButton,
IssuesButton,
PolicyButton,
SubmitButton,
SubscribeButton,
TwitterButton,
ViewButton
};
export { ChatButton, DonateButton, EmailButton, ForumButton, HomeButton, IssuesButton, PolicyButton, SubmitButton, SubscribeButton, TwitterButton, ViewButton };

29
src/FilterLists.Web/src/modules/home/components/listsTable/ListsTable.tsx
View file

@ -1,30 +1,19 @@
import * as React from "react";
import ReactTable from "react-table";
import "react-table/react-table.css";
import "../../../../utils/loader.css";
import { DetailsExpander } from "../../components";
import { IColumnVisibility } from "../../interfaces/IColumnVisibility";
import { Language } from "../../interfaces/Language";
import { ILicense } from "../../interfaces/ILicense";
import { IList } from "../../interfaces/IList";
import { IMaintainer } from "../../interfaces/IMaintainer";
import { ISoftware } from "../../interfaces/ISoftware";
import { ISyntax } from "../../interfaces/ISyntax";
import { ITag } from "../../interfaces/ITag";
import "../../../../utils/loader.css";
import ReactTable from "react-table";
import "react-table/react-table.css";
import "./listsTable.css";
import {
DetailsButton,
Languages,
License,
Maintainers,
Name,
//RuleCount,
Software,
SubscribeButton,
Tags,
//UpdatedDate
} from "./columns";
import { Language } from "../../interfaces/Language";
import { IListDetails } from "../IListDetails";
import { DetailsExpander } from "../../components";
import { DetailsButton, Languages, License, Maintainers, Name, Software, SubscribeButton, Tags } from "./columns";
import "./listsTable.css";
interface Props {
languages: Language[];
@ -49,8 +38,6 @@ export const ListsTable = (props: Props) =>
Software(props.columnVisibility, props.software),
Languages(props.columnVisibility, props.languages),
Tags(props.columnVisibility, props.tags),
//UpdatedDate(props.columnVisibility),
//RuleCount(props.columnVisibility),
License(props.columnVisibility, props.licenses),
Maintainers(props.columnVisibility, props.maintainers),
SubscribeButton(props.columnVisibility),
@ -101,11 +88,9 @@ const mapListDetails = (props: ICreateListDtoProps): IListDetails =>
name: props.list.name,
policyUrl: props.list.policyUrl,
publishedDate: props.list.publishedDate,
//ruleCount: props.list.ruleCount,
submissionUrl: props.list.submissionUrl,
syntax: props.syntaxes.filter((s: ISyntax) => props.list.syntaxId === s.id)[0],
tags: props.list.tagIds ? props.tags.filter((t: ITag) => props.list.tagIds.indexOf(t.id) > -1) : undefined,
//updatedDate: props.list.updatedDate,
viewUrl: props.list.viewUrl,
viewUrlMirrors: props.list.viewUrlMirrors
} as IListDetails);

2
src/FilterLists.Web/src/modules/home/components/listsTable/columns/Tags.tsx
View file

@ -1,8 +1,8 @@
import * as React from "react";
import { Column, Filter } from "react-table";
import { TagGroup } from "../../TagGroup";
import { IColumnVisibility } from "../../../interfaces/IColumnVisibility";
import { ITag } from "../../../interfaces/ITag";
import { TagGroup } from "../../TagGroup";
export const Tags = (columnVisibility: IColumnVisibility[], tags: ITag[]) => {
const tagsSorted = tags.sort((a: ITag, b: ITag) => a.name.localeCompare(b.name));

2
src/FilterLists.Web/src/modules/home/components/listsTable/columns/UpdatedDate.tsx
View file

@ -1,6 +1,6 @@
import moment from 'moment';
import * as React from "react";
import { Column } from "react-table";
import moment from 'moment';
import { IColumnVisibility } from "../../../interfaces/IColumnVisibility";
export const UpdatedDate = (columnVisibility: IColumnVisibility[]) =>

14
src/FilterLists.Web/src/modules/home/components/listsTable/columns/index.ts
View file

@ -10,16 +10,4 @@ import { Syntax } from "./Syntax";
import { Tags } from "./Tags";
import { UpdatedDate } from "./UpdatedDate";
export {
DetailsButton,
Languages,
License,
Maintainers,
Name,
RuleCount,
Software,
SubscribeButton,
Syntax,
Tags,
UpdatedDate
};
export { DetailsButton, Languages, License, Maintainers, Name, RuleCount, Software, SubscribeButton, Syntax, Tags, UpdatedDate };

4
src/FilterLists.Web/src/modules/home/components/listsTable/index.ts
View file

@ -1,5 +1,3 @@
import { ListsTable } from "./ListsTable";
export {
ListsTable,
};
export { ListsTable, };

36
src/FilterLists.Web/src/modules/home/components/softwareIcon/SoftwareIcon.tsx
View file

@ -1,39 +1,5 @@
import * as React from "react";
import {
img1,
img2,
img3,
img4,
img5,
img6,
img7,
img8,
img10,
img11,
img12,
img13,
img14,
img15,
img16,
img17,
img18,
img19,
img20,
img21,
img22,
img23,
img24,
img25,
img26,
img27,
img28,
img29,
img30,
img31,
img32,
img33,
img34
} from "./imgs";
import { img1, img10, img11, img12, img13, img14, img15, img16, img17, img18, img19, img2, img20, img21, img22, img23, img24, img25, img26, img27, img28, img29, img3, img30, img31, img32, img33, img34, img4, img5, img6, img7, img8 } from "./imgs";
interface Props {
id: number;

37
src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/index.ts
View file

@ -32,38 +32,5 @@ import img32 from "./32-AdNauseam.png";
import img33 from "./33-Legacy-Unix-Derivatives.png";
import img34 from "./34-Windows-command-line.png";
export {
img1,
img2,
img3,
img4,
img5,
img6,
img7,
img8,
img10,
img11,
img12,
img13,
img14,
img15,
img16,
img17,
img18,
img19,
img20,
img21,
img22,
img23,
img24,
img25,
img26,
img27,
img28,
img29,
img30,
img31,
img32,
img33,
img34
};
export { img1, img2, img3, img4, img5, img6, img7, img8, img10, img11, img12, img13, img14, img15, img16, img17, img18, img19, img20, img21, img22, img23, img24, img25, img26, img27, img28, img29, img30, img31, img32, img33, img34 };

4
src/FilterLists.Web/src/modules/home/components/softwareIcon/index.ts
View file

@ -1,5 +1,3 @@
import { SoftwareIcon } from "./SoftwareIcon";
export {
SoftwareIcon
};
export { SoftwareIcon };

4
src/FilterLists.Web/src/modules/home/index.ts
View file

@ -1,5 +1,3 @@
import { HomeContainer } from "./HomeContainer";
export {
HomeContainer as Home
};
export { HomeContainer as Home };

2
src/FilterLists.Web/src/modules/home/interfaces/IList.ts
View file

@ -14,11 +14,9 @@
name: string;
policyUrl: string;
publishedDate: string;
//ruleCount: number;
submissionUrl: string;
syntaxId: number;
tagIds: number[];
//updatedDate: string;
viewUrl: string;
viewUrlMirrors: string[];
};

4
src/FilterLists.Web/src/modules/index.ts
View file

@ -1,5 +1,3 @@
import { Home } from "./home";
export {
Home
};
export { Home };

4
src/FilterLists.Web/src/utils/index.ts
View file

@ -1,5 +1,3 @@
import { getContrast } from "./GetContrast";
export {
getContrast
};
export { getContrast };