diff --git a/src/FilterLists.Web/ClientApp/Layout.tsx b/src/FilterLists.Web/ClientApp/Layout.tsx index 578e377cb..02c0e3c92 100644 --- a/src/FilterLists.Web/ClientApp/Layout.tsx +++ b/src/FilterLists.Web/ClientApp/Layout.tsx @@ -4,7 +4,7 @@ import "./site.css"; interface IProps { children?: React.ReactNode; -} +}; export const Layout = (props: IProps) =>
diff --git a/src/FilterLists.Web/ClientApp/modules/home/HomeContainer.tsx b/src/FilterLists.Web/ClientApp/modules/home/HomeContainer.tsx index 402123f0a..70641480c 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/HomeContainer.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/HomeContainer.tsx @@ -26,26 +26,26 @@ export class HomeContainer extends React.Component<{}, IState> { } componentDidMount() { - this.fetchLists(); this.fetchLanguages(); + this.fetchLists(); this.fetchMaintainers(); this.fetchSoftware(); this.fetchTags(); this.fetchRuleCount(); }; - fetchLists() { - fetch("https://filterlists.com/api/v1/lists") - .then(r => r.json() as Promise) - .then(p => { this.setState({ lists: p }); }); - }; - fetchLanguages() { fetch("https://filterlists.com/api/v1/languages") .then(r => r.json() as Promise) .then(p => { this.setState({ languages: p }); }); }; + fetchLists() { + fetch("https://filterlists.com/api/v1/lists") + .then(r => r.json() as Promise) + .then(p => { this.setState({ lists: p }); }); + }; + fetchMaintainers() { fetch("https://filterlists.com/api/v1/maintainers") .then(r => r.json() as Promise) diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/DetailsExpander.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/DetailsExpander.tsx index 4a1747cbd..31940a62b 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/DetailsExpander.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/DetailsExpander.tsx @@ -4,18 +4,17 @@ import { InfoCard } from "./infoCard"; import { LinkButtonGroup } from "./LinkButtonGroup"; import { MaintainersInfoCard } from "./maintainersInfoCard"; -export const DetailsExpander = (props: IListDetails) => { - return
-
-
-
- - -
-
- -
-
-
-
; -}; \ No newline at end of file +export const DetailsExpander = (props: IListDetails) => +
+
+
+
+ + +
+
+ +
+
+
+
; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/DetailsExpanderContainer.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/DetailsExpanderContainer.tsx index 7ced7b1af..a0357046e 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/DetailsExpanderContainer.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/DetailsExpanderContainer.tsx @@ -6,10 +6,10 @@ import { DetailsExpander } from "./DetailsExpander"; interface IProps { list: IListDetails; -} +}; interface IState { -} +}; export class DetailsExpanderContainer extends React.Component { constructor(props: IProps) { @@ -22,4 +22,4 @@ export class DetailsExpanderContainer extends React.Component { ? :
Loading...
;; } -} \ No newline at end of file +}; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/IListDetails.ts b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/IListDetails.ts index 75b74f657..e1c4f368f 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/IListDetails.ts +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/IListDetails.ts @@ -24,21 +24,21 @@ export interface IListDetails { updatedDate: string; viewUrl: string; viewUrlMirrors: string[]; -} +}; export interface IListLicense { descriptionUrl: string; name: string; -} +}; export interface IListSyntax { definitionUrl: string; name: string; supportedSoftware: ISyntaxSupportedSoftware[]; -} +}; export interface ISyntaxSupportedSoftware { homeUrl: string; id: number; name: string; -} \ No newline at end of file +}; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/LinkButtonGroup.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/LinkButtonGroup.tsx index e165073d5..528d21029 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/LinkButtonGroup.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/LinkButtonGroup.tsx @@ -24,19 +24,18 @@ interface IProps { submissionUrl: string; viewUrl: string; viewUrlMirrors: string[]; -} +}; -export const LinkButtonGroup = (props: IProps) => { - return
- - - - - - - - - - -
; -}; \ No newline at end of file +export const LinkButtonGroup = (props: IProps) => +
+ + + + + + + + + + +
; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Description.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Description.tsx index 26bdc4eca..983c14924 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Description.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Description.tsx @@ -4,14 +4,13 @@ import "./description.css"; interface IProps { description: string; url: string; -} +}; -export const Description = (props: IProps) => { - return props.description - ?

- {props.url - ?
{props.description}
- : props.description} -

- : null; -}; \ No newline at end of file +export const Description = (props: IProps) => + props.description + ?

+ {props.url + ?
{props.description}
+ : props.description} +

+ : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/DiscontinuedDate.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/DiscontinuedDate.tsx index 7f777f0ab..e98e403cc 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/DiscontinuedDate.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/DiscontinuedDate.tsx @@ -3,12 +3,11 @@ import * as moment from "moment"; interface IProps { date: string; -} +}; -export const DiscontinuedDate = (props: IProps) => { - return props.date - ?
  • -

    Discontinued: {moment(props.date).format("l")}

    -
    • - : null; -}; \ No newline at end of file +export const DiscontinuedDate = (props: IProps) => + props.date + ?
  • +

    Discontinued: {moment(props.date).format("l")}

    +
    • + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/InfoCard.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/InfoCard.tsx index 90662f4b2..43b4cc5ad 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/InfoCard.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/InfoCard.tsx @@ -24,18 +24,17 @@ interface IProps { syntax: IListSyntax; tags: ITag[]; updatedDate: string; -} +}; -export const InfoCard = (props: IProps) => { - return
    +export const InfoCard = (props: IProps) => +
    {props.syntax ? props.syntax.supportedSoftware.map( - (s: ISyntaxSupportedSoftware, i: number) => - - - ) + (s: ISyntaxSupportedSoftware, i: number) => + + ) : null}
    @@ -48,5 +47,4 @@ export const InfoCard = (props: IProps) => { -
    ; -}; \ No newline at end of file +
    ; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Languages.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Languages.tsx index ada6383f1..c3390c299 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Languages.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Languages.tsx @@ -3,19 +3,18 @@ import { ILanguage } from "../../../interfaces"; interface IProps { languages: ILanguage[]; -} +}; -export const Languages = (props: IProps) => { - return props.languages && props.languages.length > 0 - ? props.languages.length > 1 - ?
  • -

    Languages:

    -
      - {props.languages.map((language: ILanguage, i: number) =>
    • {language.name}
      • )} -
    -
    • - :
  • -

    Language: {props.languages[0].name}

    -
    • - : null; -}; \ No newline at end of file +export const Languages = (props: IProps) => + props.languages && props.languages.length > 0 + ? props.languages.length > 1 + ?
  • +

    Languages:

    +
      + {props.languages.map((language: ILanguage, i: number) =>
    • {language.name}
      • )} +
    +
    • + :
  • +

    Language: {props.languages[0].name}

    +
    • + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/License.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/License.tsx index 3df282321..2a5846b59 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/License.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/License.tsx @@ -1,14 +1,13 @@ import * as React from "react"; import { IListLicense as IListLicenseDto } from "../IListDetails"; -export const License = (props: IListLicenseDto) => { - return props.name - ? (props.descriptionUrl - ?
  • -

    License: {props.name}

    -
    • - :
  • -

    License: {props.name}

    -
    • ) - : null; -}; \ No newline at end of file +export const License = (props: IListLicenseDto) => + props.name + ? (props.descriptionUrl + ?
  • +

    License: {props.name}

    +
    • + :
  • +

    License: {props.name}

    +
    • ) + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/PublishedDate.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/PublishedDate.tsx index 5fcaa9db0..530a08950 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/PublishedDate.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/PublishedDate.tsx @@ -3,12 +3,11 @@ import * as moment from "moment"; interface IProps { date: string; -} +}; -export const PublishedDate = (props: IProps) => { - return props.date - ?
  • -

    Published: {moment(props.date).format("l")}

    -
    • - : null; -}; \ No newline at end of file +export const PublishedDate = (props: IProps) => + props.date + ?
  • +

    Published: {moment(props.date).format("l")}

    +
    • + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/RuleCount.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/RuleCount.tsx index 33feefbde..1fb5944bf 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/RuleCount.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/RuleCount.tsx @@ -2,12 +2,11 @@ import * as React from "react"; interface IProps { ruleCount: number; -} +}; -export const RuleCount = (props: IProps) => { - return props.ruleCount > 0 - ?
  • -

    Rule Count: {props.ruleCount.toLocaleString()}

    -
    • - : null; -}; \ No newline at end of file +export const RuleCount = (props: IProps) => + props.ruleCount > 0 + ?
  • +

    Rule Count: {props.ruleCount.toLocaleString()}

    +
    • + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Syntax.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Syntax.tsx index 1c743c514..1657883ec 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Syntax.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/Syntax.tsx @@ -1,14 +1,13 @@ import * as React from "react"; import { IListSyntax as IListSyntaxDto } from "../IListDetails"; -export const Syntax = (props: IListSyntaxDto) => { - return props.name - ? (props.definitionUrl - ?
  • -

    Syntax: {props.name}

    -
    • - :
  • -

    Syntax: {props.name}

    -
    • ) - : null; -}; \ No newline at end of file +export const Syntax = (props: IListSyntaxDto) => + props.name + ? (props.definitionUrl + ?
  • +

    Syntax: {props.name}

    +
    • + :
  • +

    Syntax: {props.name}

    +
    • ) + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/UpdatedDate.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/UpdatedDate.tsx index 5f897610b..29c02aefa 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/UpdatedDate.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/infoCard/UpdatedDate.tsx @@ -4,16 +4,15 @@ import * as moment from "moment"; interface IProps { discontinuedDate: string; updatedDate: string; -} +}; -export const UpdatedDate = (props: IProps) => { - return props.discontinuedDate - ? null - : props.updatedDate - ?
  • -

    Updated: {moment(props.updatedDate).isValid() - ? moment(props.updatedDate).format("l") - : "N/A"}

    -
    • - : null; -}; \ No newline at end of file +export const UpdatedDate = (props: IProps) => + props.discontinuedDate + ? null + : props.updatedDate + ?
  • +

    Updated: {moment(props.updatedDate).isValid() + ? moment(props.updatedDate).format("l") + : "N/A"}

    +
    • + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerAdditionalLists.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerAdditionalLists.tsx index da1efd94a..96cc74f85 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerAdditionalLists.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerAdditionalLists.tsx @@ -3,11 +3,11 @@ import * as React from "react"; //interface IProps { // name: string; // additionalLists: IMaintainerAdditionalListDto[]; -//} +//}; -export const MaintainerAdditionalLists = (/*props: IProps*/) => { - return
    - { /*props.additionalLists && props.additionalLists.length > 0 +export const MaintainerAdditionalLists = (/*props: IProps*/) => +
    + { /*props.additionalLists && props.additionalLists.length > 0 ?

    More by {props.name}:

      @@ -17,5 +17,4 @@ export const MaintainerAdditionalLists = (/*props: IProps*/) => {
    : null*/ } -
    ; -}; \ No newline at end of file +
    ; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerInfoCard.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerInfoCard.tsx index d446fc711..c2315b1a6 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerInfoCard.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerInfoCard.tsx @@ -5,7 +5,7 @@ import { MaintainerLinkButtonGroup } from "./MaintainerLinkButtonGroup"; interface IProps { maintainer: IMaintainer; -} +}; export const MaintainerInfoCard = (props: IProps) => props.maintainer.name diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerLinkButtonGroup.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerLinkButtonGroup.tsx index 1d9a19226..9bd900bef 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerLinkButtonGroup.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainerLinkButtonGroup.tsx @@ -6,7 +6,7 @@ interface IProps { homeUrl: string; name: string; twitterHandle: string; -} +}; export const MaintainerLinkButtonGroup = (props: IProps) =>
    diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainersInfoCard.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainersInfoCard.tsx index 60aa4361f..cb95cbcf9 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainersInfoCard.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/detailsExpander/maintainersInfoCard/MaintainersInfoCard.tsx @@ -4,7 +4,7 @@ import { MaintainerInfoCard } from "./MaintainerInfoCard"; interface IProps { maintainers: IMaintainer[]; -} +}; export const MaintainersInfoCard = (props: IProps) => props.maintainers && props.maintainers.length > 0 diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ChatButton.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ChatButton.tsx index 116ce930d..f04b23e12 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ChatButton.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ChatButton.tsx @@ -4,12 +4,11 @@ import { LinkButton } from "./LinkButton"; interface IProps { name: string; url: string; -} +}; -export const ChatButton = (props: IProps) => { - return props.url - ? - : null; -};; \ No newline at end of file +export const ChatButton = (props: IProps) => + props.url + ? + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/DonateButton.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/DonateButton.tsx index fb995e452..ce3bbcd93 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/DonateButton.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/DonateButton.tsx @@ -4,12 +4,11 @@ import { LinkButton } from "./LinkButton"; interface IProps { name: string; url: string; -} +}; -export const DonateButton = (props: IProps) => { - return props.url - ? - : null; -}; \ No newline at end of file +export const DonateButton = (props: IProps) => + props.url + ? + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/EmailButton.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/EmailButton.tsx index 9d39af39f..edc8e9972 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/EmailButton.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/EmailButton.tsx @@ -4,12 +4,11 @@ import { LinkButton } from "./LinkButton"; interface IProps { name: string; emailAddress: string; -} +}; -export const EmailButton = (props: IProps) => { - return props.emailAddress - ? - : null; -}; \ No newline at end of file +export const EmailButton = (props: IProps) => + props.emailAddress + ? + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ForumButton.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ForumButton.tsx index 1d728b5a1..0bf0bacfc 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ForumButton.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ForumButton.tsx @@ -4,12 +4,11 @@ import { LinkButton } from "./LinkButton"; interface IProps { name: string; url: string; -} +}; -export const ForumButton = (props: IProps) => { - return props.url - ? - : null; -}; \ No newline at end of file +export const ForumButton = (props: IProps) => + props.url + ? + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/HomeButton.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/HomeButton.tsx index 96d3dfffa..e1f40b366 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/HomeButton.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/HomeButton.tsx @@ -4,12 +4,11 @@ import { LinkButton } from "./LinkButton"; interface IProps { name: string; url: string; -} +}; -export const HomeButton = (props: IProps) => { - return props.url - ? - : null; -}; \ No newline at end of file +export const HomeButton = (props: IProps) => + props.url + ? + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/IssuesButton.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/IssuesButton.tsx index ffa996b90..038ab763f 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/IssuesButton.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/IssuesButton.tsx @@ -4,12 +4,11 @@ import { LinkButton } from "./LinkButton"; interface IProps { name: string; url: string; -} +}; -export const IssuesButton = (props: IProps) => { - return props.url - ? - : null; -}; \ No newline at end of file +export const IssuesButton = (props: IProps) => + props.url + ? + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/LinkButton.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/LinkButton.tsx index 0212e8d74..66af40654 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/LinkButton.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/LinkButton.tsx @@ -6,14 +6,13 @@ interface IProps { title?: string; buttonClass?: string; text: string; -} +}; -export const LinkButton = (props: IProps) => { - return props.href - ? - {props.text} - - : null; -}; \ No newline at end of file +export const LinkButton = (props: IProps) => + props.href + ? + {props.text} + + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/PolicyButton.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/PolicyButton.tsx index 5ad5118ab..60b87d795 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/PolicyButton.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/PolicyButton.tsx @@ -4,12 +4,11 @@ import { LinkButton } from "./LinkButton"; interface IProps { name: string; url: string; -} +}; -export const PolicyButton = (props: IProps) => { - return props.url - ? - : null; -}; \ No newline at end of file +export const PolicyButton = (props: IProps) => + props.url + ? + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/SubmitButton.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/SubmitButton.tsx index a5506bf9b..e4baef971 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/SubmitButton.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/SubmitButton.tsx @@ -4,12 +4,11 @@ import { LinkButton } from "./LinkButton"; interface IProps { name: string; url: string; -} +}; -export const SubmitButton = (props: IProps) => { - return props.url - ? - : null; -}; \ No newline at end of file +export const SubmitButton = (props: IProps) => + props.url + ? + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/SubscribeButton.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/SubscribeButton.tsx index 8358e0c86..515946b9f 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/SubscribeButton.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/SubscribeButton.tsx @@ -5,7 +5,7 @@ interface IProps { name: string; url: string; text?: string; -} +}; export const SubscribeButton = (props: IProps) => { let buttonClass: string | undefined; diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/SubscribeButtonGroup.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/SubscribeButtonGroup.tsx index 15edd9c0a..e6315284c 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/SubscribeButtonGroup.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/SubscribeButtonGroup.tsx @@ -5,21 +5,21 @@ interface IProps { name: string; url: string; urlMirrors?: string[]; -} - -export const SubscribeButtonGroup = (props: IProps) => { - return props.url - ? (props.urlMirrors && props.urlMirrors.length > 0) - ? - : - : null; }; +export const SubscribeButtonGroup = (props: IProps) => + props.url + ? (props.urlMirrors && props.urlMirrors.length > 0) + ? + : + : null; + interface ISubscribeButtonGroupDropdownProps { name: string; url: string; urlMirrors: string[]; -} +}; const SubscribeButtonGroupDropdown = (props: ISubscribeButtonGroupDropdownProps) => { let firstButtonText: string = "Original"; @@ -41,13 +41,12 @@ const SubscribeButtonGroupDropdown = (props: ISubscribeButtonGroupDropdownProps)
    ; }; -const BtnGroupDropSubscribe = () => { - return ; -}; \ No newline at end of file +const BtnGroupDropSubscribe = () => + ; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/TwitterButton.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/TwitterButton.tsx index 718f4e273..8c7f7a71a 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/TwitterButton.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/TwitterButton.tsx @@ -4,12 +4,11 @@ import { LinkButton } from "./LinkButton"; interface IProps { name: string; twitterHandle: string; -} +}; -export const TwitterButton = (props: IProps) => { - return props.twitterHandle - ? - : null; -}; \ No newline at end of file +export const TwitterButton = (props: IProps) => + props.twitterHandle + ? + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ViewButton.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ViewButton.tsx index 26dd9b8b5..eb537c752 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ViewButton.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ViewButton.tsx @@ -5,12 +5,11 @@ interface IProps { name: string; url: string; text?: string; -} +}; -export const ViewButton = (props: IProps) => { - return props.url - ? - : null; -}; \ No newline at end of file +export const ViewButton = (props: IProps) => + props.url + ? + : null; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ViewButtonGroup.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ViewButtonGroup.tsx index 6226098bf..60669fa82 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ViewButtonGroup.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/linkButtons/ViewButtonGroup.tsx @@ -5,21 +5,20 @@ interface IProps { name: string; url: string; urlMirrors?: string[]; -} - -export const ViewButtonGroup = (props: IProps) => { - return props.url - ? (props.urlMirrors && props.urlMirrors.length > 0) - ? - : - : null; }; +export const ViewButtonGroup = (props: IProps) => + props.url + ? (props.urlMirrors && props.urlMirrors.length > 0) + ? + : + : null; + interface IViewButtonGroupDropdownProps { name: string; url: string; urlMirrors: string[]; -} +}; const ViewButtonGroupDropdown = (props: IViewButtonGroupDropdownProps) => { let firstButtonText: string = "Original"; @@ -41,13 +40,12 @@ const ViewButtonGroupDropdown = (props: IViewButtonGroupDropdownProps) => {
    ; }; -const BtnGroupDropView = () => { - return ; -}; \ No newline at end of file +const BtnGroupDropView = () => + ; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx index 05cd8aca9..fbfdb1501 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx @@ -1,8 +1,8 @@ import * as React from "react"; import { IColumnVisibility, ILanguage, IList, IMaintainer, ISoftware, ITag } from "../../interfaces"; import "../../../../utils/loader.css"; -import ReactTable from "react-table" -import "react-table/react-table.css" +import ReactTable from "react-table"; +import "react-table/react-table.css"; import "./listsTable.css"; import { DetailsButton, Languages, Name, Software, Tags, UpdatedDate } from "./columns"; import { IListDetails } from "../../components/detailsExpander"; @@ -49,34 +49,33 @@ interface ICreateListDtoProps { tags: ITag[]; }; -const mapListDetails = (props: ICreateListDtoProps): IListDetails => { - return { - id: props.list.id, - chatUrl: props.list.chatUrl, - description: props.list.description, - descriptionSourceUrl: props.list.descriptionSourceUrl, - discontinuedDate: props.list.discontinuedDate, - donateUrl: props.list.donateUrl, - emailAddress: props.list.emailAddress, - forumUrl: props.list.forumUrl, - homeUrl: props.list.homeUrl, - issuesUrl: props.list.issuesUrl, - languages: props.list.languageIds - ? props.languages.filter((l: ILanguage) => props.list.languageIds.indexOf(l.id) > -1) - : undefined, - //license:, - maintainers: props.list.maintainerIds - ? props.maintainers.filter((m: IMaintainer) => props.list.maintainerIds.indexOf(m.id) > -1) - : undefined, - name: props.list.name, - policyUrl: props.list.policyUrl, - publishedDate: props.list.publishedDate, - ruleCount: props.list.ruleCount, - submissionUrl: props.list.submissionUrl, - //syntax:, - 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 +const mapListDetails = (props: ICreateListDtoProps): IListDetails => +({ + id: props.list.id, + chatUrl: props.list.chatUrl, + description: props.list.description, + descriptionSourceUrl: props.list.descriptionSourceUrl, + discontinuedDate: props.list.discontinuedDate, + donateUrl: props.list.donateUrl, + emailAddress: props.list.emailAddress, + forumUrl: props.list.forumUrl, + homeUrl: props.list.homeUrl, + issuesUrl: props.list.issuesUrl, + languages: props.list.languageIds + ? props.languages.filter((l: ILanguage) => props.list.languageIds.indexOf(l.id) > -1) + : undefined, + //license:, + maintainers: props.list.maintainerIds + ? props.maintainers.filter((m: IMaintainer) => props.list.maintainerIds.indexOf(m.id) > -1) + : undefined, + name: props.list.name, + policyUrl: props.list.policyUrl, + publishedDate: props.list.publishedDate, + ruleCount: props.list.ruleCount, + submissionUrl: props.list.submissionUrl, + //syntax:, + 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/ClientApp/modules/home/components/listsTable/columns/Languages.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Languages.tsx index a91b5d6e4..a0cd09c8f 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Languages.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Languages.tsx @@ -2,22 +2,21 @@ import * as React from "react"; import { Column, Filter } from "react-table"; import { IColumnVisibility, ILanguage } from "../../../interfaces"; -export const Languages = (columnVisibility: IColumnVisibility[], languages: ILanguage[]) => { - return { - Header: "Languages", - accessor: "languageIds", - filterable: true, - filterMethod: (f: Filter, r: any[]) => filterMethod(f, r), - Filter: ({ onChange, filter }: any) => Filter({ onChange, filter }, languages), - sortable: false, - Cell: (c: any) => Cell(c.value, languages), - style: { whiteSpace: "inherit" }, - width: 95, - headerClassName: "d-none d-md-block", - className: "d-none d-md-block", - show: columnVisibility.filter((c: IColumnVisibility) => c.column === "Languages")[0].visible - } as Column; -}; +export const Languages = (columnVisibility: IColumnVisibility[], languages: ILanguage[]) => +({ + Header: "Languages", + accessor: "languageIds", + filterable: true, + filterMethod: (f: Filter, r: any[]) => filterMethod(f, r), + Filter: ({ onChange, filter }: any) => Filter({ onChange, filter }, languages), + sortable: false, + Cell: (c: any) => Cell(c.value, languages), + style: { whiteSpace: "inherit" }, + width: 95, + headerClassName: "d-none d-md-block", + className: "d-none d-md-block", + show: columnVisibility.filter((c: IColumnVisibility) => c.column === "Languages")[0].visible +} as Column); const filterMethod = (f: Filter, r: any[]): boolean => { const listLanguageIds = r[f.id as any]; diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Software.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Software.tsx index f5a5b55e4..2c8bd174c 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Software.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Software.tsx @@ -3,21 +3,19 @@ import { Column, Filter } from "react-table"; import { IColumnVisibility, ISoftware } from "../../../interfaces"; import { SoftwareIcon } from "../../softwareIcon"; -export const Software = (columnVisibility: IColumnVisibility[], software: ISoftware[]) => { - return { - Header: "Software", - accessor: "syntaxId", - filterable: true, - filterMethod: (f: Filter, r: any[]) => filterMethod(f, r, software), - Filter: ({ filter, onChange }: any) => Filter({ onChange, filter }, software), - sortable: false, - Cell: (c: any) => Cell(c.value, software), - width: 155, - headerClassName: "d-none d-md-block", - className: "d-none d-md-block", - show: columnVisibility.filter((c: IColumnVisibility) => c.column === "Software")[0].visible - } as Column; -}; +export const Software = (columnVisibility: IColumnVisibility[], software: ISoftware[]) => ({ + Header: "Software", + accessor: "syntaxId", + filterable: true, + filterMethod: (f: Filter, r: any[]) => filterMethod(f, r, software), + Filter: ({ filter, onChange }: any) => Filter({ onChange, filter }, software), + sortable: false, + Cell: (c: any) => Cell(c.value, software), + width: 155, + headerClassName: "d-none d-md-block", + className: "d-none d-md-block", + show: columnVisibility.filter((c: IColumnVisibility) => c.column === "Software")[0].visible +} as Column); const filterMethod = (f: Filter, r: any[], software: ISoftware[]): boolean => { const isAny = f.value === "any"; diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Tags.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Tags.tsx index e40f76896..82971662f 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Tags.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Tags.tsx @@ -1,22 +1,21 @@ import * as React from "react"; import { Column, Filter } from "react-table"; -import { TagGroup } from "../../TagGroup" +import { TagGroup } from "../../TagGroup"; import { IColumnVisibility, ITag } from "../../../interfaces"; -export const Tags = (columnVisibility: IColumnVisibility[], tags: ITag[]) => { - return { - Header: "Tags", - accessor: "tagIds", - filterable: true, - filterMethod: (f: Filter, r: any[]) => filterMethod(f, r, tags), - sortMethod: (a: number[], b: number[]) => sortMethod(a, b), - Cell: (c: any) => Cell(c.value, tags), - width: 215, - headerClassName: "d-none d-md-block", - className: "d-none d-md-block", - show: columnVisibility.filter((c: IColumnVisibility) => c.column === "Tags")[0].visible - } as Column; -}; +export const Tags = (columnVisibility: IColumnVisibility[], tags: ITag[]) => +({ + Header: "Tags", + accessor: "tagIds", + filterable: true, + filterMethod: (f: Filter, r: any[]) => filterMethod(f, r, tags), + sortMethod: (a: number[], b: number[]) => sortMethod(a, b), + Cell: (c: any) => Cell(c.value, tags), + width: 215, + headerClassName: "d-none d-md-block", + className: "d-none d-md-block", + show: columnVisibility.filter((c: IColumnVisibility) => c.column === "Tags")[0].visible +} as Column); const filterMethod = (f: Filter, r: any[], tags: ITag[]): boolean => { const listTagIds = r[f.id as any]; diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/UpdatedDate.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/UpdatedDate.tsx index de0663451..edcf35539 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/UpdatedDate.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/UpdatedDate.tsx @@ -3,19 +3,18 @@ import { Column } from "react-table"; import * as moment from "moment"; import { IColumnVisibility } from "../../../interfaces"; -export const UpdatedDate = (columnVisibility: IColumnVisibility[]) => { - return { - Header: "Updated", - accessor: "updatedDate", - sortMethod: (a: string, b: string) => sortMethod(a, b), - Cell: (c: any) => Cell(c.value), - style: { whiteSpace: "inherit" }, - width: 100, - headerClassName: "d-none d-md-block", - className: "d-none d-md-block", - show: columnVisibility.filter((c: IColumnVisibility) => c.column === "Updated Date")[0].visible - } as Column; -}; +export const UpdatedDate = (columnVisibility: IColumnVisibility[]) => +({ + Header: "Updated", + accessor: "updatedDate", + sortMethod: (a: string, b: string) => sortMethod(a, b), + Cell: (c: any) => Cell(c.value), + style: { whiteSpace: "inherit" }, + width: 100, + headerClassName: "d-none d-md-block", + className: "d-none d-md-block", + show: columnVisibility.filter((c: IColumnVisibility) => c.column === "Updated Date")[0].visible +} as Column); const sortMethod = (a: string, b: string) => a && moment(a).isValid() diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx index 26a2232bd..655144f9e 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx @@ -22,21 +22,20 @@ import { interface IProps { id: number; -} - -export const SoftwareIcon = (props: IProps) => { - return icons[props.id] - ? {icons[props.id].imageTitle} - : null; }; +export const SoftwareIcon = (props: IProps) => + icons[props.id] + ? {icons[props.id].imageTitle} + : null; + interface IIcon { image: any; imageTitle: string; -} +}; const icons: { [id: number]: IIcon; } = { 1: { image: img1, imageTitle: "uBlock Origin" }, diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts index 6e0a2d8b3..eae3e33a5 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/index.ts @@ -36,4 +36,4 @@ export { img19, img20, img21 - }; + }; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/interfaces/ILanguage.ts b/src/FilterLists.Web/ClientApp/modules/home/interfaces/ILanguage.ts index a9dbcef93..6f90f94d2 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/interfaces/ILanguage.ts +++ b/src/FilterLists.Web/ClientApp/modules/home/interfaces/ILanguage.ts @@ -3,4 +3,4 @@ filterListIds: number[]; iso6391: string; name: string; -} \ No newline at end of file +}; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/interfaces/IList.ts b/src/FilterLists.Web/ClientApp/modules/home/interfaces/IList.ts index d808f0eb9..a5b5e08dd 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/interfaces/IList.ts +++ b/src/FilterLists.Web/ClientApp/modules/home/interfaces/IList.ts @@ -22,4 +22,4 @@ updatedDate: string; viewUrl: string; viewUrlMirrors: string[]; -} \ No newline at end of file +}; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/interfaces/IMaintainer.ts b/src/FilterLists.Web/ClientApp/modules/home/interfaces/IMaintainer.ts index e954c7fec..421ce83c9 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/interfaces/IMaintainer.ts +++ b/src/FilterLists.Web/ClientApp/modules/home/interfaces/IMaintainer.ts @@ -5,4 +5,4 @@ homeUrl: string; name: string; twitterHandle: string; -} \ No newline at end of file +}; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/interfaces/ISoftware.ts b/src/FilterLists.Web/ClientApp/modules/home/interfaces/ISoftware.ts index e70d0113b..840a05fb0 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/interfaces/ISoftware.ts +++ b/src/FilterLists.Web/ClientApp/modules/home/interfaces/ISoftware.ts @@ -4,4 +4,4 @@ isAbpSubscribable: boolean; name: string; syntaxIds: number[]; -} \ No newline at end of file +}; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/interfaces/ITag.ts b/src/FilterLists.Web/ClientApp/modules/home/interfaces/ITag.ts index b9e0aaf7f..62e526469 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/interfaces/ITag.ts +++ b/src/FilterLists.Web/ClientApp/modules/home/interfaces/ITag.ts @@ -3,4 +3,4 @@ description: string; filterListIds: number[]; name: string; -} \ No newline at end of file +}; \ No newline at end of file diff --git a/src/FilterLists.Web/npm-shrinkwrap.json b/src/FilterLists.Web/npm-shrinkwrap.json index 203f62634..dd9b54ac9 100644 --- a/src/FilterLists.Web/npm-shrinkwrap.json +++ b/src/FilterLists.Web/npm-shrinkwrap.json @@ -85,7 +85,7 @@ "@types/webpack-env": { "version": "1.13.6", "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.13.6.tgz", - "integrity": "sha512-5Th3OsZ4gTRdr9Mho83BQ23cex4sRhOR4XTG+m+cJc0FhtUBK9Vn62hBJ+pnQYnSxoPOsKoAPOx6FcphxBC8ng==", + "integrity": "sha1-Eo0WhafDTTHtFwEPyH1qEsHeaXY=", "dev": true }, "acorn": { @@ -496,7 +496,7 @@ "bootstrap": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.3.tgz", - "integrity": "sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==", + "integrity": "sha1-DrNxryyESOjCEEEdDLgkpkCaEr4=", "dev": true }, "brace-expansion": { @@ -1735,7 +1735,7 @@ "extract-text-webpack-plugin": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz", - "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==", + "integrity": "sha1-XwQ+qgL5dQqSWLeMCm4NwUCPsvc=", "dev": true, "requires": { "async": "^2.4.1", @@ -2892,7 +2892,7 @@ "history": { "version": "4.7.2", "resolved": "https://registry.npmjs.org/history/-/history-4.7.2.tgz", - "integrity": "sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==", + "integrity": "sha1-IrXH8xYzxbgCHH9KipVKwTnujVs=", "dev": true, "requires": { "invariant": "^2.2.1", @@ -2927,7 +2927,7 @@ "hoist-non-react-statics": { "version": "2.5.5", "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", - "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==", + "integrity": "sha1-xZA89AnA39kI84jmGdhrnBF0y0c=", "dev": true }, "hosted-git-info": { @@ -3059,7 +3059,7 @@ "invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "integrity": "sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=", "dev": true, "requires": { "loose-envify": "^1.0.0" @@ -3297,7 +3297,7 @@ "jquery": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==", + "integrity": "sha1-lYzinoHJeQ8xvneS311NlfxX+8o=", "dev": true }, "js-base64": { @@ -3331,7 +3331,7 @@ "json-loader": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz", - "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==", + "integrity": "sha1-3KFKcCNf+C8KyaOr62DTN6NlGF0=", "dev": true }, "json-schema-traverse": { @@ -4829,7 +4829,7 @@ "react-router": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz", - "integrity": "sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==", + "integrity": "sha1-qtpK7xTICcsuaGsFzuR0IjRQbE4=", "dev": true, "requires": { "history": "^4.7.2", @@ -4844,7 +4844,7 @@ "react-router-dom": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.3.1.tgz", - "integrity": "sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==", + "integrity": "sha1-TCYZ/CTE+ofJ/Rj0+0pD/mP71cY=", "dev": true, "requires": { "history": "^4.7.2", @@ -5021,7 +5021,7 @@ "resolve-pathname": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.2.0.tgz", - "integrity": "sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==", + "integrity": "sha1-fpriHtgV/WOrGJre7mTcgx7vqHk=", "dev": true }, "resolve-url": { @@ -6123,7 +6123,7 @@ "value-equal": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.4.0.tgz", - "integrity": "sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==", + "integrity": "sha1-xb3S9U7gk8BIOdcc4uR1imiQq8c=", "dev": true }, "vendors": { @@ -6144,7 +6144,7 @@ "warning": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.1.tgz", - "integrity": "sha512-rAVtTNZw+cQPjvGp1ox0XC5Q2IBFyqoqh+QII4J/oguyu83Bax1apbo2eqB8bHRS+fqYUBagys6lqUoVwKSmXQ==", + "integrity": "sha1-Zs43a3+/6KiHwivfDnNJ1z05d0U=", "dev": true, "requires": { "loose-envify": "^1.0.0"