From b4afd85d5d5e19e426a27b0bc100210d19d2a969 Mon Sep 17 00:00:00 2001 From: masterElmar <18119527+masterElmar@users.noreply.github.com> Date: Wed, 1 Nov 2023 19:06:54 +0100 Subject: [PATCH] fixed merge issue with main --- .gitignore | 3 + .idea/jsLibraryMappings.xml | 6 + .idea/modules.xml | 3 +- .idea/workspace.xml | 169 ++++ backend/.gitignore | 5 + backend/.idea/dataSources.xml | 12 + backend/.idea/jpa-buddy.xml | 6 + backend/.idea/misc.xml | 9 + backend/.idea/modules.xml | 8 + backend/.idea/vcs.xml | 6 + backend/backend.iml | 9 + backend/service/addRoute.go | 20 + backend/service/db/dbRooms.go | 35 +- backend/service/room/roomService.go | 5 + frontend/.gitignore | 1 + frontend/frontend.iml | 9 + frontend/package-lock.json | 998 +++++++++++++++++++++ frontend/package.json | 7 + frontend/src/api/fetchRoom.ts | 36 + frontend/src/components/MenuBar.vue | 5 + frontend/src/components/RoomFinder.vue | 50 ++ frontend/src/components/RoomOccupation.vue | 139 +++ frontend/src/model/event.ts | 13 +- frontend/src/router/index.ts | 6 + 24 files changed, 1552 insertions(+), 8 deletions(-) create mode 100644 .gitignore create mode 100644 .idea/jsLibraryMappings.xml create mode 100644 .idea/workspace.xml create mode 100644 backend/.idea/dataSources.xml create mode 100644 backend/.idea/jpa-buddy.xml create mode 100644 backend/.idea/misc.xml create mode 100644 backend/.idea/modules.xml create mode 100644 backend/.idea/vcs.xml create mode 100644 backend/backend.iml create mode 100644 frontend/frontend.iml create mode 100644 frontend/src/api/fetchRoom.ts create mode 100644 frontend/src/components/RoomFinder.vue create mode 100644 frontend/src/components/RoomOccupation.vue diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..525d280 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.idea/ +.DS_Store + diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml new file mode 100644 index 0000000..d23208f --- /dev/null +++ b/.idea/jsLibraryMappings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 86ac74f..99c7e98 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,8 @@ - + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..489f805 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + "associatedIndex": 2 +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1697463118186 + + + + + + + + + + + + + + false + true + + + +