diff --git a/.eslintrc.json b/.eslintrc.json index ff6ed4c7..7b23c4f8 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -35,23 +35,27 @@ ] } ], - + "import/order": [ "error", { "groups": ["builtin", "external", "internal", "parent", "sibling", "index"] } ], - + "import/no-restricted-paths": [ "error", { "zones": [ // separate ui and logic - { "from": "./components", "target": "./shared" }, - { "from": "./state", "target": "./shared" }, { "from": "./constants", "target": "./shared" }, - { "from": "./pages", "target": "./shared" } + { "from": "./state", "target": "./shared" }, + { "from": "./components", "target": "./shared" }, + { "from": "./features", "target": "./shared" }, + { "from": "./pages", "target": "./shared" }, + { "from": "./types", "target": "./shared" }, + { "from": "./state", "target": "./components" }, + { "from": "./features", "target": "./components" } ] } ] diff --git a/components/App.tsx b/components/App.tsx deleted file mode 100644 index 81016270..00000000 --- a/components/App.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import React from 'react'; -import { Provider } from 'react-redux'; -import { MapProvider } from 'react-map-gl'; - -import { store } from 'state'; - -import { AboutProjectIcons } from 'components/AboutProjectIcons/AboutProjectIcons'; -import { LeftSidebar } from 'components/LeftSidebar/LeftSidebar'; -import { MobileFilters } from 'components/Filters'; -import { RightSidebar } from 'components/RightSidebar/RightSidebar'; -import { MobileCard } from 'components/Card'; -import { useIsDesktop } from 'shared/helpers/isDesktop'; -import { MobileAboutProject } from 'components/AboutProjectModal/MobileAboutProject'; -import { AboutProjectProvider } from 'state/providers/AboutProjectProvider'; -import { AboutProjectModal } from 'components/AboutProjectModal/AboutProjectModal'; -import { MapContextProvider } from './Map/providers/MapProvider'; -import { Footer } from './Footer/Footer'; -import { Copyright } from './Copyright/Copyright'; -import { Map } from './Map/Map'; - -export default function App() { - const isDesktop = useIsDesktop(); - - return ( - - - - - - {isDesktop ? ( - <> - - - - - ) : ( - <> - - - - - )} - - -