From db05258dc9c2c4b99bfa5fb00cf302ae4f68751f Mon Sep 17 00:00:00 2001 From: Rajtosh Ranjan Date: Tue, 30 Apr 2024 14:12:02 +0530 Subject: [PATCH] Update folder structure --- src/app.tsx | 5 +++-- src/components/{ui => }/button/button.tsx | 0 src/components/{ui => }/button/index.ts | 0 src/components/{ui => }/button/type.ts | 0 src/components/{ui => }/icon/constants.ts | 0 src/components/{ui => }/icon/icon.tsx | 2 +- src/components/{ui => }/icon/index.ts | 0 src/components/index.ts | 5 +++-- src/components/{ui => }/modal/index.ts | 0 src/components/{ui => }/modal/modal.tsx | 2 +- src/components/{ui => }/modal/type.ts | 2 +- src/components/ui/index.ts | 3 --- src/{components => }/header/header.tsx | 2 +- src/{components => }/header/index.ts | 0 src/{components => }/header/search.tsx | 4 ++-- src/{components => }/header/types.ts | 0 src/{components => layer-panel}/draw/constants.ts | 2 +- src/{components => layer-panel}/draw/draw.tsx | 2 +- src/{components => layer-panel}/draw/helpers.ts | 0 src/{components => layer-panel}/draw/index.ts | 0 src/layer-panel/index.ts | 1 + .../sidenav.tsx => layer-panel/layer-panel.tsx} | 10 +++++----- src/{components => layer-panel}/layer.tsx | 2 +- 23 files changed, 21 insertions(+), 21 deletions(-) rename src/components/{ui => }/button/button.tsx (100%) rename src/components/{ui => }/button/index.ts (100%) rename src/components/{ui => }/button/type.ts (100%) rename src/components/{ui => }/icon/constants.ts (100%) rename src/components/{ui => }/icon/icon.tsx (90%) rename src/components/{ui => }/icon/index.ts (100%) rename src/components/{ui => }/modal/index.ts (100%) rename src/components/{ui => }/modal/modal.tsx (97%) rename src/components/{ui => }/modal/type.ts (87%) delete mode 100644 src/components/ui/index.ts rename src/{components => }/header/header.tsx (94%) rename src/{components => }/header/index.ts (100%) rename src/{components => }/header/search.tsx (98%) rename src/{components => }/header/types.ts (100%) rename src/{components => layer-panel}/draw/constants.ts (90%) rename src/{components => layer-panel}/draw/draw.tsx (96%) rename src/{components => layer-panel}/draw/helpers.ts (100%) rename src/{components => layer-panel}/draw/index.ts (100%) create mode 100644 src/layer-panel/index.ts rename src/{components/sidenav.tsx => layer-panel/layer-panel.tsx} (89%) rename src/{components => layer-panel}/layer.tsx (97%) diff --git a/src/app.tsx b/src/app.tsx index 960c838..f62ecd3 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -19,7 +19,8 @@ import { import { useEffect, useRef, useState } from "react"; import { GlobalContext } from "./contexts"; -import { Header, SideNav } from "./components"; +import { LayerPanel } from "./layer-panel"; +import { Header } from "./header"; const baseStyleSpec: StyleSpecification = { version: 8, @@ -116,7 +117,7 @@ function App() { return (
- + {/* Map Container */}
& { diff --git a/src/components/ui/icon/index.ts b/src/components/icon/index.ts similarity index 100% rename from src/components/ui/icon/index.ts rename to src/components/icon/index.ts diff --git a/src/components/index.ts b/src/components/index.ts index 38dbd98..fac545c 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -1,2 +1,3 @@ -export * from "./header"; -export * from "./sidenav"; +export * from "./modal"; +export * from "./button"; +export * from "./icon"; diff --git a/src/components/ui/modal/index.ts b/src/components/modal/index.ts similarity index 100% rename from src/components/ui/modal/index.ts rename to src/components/modal/index.ts diff --git a/src/components/ui/modal/modal.tsx b/src/components/modal/modal.tsx similarity index 97% rename from src/components/ui/modal/modal.tsx rename to src/components/modal/modal.tsx index df5443a..cf1b1b4 100644 --- a/src/components/ui/modal/modal.tsx +++ b/src/components/modal/modal.tsx @@ -3,7 +3,7 @@ import React from "react"; import classNames from "classnames"; import { Icon, IconIdentifier } from "../icon"; -import { ModalBaseProps, ModalComponents, ModalProps } from "./type"; +import { ModalComponents, ModalProps } from "./type"; export const Modal: React.FC & ModalComponents = ({ title, diff --git a/src/components/ui/modal/type.ts b/src/components/modal/type.ts similarity index 87% rename from src/components/ui/modal/type.ts rename to src/components/modal/type.ts index a240d1b..433811d 100644 --- a/src/components/ui/modal/type.ts +++ b/src/components/modal/type.ts @@ -1,5 +1,5 @@ import { HTMLProps } from "react"; -import { ForwardRef } from "../../../utils"; +import { ForwardRef } from "../../utils"; export type ModalBaseProps = HTMLProps; diff --git a/src/components/ui/index.ts b/src/components/ui/index.ts deleted file mode 100644 index fac545c..0000000 --- a/src/components/ui/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from "./modal"; -export * from "./button"; -export * from "./icon"; diff --git a/src/components/header/header.tsx b/src/header/header.tsx similarity index 94% rename from src/components/header/header.tsx rename to src/header/header.tsx index 976ba5a..0eb0760 100644 --- a/src/components/header/header.tsx +++ b/src/header/header.tsx @@ -1,4 +1,4 @@ -import { Icon, IconIdentifier } from "../ui"; +import { Icon, IconIdentifier } from "../components"; import { Search } from "./search"; export const Header = () => { diff --git a/src/components/header/index.ts b/src/header/index.ts similarity index 100% rename from src/components/header/index.ts rename to src/header/index.ts diff --git a/src/components/header/search.tsx b/src/header/search.tsx similarity index 98% rename from src/components/header/search.tsx rename to src/header/search.tsx index 263c583..3a0ab68 100644 --- a/src/components/header/search.tsx +++ b/src/header/search.tsx @@ -1,6 +1,6 @@ import classNames from "classnames"; import React, { ChangeEvent, useContext, useEffect, useState } from "react"; -import { GlobalContext } from "../../contexts"; +import { GlobalContext } from "../contexts"; import { FeatureCollectionResponse, FeatureResponse, @@ -8,7 +8,7 @@ import { } from "./types"; import { useDebounce } from "@uidotdev/usehooks"; -import { Icon, IconIdentifier } from "../ui"; +import { Icon, IconIdentifier } from "../components"; type SearchProps = React.HTMLProps; diff --git a/src/components/header/types.ts b/src/header/types.ts similarity index 100% rename from src/components/header/types.ts rename to src/header/types.ts diff --git a/src/components/draw/constants.ts b/src/layer-panel/draw/constants.ts similarity index 90% rename from src/components/draw/constants.ts rename to src/layer-panel/draw/constants.ts index 5c7e1d9..3bb80c4 100644 --- a/src/components/draw/constants.ts +++ b/src/layer-panel/draw/constants.ts @@ -1,4 +1,4 @@ -import { IconIdentifier } from "../ui"; +import { IconIdentifier } from "../../components"; export const MODES = { select: { diff --git a/src/components/draw/draw.tsx b/src/layer-panel/draw/draw.tsx similarity index 96% rename from src/components/draw/draw.tsx rename to src/layer-panel/draw/draw.tsx index a60d3bf..62b2c57 100644 --- a/src/components/draw/draw.tsx +++ b/src/layer-panel/draw/draw.tsx @@ -4,7 +4,7 @@ import { TerraDraw, TerraDrawMapLibreGLAdapter } from "terra-draw"; import { GlobalContext } from "../../contexts"; import classNames from "classnames"; -import { Button, IconIdentifier } from "../ui"; +import { Button, IconIdentifier } from "../../components"; import { MODES } from "./constants"; import { setupModes } from "./helpers"; diff --git a/src/components/draw/helpers.ts b/src/layer-panel/draw/helpers.ts similarity index 100% rename from src/components/draw/helpers.ts rename to src/layer-panel/draw/helpers.ts diff --git a/src/components/draw/index.ts b/src/layer-panel/draw/index.ts similarity index 100% rename from src/components/draw/index.ts rename to src/layer-panel/draw/index.ts diff --git a/src/layer-panel/index.ts b/src/layer-panel/index.ts new file mode 100644 index 0000000..047c75c --- /dev/null +++ b/src/layer-panel/index.ts @@ -0,0 +1 @@ +export * from "./layer-panel"; diff --git a/src/components/sidenav.tsx b/src/layer-panel/layer-panel.tsx similarity index 89% rename from src/components/sidenav.tsx rename to src/layer-panel/layer-panel.tsx index bdc7b8e..c7b24ca 100644 --- a/src/components/sidenav.tsx +++ b/src/layer-panel/layer-panel.tsx @@ -2,12 +2,12 @@ import { useLocalStorage } from "@uidotdev/usehooks"; import classNames from "classnames"; import { Draw } from "./draw"; import { Layer } from "./layer"; -import { Icon, IconIdentifier } from "./ui"; +import { Icon, IconIdentifier } from "../components"; -export const SideNav = () => { +export const LayerPanel = () => { // States. const [show, setShow] = useLocalStorage( - "isSideNavOpen", + "isLayerPanelOpen", window.innerWidth >= 1024 ); @@ -21,7 +21,7 @@ export const SideNav = () => { ); // Handlers. - const onClickToggleSideNav = () => { + const onClickToggleLayerPanel = () => { setShow((prev) => !prev); }; @@ -30,7 +30,7 @@ export const SideNav = () => { {/* Toggle Button */}