Remove component dir

src/components/DownloadLink.jsx

@@ -1,67 +0,0 @@
-import React from "react";
-import { useTranslation } from "react-i18next";
-
-const generateDownloadURI = (data) => {
-  return (
-    "data:text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(data))
-  );
-};
-
-export const DownloadLink = ({ getData = () => {} }) => {
-  const { t } = useTranslation();
-
-  const [downloadURI, setDownloadURI] = React.useState("");
-  const [date, setDate] = React.useState(Date.now());
-  const [genOnce, setGenOnce] = React.useState(false);
-
-  const updateSaveLink = React.useCallback(async () => {
-    const data = await getData();
-    if (data.items.length) {
-      setDownloadURI(generateDownloadURI(data));
-      setDate(Date.now());
-      setGenOnce(true);
-    }
-  }, [getData]);
-
-  React.useEffect(() => {
-    let mounted = true;
-
-    const cancel = setInterval(() => {
-      if (!mounted) return;
-      updateSaveLink();
-    }, 2000);
-
-    updateSaveLink();
-
-    return () => {
-      mounted = false;
-      setGenOnce(false);
-      clearInterval(cancel);
-    };
-  }, [updateSaveLink]);
-
-  return (
-    <>
-      {genOnce && (
-        <a
-          className="button success icon"
-          href={downloadURI}
-          download={`airboardgame_${date}.json`}
-        >
-          {t("Export")}
-          <img
-            src={"https://icongr.am/entypo/download.svg?size=20&color=f9fbfa"}
-            alt="icon"
-          />
-        </a>
-      )}
-      {!genOnce && (
-        <button className="button" disabled>
-          {t("Generating export")}...
-        </button>
-      )}
-    </>
-  );
-};
-
-export default DownloadLink;

src/gameComponents/Image.jsx

@@ -1,7 +1,7 @@
 import React, { memo } from "react";
 import { useUsers } from "react-sync-board";
 import styled from "styled-components";
-import { media2Url } from "../components/mediaLibrary";
+import { media2Url } from "../mediaLibrary";
 
 import eye from "../images/eye.svg";
 

src/gameComponents/ItemForm.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../components/ui/formUtils/Label";
-import Hint from "../components/ui/formUtils/Hint";
-import Slider from "../components/ui/Slider";
+import Label from "../ui/formUtils/Label";
+import Hint from "../ui/formUtils/Hint";
+import Slider from "../ui/Slider";
 
 import ActionsField from "./forms/ActionsField";
 

src/gameComponents/forms/ActionsField.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import Label from "../../components/ui/formUtils/Label";
+import Label from "../../ui/formUtils/Label";
 
 import { Field } from "react-final-form";
 

src/gameComponents/forms/CheckerBoardFormFields.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../../components/ui/formUtils/Label";
+import Label from "../../ui/formUtils/Label";
 
-import ColorPicker from "../../components/ui/formUtils/ColorPicker";
+import ColorPicker from "../../ui/formUtils/ColorPicker";
 
 const Form = ({ initialValues }) => {
   const { t } = useTranslation();

src/gameComponents/forms/CounterFormFields.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../../components/ui/formUtils/Label";
+import Label from "../../ui/formUtils/Label";
 
-import ColorPicker from "../../components/ui/formUtils/ColorPicker";
+import ColorPicker from "../../ui/formUtils/ColorPicker";
 
 const Form = ({ initialValues }) => {
   const { t } = useTranslation();

src/gameComponents/forms/CubeFormFields.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../../components/ui/formUtils/Label";
+import Label from "../../ui/formUtils/Label";
 
-import ColorPicker from "../../components/ui/formUtils/ColorPicker";
+import ColorPicker from "../../ui/formUtils/ColorPicker";
 
 const Form = ({ initialValues }) => {
   const { t } = useTranslation();

src/gameComponents/forms/CylinderFormFields.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../../components/ui/formUtils/Label";
+import Label from "../../ui/formUtils/Label";
 
-import ColorPicker from "../../components/ui/formUtils/ColorPicker";
+import ColorPicker from "../../ui/formUtils/ColorPicker";
 
 const Form = ({ initialValues }) => {
   const { t } = useTranslation();

src/gameComponents/forms/DiceFormFields.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../../components/ui/formUtils/Label";
+import Label from "../../ui/formUtils/Label";
 
-import ColorPicker from "../../components/ui/formUtils/ColorPicker";
+import ColorPicker from "../../ui/formUtils/ColorPicker";
 
 const Form = ({ initialValues }) => {
   const { t } = useTranslation();

src/gameComponents/forms/ImageFormFields.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import { Field } from "react-final-form";
 import { useTranslation } from "react-i18next";
 
-import Label from "../../components/ui/formUtils/Label";
+import Label from "../../ui/formUtils/Label";
 
-import { ImageField } from "../../components/mediaLibrary";
+import { ImageField } from "../../mediaLibrary";
 
 const ImageForm = ({ initialValues }) => {
   const { t } = useTranslation();

src/gameComponents/forms/JewelFormFields.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../../components/ui/formUtils/Label";
+import Label from "../../ui/formUtils/Label";
 
-import ColorPicker from "../../components/ui/formUtils/ColorPicker";
+import ColorPicker from "../../ui/formUtils/ColorPicker";
 
 const Form = ({ initialValues }) => {
   const { t } = useTranslation();

src/gameComponents/forms/MeepleFormFields.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../../components/ui/formUtils/Label";
+import Label from "../../ui/formUtils/Label";
 
-import ColorPicker from "../../components/ui/formUtils/ColorPicker";
+import ColorPicker from "../../ui/formUtils/ColorPicker";
 
 const Form = ({ initialValues }) => {
   const { t } = useTranslation();

src/gameComponents/forms/NoteFormFields.jsx

@@ -2,8 +2,8 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../../components/ui/formUtils/Label";
-import ColorPicker from "../../components/ui/formUtils/ColorPicker";
+import Label from "../../ui/formUtils/Label";
+import ColorPicker from "../../ui/formUtils/ColorPicker";
 
 const Form = ({ initialValues }) => {
   const { t } = useTranslation();

src/gameComponents/forms/PawnFormFields.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../../components/ui/formUtils/Label";
+import Label from "../../ui/formUtils/Label";
 
-import ColorPicker from "../../components/ui/formUtils/ColorPicker";
+import ColorPicker from "../../ui/formUtils/ColorPicker";
 
 const Form = ({ initialValues }) => {
   const { t } = useTranslation();

src/gameComponents/forms/RectFormFields.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../../components/ui/formUtils/Label";
+import Label from "../../ui/formUtils/Label";
 
-import ColorPicker from "../../components/ui/formUtils/ColorPicker";
+import ColorPicker from "../../ui/formUtils/ColorPicker";
 
 const Form = ({ initialValues }) => {
   const { t } = useTranslation();

src/gameComponents/forms/RoundFormFields.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../../components/ui/formUtils/Label";
+import Label from "../../ui/formUtils/Label";
 
-import ColorPicker from "../../components/ui/formUtils/ColorPicker";
+import ColorPicker from "../../ui/formUtils/ColorPicker";
 
 const Form = ({ initialValues }) => {
   const { t } = useTranslation();

src/gameComponents/forms/TokenFormFields.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../../components/ui/formUtils/Label";
+import Label from "../../ui/formUtils/Label";
 
-import ColorPicker from "../../components/ui/formUtils/ColorPicker";
+import ColorPicker from "../../ui/formUtils/ColorPicker";
 
 const Form = ({ initialValues }) => {
   const { t } = useTranslation();

src/gameComponents/forms/ZoneFormFields.jsx

@@ -2,8 +2,8 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Field } from "react-final-form";
 
-import Label from "../../components/ui/formUtils/Label";
-import Hint from "../../components/ui/formUtils/Hint";
+import Label from "../../ui/formUtils/Label";
+import Hint from "../../ui/formUtils/Hint";
 
 import ActionsField from "./ActionsField";
 import useGameItemActions from "../useGameItemActions";

src/gameComponents/useGameItemActionMap.jsx

@@ -4,12 +4,12 @@ import { nanoid } from "nanoid";
 import { toast } from "react-toastify";
 import { useSetRecoilState, useRecoilCallback } from "recoil";
 
-import { useItemActions } from "../components/board/Items";
-import { SelectedItemsAtom } from "../components/board";
-import { useUsers } from "../components/users";
-import { ItemMapAtom } from "../components/board";
+import { useItemActions } from "../board/Items";
+import { SelectedItemsAtom } from "../board";
+import { useUsers } from "../users";
+import { ItemMapAtom } from "../board";
 
-import { shuffle as shuffleArray, randInt } from "../components/utils";
+import { shuffle as shuffleArray, randInt } from "../utils";
 
 import deleteIcon from "../images/delete.svg";
 import stackToCenterIcon from "../images/stackToCenter.svg";

src/components/mediaLibrary/ImageField.jsx → src/mediaLibrary/ImageField.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { MediaLibraryButton, media2Url } from "./";
-import backgroundGrid from "../../images/background-grid.png";
+import backgroundGrid from "../images/background-grid.png";
 
 const StyledImageField = styled.div`
   & .typeSelect {

src/components/mediaLibrary/MediaLibraryModal.jsx → src/mediaLibrary/MediaLibraryModal.jsx

@@ -3,8 +3,8 @@ import { useTranslation } from "react-i18next";
 import { useQuery, useMutation, useQueryClient } from "react-query";
 import styled from "styled-components";
 
-import { API_BASE } from "../../utils/settings";
-import backgroundGrid from "../../images/background-grid.png";
+import { API_BASE } from "../utils/settings";
+import backgroundGrid from "../images/background-grid.png";
 
 import { confirmAlert } from "react-confirm-alert";
 import { toast } from "react-toastify";

src/components/mediaLibrary/MediaLibraryProvider.jsx → src/mediaLibrary/MediaLibraryProvider.jsx

@@ -3,7 +3,7 @@ import {
   uploadResourceImage as uploadMedia,
   deleteResourceImage as deleteMedia,
   listResourceImage as listMedia,
-} from "../../utils/api";
+} from "../utils/api";
 
 export const MediaLibraryContext = React.createContext({});
 

src/components/mediaLibrary/index.js → src/mediaLibrary/index.js

@@ -1,4 +1,4 @@
-import { API_BASE } from "../../utils/settings";
+import { API_BASE } from "../utils/settings";
 
 export { default as MediaLibraryProvider } from "./MediaLibraryProvider";
 export { useMediaLibrary } from "./MediaLibraryProvider";

src/components/messages/MessageButton.jsx → src/messages/MessageButton.jsx

@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { useMessage } from "react-sync-board";
 
-import useNotify from "../../hooks/useNotify";
+import useNotify from "../hooks/useNotify";
 import Touch from "../ui/Touch";
 import SidePanel from "../ui/SidePanel";
 

src/views/AboutModal.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Trans } from "react-i18next";
 
-import Modal from "../components/ui/Modal";
+import Modal from "../ui/Modal";
 
 const AboutModal = ({ show, setShow }) => {
   const { t } = useTranslation();

src/views/Account.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "react-toastify";
 
-import Modal from "../components/ui/Modal";
+import Modal from "../ui/Modal";
 import { sendAuthToken } from "../utils/api";
 import useAuth from "../hooks/useAuth";
 

src/views/BoardView/ActionBar.jsx

@@ -1,13 +1,13 @@
 import React from "react";
 
-import MessageButton from "../../components/messages/MessageButton";
-import EditInfoButton from "../../components/EditInfoButton";
-import AddItemButton from "../../components/AddItemButton";
+import MessageButton from "../../messages/MessageButton";
+import EditInfoButton from "./EditInfoButton";
+import AddItemButton from "./AddItemButton";
 
 import styled from "styled-components";
 import { useTranslation } from "react-i18next";
 
-import Touch from "../../components/ui/Touch";
+import Touch from "../../ui/Touch";
 
 const StyledActionBar = styled.div`
   position: absolute;

src/components/AddItemButton.jsx → src/views/BoardView/AddItemButton.jsx

@@ -2,8 +2,8 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import ItemLibrary from "./ItemLibrary";
 
-import Touch from "./ui/Touch";
-import SidePanel from "./ui/SidePanel";
+import Touch from "../../ui/Touch";
+import SidePanel from "../../ui/SidePanel";
 
 const AddItemPanel = ({ itemLibraries, open, onClose }) => {
   const [tab, setTab] = React.useState(itemLibraries[0]?.key || "standard");

src/views/BoardView/BoardForm.jsx

@@ -4,10 +4,10 @@ import { nanoid } from "nanoid";
 import { Field } from "react-final-form";
 import { useBoardConfig } from "react-sync-board";
 
-import Hint from "../../components/ui/formUtils/Hint";
-import Label from "../../components/ui/formUtils/Label";
-import SliderRange from "../../components/ui/SliderRange";
-import { ImageField } from "../../components/mediaLibrary";
+import Hint from "../../ui/formUtils/Hint";
+import Label from "../../ui/formUtils/Label";
+import SliderRange from "../../ui/SliderRange";
+import { ImageField } from "../../mediaLibrary";
 
 const BoardConfigForm = () => {
   const { t } = useTranslation();

src/views/BoardView/BoardView.jsx

@@ -12,10 +12,7 @@ import { ItemForm, itemTemplates } from "../../gameComponents";
 
 import ActionBar from "./ActionBar";
 
-import {
-  MediaLibraryProvider,
-  ImageDropNPaste,
-} from "../../components/mediaLibrary";
+import { MediaLibraryProvider, ImageDropNPaste } from "../../mediaLibrary";
 
 const style = {
   background:

src/views/BoardView/ChangeGameModal.jsx

@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { useQuery } from "react-query";
 
-import Modal from "../../components/ui/Modal";
+import Modal from "../../ui/Modal";
 import { getGames } from "../../utils/api";
 import useSession from "../../hooks/useSession";
 

src/components/EditInfoButton.jsx → src/views/BoardView/EditInfoButton.jsx

@@ -3,9 +3,9 @@ import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { Form } from "react-final-form";
 
-import Touch from "./ui/Touch";
-import Modal from "./ui/Modal";
-import AutoSave from "./ui/formUtils/AutoSave";
+import Touch from "../../ui/Touch";
+import Modal from "../../ui/Modal";
+import AutoSave from "../../ui/formUtils/AutoSave";
 
 import { useBoardConfig } from "react-sync-board";
 

src/views/BoardView/ExportModal.jsx

@@ -5,7 +5,7 @@ import useSession from "../../hooks/useSession";
 import { useItems, useBoardConfig, useMessage } from "react-sync-board";
 
 import DownloadLink from "./DownloadLink";
-import Modal from "../../components/ui/Modal";
+import Modal from "../../ui/Modal";
 
 const ExportModal = ({ show, setShow }) => {
   const { t } = useTranslation();

src/views/BoardView/InfoModal.jsx

@@ -4,8 +4,8 @@ import { useRecoilValue } from "recoil";
 import useAsyncEffect from "use-async-effect";
 import styled from "styled-components";
 
-import Modal from "../../components/ui/Modal";
-// import { BoardConfigAtom } from "../../components/board";
+import Modal from "../../ui/Modal";
+// import { BoardConfigAtom } from "../../board";
 
 import { getBestTranslationFromConfig } from "../../utils/api";
 

src/views/BoardView/ItemFormFactory.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { Form } from "react-final-form";
 
-import AutoSave from "../../components/ui/formUtils/AutoSave";
+import AutoSave from "../../ui/formUtils/AutoSave";
 import {
   useItemActions,
   useSelectedItems,

src/components/ItemLibrary.jsx → src/views/BoardView/ItemLibrary.jsx

@@ -7,9 +7,9 @@ import debounce from "lodash.debounce";
 
 import { useItemActions } from "react-sync-board";
 
-import { search } from "../views/utils";
+import { search } from "../utils";
 
-import Chevron from "./ui/Chevron";
+import Chevron from "../../ui/Chevron";
 
 const StyledItemList = styled.ul`
   display: flex;

src/views/BoardView/LoadGameModal.jsx

@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
 
 import useGame from "../../hooks/useGame";
 
-import Modal from "../../components/ui/Modal";
+import Modal from "../../ui/Modal";
 
 import LoadData from "./LoadData";
 

src/views/BoardView/LoadSessionModal.jsx

@@ -4,7 +4,7 @@ import { useC2C } from "react-sync-board";
 
 import useSession from "../../hooks/useSession";
 
-import Modal from "../../components/ui/Modal";
+import Modal from "../../ui/Modal";
 
 import LoadData from "./LoadData";
 

src/views/BoardView/NavBar.jsx

@@ -6,8 +6,8 @@ import { useHistory, useRouteMatch } from "react-router-dom";
 import { confirmAlert } from "react-confirm-alert";
 import { useC2C, useBoardConfig } from "react-sync-board";
 
-import UserList from "../../components/users/UserList";
-import Touch from "../../components/ui/Touch";
+import UserList from "../../users/UserList";
+import Touch from "../../ui/Touch";
 import WebConferenceButton from "../webconf/WebConferenceButton";
 
 import { getBestTranslationFromConfig } from "../../utils/api";

src/views/BoardView/SaveExportModal.jsx

@@ -2,8 +2,8 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "react-toastify";
 
-import DownloadLink from "../../components/DownloadLink";
-import Modal from "../../components/ui/Modal";
+import DownloadLink from "./DownloadLink";
+import Modal from "../../ui/Modal";
 import useGame from "../../hooks/useGame";
 
 const SaveExportGameModal = ({ show, setShow }) => {

src/views/BoardView/SelectedItemsPane.jsx

@@ -4,7 +4,7 @@ import { toast } from "react-toastify";
 import { useTranslation } from "react-i18next";
 
 import { insideClass, hasClass } from "../utils";
-import SidePanel from "../../components/ui/SidePanel";
+import SidePanel from "../../ui/SidePanel";
 import ItemFormFactory from "./ItemFormFactory";
 import {
   useAvailableActions,

src/views/BoardView/WelcomeModal.jsx

@@ -4,7 +4,7 @@ import { Trans } from "react-i18next";
 import styled from "styled-components";
 import { toast } from "react-toastify";
 
-import Modal from "../../components/ui/Modal";
+import Modal from "../../ui/Modal";
 
 import useSession from "../../hooks/useSession";
 

src/views/GameListItem.jsx

@@ -6,7 +6,7 @@ import { deleteGame, getBestTranslationFromConfig } from "../utils/api";
 import { confirmAlert } from "react-confirm-alert";
 import { toast } from "react-toastify";
 import { useMutation, useQueryClient } from "react-query";
-import { media2Url } from "../components/mediaLibrary";
+import { media2Url } from "../mediaLibrary";
 
 const Game = styled.li`
   position: relative;

src/views/GameListView.jsx

@@ -3,7 +3,7 @@ import { useTranslation, Trans } from "react-i18next";
 import styled from "styled-components";
 import { useQuery } from "react-query";
 
-import SliderRange from "../components/ui/SliderRange";
+import SliderRange from "../ui/SliderRange";
 import Spinner from "./Spinner";
 
 import playerSVG from "../images/player.svg";

src/views/RoomView/RoomNavBar.jsx

@@ -7,8 +7,8 @@ import { ENABLE_WEBCONFERENCE } from "../../utils/settings";
 import useLocalStorage from "../../hooks/useLocalStorage";
 import { useC2C } from "react-sync-board";
 
-import Touch from "../../components/ui/Touch";
-import UserList from "../../components/users/UserList";
+import Touch from "../../ui/Touch";
+import UserList from "../../users/UserList";
 import WebConferenceButton from "../webconf/WebConferenceButton";
 
 import Brand from "../Brand";

src/views/RoomView/RoomView.jsx

@@ -6,7 +6,7 @@ import { RoomWrapper, useC2C, useUsers } from "react-sync-board";
 
 import { Switch, Route, Link } from "react-router-dom";
 import Session from "../Session";
-import UserCircle from "../../components/users/UserCircle";
+import UserCircle from "../../users/UserCircle";
 
 import RoomNavBar from "./RoomNavBar";
 

src/views/webconf/WebConference.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-// import useUsers from "../../components/users/useUsers";
+// import useUsers from "../../users/useUsers";
 import { getConfToken } from "../../utils/api";
 
 import { OpenViduProvider } from "./useOpenVidu";

src/views/webconf/WebConferenceButton.jsx

@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
 
 import { useUsers } from "react-sync-board";
 
-import Touch from "../../components/ui/Touch";
+import Touch from "../../ui/Touch";
 import useLocalStorage from "../../hooks/useLocalStorage";
 
 import WebConference from "./WebConference";