diff --git a/src/FilterLists.Web/src/Router.tsx b/src/FilterLists.Web/src/Router.tsx index 2dd141c6c..6036178a7 100644 --- a/src/FilterLists.Web/src/Router.tsx +++ b/src/FilterLists.Web/src/Router.tsx @@ -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 = diff --git a/src/FilterLists.Web/src/index.tsx b/src/FilterLists.Web/src/index.tsx index 2fcb3d257..90ba2def7 100644 --- a/src/FilterLists.Web/src/index.tsx +++ b/src/FilterLists.Web/src/index.tsx @@ -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(, document.getElementById('root')); \ No newline at end of file diff --git a/src/FilterLists.Web/src/modules/home/Home.tsx b/src/FilterLists.Web/src/modules/home/Home.tsx index 83283c303..34350686b 100644 --- a/src/FilterLists.Web/src/modules/home/Home.tsx +++ b/src/FilterLists.Web/src/modules/home/Home.tsx @@ -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 { render() { return
- + {this.renderColumnVisibilityCheckboxes()}
; diff --git a/src/FilterLists.Web/src/modules/home/HomeContainer.tsx b/src/FilterLists.Web/src/modules/home/HomeContainer.tsx index e32d98fc9..d13a8a634 100644 --- a/src/FilterLists.Web/src/modules/home/HomeContainer.tsx +++ b/src/FilterLists.Web/src/modules/home/HomeContainer.tsx @@ -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[]; diff --git a/src/FilterLists.Web/src/modules/home/components/IListDetails.ts b/src/FilterLists.Web/src/modules/home/components/IListDetails.ts index e9f6065cf..d5ed31f82 100644 --- a/src/FilterLists.Web/src/modules/home/components/IListDetails.ts +++ b/src/FilterLists.Web/src/modules/home/components/IListDetails.ts @@ -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[]; }; \ No newline at end of file diff --git a/src/FilterLists.Web/src/modules/home/components/Oneliner.tsx b/src/FilterLists.Web/src/modules/home/components/Oneliner.tsx index 5a587c494..b9754c39f 100644 --- a/src/FilterLists.Web/src/modules/home/components/Oneliner.tsx +++ b/src/FilterLists.Web/src/modules/home/components/Oneliner.tsx @@ -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*/ - ?

- The independent, comprehensive directory of {/*}{props.ruleCount.toLocaleString() - } unique rules across */}{props.listCount.toLocaleString() - } filter and host lists for advertisements, trackers, malware, and annoyances. + props.listCount > 0 + ?

+ The independent, comprehensive directory of {props.listCount.toLocaleString()} filter and host lists for advertisements, trackers, malware, and annoyances.

- :

- The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances. + :

+ The independent, comprehensive directory of filter and host lists for advertisements, trackers, malware, and annoyances.

; \ No newline at end of file diff --git a/src/FilterLists.Web/src/modules/home/components/TagGroup.tsx b/src/FilterLists.Web/src/modules/home/components/TagGroup.tsx index de4dad5f4..a6439ab80 100644 --- a/src/FilterLists.Web/src/modules/home/components/TagGroup.tsx +++ b/src/FilterLists.Web/src/modules/home/components/TagGroup.tsx @@ -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[]; diff --git a/src/FilterLists.Web/src/modules/home/components/detailsExpander/DetailsExpander.tsx b/src/FilterLists.Web/src/modules/home/components/detailsExpander/DetailsExpander.tsx index 585e00a01..c1de123f4 100644 --- a/src/FilterLists.Web/src/modules/home/components/detailsExpander/DetailsExpander.tsx +++ b/src/FilterLists.Web/src/modules/home/components/detailsExpander/DetailsExpander.tsx @@ -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"; diff --git a/src/FilterLists.Web/src/modules/home/components/detailsExpander/LinkButtonGroup.tsx b/src/FilterLists.Web/src/modules/home/components/detailsExpander/LinkButtonGroup.tsx index b3540eefe..888e57b6d 100644 --- a/src/FilterLists.Web/src/modules/home/components/detailsExpander/LinkButtonGroup.tsx +++ b/src/FilterLists.Web/src/modules/home/components/detailsExpander/LinkButtonGroup.tsx @@ -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; diff --git a/src/FilterLists.Web/src/modules/home/components/detailsExpander/index.ts b/src/FilterLists.Web/src/modules/home/components/detailsExpander/index.ts index fa95d60ba..741dbb60b 100644 --- a/src/FilterLists.Web/src/modules/home/components/detailsExpander/index.ts +++ b/src/FilterLists.Web/src/modules/home/components/detailsExpander/index.ts @@ -1,5 +1,3 @@ import { DetailsExpander } from "./DetailsExpander"; -export { - DetailsExpander -}; \ No newline at end of file +export { DetailsExpander }; diff --git a/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/InfoCard.tsx b/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/InfoCard.tsx index 9ec730152..0ca8ada5f 100644 --- a/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/InfoCard.tsx +++ b/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/InfoCard.tsx @@ -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) =>
    - {/*{props.columnVisibility.filter((c: IColumnVisibility) => c.column === "Rules")[0].visible - ? null - : } - {props.columnVisibility.filter((c: IColumnVisibility) => c.column === "Updated")[0].visible - ? null - : }*/} {props.columnVisibility.filter((c: IColumnVisibility) => c.column === "License")[0].visible diff --git a/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/PublishedDate.tsx b/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/PublishedDate.tsx index 53a56f3e1..67325b70a 100644 --- a/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/PublishedDate.tsx +++ b/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/PublishedDate.tsx @@ -1,5 +1,5 @@ -import * as React from "react"; import moment from 'moment'; +import * as React from "react"; interface Props { date: string; diff --git a/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/UpdatedDate.tsx b/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/UpdatedDate.tsx index ff4a64754..7ccd41bb1 100644 --- a/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/UpdatedDate.tsx +++ b/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/UpdatedDate.tsx @@ -1,5 +1,5 @@ -import * as React from "react"; import moment from 'moment'; +import * as React from "react"; interface Props { updatedDate: string; diff --git a/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/index.ts b/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/index.ts index e054a3cee..260aed18f 100644 --- a/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/index.ts +++ b/src/FilterLists.Web/src/modules/home/components/detailsExpander/infoCard/index.ts @@ -1,5 +1,3 @@ import { InfoCard } from "./InfoCard"; -export { - InfoCard -}; \ No newline at end of file +export { InfoCard }; diff --git a/src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerAdditionalLists.tsx b/src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerAdditionalLists.tsx deleted file mode 100644 index 042d91060..000000000 --- a/src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerAdditionalLists.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import * as React from "react"; - -//interface Props { -// name: string; -// additionalLists: IMaintainerAdditionalListDto[]; -//}; - -export const MaintainerAdditionalLists = (/*props: Props*/) => -
    - { /*props.additionalLists && props.additionalLists.length > 0 - ?
    -

    More by {props.name}:

    -
      - {props.additionalLists.map( - (l: IMaintainerAdditionalListDto, i: number) =>
    • {l.name}
      • )} -
    - -
    - : null*/ } -
    ; \ No newline at end of file diff --git a/src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerInfoCard.tsx b/src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerInfoCard.tsx index b8d5d09e0..d773bc9b5 100644 --- a/src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerInfoCard.tsx +++ b/src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerInfoCard.tsx @@ -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) =>

    Maintained by {props.maintainer.name}

    -
    diff --git a/src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/index.ts b/src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/index.ts index ba527225b..162aa5359 100644 --- a/src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/index.ts +++ b/src/FilterLists.Web/src/modules/home/components/detailsExpander/maintainersInfoCard/index.ts @@ -1,5 +1,3 @@ import { MaintainersInfoCard } from "./MaintainersInfoCard"; -export { - MaintainersInfoCard -}; \ No newline at end of file +export { MaintainersInfoCard }; diff --git a/src/FilterLists.Web/src/modules/home/components/index.ts b/src/FilterLists.Web/src/modules/home/components/index.ts index 956aaf11e..feee39ff4 100644 --- a/src/FilterLists.Web/src/modules/home/components/index.ts +++ b/src/FilterLists.Web/src/modules/home/components/index.ts @@ -2,8 +2,4 @@ import { ListsTable } from "./listsTable"; import { Oneliner } from "./Oneliner"; -export { - DetailsExpander, - ListsTable, - Oneliner -}; \ No newline at end of file +export { DetailsExpander, ListsTable, Oneliner }; diff --git a/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/SubscribeButtonGroup.tsx b/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/SubscribeButtonGroup.tsx index 095144fbc..5e876d6c3 100644 --- a/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/SubscribeButtonGroup.tsx +++ b/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/SubscribeButtonGroup.tsx @@ -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; diff --git a/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/SubscribeButtonGroupDropdown.tsx b/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/SubscribeButtonGroupDropdown.tsx index 2fa2cae3e..922c9a5e2 100644 --- a/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/SubscribeButtonGroupDropdown.tsx +++ b/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/SubscribeButtonGroupDropdown.tsx @@ -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 { diff --git a/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/index.ts b/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/index.ts index a9dbacd3d..870bea9c7 100644 --- a/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/index.ts +++ b/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButton/index.ts @@ -1,5 +1,3 @@ import { SubscribeButtonGroup } from "./SubscribeButtonGroup"; -export { - SubscribeButtonGroup as SubscribeButton -}; \ No newline at end of file +export { SubscribeButtonGroup as SubscribeButton }; diff --git a/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/ViewButtonGroup.tsx b/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/ViewButtonGroup.tsx index 67412484e..adc0cb388 100644 --- a/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/ViewButtonGroup.tsx +++ b/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/ViewButtonGroup.tsx @@ -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; diff --git a/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/ViewButtonGroupDropdown.tsx b/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/ViewButtonGroupDropdown.tsx index 906538d2e..a72a6cece 100644 --- a/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/ViewButtonGroupDropdown.tsx +++ b/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/ViewButtonGroupDropdown.tsx @@ -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 { diff --git a/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/index.ts b/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/index.ts index 29a37b647..6a15392f2 100644 --- a/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/index.ts +++ b/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButton/index.ts @@ -1,5 +1,3 @@ import { ViewButtonGroup } from "./ViewButtonGroup"; -export { - ViewButtonGroup as ViewButton -}; \ No newline at end of file +export { ViewButtonGroup as ViewButton }; diff --git a/src/FilterLists.Web/src/modules/home/components/linkButtons/index.ts b/src/FilterLists.Web/src/modules/home/components/linkButtons/index.ts index 83a8d58f2..15e7c38f1 100644 --- a/src/FilterLists.Web/src/modules/home/components/linkButtons/index.ts +++ b/src/FilterLists.Web/src/modules/home/components/linkButtons/index.ts @@ -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 -}; \ No newline at end of file +export { ChatButton, DonateButton, EmailButton, ForumButton, HomeButton, IssuesButton, PolicyButton, SubmitButton, SubscribeButton, TwitterButton, ViewButton }; diff --git a/src/FilterLists.Web/src/modules/home/components/listsTable/ListsTable.tsx b/src/FilterLists.Web/src/modules/home/components/listsTable/ListsTable.tsx index b46e9fb6d..3816e7c1f 100644 --- a/src/FilterLists.Web/src/modules/home/components/listsTable/ListsTable.tsx +++ b/src/FilterLists.Web/src/modules/home/components/listsTable/ListsTable.tsx @@ -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); \ No newline at end of file diff --git a/src/FilterLists.Web/src/modules/home/components/listsTable/columns/Tags.tsx b/src/FilterLists.Web/src/modules/home/components/listsTable/columns/Tags.tsx index 07a60444a..76957a4e5 100644 --- a/src/FilterLists.Web/src/modules/home/components/listsTable/columns/Tags.tsx +++ b/src/FilterLists.Web/src/modules/home/components/listsTable/columns/Tags.tsx @@ -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)); diff --git a/src/FilterLists.Web/src/modules/home/components/listsTable/columns/UpdatedDate.tsx b/src/FilterLists.Web/src/modules/home/components/listsTable/columns/UpdatedDate.tsx index a01e54d63..23acf2b89 100644 --- a/src/FilterLists.Web/src/modules/home/components/listsTable/columns/UpdatedDate.tsx +++ b/src/FilterLists.Web/src/modules/home/components/listsTable/columns/UpdatedDate.tsx @@ -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[]) => diff --git a/src/FilterLists.Web/src/modules/home/components/listsTable/columns/index.ts b/src/FilterLists.Web/src/modules/home/components/listsTable/columns/index.ts index a2a6c5411..e82dc8aa9 100644 --- a/src/FilterLists.Web/src/modules/home/components/listsTable/columns/index.ts +++ b/src/FilterLists.Web/src/modules/home/components/listsTable/columns/index.ts @@ -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 -}; \ No newline at end of file +export { DetailsButton, Languages, License, Maintainers, Name, RuleCount, Software, SubscribeButton, Syntax, Tags, UpdatedDate }; diff --git a/src/FilterLists.Web/src/modules/home/components/listsTable/index.ts b/src/FilterLists.Web/src/modules/home/components/listsTable/index.ts index 08d82a9e1..6a848e986 100644 --- a/src/FilterLists.Web/src/modules/home/components/listsTable/index.ts +++ b/src/FilterLists.Web/src/modules/home/components/listsTable/index.ts @@ -1,5 +1,3 @@ import { ListsTable } from "./ListsTable"; -export { - ListsTable, -}; \ No newline at end of file +export { ListsTable, }; diff --git a/src/FilterLists.Web/src/modules/home/components/softwareIcon/SoftwareIcon.tsx b/src/FilterLists.Web/src/modules/home/components/softwareIcon/SoftwareIcon.tsx index ca0c002a5..8b7b94ec0 100644 --- a/src/FilterLists.Web/src/modules/home/components/softwareIcon/SoftwareIcon.tsx +++ b/src/FilterLists.Web/src/modules/home/components/softwareIcon/SoftwareIcon.tsx @@ -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; diff --git a/src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/index.ts b/src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/index.ts index 6c195031e..d3055c53e 100644 --- a/src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/index.ts +++ b/src/FilterLists.Web/src/modules/home/components/softwareIcon/imgs/index.ts @@ -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 }; + diff --git a/src/FilterLists.Web/src/modules/home/components/softwareIcon/index.ts b/src/FilterLists.Web/src/modules/home/components/softwareIcon/index.ts index 8fa0f379c..b3f6cc39f 100644 --- a/src/FilterLists.Web/src/modules/home/components/softwareIcon/index.ts +++ b/src/FilterLists.Web/src/modules/home/components/softwareIcon/index.ts @@ -1,5 +1,3 @@ import { SoftwareIcon } from "./SoftwareIcon"; -export { - SoftwareIcon -}; \ No newline at end of file +export { SoftwareIcon }; diff --git a/src/FilterLists.Web/src/modules/home/index.ts b/src/FilterLists.Web/src/modules/home/index.ts index 5fe1540b0..bace2e88e 100644 --- a/src/FilterLists.Web/src/modules/home/index.ts +++ b/src/FilterLists.Web/src/modules/home/index.ts @@ -1,5 +1,3 @@ import { HomeContainer } from "./HomeContainer"; -export { - HomeContainer as Home -}; \ No newline at end of file +export { HomeContainer as Home }; diff --git a/src/FilterLists.Web/src/modules/home/interfaces/IList.ts b/src/FilterLists.Web/src/modules/home/interfaces/IList.ts index 1de1a8607..ff8c6cf81 100644 --- a/src/FilterLists.Web/src/modules/home/interfaces/IList.ts +++ b/src/FilterLists.Web/src/modules/home/interfaces/IList.ts @@ -14,11 +14,9 @@ name: string; policyUrl: string; publishedDate: string; - //ruleCount: number; submissionUrl: string; syntaxId: number; tagIds: number[]; - //updatedDate: string; viewUrl: string; viewUrlMirrors: string[]; }; \ No newline at end of file diff --git a/src/FilterLists.Web/src/modules/index.ts b/src/FilterLists.Web/src/modules/index.ts index 319820928..26437089f 100644 --- a/src/FilterLists.Web/src/modules/index.ts +++ b/src/FilterLists.Web/src/modules/index.ts @@ -1,5 +1,3 @@ import { Home } from "./home"; -export { - Home -}; \ No newline at end of file +export { Home }; diff --git a/src/FilterLists.Web/src/utils/index.ts b/src/FilterLists.Web/src/utils/index.ts index 43c057d47..4646f2030 100644 --- a/src/FilterLists.Web/src/utils/index.ts +++ b/src/FilterLists.Web/src/utils/index.ts @@ -1,5 +1,3 @@ import { getContrast } from "./GetContrast"; -export { - getContrast -}; \ No newline at end of file +export { getContrast };