1859: Fixed merge

.docker/vhost.conf

@@ -9,7 +9,7 @@ server {
         proxy_pass         http://node:3000;
     }
 
-    location /ws {
+    location /admin/ws {
         proxy_pass http://node:3000;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;

.gitignore

@@ -28,13 +28,13 @@ yarn-error.log*
 # Temp files
 temp/
 
-# API mock
-json-server/
-
-public/config.json
-public/access-config.json
-public/release.json
+# Playwright
 /test-results/
 /playwright-report/
 /blob-report/
 /playwright/.cache/
+
+# Json files in public folder
+public/config.json
+public/access-config.json
+public/release.json

CHANGELOG.md

@@ -1,31 +1,42 @@
+
 # Changelog
 
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-- Changed playlist.slides list columns.
-- Set published.to to now when creating new slides.
-- Added option to sort slides in playlist by published.to and status.
-- Changed from vite CJS to ESM.
-- Removed array spread.
-- Fixed HMR setup.
-- Upgraded @fortawesome/react-fontawesome, react-quill, react-toastify.
-- Removed unused react-dayjs.
-- Remove default props from the project.
-
-- [#244](https://github.com/aroskanalen/display-admin-client/pull/1)
+- [#254](https://github.com/os2display/display-admin-client/pull/254)
+  - Changed playlist.slides list columns.
+  - Set published.to to now when creating new slides.
+  - Added option to sort slides in playlist by published.to and status.
+- [#253](https://github.com/os2display/display-admin-client/pull/253)
+  - Refactored scheduling to increase user experience.
+  - Added interval and count to rrule inputs.
+- [#249](https://github.com/os2display/display-admin-client/pull/249)
+  - Set infrastructure node version to 20.
+  - Fixed base path to /admin in vite setup.
+  - Changed from vite CJS to ESM.
+  - Removed array spread.
+  - Fixed HMR setup.
+  - Upgraded @fortawesome/react-fontawesome, react-quill, react-toastify.
+  - Removed unused react-dayjs.
+  - Remove default props from the project.
   - Migrate from Cypress to playwright
-
-- [#243](https://github.com/aroskanalen/display-admin-client/pull/2)
   - Migrate from CRA to Vite
   - Upgrade node from 14 -> 20
 
+## [2.0.3] - 2024-08-14
+
+- [#252](https://github.com/os2display/display-admin-client/pull/252)
+  - Reverted change in https://github.com/os2display/display-admin-client/commit/65762066c708f541305a48fbd6b28264dca593b5 regarding rrule dtstart.
+  - Added comments about how rrules are handled.
 - [#242](https://github.com/os2display/display-admin-client/pull/243)
-    - Add entry in example config for midttrafik api key
-    - Clean up multi select component a bit, replace reduce with Map logic
-    - Make the station selector call new api
-    - Add config to context in app.jsx
+  - Add entry in example config for midttrafik api key
+  - Clean up multi select component a bit, replace reduce with Map logic
+  - Make the station selector call new api
+  - Add config to context in app.jsx
+- [#243](https://github.com/os2display/display-admin-client/pull/251)
+  - Fix null bug: replace valueAsDate with target.value as valueAsDate was null
 
 ## [2.0.2] - 2024-04-25
 

README.md

@@ -8,7 +8,7 @@ description of the admin.
 
 ### Create public/config file
 
-By default the api that is requested is located at `/api/`.
+By default, the api that is requested is located at `/api/`.
 This can be configured by:
 
 ```shell