Merge branch 'feature/ws-included' into 'dev'

Using socket.io for websocket handling and make reforis configurable

See merge request turris/reforis/foris-js!201

CHANGELOG.md

@@ -8,19 +8,6 @@ and this project adheres to
 
 ## [Unreleased]
 
-## [6.2.0] - 2024-09-20
-
-### Added
-
--   Added useFocusTrap hook
--   Added extendSession endpoint
-
-### Changed
-
--   Refactored Spinner.css to use CSS variable for color
--   Refactored Modal component to use useFocusTrap hook
--   Refactored Alert component to use useFocusTrap hook
-
 ## [6.1.1] - 2024-08-30
 
 ### Added
@@ -374,8 +361,7 @@ and this project adheres to
 ## [0.0.7] - 2019-09-02
 
 [unreleased]:
-    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.2.0...dev
-[6.2.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.1.1...v6.2.0
+    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.1.1...master
 [6.1.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.1.0...v6.1.1
 [6.1.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.3...v6.1.0
 [6.0.3]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.2...v6.0.3

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "foris",
-    "version": "6.2.0",
+    "version": "6.1.1",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "foris",
-            "version": "6.2.0",
+            "version": "6.1.1",
             "license": "GPL-3.0",
             "dependencies": {
                 "@fortawesome/fontawesome-svg-core": "^6.6.0",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "foris",
-    "version": "6.2.0",
+    "version": "6.1.1",
     "description": "Foris JS library is a set of components and utils for reForis application and plugins.",
     "author": "CZ.NIC, z.s.p.o.",
     "repository": {

src/bootstrap/Spinner.css

@@ -9,7 +9,7 @@
 .spinner-wrapper .spinner-border {
     width: 4rem;
     height: 4rem;
-    color: var(--bs-primary);
+    color: #00a2e2;
 }
 
 .spinner-fs-background {

src/utils/forisUrls.js

@@ -9,10 +9,8 @@ export const REFORIS_URL_PREFIX = process.env.REFORIS_PREFIX || "";
 export const REFORIS_API_URL_PREFIX = `${REFORIS_URL_PREFIX}/api`;
 
 export const ForisURLs = {
-    // turris-auth
     login: `/login?${REFORIS_URL_PREFIX}/`,
     logout: `/logout`,
-    extendSession: `/extend-session`,
 
     static: `${REFORIS_URL_PREFIX}/static/reforis`,
     wifi: `${REFORIS_URL_PREFIX}/network-settings/wifi`,