Merge branch 'main' of https://github.com/Sybit-Education/bk2wi-2023

Sybit-Education · Jan 8, 2024 · 0b6485a · 0b6485a
2 parents f41c3ea + 728b9db
commit 0b6485a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 27 deletions.
diff --git a/src/components/verleih/VerleihList.vue b/src/components/verleih/VerleihList.vue
@@ -22,7 +22,7 @@ import { mapState } from 'pinia';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-  name: "ProjectListView",
+  name: "VerleihListView",
   computed: {
     ...mapState(useVerleihItemStore, {
       verleihList: (store) => store.verleihItemList as Array<VerleihItem>,

diff --git a/src/views/EventDetailView.vue b/src/views/EventDetailView.vue
@@ -1,7 +1,7 @@
 <template>
     <div  v-if="events">
       <BBreadcrumb>
-        <BBreadcrumbItem to="/home"> Home </BBreadcrumbItem>
+        <BBreadcrumbItem to="/"> Home </BBreadcrumbItem>
         <BBreadcrumbItem to="/event"> Events </BBreadcrumbItem>
         <BBreadcrumbItem :to="'/event/' + events.id" active> {{ events.name }} </BBreadcrumbItem>
       </BBreadcrumb>

diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
@@ -10,19 +10,14 @@ const entries = ref([ "test", '1234', '567'])
 
 </script>
 
-<template>   
-  <BRow>
-    <BCol lg="3">
-      <FilterSidebar />
-    </BCol>
-    <BCol>
-      <BRow>
-        <SearchBar :searchQuery="searchQuery" @searchQuery="searchQuery = $event" />
-        <HomeContent :entries="entries" :foundEntry="searchQuery" />
-
-      </BRow>
-    </BCol>
-  </BRow>
+<template>
+  <BContainer>
+      <!-- <BCol lg="3">
+        <FilterSidebar />
+      </BCol> -->
+          <SearchBar :searchQuery="searchQuery" @searchQuery="searchQuery = $event" />
+          <HomeContent :entries="entries" :foundEntry="searchQuery" />
+  </BContainer>   
 </template>
 
 <style scoped>

diff --git a/src/views/VerleihDetailView.vue b/src/views/VerleihDetailView.vue
@@ -1,7 +1,7 @@
 <template>
   <div  v-if="verleih">
     <BBreadcrumb>
-      <BBreadcrumbItem to="/home"> Home </BBreadcrumbItem>
+      <BBreadcrumbItem to="/"> Home </BBreadcrumbItem>
       <BBreadcrumbItem to="/verleih"> Verleihe </BBreadcrumbItem>
       <BBreadcrumbItem :to="'/verleih/' + verleih.id" active> {{ verleih.name }} </BBreadcrumbItem>
     </BBreadcrumb>

diff --git a/src/views/VerleihListView.vue b/src/views/VerleihListView.vue
@@ -1,23 +1,15 @@
 <script setup lang="ts">
-// import Verleihlistcontent from '@/components/Verleihlistcontent.vue'
-import FilterSidebar from '@/components/FilterSidebar.vue'
-import SearchBar from '@/components/SearchBar.vue'
-import type { BRow } from 'bootstrap-vue-next'
-import {  ref } from 'vue'
-
-
-const searchQuery = ref('')
-const entries = ref([ "test", '1234', '567'])
+import VerleihList from '../components/verleih/VerleihList.vue'
 
 </script>
 
 <template>
 
 <BContainer>
   <BRow>
-    <BCol>
+    <!-- <BCol>
       <FilterSidebar />
-    </BCol >
+    </BCol > -->
       <!-- <BCol>
         <SearchBar :searchQuery="searchQuery" @searchQuery="searchQuery = $event" />
     </BCol> -->