-
+
- Kalender +
- Einstellungen +
+
+
+
+
+
+
+
+
+
+
+
+
+ diff --git a/build.gradle b/build.gradle index df03d62..af2d690 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group = 'de.jottyfan' -version = '1.2.7' +version = '1.2.8' sourceCompatibility = '11' ext['spring-framework.version'] = '5.3.18' @@ -25,21 +25,22 @@ repositories { dependencyManagement { imports { - mavenBom 'org.keycloak.bom:keycloak-adapter-bom:17.0.1' + mavenBom 'org.keycloak.bom:keycloak-adapter-bom:21.1.1' } } dependencies { - implementation 'org.apache.logging.log4j:log4j-api:2.17.1' - implementation 'org.apache.logging.log4j:log4j-core:2.17.1' - implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.17.1' + implementation 'org.apache.logging.log4j:log4j-api:2.20.0' + implementation 'org.apache.logging.log4j:log4j-core:2.20.0' + implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.20.0' - implementation 'org.webjars:bootstrap:5.1.3' + implementation 'org.webjars:bootstrap:5.2.3' implementation 'org.webjars:font-awesome:5.15.4' - implementation 'org.webjars:jquery:3.6.0' + implementation 'org.webjars:jquery:3.6.4' implementation 'org.webjars:popper.js:2.9.3' - implementation 'org.webjars:datatables:1.11.3' - implementation 'org.webjars:jquery-ui:1.13.0' + implementation 'org.webjars:datatables:1.13.2' + implementation 'org.webjars:jquery-ui:1.13.2' + implementation 'org.webjars:fullcalendar:5.11.3' implementation 'com.google.code.gson:gson:2.9.0'; diff --git a/src/main/java/de/jottyfan/timetrack/spring/calendar/CalendarController.java b/src/main/java/de/jottyfan/timetrack/spring/calendar/CalendarController.java new file mode 100644 index 0000000..0e6982c --- /dev/null +++ b/src/main/java/de/jottyfan/timetrack/spring/calendar/CalendarController.java @@ -0,0 +1,20 @@ +package de.jottyfan.timetrack.spring.calendar; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * + * @author jotty + * + */ +@Controller +public class CalendarController { + + @GetMapping("/calendar") + public String getCalendar(Model model) { + // TODO: implement + return "/calendar/calendar"; + } +} diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index b63c899..b63ee80 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -246,6 +246,13 @@ body { border: 1px solid silver; } +.tab-pane-glassy { + background: rgba(255, 255, 255, 0.5); + padding: 8px; + border-radius: 4px; + border: 1px solid silver; +} + .inputtimefield { min-width: 70px !important; } diff --git a/src/main/resources/templates/calendar/calendar.html b/src/main/resources/templates/calendar/calendar.html new file mode 100644 index 0000000..f761b2b --- /dev/null +++ b/src/main/resources/templates/calendar/calendar.html @@ -0,0 +1,55 @@ + + +
+