diff --git a/src/alertContext/AlertContext.js b/src/alertContext/AlertContext.js index 196969a..fc5b0ec 100644 --- a/src/alertContext/AlertContext.js +++ b/src/alertContext/AlertContext.js @@ -8,8 +8,8 @@ import React, { useState, useContext, useCallback } from "react"; import PropTypes from "prop-types"; -import { Alert, ALERT_TYPES } from "bootstrap/Alert"; -import { Portal } from "utils/Portal"; +import { Alert, ALERT_TYPES } from "../bootstrap/Alert"; +import { Portal } from "../utils/Portal"; AlertContextProvider.propTypes = { children: PropTypes.oneOfType([ diff --git a/src/api/hooks.js b/src/api/hooks.js index b5f00d0..05503ae 100644 --- a/src/api/hooks.js +++ b/src/api/hooks.js @@ -9,7 +9,7 @@ import { useCallback, useEffect, useReducer, useState, } from "react"; -import { ForisURLs } from "forisUrls"; +import { ForisURLs } from "../forisUrls"; import { API_ACTIONS, API_METHODS, API_STATE, getErrorPayload, HEADERS, TIMEOUT, } from "./utils"; diff --git a/src/bootstrap/EmailInput.js b/src/bootstrap/EmailInput.js index 44e78de..18d3a39 100644 --- a/src/bootstrap/EmailInput.js +++ b/src/bootstrap/EmailInput.js @@ -6,8 +6,8 @@ */ import React from "react"; - import PropTypes from "prop-types"; + import { Input } from "./Input"; export const EmailInput = ({ ...props }) => ; diff --git a/src/bootstrap/Modal.js b/src/bootstrap/Modal.js index 9e9dbe7..00f5c83 100644 --- a/src/bootstrap/Modal.js +++ b/src/bootstrap/Modal.js @@ -8,8 +8,8 @@ import React, { useRef } from "react"; import PropTypes from "prop-types"; -import { Portal } from "utils/Portal"; -import { useClickOutside } from "utils/hooks"; +import { Portal } from "../utils/Portal"; +import { useClickOutside } from "../utils/hooks"; Modal.propTypes = { /** Is modal shown value */ diff --git a/src/bootstrap/NumberInput.js b/src/bootstrap/NumberInput.js index e841622..e8dc59a 100644 --- a/src/bootstrap/NumberInput.js +++ b/src/bootstrap/NumberInput.js @@ -8,7 +8,7 @@ import React from "react"; import PropTypes from "prop-types"; -import { useConditionalTimeout } from "utils/hooks"; +import { useConditionalTimeout } from "../utils/hooks"; import { Input } from "./Input"; import "./NumberInput.css"; diff --git a/src/common/RebootButton.js b/src/common/RebootButton.js index 3b6c256..d06a76b 100644 --- a/src/common/RebootButton.js +++ b/src/common/RebootButton.js @@ -8,15 +8,15 @@ import React, { useState, useEffect } from "react"; import PropTypes from "prop-types"; -import { useAPIPost } from "api/hooks"; -import { API_STATE } from "api/utils"; -import { ForisURLs } from "forisUrls"; +import { useAPIPost } from "../api/hooks"; +import { API_STATE } from "../api/utils"; +import { ForisURLs } from "../forisUrls"; -import { Button } from "bootstrap/Button"; +import { Button } from "../bootstrap/Button"; import { Modal, ModalHeader, ModalBody, ModalFooter, -} from "bootstrap/Modal"; -import { useAlert } from "alertContext/AlertContext"; +} from "../bootstrap/Modal"; +import { useAlert } from "../alertContext/AlertContext"; RebootButton.propTypes = { forisFormSize: PropTypes.bool, diff --git a/src/form/components/ForisForm.js b/src/form/components/ForisForm.js index 80e3821..77e4055 100644 --- a/src/form/components/ForisForm.js +++ b/src/form/components/ForisForm.js @@ -7,15 +7,14 @@ import React, { useEffect } from "react"; import PropTypes from "prop-types"; - -import { Spinner } from "bootstrap/Spinner"; -import { useAPIPost } from "api/hooks"; - import { Prompt } from "react-router"; -import { API_STATE } from "api/utils"; -import { ErrorMessage } from "utils/ErrorMessage"; -import { useAlert } from "alertContext/AlertContext"; -import { ALERT_TYPES } from "bootstrap/Alert"; + +import { useAPIPost } from "../../api/hooks"; +import { API_STATE } from "../../api/utils"; +import { ErrorMessage } from "../../utils/ErrorMessage"; +import { useAlert } from "../../alertContext/AlertContext"; +import { Spinner } from "../../bootstrap/Spinner"; +import { ALERT_TYPES } from "../../bootstrap/Alert"; import { useForisModule, useForm } from "../hooks"; import { STATES as SUBMIT_BUTTON_STATES, SubmitButton } from "./SubmitButton"; diff --git a/src/form/components/SubmitButton.js b/src/form/components/SubmitButton.js index eff40bb..a5a1f64 100644 --- a/src/form/components/SubmitButton.js +++ b/src/form/components/SubmitButton.js @@ -8,7 +8,7 @@ import React from "react"; import PropTypes from "prop-types"; -import { Button } from "bootstrap/Button"; +import { Button } from "../../bootstrap/Button"; export const STATES = { READY: 1, diff --git a/src/form/hooks.js b/src/form/hooks.js index f91b5da..e0e5824 100644 --- a/src/form/hooks.js +++ b/src/form/hooks.js @@ -8,8 +8,8 @@ import { useCallback, useEffect, useReducer } from "react"; import update from "immutability-helper"; -import { useAPIGet } from "api/hooks"; -import { useWSForisModule } from "webSockets/hooks"; +import { useAPIGet } from "../api/hooks"; +import { useWSForisModule } from "../webSockets/hooks"; const FORM_ACTIONS = { updateValue: 1, diff --git a/src/index.js b/src/index.js index 645ca1d..2ad5a95 100644 --- a/src/index.js +++ b/src/index.js @@ -13,59 +13,59 @@ export { useAPIPut, useAPIDelete, useAPIPolling, -} from "api/hooks"; -export { API_STATE } from "api/utils"; +} from "./api/hooks"; +export { API_STATE } from "./api/utils"; // Bootstrap -export { Alert, ALERT_TYPES } from "bootstrap/Alert"; -export { Button } from "bootstrap/Button"; -export { CheckBox } from "bootstrap/CheckBox"; -export { DownloadButton } from "bootstrap/DownloadButton"; -export { DataTimeInput } from "bootstrap/DataTimeInput"; -export { EmailInput } from "bootstrap/EmailInput"; -export { FileInput } from "bootstrap/FileInput"; -export { Input } from "bootstrap/Input"; -export { NumberInput } from "bootstrap/NumberInput"; -export { PasswordInput } from "bootstrap/PasswordInput"; -export { Radio, RadioSet } from "bootstrap/RadioSet"; -export { Select } from "bootstrap/Select"; -export { TextInput } from "bootstrap/TextInput"; -export { formFieldsSize } from "bootstrap/constants"; +export { Alert, ALERT_TYPES } from "./bootstrap/Alert"; +export { Button } from "./bootstrap/Button"; +export { CheckBox } from "./bootstrap/CheckBox"; +export { DownloadButton } from "./bootstrap/DownloadButton"; +export { DataTimeInput } from "./bootstrap/DataTimeInput"; +export { EmailInput } from "./bootstrap/EmailInput"; +export { FileInput } from "./bootstrap/FileInput"; +export { Input } from "./bootstrap/Input"; +export { NumberInput } from "./bootstrap/NumberInput"; +export { PasswordInput } from "./bootstrap/PasswordInput"; +export { Radio, RadioSet } from "./bootstrap/RadioSet"; +export { Select } from "./bootstrap/Select"; +export { TextInput } from "./bootstrap/TextInput"; +export { formFieldsSize } from "./bootstrap/constants"; export { Spinner, SpinnerElement, -} from "bootstrap/Spinner"; +} from "./bootstrap/Spinner"; export { Modal, ModalBody, ModalFooter, ModalHeader, -} from "bootstrap/Modal"; +} from "./bootstrap/Modal"; // Common -export { RebootButton } from "common/RebootButton"; +export { RebootButton } from "./common/RebootButton"; // Form -export { ForisForm } from "form/components/ForisForm"; -export { SubmitButton, STATES as SUBMIT_BUTTON_STATES } from "form/components/SubmitButton"; -export { useForisModule, useForm } from "form/hooks"; +export { ForisForm } from "./form/components/ForisForm"; +export { SubmitButton, STATES as SUBMIT_BUTTON_STATES } from "./form/components/SubmitButton"; +export { useForisModule, useForm } from "./form/hooks"; // WebSockets -export { useWSForisModule } from "webSockets/hooks"; -export { WebSockets } from "webSockets/WebSockets"; +export { useWSForisModule } from "./webSockets/hooks"; +export { WebSockets } from "./webSockets/WebSockets"; // Utils -export { Portal } from "utils/Portal"; -export { undefinedIfEmpty, withoutUndefinedKeys, onlySpecifiedKeys } from "utils/objectHelpers"; +export { Portal } from "./utils/Portal"; +export { undefinedIfEmpty, withoutUndefinedKeys, onlySpecifiedKeys } from "./utils/objectHelpers"; export { withEither, withSpinner, withSending, withSpinnerOnSending, withError, withErrorMessage, -} from "utils/conditionalHOCs"; -export { ErrorMessage } from "utils/ErrorMessage"; -export { useClickOutside } from "utils/hooks"; +} from "./utils/conditionalHOCs"; +export { ErrorMessage } from "./utils/ErrorMessage"; +export { useClickOutside } from "./utils/hooks"; // Foris URL -export { ForisURLs, REFORIS_URL_PREFIX } from "forisUrls"; +export { ForisURLs, REFORIS_URL_PREFIX } from "./forisUrls"; // Validation export { @@ -76,7 +76,7 @@ export { validateDUID, validateMAC, validateMultipleEmails, -} from "validations"; +} from "./validations"; // Alert context -export { AlertContextProvider, useAlert } from "alertContext/AlertContext"; +export { AlertContextProvider, useAlert } from "./alertContext/AlertContext"; diff --git a/src/utils/conditionalHOCs.js b/src/utils/conditionalHOCs.js index fcb4978..5f39920 100644 --- a/src/utils/conditionalHOCs.js +++ b/src/utils/conditionalHOCs.js @@ -7,8 +7,8 @@ import React from "react"; -import { Spinner } from "bootstrap/Spinner"; -import { API_STATE } from "api/utils"; +import { Spinner } from "../bootstrap/Spinner"; +import { API_STATE } from "../api/utils"; import { ErrorMessage } from "./ErrorMessage"; function withEither(conditionalFn, Either) { diff --git a/src/webSockets/WebSockets.js b/src/webSockets/WebSockets.js index 6548334..b7c3dfb 100644 --- a/src/webSockets/WebSockets.js +++ b/src/webSockets/WebSockets.js @@ -7,7 +7,7 @@ /* eslint no-console: "off" */ -import { ForisURLs } from "forisUrls"; +import { ForisURLs } from "../forisUrls"; const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";