diff --git a/docs/components/Logo.js b/docs/components/Logo.js new file mode 100644 index 0000000..afa9748 --- /dev/null +++ b/docs/components/Logo.js @@ -0,0 +1,36 @@ +import React from "react"; +import PropTypes from "prop-types"; +import Styled from "rsg-components/Styled"; +import logo from "./logo.svg"; + +const styles = ({ fontFamily }) => ({ + logo: { + display: "flex", + alignItems: "center", + margin: 0, + fontFamily: fontFamily.base, + fontSize: 18, + fontWeight: "normal", + }, + image: { + height: "1.3em", + marginLeft: "-0.2em", + marginRight: "0.2em", + }, +}); + +export function LogoRenderer({ classes, children }) { + return ( +

+ React logo + {children} +

+ ); +} + +LogoRenderer.propTypes = { + classes: PropTypes.object.isRequired, + children: PropTypes.node, +}; + +export default Styled(styles)(LogoRenderer); diff --git a/docs/components/logo.svg b/docs/components/logo.svg new file mode 100644 index 0000000..7fb7f23 --- /dev/null +++ b/docs/components/logo.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/docs/development.md b/docs/development.md index 585213c..21f7e67 100644 --- a/docs/development.md +++ b/docs/development.md @@ -1,15 +1,15 @@ -Sooner or later you will face with situation when you want/need to make some -changes in the library. Then the most important tool for you it's +Sooner or later, you will face with situation when you want/need to make some +changes in the library. Then the most important tool for you it's the [`npm link`](https://docs.npmjs.com/cli/link). -Please, notice that it will not work if you link library just from root of the -repo. It happens due to location of sources `./src`. You need to pack library -first `make pack` and then link it from `./dist` directory. +Please, notice that it will not work if you link the library just from the root +of the repo. It happens due to the location of sources `./src`. You need to pack +the library first, `make pack` and then link it from the `./dist` directory. -Yeah it's not such comfortable solution for development. But it can fixed by -writing small script similar as `make pack` but with linking every file and -directory from `./src` to the some directory and linking then from it. Notice -that you need to link `package.json` and `package-lock.json` as well. +Yeah, it's not such a comfortable solution for development. But it can be fixed +by writing a small script similar to making a pack but by linking every file and +directory from `./src` to the same directory and linking then from it. Notice +that you need to link a `package.json` and a `package-lock.json` as well. So step by step: diff --git a/docs/forisjs-npm.svg b/docs/forisjs-npm.svg new file mode 100644 index 0000000..8ebd3d8 --- /dev/null +++ b/docs/forisjs-npm.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/docs/intro.md b/docs/intro.md deleted file mode 100644 index 4637cbc..0000000 --- a/docs/intro.md +++ /dev/null @@ -1,6 +0,0 @@ -Foris JS library is set of components and utils for Foris JS application and -plugins. - -Please notice that all of these components or utils are used in reForis and -plugins. If you like to study by example I would recommend to full-text search -these repos. diff --git a/docs/introduction.md b/docs/introduction.md new file mode 100644 index 0000000..767327f --- /dev/null +++ b/docs/introduction.md @@ -0,0 +1,37 @@ +Welcome! This is the official documentation for Foris JS. + +## What Foris JS is + +Foris JS library is a set of components and utils for reForis application and +plugins. + +Please notice that all of these components or utils are used in reForis and +plugins. If you want to study them by example, I recommend you to full-text +search those repositories. + +# Installation + +## Prerequisites + +Please make sure that [Node.js](https://nodejs.org/en/) is installed on your +system. + +The current Long Term Support (LTS) release is an ideal starting point, see +[here](https://github.com/nodejs/Release#release-schedule). + +## Installation + +To install the latest release: + +```plain +npm install foris +``` + +To install a specific version: + +```plain +npm install foris@version +``` + +Check +on diff --git a/package.json b/package.json index ed49859..e96d677 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "foris", "version": "5.4.1", - "description": "Set of components and utils for Foris and its plugins.", + "description": "Foris JS library is a set of components and utils for reForis application and plugins.", "author": "CZ.NIC, z.s.p.o.", "repository": { "type": "git", diff --git a/src/bootstrap/Switch.md b/src/bootstrap/Switch.md new file mode 100644 index 0000000..4969b9b --- /dev/null +++ b/src/bootstrap/Switch.md @@ -0,0 +1,5 @@ +Switch example: + +```js + +``` diff --git a/src/common/WiFiSettings/WiFiForm.js b/src/common/WiFiSettings/WiFiForm.js index 7539045..35f52d7 100644 --- a/src/common/WiFiSettings/WiFiForm.js +++ b/src/common/WiFiSettings/WiFiForm.js @@ -8,7 +8,6 @@ import React from "react"; import PropTypes from "prop-types"; import { Switch } from "../../bootstrap/Switch"; -import { CheckBox } from "../../bootstrap/CheckBox"; import { PasswordInput } from "../../bootstrap/PasswordInput"; import { RadioSet } from "../../bootstrap/RadioSet"; import { Select } from "../../bootstrap/Select"; @@ -65,6 +64,7 @@ DeviceForm.propTypes = { guest_wifi: PropTypes.object.isRequired, encryption: PropTypes.string.isRequired, available_bands: PropTypes.array.isRequired, + ieee80211w_disabled: PropTypes.bool.isRequired, }), formErrors: PropTypes.object.isRequired, setFormValue: PropTypes.func.isRequired, @@ -102,7 +102,7 @@ function DeviceForm({ switchHeading {...props} /> - {formData.enabled ? ( + {formData.enabled && ( <> - + {(formData.encryption === "WPA3" || + formData.encryption === "WPA2/3") && ( + ({ + devices: { + [deviceIndex]: { + ieee80211w_disabled: { $set: value }, + }, + }, + }))} + {...props} + /> + )} + {hasGuestNetwork && ( )} - ) : null} - {divider ?
: null} + )} + {divider &&
} ); } diff --git a/src/common/WiFiSettings/WiFiSettings.js b/src/common/WiFiSettings/WiFiSettings.js index d97ba7a..217e242 100644 --- a/src/common/WiFiSettings/WiFiSettings.js +++ b/src/common/WiFiSettings/WiFiSettings.js @@ -59,6 +59,10 @@ function prepDataToSubmit(formData) { if (!device.guest_wifi.enabled) formData.devices[idx].guest_wifi = { enabled: false }; + + if (device.encryption === "WPA2") { + delete formData.devices[idx].ieee80211w_disabled; + } }); return formData; } diff --git a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap index 3b2fdf0..d66d559 100644 --- a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap +++ b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap @@ -337,7 +337,7 @@ exports[` Snapshot guest network. 1`] = ` - First value + Second value -@@ -500,10 +500,92 @@ +@@ -524,10 +524,92 @@ > Enables Wi-Fi for guests, which is separated from LAN network. Devices connected to this network are allowed to access the internet, but aren't allowed to access other devices and the configuration interface of the router. Parameters of the guest network can be set in the Guest network tab. @@ -347,7 +347,7 @@ exports[` Snapshot guest network. 1`] = ` + class=\\"form-group\\" + > + @@ -356,7 +356,7 @@ exports[` Snapshot guest network. 1`] = ` + > + @@ -386,7 +386,7 @@ exports[` Snapshot guest network. 1`] = ` + class=\\"form-group\\" + > + @@ -396,7 +396,7 @@ exports[` Snapshot guest network. 1`] = ` + Snapshot guest network. 1`] = ` class=\\"form-group switch\\" >
@@ -449,7 +449,7 @@ exports[` Snapshot one module enabled. 1`] = ` - First value + Second value -@@ -22,10 +22,488 @@ +@@ -22,10 +22,512 @@ Wi-Fi 1 @@ -537,7 +537,7 @@ exports[` Snapshot one module enabled. 1`] = ` + class=\\"form-group\\" + > +
+ Snapshot one module enabled. 1`] = ` + for=\\"6\\" + > + Hide SSID -+ -+ If set, network is not visible when scanning for available networks. -+ + ++ ++ If set, network is not visible when scanning for available networks. ++ +
+
+
Snapshot one module enabled. 1`] = ` + class=\\"custom-control-label\\" + for=\\"11\\" + > ++ Disable Management Frame Protection ++ ++ ++ In case you have trouble connecting to WiFi Access Point, try disabling Management Frame Protection. ++ ++
++ ++
++
++ ++ +