mirror of
https://gitlab.nic.cz/turris/reforis/foris-js.git
synced 2024-12-25 00:11:36 +01:00
Merge branch 'no-babel' into 'dev'
No babel See merge request turris/reforis/foris-js!64
This commit is contained in:
commit
cc13e9c164
5
Makefile
5
Makefile
|
@ -35,11 +35,6 @@ $(VENV_NAME)/bin/activate:
|
|||
install-js: package.json
|
||||
npm install --save-dev
|
||||
|
||||
watch-js:
|
||||
npm run build:watch
|
||||
build-js:
|
||||
npm run build
|
||||
|
||||
collect-files:
|
||||
sh scripts/collect_files.sh
|
||||
pack: collect-files
|
||||
|
|
1428
package-lock.json
generated
1428
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
|
@ -12,7 +12,7 @@
|
|||
"reforis"
|
||||
],
|
||||
"license": "GPL-3.0",
|
||||
"main": "index.js",
|
||||
"main": "./src/index.js",
|
||||
"dependencies": {
|
||||
"axios": "^0.19.0",
|
||||
"jest-transform-css": "^2.0.0",
|
||||
|
@ -44,7 +44,7 @@
|
|||
"babel-plugin-react-transform": "^3.0.0",
|
||||
"babel-polyfill": "^6.26.0",
|
||||
"bootstrap": "^4.3.1",
|
||||
"copy-webpack-plugin": "^5.0.4",
|
||||
"copy-webpack-plugin": "^5.1.1",
|
||||
"css-loader": "^3.2.0",
|
||||
"eslint": "^6.1.0",
|
||||
"eslint-config-reforis": "^1.0.0",
|
||||
|
@ -56,14 +56,12 @@
|
|||
"moment-timezone": "^0.5.25",
|
||||
"react": "16.9.0",
|
||||
"react-dom": "16.9.0",
|
||||
"react-styleguidist": "^9.1.16",
|
||||
"react-styleguidist": "^10.3.2",
|
||||
"snapshot-diff": "^0.5.1",
|
||||
"style-loader": "^1.0.0",
|
||||
"webpack": "^4.41.0"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "rm -rf dist; babel src --out-dir dist --source-maps inline --copy-files",
|
||||
"build:watch": "babel src --verbose --watch --out-dir dist --source-maps inline --copy-files",
|
||||
"lint": "eslint src",
|
||||
"test": "jest",
|
||||
"test:watch": "jest --watch",
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Collect files
|
||||
npm run build
|
||||
cp package.json README.md dist
|
||||
mkdir -p dist
|
||||
cp -rf ./src dist
|
||||
cp package.json package-lock.json README.md dist
|
||||
cp -rf translations dist
|
||||
# Remove unwanted files
|
||||
rm -rf dist/**/__tests__
|
||||
|
|
|
@ -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([
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
*/
|
||||
|
||||
import React from "react";
|
||||
|
||||
import PropTypes from "prop-types";
|
||||
|
||||
import { Input } from "./Input";
|
||||
|
||||
export const EmailInput = ({ ...props }) => <Input type="email" {...props} />;
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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";
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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";
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
64
src/index.js
64
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";
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
/* eslint no-console: "off" */
|
||||
|
||||
import { ForisURLs } from "forisUrls";
|
||||
import { ForisURLs } from "../forisUrls";
|
||||
|
||||
const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user