From 55eabaaa64226cc7ede7d0e4d3f7d11a1d506039 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 16 Sep 2018 16:17:57 -0500 Subject: [PATCH] organizing react proj --- .../ClientApp/modules/home/Home.tsx | 4 +-- .../ClientApp/modules/home/HomeContainer.tsx | 4 +-- .../detailsExpander/infoCard/InfoCard.tsx | 2 +- .../home/components/listsTable/ListsTable.tsx | 6 ++-- .../SoftwareIcon.tsx | 28 +++++++++--------- .../softwareIcon/imgs}/01-uBlock-Origin.svg | 0 .../softwareIcon/imgs}/02-Adblock-Plus.svg | 0 .../softwareIcon/imgs}/03-AdGuard.png | Bin .../softwareIcon/imgs}/04-DNS66.png | Bin .../softwareIcon/imgs}/05-Nano-Adblocker.png | Bin .../softwareIcon/imgs}/06-AdBlock.png | Bin .../softwareIcon/imgs}/07-AdAway.png | Bin .../imgs}/08-Personal-Blocklist.png | Bin .../softwareIcon/imgs}/10-Redirector.png | Bin .../softwareIcon/imgs}/13-MinerBlock.svg | 0 .../softwareIcon/imgs}/14-Pi-hole.png | Bin .../softwareIcon/imgs}/15-uBlock.svg | 0 .../imgs}/16-Internet-Explorer-TPL.png | Bin .../softwareIcon/imgs}/18-FireHOL.png | Bin .../components/softwareIcon}/imgs/imgs.d.ts | 0 .../home/components/softwareIcon/index.ts | 5 ++++ .../home/{ => interfaces}/ILanguageDto.ts | 0 .../modules/home/{ => interfaces}/IListDto.ts | 0 .../home/{ => interfaces}/ISoftwareDto.ts | 0 .../modules/home/interfaces/index.ts | 9 ++++++ 25 files changed, 33 insertions(+), 25 deletions(-) rename src/FilterLists.Web/ClientApp/modules/home/components/{listsTable => softwareIcon}/SoftwareIcon.tsx (56%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/01-uBlock-Origin.svg (100%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/02-Adblock-Plus.svg (100%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/03-AdGuard.png (100%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/04-DNS66.png (100%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/05-Nano-Adblocker.png (100%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/06-AdBlock.png (100%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/07-AdAway.png (100%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/08-Personal-Blocklist.png (100%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/10-Redirector.png (100%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/13-MinerBlock.svg (100%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/14-Pi-hole.png (100%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/15-uBlock.svg (100%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/16-Internet-Explorer-TPL.png (100%) rename src/FilterLists.Web/ClientApp/{imgs/software => modules/home/components/softwareIcon/imgs}/18-FireHOL.png (100%) rename src/FilterLists.Web/ClientApp/{ => modules/home/components/softwareIcon}/imgs/imgs.d.ts (100%) create mode 100644 src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/index.ts rename src/FilterLists.Web/ClientApp/modules/home/{ => interfaces}/ILanguageDto.ts (100%) rename src/FilterLists.Web/ClientApp/modules/home/{ => interfaces}/IListDto.ts (100%) rename src/FilterLists.Web/ClientApp/modules/home/{ => interfaces}/ISoftwareDto.ts (100%) create mode 100644 src/FilterLists.Web/ClientApp/modules/home/interfaces/index.ts diff --git a/src/FilterLists.Web/ClientApp/modules/home/Home.tsx b/src/FilterLists.Web/ClientApp/modules/home/Home.tsx index 36392701c..a3e0416a3 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/Home.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/Home.tsx @@ -1,7 +1,5 @@ import * as React from "react"; -import { IListDto } from "./IListDto"; -import { ISoftwareDto } from "./ISoftwareDto"; -import { ILanguageDto } from "./ILanguageDto"; +import { IListDto, ISoftwareDto, ILanguageDto } from "./interfaces"; import { Tagline, ListsTable, IColumnVisibility } from "./components"; const columnVisibilityDefaults = [ diff --git a/src/FilterLists.Web/ClientApp/modules/home/HomeContainer.tsx b/src/FilterLists.Web/ClientApp/modules/home/HomeContainer.tsx index 253b78b40..d9ad6a25b 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/HomeContainer.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/HomeContainer.tsx @@ -1,8 +1,6 @@ import * as React from "react"; import "isomorphic-fetch"; -import { IListDto } from "./IListDto"; -import { ISoftwareDto } from "./ISoftwareDto"; -import { ILanguageDto } from "./ILanguageDto"; +import { IListDto, ISoftwareDto, ILanguageDto } from "./interfaces"; import "../../utils/loader.css"; import { Home } from "./Home"; 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 90f2ca226..e7fc7967e 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 @@ -6,7 +6,7 @@ import { Languages } from "./Languages"; import { License } from "./License"; import { PublishedDate } from "./PublishedDate"; import { RuleCount } from "./RuleCount"; -import { SoftwareIcon } from "../../listsTable/SoftwareIcon"; +import { SoftwareIcon } from "../../softwareIcon"; import { Syntax } from "./Syntax"; import { Tags } from "./Tags"; import { UpdatedDate } from "./UpdatedDate"; 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 0486dec22..148903525 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx @@ -1,12 +1,10 @@ import * as React from "react"; -import { IListDto } from "../../IListDto"; -import { ISoftwareDto } from "../../ISoftwareDto"; -import { ILanguageDto } from "../../ILanguageDto"; +import { IListDto, ISoftwareDto, ILanguageDto } from "../../interfaces"; import ReactTable from "react-table" import "react-table/react-table.css" import "./listsTable.css"; import * as moment from "moment"; -import { SoftwareIcon } from "./SoftwareIcon"; +import { SoftwareIcon } from "../softwareIcon"; import { getContrast } from "../../../../utils/GetContrast"; import { DetailsExpander } from "../../components"; diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/SoftwareIcon.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx similarity index 56% rename from src/FilterLists.Web/ClientApp/modules/home/components/listsTable/SoftwareIcon.tsx rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx index f6149d5f1..aefa88b5f 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/SoftwareIcon.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx @@ -1,18 +1,18 @@ import * as React from "react"; -import img1 from "../../../../imgs/software/01-uBlock-Origin.svg"; -import img2 from "../../../../imgs/software/02-Adblock-Plus.svg"; -import img3 from "../../../../imgs/software/03-AdGuard.png"; -import img4 from "../../../../imgs/software/04-DNS66.png"; -import img5 from "../../../../imgs/software/05-Nano-Adblocker.png"; -import img6 from "../../../../imgs/software/06-AdBlock.png"; -import img7 from "../../../../imgs/software/07-AdAway.png"; -import img8 from "../../../../imgs/software/08-Personal-Blocklist.png"; -import img10 from "../../../../imgs/software/10-Redirector.png"; -import img13 from "../../../../imgs/software/13-MinerBlock.svg"; -import img14 from "../../../../imgs/software/14-Pi-hole.png"; -import img15 from "../../../../imgs/software/15-uBlock.svg"; -import img16 from "../../../../imgs/software/16-Internet-Explorer-TPL.png"; -import img18 from "../../../../imgs/software/18-FireHOL.png"; +import img1 from "./imgs/01-uBlock-Origin.svg"; +import img2 from "./imgs/02-Adblock-Plus.svg"; +import img3 from "./imgs/03-AdGuard.png"; +import img4 from "./imgs/04-DNS66.png"; +import img5 from "./imgs/05-Nano-Adblocker.png"; +import img6 from "./imgs/06-AdBlock.png"; +import img7 from "./imgs/07-AdAway.png"; +import img8 from "./imgs/08-Personal-Blocklist.png"; +import img10 from "./imgs/10-Redirector.png"; +import img13 from "./imgs/13-MinerBlock.svg"; +import img14 from "./imgs/14-Pi-hole.png"; +import img15 from "./imgs/15-uBlock.svg"; +import img16 from "./imgs/16-Internet-Explorer-TPL.png"; +import img18 from "./imgs/18-FireHOL.png"; interface IProps { id: number; diff --git a/src/FilterLists.Web/ClientApp/imgs/software/01-uBlock-Origin.svg b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/01-uBlock-Origin.svg similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/01-uBlock-Origin.svg rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/01-uBlock-Origin.svg diff --git a/src/FilterLists.Web/ClientApp/imgs/software/02-Adblock-Plus.svg b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/02-Adblock-Plus.svg similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/02-Adblock-Plus.svg rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/02-Adblock-Plus.svg diff --git a/src/FilterLists.Web/ClientApp/imgs/software/03-AdGuard.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/03-AdGuard.png similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/03-AdGuard.png rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/03-AdGuard.png diff --git a/src/FilterLists.Web/ClientApp/imgs/software/04-DNS66.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/04-DNS66.png similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/04-DNS66.png rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/04-DNS66.png diff --git a/src/FilterLists.Web/ClientApp/imgs/software/05-Nano-Adblocker.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/05-Nano-Adblocker.png similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/05-Nano-Adblocker.png rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/05-Nano-Adblocker.png diff --git a/src/FilterLists.Web/ClientApp/imgs/software/06-AdBlock.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/06-AdBlock.png similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/06-AdBlock.png rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/06-AdBlock.png diff --git a/src/FilterLists.Web/ClientApp/imgs/software/07-AdAway.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/07-AdAway.png similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/07-AdAway.png rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/07-AdAway.png diff --git a/src/FilterLists.Web/ClientApp/imgs/software/08-Personal-Blocklist.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/08-Personal-Blocklist.png similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/08-Personal-Blocklist.png rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/08-Personal-Blocklist.png diff --git a/src/FilterLists.Web/ClientApp/imgs/software/10-Redirector.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/10-Redirector.png similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/10-Redirector.png rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/10-Redirector.png diff --git a/src/FilterLists.Web/ClientApp/imgs/software/13-MinerBlock.svg b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/13-MinerBlock.svg similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/13-MinerBlock.svg rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/13-MinerBlock.svg diff --git a/src/FilterLists.Web/ClientApp/imgs/software/14-Pi-hole.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/14-Pi-hole.png similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/14-Pi-hole.png rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/14-Pi-hole.png diff --git a/src/FilterLists.Web/ClientApp/imgs/software/15-uBlock.svg b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/15-uBlock.svg similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/15-uBlock.svg rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/15-uBlock.svg diff --git a/src/FilterLists.Web/ClientApp/imgs/software/16-Internet-Explorer-TPL.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/16-Internet-Explorer-TPL.png similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/16-Internet-Explorer-TPL.png rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/16-Internet-Explorer-TPL.png diff --git a/src/FilterLists.Web/ClientApp/imgs/software/18-FireHOL.png b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/18-FireHOL.png similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/software/18-FireHOL.png rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/18-FireHOL.png diff --git a/src/FilterLists.Web/ClientApp/imgs/imgs.d.ts b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/imgs.d.ts similarity index 100% rename from src/FilterLists.Web/ClientApp/imgs/imgs.d.ts rename to src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/imgs/imgs.d.ts diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/index.ts b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/index.ts new file mode 100644 index 000000000..2dca6d6c1 --- /dev/null +++ b/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/index.ts @@ -0,0 +1,5 @@ +import { SoftwareIcon } from "./SoftwareIcon"; + +export { + SoftwareIcon + }; \ No newline at end of file diff --git a/src/FilterLists.Web/ClientApp/modules/home/ILanguageDto.ts b/src/FilterLists.Web/ClientApp/modules/home/interfaces/ILanguageDto.ts similarity index 100% rename from src/FilterLists.Web/ClientApp/modules/home/ILanguageDto.ts rename to src/FilterLists.Web/ClientApp/modules/home/interfaces/ILanguageDto.ts diff --git a/src/FilterLists.Web/ClientApp/modules/home/IListDto.ts b/src/FilterLists.Web/ClientApp/modules/home/interfaces/IListDto.ts similarity index 100% rename from src/FilterLists.Web/ClientApp/modules/home/IListDto.ts rename to src/FilterLists.Web/ClientApp/modules/home/interfaces/IListDto.ts diff --git a/src/FilterLists.Web/ClientApp/modules/home/ISoftwareDto.ts b/src/FilterLists.Web/ClientApp/modules/home/interfaces/ISoftwareDto.ts similarity index 100% rename from src/FilterLists.Web/ClientApp/modules/home/ISoftwareDto.ts rename to src/FilterLists.Web/ClientApp/modules/home/interfaces/ISoftwareDto.ts diff --git a/src/FilterLists.Web/ClientApp/modules/home/interfaces/index.ts b/src/FilterLists.Web/ClientApp/modules/home/interfaces/index.ts new file mode 100644 index 000000000..2ece65482 --- /dev/null +++ b/src/FilterLists.Web/ClientApp/modules/home/interfaces/index.ts @@ -0,0 +1,9 @@ +import { ILanguageDto } from "./ILanguageDto"; +import { IListDto } from "./IListDto"; +import { ISoftwareDto } from "./ISoftwareDto"; + +export { + ILanguageDto, + IListDto, + ISoftwareDto + }; \ No newline at end of file