HTWK/htwkalender-pwa
1
0
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender-pwa.git synced 2025-07-24 21:39:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 15-calendar-preview

Browse Source 
# Conflicts:
#	frontend/src/App.vue
#	frontend/src/view/AdditionalModules.vue
This commit is contained in:
masterelmar
2023-11-20 11:37:25 +01:00
parent bcd1dd714d ef9247c300
commit e8e7c6149a
59 changed files with 1539 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/App.vue
View File

@@ -1,11 +1,12 @@
<script lang="ts" setup>
import MenuBar from "./components/MenuBar.vue";
import { RouterView } from "vue-router";
import CalendarPreview from "./components/CalendarPreview.vue";
</script>
<template>
<MenuBar />
<router-view></router-view>
<RouterView />
<CalendarPreview />
</template>