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
Merge branch 'bump-version-620' into 'dev'
2024-11-14 17:35:35 +01:00 · 2024-09-21 20:28:53 +02:00 · 2024-09-20 13:51:48 +02:00 · 2024-09-20 13:36:45 +02:00 · 2024-09-20 13:27:22 +02:00 · 2024-09-20 13:23:01 +02:00
5 changed files with 21 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -8,6 +8,19 @@ 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
@ -361,7 +374,8 @@ and this project adheres to
 ## [0.0.7] - 2019-09-02

 [unreleased]:
-    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.1.1...master
+    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
 [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
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
    "name": "foris",
-    "version": "6.1.1",
+    "version": "6.2.0",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
        "": {
            "name": "foris",
-            "version": "6.1.1",
+            "version": "6.2.0",
            "license": "GPL-3.0",
            "dependencies": {
                "@fortawesome/fontawesome-svg-core": "^6.6.0",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "foris",
-    "version": "6.1.1",
+    "version": "6.2.0",
    "description": "Foris JS library is a set of components and utils for reForis application and plugins.",
    "author": "CZ.NIC, z.s.p.o.",
    "repository": {
--- a/src/bootstrap/Spinner.css
+++ b/src/bootstrap/Spinner.css
@ -9,7 +9,7 @@
 .spinner-wrapper .spinner-border {
    width: 4rem;
    height: 4rem;
-    color: #00a2e2;
+    color: var(--bs-primary);
 }

 .spinner-fs-background {
--- a/src/utils/forisUrls.js
+++ b/src/utils/forisUrls.js
@ -9,8 +9,10 @@ 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`,
Author	SHA1	Message	Date
Štěpán Henek	22fc17c265	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	2024-09-21 20:28:53 +02:00
Aleksandr Gumroian	acfbeb2c43	Merge branch 'bump-version-620' into 'dev' Bump v6.2.0 See merge request turris/reforis/foris-js!239	2024-09-20 13:51:48 +02:00
Aleksandr Gumroian	3bef624ce4	Bump v6.2.0 * Add useFocusTrap hook * Add extendSession endpoint * Refactor Spinner.css to use CSS variable for color * Refactor Modal component to use useFocusTrap hook * Refactor Alert component to use useFocusTrap hook	2024-09-20 13:36:45 +02:00
Aleksandr Gumroian	7d0d52666d	Merge branch 'add-extend-session-url' into 'dev' Add extendSession endpoint ot ForisURLs See merge request turris/reforis/foris-js!238	2024-09-20 13:27:22 +02:00
Aleksandr Gumroian	52fe5d65a6	Refactor Spinner.css to use CSS variable for color	2024-09-20 13:23:01 +02:00
Aleksandr Gumroian	b99add91cf	Refactor ForisURLs.js to add extendSession endpoint	2024-09-20 13:23:01 +02:00