Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vorbereitung zur Demo 20.11.2024 #233

Merged
merged 6 commits into from
Nov 19, 2024
Merged

Vorbereitung zur Demo 20.11.2024 #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24e5d3e
Feat/dave 200 anbindung featureservices (#216)
Der-Alex-K Oct 17, 2024
e0cd597
Feat/dave 387 blp keine darstellung nicht ausgewaehlter mq (#221)
Der-Alex-K Oct 17, 2024
ce52a40
fix wrong Zeitintervall (#225)
Der-Alex-K Oct 17, 2024
7ac4bca
Bug/sammler (#226)
Der-Alex-K Nov 12, 2024
2464192
DAVE-418 BUG Austausch Custom Date Picker durch vue3datepicker (#230)
boal Nov 18, 2024
bd16ff6
Feat/dave 205 gesamtauswertungen ausgabe excel (#231)
Der-Alex-K Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apigateway/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.release>${java.version}</maven.compiler.release>
<spring.boot.version>3.3.3</spring.boot.version>
<spring.boot.version>3.3.4</spring.boot.version>
<spring.cloud.version>2023.0.3</spring.cloud.version>
<!-- Version muss mit der in den spring-boot-dependencies bereitgestellten Lombok-Version übereinstimmen -->
<org.projectlombok.lombok.version>1.18.34</org.projectlombok.lombok.version>
Expand Down Expand Up @@ -158,7 +158,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.2</version>
<version>3.5.1</version>
<configuration>
<argLine>${jvm.options}</argLine>
</configuration>
Expand Down
107 changes: 66 additions & 41 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,32 @@
"dependencies": {
"@fontsource/roboto": "^4.5.8",
"@mdi/font": "7.3.67",
"@vuepic/vue-datepicker": "^10.0.0",
"moment": "^2.29.4",
"pinia": "^2.1.7",
"sass": "^1.77.6",
"vue": "^3.4.31",
"vue-router": "^4.4.0",
"vue-router": "^4.4.5",
"vuetify": "^3.7.1"
},
"devDependencies": {
"@babel/types": "^7.23.0",
"@ianvs/prettier-plugin-sort-imports": "^4.1.1",
"@ianvs/prettier-plugin-sort-imports": "^4.3.1",
"@muenchen/prettier-codeformat": "^1.0.1",
"@svgdotjs/svg.js": "3.0.16",
"@types/jsdom": "^21.1.4",
"@types/leaflet": "^1.9.12",
"@types/leaflet.fullscreen": "^3.0.2",
"@types/leaflet.markercluster": "^1.5.4",
"@types/lodash": "^4.17.6",
"@types/node": "^18.18.8",
"@types/lodash": "^4.17.10",
"@types/node": "^18.19.55",
"@vitejs/plugin-vue": "^4.4.0",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/test-utils": "^2.4.1",
"base64-blob": "1.4.1",
"echarts": "^5.5.1",
"eslint": "^8.52.0",
"eslint": "^8.57.1",
"eslint-plugin-vue": "^9.18.1",
"html2canvas": "^1.4.1",
"jsdom": "^22.1.0",
Expand All @@ -47,11 +48,11 @@
"leaflet.markercluster": "^1.5.3",
"leaflet.nontiledlayer": "^1.0.9",
"lodash": "^4.17.21",
"prettier": "^3.0.3",
"prettier": "^3.3.3",
"save-svg-as-png": "1.4.17",
"typescript": "^5.2.2",
"unplugin-fonts": "^1.0.3",
"vite": "^4.5.0",
"vite": "^4.5.5",
"vite-plugin-vuetify": "^1.0.2",
"vitest": "^0.34.6",
"vue-echarts": "^6.6.1",
Expand Down
4 changes: 2 additions & 2 deletions frontend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.release>${java.version}</maven.compiler.release>
<exec.maven.plugin>3.0.0</exec.maven.plugin>
<maven.clean.plugin>3.1.0</maven.clean.plugin>
<exec.maven.plugin>3.4.1</exec.maven.plugin>
<maven.clean.plugin>3.4.0</maven.clean.plugin>
<sonar.sources>src,public</sonar.sources>
<sonar.coverage.exclusions>src,public</sonar.coverage.exclusions>
</properties>
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

<router-view
v-slot="{ Component }"
:key="$route.fullPath"
:key="route.fullPath"
>
<v-fade-transition mode="out-in">
<component :is="Component" />
Expand All @@ -69,6 +69,7 @@

<script setup lang="ts">
import { ref } from "vue";
import { useRoute } from "vue-router";

import goldTrophy from "@/../public/easteregg/trophy-outline-gold.svg";
import silverTrophy from "@/../public/easteregg/trophy-outline-silver.svg";
Expand All @@ -92,6 +93,7 @@ const frontendVersion = ref("");

const snackbarStore = useSnackbarStore();
const userStore = useUserStore();
const route = useRoute();

created();

Expand Down
Loading
Loading