1
0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2025-12-14 04:03:37 +01:00

Compare commits

...

7 Commits

Author SHA1 Message Date
Aleksandr Gumroian
74410b374b Bump v.5.1.2 2020-09-08 18:22:42 +02:00
Aleksandr Gumroian
c3cdafce13 Merge branch 'fix-ws-loop' into 'dev'
Fix infinity loop caused by WebSockets

Closes #17

See merge request turris/reforis/foris-js!125
2020-09-08 18:11:05 +02:00
Aleksandr Gumroian
b96b434a3e Update Snapshots 2020-09-02 17:55:53 +02:00
Aleksandr Gumroian
0ea5f7de84 Decrease Switch's margin-bottom with headings 2020-09-02 17:55:44 +02:00
Aleksandr Gumroian
0c7997f6c0 Fix Reboot page URL in respective dropdown 2020-09-02 17:55:44 +02:00
Aleksandr Gumroian
90ce866869 Fix infinity loop caused by WebSockets 2020-09-02 17:55:25 +02:00
Aleksandr Gumroian
4ff814f0fd Merge branch 'small-fixes' into 'dev'
Add "inline" option to RadioSet

See merge request turris/reforis/foris-js!123
2020-08-31 18:19:12 +02:00
7 changed files with 9 additions and 9 deletions

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "foris", "name": "foris",
"version": "5.1.1", "version": "5.1.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@@ -1,6 +1,6 @@
{ {
"name": "foris", "name": "foris",
"version": "5.1.1", "version": "5.1.2",
"description": "Set of components and utils for Foris and its plugins.", "description": "Set of components and utils for Foris and its plugins.",
"author": "CZ.NIC, z.s.p.o.", "author": "CZ.NIC, z.s.p.o.",
"repository": { "repository": {

View File

@@ -23,7 +23,7 @@ Switch.propTypes = {
export function Switch({ label, helpText, switchHeading, ...props }) { export function Switch({ label, helpText, switchHeading, ...props }) {
const uid = useUID(); const uid = useUID();
return ( return (
<div className="form-group switch"> <div className={`form-group ${switchHeading ? "switch" : ""}`}>
<div <div
className={`custom-control custom-switch ${ className={`custom-control custom-switch ${
!helpText ? "custom-control-inline" : "" !helpText ? "custom-control-inline" : ""

View File

@@ -2,7 +2,7 @@
exports[`<Switch/> Render switch 1`] = ` exports[`<Switch/> Render switch 1`] = `
<div <div
class="form-group switch" class="form-group "
> >
<div <div
class="custom-control custom-switch" class="custom-control custom-switch"
@@ -30,7 +30,7 @@ exports[`<Switch/> Render switch 1`] = `
exports[`<Switch/> Render uncheked switch 1`] = ` exports[`<Switch/> Render uncheked switch 1`] = `
<div <div
class="form-group switch" class="form-group "
> >
<div <div
class="custom-control custom-switch" class="custom-control custom-switch"

View File

@@ -876,7 +876,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
+ </select> + </select>
+ </div> + </div>
+ <div + <div
+ class=\\"form-group switch\\" + class=\\"form-group \\"
+ > + >
+ <div + <div
+ class=\\"custom-control custom-switch\\" + class=\\"custom-control custom-switch\\"

View File

@@ -27,7 +27,7 @@ export const ForisURLs = {
approveUpdates: "/package-management/updates", approveUpdates: "/package-management/updates",
languages: "/package-management/languages", languages: "/package-management/languages",
rebootPage: "/reforis/administration/reboot", rebootPage: "/administration/reboot",
luci: "/cgi-bin/luci", luci: "/cgi-bin/luci",
// API // API

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) * Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
* *
* This is free software, licensed under the GNU General Public License v3. * This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information. * See /LICENSE for more information.
@@ -12,7 +12,7 @@ import { ForisURLs } from "../utils/forisUrls";
const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss"; const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";
const URL = process.env.LIGHTTPD const URL = process.env.LIGHTTPD
? `${PROTOCOL}://${window.location.hostname}/foris-ws` ? `${PROTOCOL}://${window.location.host}/foris-ws`
: `${PROTOCOL}://${window.location.hostname}:${9081}`; : `${PROTOCOL}://${window.location.hostname}:${9081}`;
const WAITING_FOR_CONNECTION_TIMEOUT = 500; const WAITING_FOR_CONNECTION_TIMEOUT = 500;