Skip to content

Commit efbe7e4

Browse files
SirChriSirChri
committed
fixed issue on events edit; improved ui and translations
1 parent b964287 commit efbe7e4

File tree

12 files changed

+706
-815
lines changed

12 files changed

+706
-815
lines changed

‎CHANGELOG.md‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,33 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [0.9.4]
9+
10+
### Added
11+
- Added buttons to select and deselect all calendars for easier management.
12+
13+
### Fixed
14+
- Fixed an issue where editing events in the popup was not functioning correctly.
15+
16+
### Improvements
17+
- Completed all missing translations for English (`en`) and Italian (`it`).
18+
- Enhanced the overall layout for a cleaner and more user-friendly interface.
19+
- Updated the UI font to **Open Sans** for a modern and consistent appearance.
20+
- Upgraded all frontend libraries to ensure better performance, security, and compatibility.
21+
822
## [0.9.3]
923

10-
## Added
24+
### Added
1125
- Timezone management: Users can now select a specific timezone for each event and view the calendar in a different timezone. The default timezone is set to "Europe/Rome," but it can be customized in the user preferences page.
1226
- Added user preferences
1327

14-
## Improvements
28+
### Improvements
1529
- Updated all frontend dependencies to use Node.js version 24, ensuring improved performance and compatibility
1630
- Enhanced the design and usability of the event popup for a better user experience.
1731

1832
## [0.9.2]
1933

20-
## Fixed
34+
### Fixed
2135
- unable to set "until" recurring fields
2236

2337
## [0.9.1]

‎webapp/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM tomcat:jre21
2-
ADD https://github.com/SirChri/employee-shift-scheduler/releases/latest/download/ess-v0.9.3.war /tmp/ess.war
2+
ADD ./target/ess.war /tmp/ess.war
33
RUN apt-get update && apt-get install unzip
44
RUN unzip /tmp/ess.war -d /usr/local/tomcat/webapps/ess
55

‎webapp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</parent>
1414
<groupId>io.sirchri</groupId>
1515
<artifactId>ess</artifactId>
16-
<version>0.9.3</version>
16+
<version>0.9.4</version>
1717
<packaging>war</packaging>
1818
<name>ess</name>
1919
<description>Shift Scheduler</description>

‎webapp/src/main/frontend/package.json‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,42 @@
11
{
22
"name": "ess-ui",
3-
"version": "0.9.3",
3+
"version": "0.9.4",
44
"private": true,
55
"dependencies": {
6-
"@fullcalendar/core": "6.1.18",
7-
"@fullcalendar/daygrid": "6.1.18",
8-
"@fullcalendar/interaction": "6.1.18",
9-
"@fullcalendar/react": "6.1.18",
10-
"@fullcalendar/rrule": "6.1.18",
11-
"@fullcalendar/timegrid": "6.1.18",
6+
"@fullcalendar/core": "^6.1.18",
7+
"@fullcalendar/daygrid": "^6.1.18",
8+
"@fullcalendar/interaction": "^6.1.18",
9+
"@fullcalendar/react": "^6.1.18",
10+
"@fullcalendar/rrule": "^6.1.18",
11+
"@fullcalendar/timegrid": "^6.1.18",
1212
"@mui/icons-material": "^7.2.0",
1313
"@mui/material": "^7.2.0",
14-
"@testing-library/jest-dom": "6.6.3",
15-
"@testing-library/react": "16.3.0",
16-
"@testing-library/user-event": "14.6.1",
17-
"dotenv": "17.2.0",
18-
"moment": "2.30.1",
19-
"ra-data-simple-rest": "5.9.2",
20-
"react": "19.1.0",
21-
"react-admin": "5.9.2",
22-
"react-calendar": "6.0.0",
23-
"react-dom": "^19.1.0",
24-
"react-progressbar": "15.4.1",
25-
"typescript": "4.9.5",
26-
"web-vitals": "5.0.3",
27-
"xss": "1.0.15"
14+
"@testing-library/jest-dom": "^6.6.3",
15+
"@testing-library/react": "^16.3.0",
16+
"@testing-library/user-event": "^14.6.1",
17+
"dotenv": "^17.2.0",
18+
"ra-data-simple-rest": "^5.9.2",
19+
"react": "^19.1.1",
20+
"react-admin": "^5.9.2",
21+
"react-calendar": "^6.0.0",
22+
"react-dom": "^19.1.1",
23+
"react-progressbar": "^15.4.1",
24+
"typescript": "^4.9.5",
25+
"web-vitals": "^5.0.3",
26+
"xss": "^1.0.15"
2827
},
2928
"devDependencies": {
30-
"@types/jsonexport": "3.0.5",
31-
"@types/node": "24.0.15",
32-
"@types/react-calendar": "4.1.0",
33-
"@types/react-color": "3.0.13",
34-
"@types/react-datepicker": "7.0.0",
29+
"@types/jsonexport": "^3.0.5",
30+
"@types/node": "^24.0.15",
31+
"@types/react-calendar": "^4.1.0",
32+
"@types/react-color": "^3.0.13",
33+
"@types/react-datepicker": "^7.0.0",
3534
"@types/react-dom": "^19.1.6",
36-
"ra-i18n-polyglot": "5.9.2",
37-
"ra-jsonapi-client": "0.10.0",
38-
"ra-language-english": "5.9.2",
39-
"react-color": "2.19.3",
40-
"react-scripts": "5.0.1"
35+
"ra-i18n-polyglot": "^5.9.2",
36+
"ra-jsonapi-client": "^0.10.0",
37+
"ra-language-english": "^5.9.2",
38+
"react-color": "^2.19.3",
39+
"react-scripts": "^5.0.1"
4140
},
4241
"scripts": {
4342
"start": "react-scripts start",
@@ -63,4 +62,4 @@
6362
]
6463
},
6564
"proxy": "http://localhost:8081"
66-
}
65+
}

‎webapp/src/main/frontend/public/index.html‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="utf-8" />
5-
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1" />
7-
<meta name="theme-color" content="#000000" />
8-
<meta
9-
name="description"
10-
content="Web site created using create-react-app"
11-
/>
12-
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
13-
<!--
3+
4+
<head>
5+
<meta charset="utf-8" />
6+
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
7+
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700&display=swap" rel="stylesheet">
8+
<meta name="description" content="Web site created using create-react-app" />
9+
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
10+
<!--
1411
manifest.json provides metadata used when your web app is installed on a
1512
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
1613
-->
17-
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
18-
<!--
14+
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
15+
<!--
1916
Notice the use of %PUBLIC_URL% in the tags above.
2017
It will be replaced with the URL of the `public` folder during the build.
2118
Only files inside the `public` folder can be referenced from the HTML.
@@ -24,12 +21,13 @@
2421
work correctly both with client-side routing and a non-root public URL.
2522
Learn how to configure a non-root public URL by running `npm run build`.
2623
-->
27-
<title>Shift Scheduler</title>
28-
</head>
29-
<body>
30-
<noscript>You need to enable JavaScript to run this app.</noscript>
31-
<div id="root" style="display: flex; flex-flow: column; height: 100vh"></div>
32-
<!--
24+
<title>Shift Scheduler</title>
25+
</head>
26+
27+
<body>
28+
<noscript>You need to enable JavaScript to run this app.</noscript>
29+
<div id="root" style="display: flex; flex-flow: column; height: 100vh"></div>
30+
<!--
3331
This HTML file is a template.
3432
If you open it directly in the browser, you will see an empty page.
3533
@@ -39,5 +37,6 @@
3937
To begin the development, run `npm start` or `yarn start`.
4038
To create a production bundle, use `npm run build` or `yarn build`.
4139
-->
42-
</body>
43-
</html>
40+
</body>
41+
42+
</html>

‎webapp/src/main/frontend/src/components/ColorInput.tsx‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@ interface ColorInputProps {
3939
isRequired?: boolean
4040
validate?: Validator | Validator[] | undefined
4141
picker?:
42-
| 'Alpha'
43-
| 'Block'
44-
| 'Check'
45-
| 'Chrome'
46-
| 'Circle'
47-
| 'Compact'
48-
| 'Github'
49-
| 'Hue'
50-
| 'Material'
51-
| 'Photoshop'
52-
| 'Sketch'
53-
| 'Slider'
54-
| 'Swatches'
55-
| 'Twitter'
56-
| 'Custom'
42+
| 'Alpha'
43+
| 'Block'
44+
| 'Check'
45+
| 'Chrome'
46+
| 'Circle'
47+
| 'Compact'
48+
| 'Github'
49+
| 'Hue'
50+
| 'Material'
51+
| 'Photoshop'
52+
| 'Sketch'
53+
| 'Slider'
54+
| 'Swatches'
55+
| 'Twitter'
56+
| 'Custom'
5757
}
5858

5959
export const ColorInput = (props: ColorInputProps) => {
@@ -95,6 +95,7 @@ export const ColorInput = (props: ColorInputProps) => {
9595
isRequired={isRequired}
9696
label={label}
9797
error={!!(isTouched && error)}
98+
style={{ marginRight: '5px' }}
9899
/>
99100
{show ? (
100101
<div className="ColorInput-popup">
@@ -106,13 +107,14 @@ export const ColorInput = (props: ColorInputProps) => {
106107
</div>
107108
) : null}
108109
<div
110+
onClick={handleOpen}
109111
style={{
110-
width: '20px',
112+
width: '40px',
111113
height: '40px',
112-
background: field.value ? field.value : "#FFFFFF",
113-
border: "1px solid #bbb",
114-
marginRight: '5px',
115-
marginLeft: '-1px'
114+
background: field.value || '#FFFFFF',
115+
border: '1px solid #bbb',
116+
borderRadius: '4px',
117+
cursor: 'pointer',
116118
}}
117119
/>
118120
</div>

0 commit comments

Comments
 (0)