refactor(anni): reorganize components

hpi-dhc · Jun 20, 2022 · 7cdaa5a · 7cdaa5a
1 parent d27a7f2
commit 7cdaa5a
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 21 deletions.
diff --git a/...tation-interface/components/BrickForm.tsx → ...interface/components/bricks/BrickForm.tsx b/...tation-interface/components/BrickForm.tsx → ...interface/components/bricks/BrickForm.tsx
@@ -8,15 +8,15 @@ import {
     BrickUsage,
     SupportedLanguage,
     supportedLanguages,
-} from '../common/constants';
+} from '../../common/constants';
 import {
     ITextBrick,
     ITextBrickTranslation,
     translationIsValid,
     translationsToArray,
     translationsToMap,
-} from '../database/models/TextBrick';
-import SelectionPopover from './SelectionPopover';
+} from '../../database/models/TextBrick';
+import SelectionPopover from '../common/SelectionPopover';
 
 type Props = {
     usage: BrickUsage | null;

diff --git a/...face/components/DisplayLanguagePicker.tsx → ...mponents/common/DisplayLanguagePicker.tsx b/...face/components/DisplayLanguagePicker.tsx → ...mponents/common/DisplayLanguagePicker.tsx
@@ -1,5 +1,5 @@
-import { supportedLanguages } from '../common/constants';
-import { useLanguageContext } from '../contexts/language';
+import { supportedLanguages } from '../../common/constants';
+import { useLanguageContext } from '../../contexts/language';
 import SelectionPopover from './SelectionPopover';
 
 const DisplayLanguagePicker = () => {

diff --git a/...ation-interface/components/FilterTabs.tsx → ...nterface/components/common/FilterTabs.tsx b/...ation-interface/components/FilterTabs.tsx → ...nterface/components/common/FilterTabs.tsx
diff --git a/annotation-interface/components/Label.tsx → ...ion-interface/components/common/Label.tsx b/annotation-interface/components/Label.tsx → ...ion-interface/components/common/Label.tsx
diff --git a/annotation-interface/components/Layout.tsx → ...on-interface/components/common/Layout.tsx b/annotation-interface/components/Layout.tsx → ...on-interface/components/common/Layout.tsx
@@ -2,8 +2,8 @@ import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { createElement, PropsWithChildren } from 'react';
 
-import { BrickFilterContextProvider } from '../contexts/brickFilter';
-import { LanguageContextProvider } from '../contexts/language';
+import { BrickFilterContextProvider } from '../../contexts/brickFilter';
+import { LanguageContextProvider } from '../../contexts/language';
 
 export type ContextProvider = ({ children }: PropsWithChildren) => JSX.Element;
 

diff --git a/...tion-interface/components/PageHeading.tsx → ...terface/components/common/PageHeading.tsx b/...tion-interface/components/PageHeading.tsx → ...terface/components/common/PageHeading.tsx
diff --git a/...interface/components/SelectionPopover.tsx → ...ce/components/common/SelectionPopover.tsx b/...interface/components/SelectionPopover.tsx → ...ce/components/common/SelectionPopover.tsx
diff --git a/annotation-interface/contexts/brickFilter.tsx b/annotation-interface/contexts/brickFilter.tsx
@@ -7,7 +7,7 @@ import {
 } from 'react';
 
 import { brickUsages } from '../common/constants';
-import { ContextProvider } from '../components/Layout';
+import { ContextProvider } from '../components/common/Layout';
 
 export const displayCategories = ['All', ...brickUsages] as const;
 export type DisplayCategory = typeof displayCategories[number];

diff --git a/annotation-interface/contexts/language.tsx b/annotation-interface/contexts/language.tsx
@@ -7,7 +7,7 @@ import {
 } from 'react';
 
 import { SupportedLanguage } from '../common/constants';
-import { ContextProvider } from '../components/Layout';
+import { ContextProvider } from '../components/common/Layout';
 
 interface ILanguageContext {
     language: SupportedLanguage;

diff --git a/annotation-interface/pages/_app.tsx b/annotation-interface/pages/_app.tsx
@@ -2,7 +2,7 @@ import '../styles/globals.css';
 import type { AppProps } from 'next/app';
 import Head from 'next/head';
 
-import Layout from '../components/Layout';
+import Layout from '../components/common/Layout';
 
 function AnnotationInterface({ Component, pageProps }: AppProps) {
     return (

diff --git a/annotation-interface/pages/annotations.tsx b/annotation-interface/pages/annotations.tsx
@@ -1,6 +1,6 @@
 import Link from 'next/link';
 
-import PageHeading from '../components/PageHeading';
+import PageHeading from '../components/common/PageHeading';
 
 const Annotations = () => {
     return (

diff --git a/annotation-interface/pages/bricks/[id].tsx b/annotation-interface/pages/bricks/[id].tsx
@@ -6,9 +6,9 @@ import {
 
 import { BrickUsage, brickUsages } from '../../common/constants';
 import { useMountEffect } from '../../common/react-helpers';
-import BrickForm from '../../components/BrickForm';
-import FilterTabs from '../../components/FilterTabs';
-import PageHeading from '../../components/PageHeading';
+import BrickForm from '../../components/bricks/BrickForm';
+import FilterTabs from '../../components/common/FilterTabs';
+import PageHeading from '../../components/common/PageHeading';
 import {
     useBrickFilterContext,
     DisplayCategory,

diff --git a/annotation-interface/pages/bricks/index.tsx b/annotation-interface/pages/bricks/index.tsx
@@ -3,10 +3,10 @@ import { ExclamationIcon, PlusCircleIcon } from '@heroicons/react/solid';
 import { InferGetServerSidePropsType } from 'next';
 import Link from 'next/link';
 
-import DisplayLanguagePicker from '../../components/DisplayLanguagePicker';
-import FilterTabs from '../../components/FilterTabs';
-import Label from '../../components/Label';
-import PageHeading from '../../components/PageHeading';
+import DisplayLanguagePicker from '../../components/common/DisplayLanguagePicker';
+import FilterTabs from '../../components/common/FilterTabs';
+import Label from '../../components/common/Label';
+import PageHeading from '../../components/common/PageHeading';
 import {
     displayCategories,
     useBrickFilterContext,

diff --git a/annotation-interface/pages/bricks/new.tsx b/annotation-interface/pages/bricks/new.tsx
@@ -1,8 +1,8 @@
 import { BrickUsage, brickUsages } from '../../common/constants';
 import { useMountEffect } from '../../common/react-helpers';
-import BrickForm from '../../components/BrickForm';
-import FilterTabs from '../../components/FilterTabs';
-import PageHeading from '../../components/PageHeading';
+import BrickForm from '../../components/bricks/BrickForm';
+import FilterTabs from '../../components/common/FilterTabs';
+import PageHeading from '../../components/common/PageHeading';
 import {
     DisplayCategory,
     displayCategoryForIndex,