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

Sybit-Education · Nov 27, 2023 · f897df9 · f897df9
2 parents 73caa5e + 5ff11a4
commit f897df9
Show file tree

Hide file tree

Showing 26 changed files with 281 additions and 290 deletions.
diff --git a/components.d.ts b/components.d.ts
@@ -7,22 +7,37 @@ export {}
 
 declare module 'vue' {
   export interface GlobalComponents {
+    BarsItem: typeof import('./src/components/bars/barsItem.vue')['default']
+    BarsList: typeof import('./src/components/bars/barsList.vue')['default']
+    BBreadcrumb: typeof import('bootstrap-vue-next')['BBreadcrumb']
+    BBreadcrumbItem: typeof import('bootstrap-vue-next')['BBreadcrumbItem']
     BButton: typeof import('bootstrap-vue-next')['BButton']
     BCard: typeof import('bootstrap-vue-next')['BCard']
     BCardGroup: typeof import('bootstrap-vue-next')['BCardGroup']
     BCardText: typeof import('bootstrap-vue-next')['BCardText']
     BCardTitle: typeof import('bootstrap-vue-next')['BCardTitle']
     BCol: typeof import('bootstrap-vue-next')['BCol']
+    BCollapse: typeof import('bootstrap-vue-next')['BCollapse']
     BContainer: typeof import('bootstrap-vue-next')['BContainer']
     BFormGroup: typeof import('bootstrap-vue-next')['BFormGroup']
     BFormInput: typeof import('bootstrap-vue-next')['BFormInput']
+    BImg: typeof import('bootstrap-vue-next')['BImg']
     BInputGroup: typeof import('bootstrap-vue-next')['BInputGroup']
+    BNavbar: typeof import('bootstrap-vue-next')['BNavbar']
+    BNavbarBrand: typeof import('bootstrap-vue-next')['BNavbarBrand']
+    BNavbarNav: typeof import('bootstrap-vue-next')['BNavbarNav']
+    BNavbarToggle: typeof import('bootstrap-vue-next')['BNavbarToggle']
+    BNavItem: typeof import('bootstrap-vue-next')['BNavItem']
+    BNavText: typeof import('bootstrap-vue-next')['BNavText']
     BPlaceholder: typeof import('bootstrap-vue-next')['BPlaceholder']
     BPlaceholderCard: typeof import('bootstrap-vue-next')['BPlaceholderCard']
     BPlaceholderWrapper: typeof import('bootstrap-vue-next')['BPlaceholderWrapper']
     BRow: typeof import('bootstrap-vue-next')['BRow']
     BSkeleton: typeof import('bootstrap-vue-next')['BSkeleton']
     BSkeletonWrapper: typeof import('bootstrap-vue-next')['BSkeletonWrapper']
+    Club1: typeof import('./src/components/club/Club1.vue')['default']
+    ClubItem: typeof import('./src/components/club/ClubItem.vue')['default']
+    ClubList: typeof import('./src/components/club/ClubList.vue')['default']
     ContentItem: typeof import('./src/components/ContentItem.vue')['default']
     EventItem: typeof import('./src/components/events/EventItem.vue')['default']
     EventList: typeof import('./src/components/events/EventList.vue')['default']
@@ -43,4 +58,7 @@ declare module 'vue' {
     TheWelcome: typeof import('./src/components/TheWelcome.vue')['default']
     WelcomeItem: typeof import('./src/components/WelcomeItem.vue')['default']
   }
+  export interface ComponentCustomProperties {
+    vBColorMode: typeof import('bootstrap-vue-next')['vBColorMode']
+  }
 }
diff --git a/src/App.vue b/src/App.vue
@@ -1,6 +1,4 @@
 <script lang="ts">
-import { RouterView } from 'vue-router'
-import LocaleeHeader from "./components/LocaleeHeader.vue"
 import { useEventItemStore } from './stores/eventItem';
 import { useClubItemStore } from './stores/clubItem';
 

diff --git a/src/components/ContentItem.vue b/src/components/ContentItem.vue
@@ -4,7 +4,7 @@
     <slot name="text"></slot>
 
     <BCard
-      title= "Test"
+      title= "test"
       img-src="https://picsum.photos/600/300/?image=25"
       img-alt="Image"
       img-top
@@ -13,7 +13,7 @@
     >
       <BCardText>
         Some quick example text to build on the card title and make up the bulk of the card's
-        content.
+        content. {{ title }}
       </BCardText>
 
       <BButton href="#" variant="primary">Go somewhere</BButton>

diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue
diff --git a/src/components/HomeContent.vue b/src/components/HomeContent.vue
@@ -1,16 +1,17 @@
 <template>
-    <div id="contentbox">
+    <div>
 
       <!--
       <div class="item entry" v-for="entry in filteredList()" :key="entry">
         {{entry}}
       </div>
       -->
 
-      <ContentItem title="test"></ContentItem>
-
-      <ContentItem></ContentItem>
+      <h2>Clubs</h2>
+      <ClubList />
 
+
+      <h2>Events</h2>
       <EventList />
 
     </div>
@@ -19,6 +20,8 @@
 <script setup lang="ts">
 import ContentItem from './ContentItem.vue';
 import EventList from './events/EventList.vue'
+import ClubList from './club/ClubList.vue'
+
 
 const props = defineProps(['foundEntry', 'entries'])
 

diff --git a/src/components/LocaleeHeader.vue b/src/components/LocaleeHeader.vue
@@ -2,9 +2,18 @@
 
 
 <template>
-    <div id="header">
-        <h1>Localee</h1>
-    </div>
+    <BNavbar toggleable="sm" variant="primary" v-b-color-mode="'dark'">
+        <BNavbarBrand tag="h1" class="mb-0" to="/">Localee</BNavbarBrand>
+
+        <BNavbarToggle target="nav-text-collapse" />
+
+        <BCollapse id="nav-text-collapse" is-nav>
+            <BNavbarNav>
+                <BNavItem to="/club">Clubs</BNavItem>
+                <BNavItem to="/about">Über uns</BNavItem>
+            </BNavbarNav>
+        </BCollapse>
+    </BNavbar>
 </template>
 
 

diff --git a/src/components/TheWelcome.vue b/src/components/TheWelcome.vue
diff --git a/src/components/WelcomeItem.vue b/src/components/WelcomeItem.vue
diff --git a/src/components/bars/barsItem.vue b/src/components/bars/barsItem.vue
@@ -0,0 +1,20 @@
+<template>
+    <b-card img-src="https://picsum.photos/300/200" img-top>
+        <b-card-title>{{ event.name }}</b-card-title>
+        <b-card-text>Lore ipsum </b-card-text>
+    </b-card>
+</template>
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+
+export default defineComponent({
+    name: 'EventItem',
+    props: {
+        event: {
+            type: Object,
+            required: true,
+        }
+    }
+})
+</script>