mirror of
https://gitlab.nic.cz/turris/reforis/foris-js.git
synced 2024-11-14 17:35:35 +01:00
Merge branch 'dev' into 'master'
Bump v5.1.2 See merge request turris/reforis/foris-js!127
This commit is contained in:
commit
d2688532af
2
package-lock.json
generated
2
package-lock.json
generated
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "foris",
|
||||
"version": "5.1.1",
|
||||
"version": "5.1.2",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "foris",
|
||||
"version": "5.1.1",
|
||||
"version": "5.1.2",
|
||||
"description": "Set of components and utils for Foris and its plugins.",
|
||||
"author": "CZ.NIC, z.s.p.o.",
|
||||
"repository": {
|
||||
|
|
|
@ -23,7 +23,7 @@ Switch.propTypes = {
|
|||
export function Switch({ label, helpText, switchHeading, ...props }) {
|
||||
const uid = useUID();
|
||||
return (
|
||||
<div className="form-group switch">
|
||||
<div className={`form-group ${switchHeading ? "switch" : ""}`}>
|
||||
<div
|
||||
className={`custom-control custom-switch ${
|
||||
!helpText ? "custom-control-inline" : ""
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
exports[`<Switch/> Render switch 1`] = `
|
||||
<div
|
||||
class="form-group switch"
|
||||
class="form-group "
|
||||
>
|
||||
<div
|
||||
class="custom-control custom-switch"
|
||||
|
@ -30,7 +30,7 @@ exports[`<Switch/> Render switch 1`] = `
|
|||
|
||||
exports[`<Switch/> Render uncheked switch 1`] = `
|
||||
<div
|
||||
class="form-group switch"
|
||||
class="form-group "
|
||||
>
|
||||
<div
|
||||
class="custom-control custom-switch"
|
||||
|
|
|
@ -876,7 +876,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
|
|||
+ </select>
|
||||
+ </div>
|
||||
+ <div
|
||||
+ class=\\"form-group switch\\"
|
||||
+ class=\\"form-group \\"
|
||||
+ >
|
||||
+ <div
|
||||
+ class=\\"custom-control custom-switch\\"
|
||||
|
|
|
@ -27,7 +27,7 @@ export const ForisURLs = {
|
|||
|
||||
approveUpdates: "/package-management/updates",
|
||||
languages: "/package-management/languages",
|
||||
rebootPage: "/reforis/administration/reboot",
|
||||
rebootPage: "/administration/reboot",
|
||||
luci: "/cgi-bin/luci",
|
||||
|
||||
// API
|
||||
|
|
|
@ -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.
|
||||
* See /LICENSE for more information.
|
||||
|
@ -12,7 +12,7 @@ import { ForisURLs } from "../utils/forisUrls";
|
|||
const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";
|
||||
|
||||
const URL = process.env.LIGHTTPD
|
||||
? `${PROTOCOL}://${window.location.hostname}/foris-ws`
|
||||
? `${PROTOCOL}://${window.location.host}/foris-ws`
|
||||
: `${PROTOCOL}://${window.location.hostname}:${9081}`;
|
||||
|
||||
const WAITING_FOR_CONNECTION_TIMEOUT = 500;
|
||||
|
|
Loading…
Reference in New Issue
Block a user