GGLinnk/foris-js
1
0
Fork 0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2025-11-03 23:00:31 +01:00
Code Issues Releases Activity

Merge branch 'no-babel' into 'dev'

Browse Source 
No babel

See merge request turris/reforis/foris-js!64
This commit is contained in:
Bogdan Bodnar
2020-01-07 11:12:17 +01:00
parent 6d4bff2b4f 32e3a57bd7
commit cc13e9c164
17 changed files with 955 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -35,11 +35,6 @@ $(VENV_NAME)/bin/activate:
install-js: package.json install-js: package.json
npm install --save-dev npm install --save-dev
watch-js:
npm run build:watch
build-js:
npm run build
collect-files: collect-files:
sh scripts/collect_files.sh sh scripts/collect_files.sh
pack: collect-files pack: collect-files

1
babel.cfg
View File

@@ -1 +0,0 @@
[javascript: src/**.js]

1428
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

8
package.json
View File

@@ -12,7 +12,7 @@
"reforis" "reforis"
], ],
"license": "GPL-3.0", "license": "GPL-3.0",
"main": "index.js", "main": "./src/index.js",
"dependencies": { "dependencies": {
"axios": "^0.19.0", "axios": "^0.19.0",
"jest-transform-css": "^2.0.0", "jest-transform-css": "^2.0.0",
@@ -44,7 +44,7 @@
"babel-plugin-react-transform": "^3.0.0", "babel-plugin-react-transform": "^3.0.0",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"copy-webpack-plugin": "^5.0.4", "copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.2.0", "css-loader": "^3.2.0",
"eslint": "^6.1.0", "eslint": "^6.1.0",
"eslint-config-reforis": "^1.0.0", "eslint-config-reforis": "^1.0.0",
@@ -56,14 +56,12 @@
"moment-timezone": "^0.5.25", "moment-timezone": "^0.5.25",
"react": "16.9.0", "react": "16.9.0",
"react-dom": "16.9.0", "react-dom": "16.9.0",
"react-styleguidist": "^9.1.16", "react-styleguidist": "^10.3.2",
"snapshot-diff": "^0.5.1", "snapshot-diff": "^0.5.1",
"style-loader": "^1.0.0", "style-loader": "^1.0.0",
"webpack": "^4.41.0" "webpack": "^4.41.0"
}, },
"scripts": { "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", "lint": "eslint src",
"test": "jest", "test": "jest",
"test:watch": "jest --watch", "test:watch": "jest --watch",

5
scripts/collect_files.sh
View File

@@ -1,8 +1,9 @@
#!/bin/sh #!/bin/sh
# Collect files # Collect files
npm run build mkdir -p dist
cp package.json README.md dist cp -rf ./src dist
cp package.json package-lock.json README.md dist
cp -rf translations dist cp -rf translations dist
# Remove unwanted files # Remove unwanted files
rm -rf dist/**/__tests__ rm -rf dist/**/__tests__

4
src/alertContext/AlertContext.js
View File

@@ -8,8 +8,8 @@
import React, { useState, useContext, useCallback } from "react"; import React, { useState, useContext, useCallback } from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { Alert, ALERT_TYPES } from "bootstrap/Alert"; import { Alert, ALERT_TYPES } from "../bootstrap/Alert";
import { Portal } from "utils/Portal"; import { Portal } from "../utils/Portal";
AlertContextProvider.propTypes = { AlertContextProvider.propTypes = {
children: PropTypes.oneOfType([ children: PropTypes.oneOfType([

2
src/api/hooks.js
View File

@@ -9,7 +9,7 @@ import {
useCallback, useEffect, useReducer, useState, useCallback, useEffect, useReducer, useState,
} from "react"; } from "react";
import { ForisURLs } from "forisUrls"; import { ForisURLs } from "../forisUrls";
import { import {
API_ACTIONS, API_METHODS, API_STATE, getErrorPayload, HEADERS, TIMEOUT, API_ACTIONS, API_METHODS, API_STATE, getErrorPayload, HEADERS, TIMEOUT,
} from "./utils"; } from "./utils";

2
src/bootstrap/EmailInput.js
View File

@@ -6,8 +6,8 @@
*/ */
import React from "react"; import React from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { Input } from "./Input"; import { Input } from "./Input";
export const EmailInput = ({ ...props }) => <Input type="email" {...props} />; export const EmailInput = ({ ...props }) => <Input type="email" {...props} />;

4
src/bootstrap/Modal.js
View File

@@ -8,8 +8,8 @@
import React, { useRef } from "react"; import React, { useRef } from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { Portal } from "utils/Portal"; import { Portal } from "../utils/Portal";
import { useClickOutside } from "utils/hooks"; import { useClickOutside } from "../utils/hooks";
Modal.propTypes = { Modal.propTypes = {
/** Is modal shown value */ /** Is modal shown value */

2
src/bootstrap/NumberInput.js
View File

@@ -8,7 +8,7 @@
import React from "react"; import React from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { useConditionalTimeout } from "utils/hooks"; import { useConditionalTimeout } from "../utils/hooks";
import { Input } from "./Input"; import { Input } from "./Input";
import "./NumberInput.css"; import "./NumberInput.css";

12
src/common/RebootButton.js
View File

@@ -8,15 +8,15 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { useAPIPost } from "api/hooks"; import { useAPIPost } from "../api/hooks";
import { API_STATE } from "api/utils"; import { API_STATE } from "../api/utils";
import { ForisURLs } from "forisUrls"; import { ForisURLs } from "../forisUrls";
import { Button } from "bootstrap/Button"; import { Button } from "../bootstrap/Button";
import { import {
Modal, ModalHeader, ModalBody, ModalFooter, Modal, ModalHeader, ModalBody, ModalFooter,
} from "bootstrap/Modal"; } from "../bootstrap/Modal";
import { useAlert } from "alertContext/AlertContext"; import { useAlert } from "../alertContext/AlertContext";
RebootButton.propTypes = { RebootButton.propTypes = {
forisFormSize: PropTypes.bool, forisFormSize: PropTypes.bool,

15
src/form/components/ForisForm.js
View File

@@ -7,15 +7,14 @@
import React, { useEffect } from "react"; import React, { useEffect } from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { Spinner } from "bootstrap/Spinner";
import { useAPIPost } from "api/hooks";
import { Prompt } from "react-router"; import { Prompt } from "react-router";
import { API_STATE } from "api/utils";
import { ErrorMessage } from "utils/ErrorMessage"; import { useAPIPost } from "../../api/hooks";
import { useAlert } from "alertContext/AlertContext"; import { API_STATE } from "../../api/utils";
import { ALERT_TYPES } from "bootstrap/Alert"; 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 { useForisModule, useForm } from "../hooks";
import { STATES as SUBMIT_BUTTON_STATES, SubmitButton } from "./SubmitButton"; import { STATES as SUBMIT_BUTTON_STATES, SubmitButton } from "./SubmitButton";

2
src/form/components/SubmitButton.js
View File

@@ -8,7 +8,7 @@
import React from "react"; import React from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { Button } from "bootstrap/Button"; import { Button } from "../../bootstrap/Button";
export const STATES = { export const STATES = {
READY: 1, READY: 1,

4
src/form/hooks.js
View File

@@ -8,8 +8,8 @@
import { useCallback, useEffect, useReducer } from "react"; import { useCallback, useEffect, useReducer } from "react";
import update from "immutability-helper"; import update from "immutability-helper";
import { useAPIGet } from "api/hooks"; import { useAPIGet } from "../api/hooks";
import { useWSForisModule } from "webSockets/hooks"; import { useWSForisModule } from "../webSockets/hooks";
const FORM_ACTIONS = { const FORM_ACTIONS = {
updateValue: 1, updateValue: 1,

64
src/index.js
View File

@@ -13,59 +13,59 @@ export {
useAPIPut, useAPIPut,
useAPIDelete, useAPIDelete,
useAPIPolling, useAPIPolling,
} from "api/hooks"; } from "./api/hooks";
export { API_STATE } from "api/utils"; export { API_STATE } from "./api/utils";
// Bootstrap // Bootstrap
export { Alert, ALERT_TYPES } from "bootstrap/Alert"; export { Alert, ALERT_TYPES } from "./bootstrap/Alert";
export { Button } from "bootstrap/Button"; export { Button } from "./bootstrap/Button";
export { CheckBox } from "bootstrap/CheckBox"; export { CheckBox } from "./bootstrap/CheckBox";
export { DownloadButton } from "bootstrap/DownloadButton"; export { DownloadButton } from "./bootstrap/DownloadButton";
export { DataTimeInput } from "bootstrap/DataTimeInput"; export { DataTimeInput } from "./bootstrap/DataTimeInput";
export { EmailInput } from "bootstrap/EmailInput"; export { EmailInput } from "./bootstrap/EmailInput";
export { FileInput } from "bootstrap/FileInput"; export { FileInput } from "./bootstrap/FileInput";
export { Input } from "bootstrap/Input"; export { Input } from "./bootstrap/Input";
export { NumberInput } from "bootstrap/NumberInput"; export { NumberInput } from "./bootstrap/NumberInput";
export { PasswordInput } from "bootstrap/PasswordInput"; export { PasswordInput } from "./bootstrap/PasswordInput";
export { Radio, RadioSet } from "bootstrap/RadioSet"; export { Radio, RadioSet } from "./bootstrap/RadioSet";
export { Select } from "bootstrap/Select"; export { Select } from "./bootstrap/Select";
export { TextInput } from "bootstrap/TextInput"; export { TextInput } from "./bootstrap/TextInput";
export { formFieldsSize } from "bootstrap/constants"; export { formFieldsSize } from "./bootstrap/constants";
export { export {
Spinner, Spinner,
SpinnerElement, SpinnerElement,
} from "bootstrap/Spinner"; } from "./bootstrap/Spinner";
export { export {
Modal, Modal,
ModalBody, ModalBody,
ModalFooter, ModalFooter,
ModalHeader, ModalHeader,
} from "bootstrap/Modal"; } from "./bootstrap/Modal";
// Common // Common
export { RebootButton } from "common/RebootButton"; export { RebootButton } from "./common/RebootButton";
// Form // Form
export { ForisForm } from "form/components/ForisForm"; export { ForisForm } from "./form/components/ForisForm";
export { SubmitButton, STATES as SUBMIT_BUTTON_STATES } from "form/components/SubmitButton"; export { SubmitButton, STATES as SUBMIT_BUTTON_STATES } from "./form/components/SubmitButton";
export { useForisModule, useForm } from "form/hooks"; export { useForisModule, useForm } from "./form/hooks";
// WebSockets // WebSockets
export { useWSForisModule } from "webSockets/hooks"; export { useWSForisModule } from "./webSockets/hooks";
export { WebSockets } from "webSockets/WebSockets"; export { WebSockets } from "./webSockets/WebSockets";
// Utils // Utils
export { Portal } from "utils/Portal"; export { Portal } from "./utils/Portal";
export { undefinedIfEmpty, withoutUndefinedKeys, onlySpecifiedKeys } from "utils/objectHelpers"; export { undefinedIfEmpty, withoutUndefinedKeys, onlySpecifiedKeys } from "./utils/objectHelpers";
export { export {
withEither, withSpinner, withSending, withSpinnerOnSending, withError, withErrorMessage, withEither, withSpinner, withSending, withSpinnerOnSending, withError, withErrorMessage,
} from "utils/conditionalHOCs"; } from "./utils/conditionalHOCs";
export { ErrorMessage } from "utils/ErrorMessage"; export { ErrorMessage } from "./utils/ErrorMessage";
export { useClickOutside } from "utils/hooks"; export { useClickOutside } from "./utils/hooks";
// Foris URL // Foris URL
export { ForisURLs, REFORIS_URL_PREFIX } from "forisUrls"; export { ForisURLs, REFORIS_URL_PREFIX } from "./forisUrls";
// Validation // Validation
export { export {
@@ -76,7 +76,7 @@ export {
validateDUID, validateDUID,
validateMAC, validateMAC,
validateMultipleEmails, validateMultipleEmails,
} from "validations"; } from "./validations";
// Alert context // Alert context
export { AlertContextProvider, useAlert } from "alertContext/AlertContext"; export { AlertContextProvider, useAlert } from "./alertContext/AlertContext";

4
src/utils/conditionalHOCs.js
View File

@@ -7,8 +7,8 @@
import React from "react"; import React from "react";
import { Spinner } from "bootstrap/Spinner"; import { Spinner } from "../bootstrap/Spinner";
import { API_STATE } from "api/utils"; import { API_STATE } from "../api/utils";
import { ErrorMessage } from "./ErrorMessage"; import { ErrorMessage } from "./ErrorMessage";
function withEither(conditionalFn, Either) { function withEither(conditionalFn, Either) {

2
src/webSockets/WebSockets.js
View File

@@ -7,7 +7,7 @@
/* eslint no-console: "off" */ /* eslint no-console: "off" */
import { ForisURLs } from "forisUrls"; import { ForisURLs } from "../forisUrls";
const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss"; const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";