Refactor according to conventions

presleyp · presleyp · commit acc92f8fcb5c · 2022-04-08T22:04:05.000Z
diff --git a/site/src/components/AdminDropdown/AdminDropdown.stories.tsx b/site/src/components/AdminDropdown/AdminDropdown.stories.tsx
@@ -1,10 +1,10 @@
 import Box from "@material-ui/core/Box"
 import { Story } from "@storybook/react"
 import React from "react"
-import { AdminDropdown } from "."
+import { AdminDropdown } from "./AdminDropdown"
 
 export default {
-  title: "Navbar/AdminDropdown",
+  title: "components/AdminDropdown",
   component: AdminDropdown,
 }
 
diff --git a/site/src/components/AdminDropdown/AdminDropdown.test.tsx b/site/src/components/AdminDropdown/AdminDropdown.test.tsx
@@ -1,7 +1,7 @@
 import { screen } from "@testing-library/react"
 import React from "react"
-import { AdminDropdown, Language } from "."
-import { history, render } from "../../../test_helpers"
+import { history, render } from "../../test_helpers"
+import { AdminDropdown, Language } from "./AdminDropdown"
 
 const renderAndClick = async () => {
   render(<AdminDropdown />)
diff --git a/site/src/components/AdminDropdown/AdminDropdown.tsx b/site/src/components/AdminDropdown/AdminDropdown.tsx
@@ -3,12 +3,12 @@ import ListItemText from "@material-ui/core/ListItemText"
 import { fade, makeStyles, Theme } from "@material-ui/core/styles"
 import AdminIcon from "@material-ui/icons/SettingsOutlined"
 import React, { useState } from "react"
-import { navHeight } from "../../../theme/constants"
-import { BorderedMenu } from "../../BorderedMenu"
-import { BorderedMenuRow } from "../../BorderedMenu/BorderedMenuRow"
-import { BuildingIcon } from "../../Icons/BuildingIcon"
-import { UsersOutlinedIcon } from "../../Icons/UsersOutlinedIcon"
-import { CloseDropdown, OpenDropdown } from "../Arrows"
+import { navHeight } from "../../theme/constants"
+import { BorderedMenu } from "../BorderedMenu/BorderedMenu"
+import { BorderedMenuRow } from "../BorderedMenuRow/BorderedMenuRow"
+import { CloseDropdown, OpenDropdown } from "../DropdownArrows/DropdownArrows"
+import { BuildingIcon } from "../Icons/BuildingIcon"
+import { UsersOutlinedIcon } from "../Icons/UsersOutlinedIcon"
 
 export const Language = {
   menuTitle: "Admin",
diff --git a/site/src/components/BorderedMenu/BorderedMenu.stories.tsx b/site/src/components/BorderedMenu/BorderedMenu.stories.tsx
@@ -1,12 +1,12 @@
 import { Story } from "@storybook/react"
 import React from "react"
-import { BorderedMenu, BorderedMenuProps } from "."
+import { BorderedMenuRow } from "../BorderedMenuRow/BorderedMenuRow"
 import { BuildingIcon } from "../Icons/BuildingIcon"
 import { UsersOutlinedIcon } from "../Icons/UsersOutlinedIcon"
-import { BorderedMenuRow } from "./BorderedMenuRow"
+import { BorderedMenu, BorderedMenuProps } from "./BorderedMenu"
 
 export default {
-  title: "Navbar/BorderedMenu",
+  title: "components/BorderedMenu",
   component: BorderedMenu,
 }
 
diff --git a/site/src/components/BorderedMenu/BorderedMenu.tsx b/site/src/components/BorderedMenu/BorderedMenu.tsx
diff --git a/site/src/components/BorderedMenuRow/BorderedMenuRow.tsx b/site/src/components/BorderedMenuRow/BorderedMenuRow.tsx
@@ -5,7 +5,7 @@ import CheckIcon from "@material-ui/icons/Check"
 import React from "react"
 import { NavLink } from "react-router-dom"
 import { ellipsizeText } from "../../util/ellipsizeText"
-import { Typography } from "../Typography"
+import { Typography } from "../Typography/Typography"
 
 type BorderedMenuRowVariant = "narrow" | "wide"
 
diff --git a/site/src/components/DropdownArrows/DropdownArrows.tsx b/site/src/components/DropdownArrows/DropdownArrows.tsx
diff --git a/site/src/components/Navbar/NavbarView/NavbarView.stories.tsx b/site/src/components/Navbar/NavbarView/NavbarView.stories.tsx
@@ -3,7 +3,7 @@ import React from "react"
 import { NavbarView, NavbarViewProps } from "."
 
 export default {
-  title: "Navbar/NavbarView",
+  title: "components/NavbarView",
   component: NavbarView,
   argTypes: {
     onSignOut: { action: "Sign Out" },
diff --git a/site/src/components/Navbar/NavbarView/index.tsx b/site/src/components/Navbar/NavbarView/index.tsx
@@ -5,8 +5,8 @@ import React from "react"
 import { NavLink } from "react-router-dom"
 import { UserResponse } from "../../../api/types"
 import { navHeight } from "../../../theme/constants"
+import { AdminDropdown } from "../../AdminDropdown/AdminDropdown"
 import { Logo } from "../../Icons"
-import { AdminDropdown } from "../AdminDropdown"
 import { UserDropdown } from "../UserDropdown"
 
 export interface NavbarViewProps {
diff --git a/site/src/components/Navbar/UserDropdown/index.tsx b/site/src/components/Navbar/UserDropdown/index.tsx
@@ -8,12 +8,12 @@ import AccountIcon from "@material-ui/icons/AccountCircleOutlined"
 import React, { useState } from "react"
 import { Link } from "react-router-dom"
 import { UserResponse } from "../../../api/types"
-import { BorderedMenu } from "../../BorderedMenu"
+import { BorderedMenu } from "../../BorderedMenu/BorderedMenu"
+import { CloseDropdown, OpenDropdown } from "../../DropdownArrows/DropdownArrows"
 import { LogoutIcon } from "../../Icons"
 import { DocsIcon } from "../../Icons/DocsIcon"
 import { UserAvatar } from "../../User"
 import { UserProfileCard } from "../../User/UserProfileCard"
-import { CloseDropdown, OpenDropdown } from "../Arrows"
 
 export const Language = {
   accountLabel: "Account",
diff --git a/site/src/components/Typography/Typography.stories.tsx b/site/src/components/Typography/Typography.stories.tsx
@@ -1,9 +1,9 @@
 import { Story } from "@storybook/react"
 import React from "react"
-import { Typography, TypographyProps } from "."
+import { Typography, TypographyProps } from "./Typography"
 
 export default {
-  title: "Text/Typography",
+  title: "components/Typography",
   component: Typography,
 }
 
diff --git a/site/src/components/Typography/Typography.tsx b/site/src/components/Typography/Typography.tsx
