Merge master (#1188)

Merge branch 'master' into 709-6-Toggle-In-TopMenu resolve review - robert resolve review - robert fix eslint in backend fix unit update after rebase fix storybook error jsdom fix lint resolve conclict from - git rebase origin/master fix lint Update frontend/src/components/menu/BottomMenu.vue Update frontend/src/components/menu/BottomMenu.vue Update frontend/src/components/menu/BottomMenu.vue fix test:lint add @typescript-eslint/no-unsafe-argument fix test:unit fix test:lint fix stories remove unused code camera button position in percent fix lint eslint, test update add cursor:pointer an camera icon in top und bottom menu add changes ListWithNavigationDrawer saved fix update, lint, test add ListWithNavigationDrawer in bottom menu and topmenu remove MessageIndicator NewsIndicator file in bottom menu fix eslint resolve conclict from - git rebase origin/master all tests, lint fix test drawer buttom menu, commented out resolve conclict from - git rebase origin/master resolve conclict from - git rebase origin/master resolve conclict from - git rebase origin/master remove timeout for refetch rooms more logs, use setRooms to update state delay refetch open rooms 1 min, more console to debug console to debug linting error handling refetch open rooms handle click event on open room type startTime in Room/OpenRoom is string resolve conclict from - git rebase origin/master Add rooms store. resolve conclict from - git rebase origin/master Fix linting resolve conclict from - git rebase origin/master resolve conclict from - git rebase origin/master fix style fix eslint remove space lint fix resolve conclict from - git rebase origin/master remove render files remove only from test resolve conclict from - git rebase origin/master change classname resolve conclict from - git rebase origin/master resolve conclict from - git rebase origin/master fix test and lint and update add snapshot resolve conflicts, remove Navigatin Drawer Component remove unused prop Update frontend/src/components/vuetify/NavigationDrawer.vue Co-authored-by: Moriz Wahl <[email protected]> Update frontend/src/components/vuetify/NavigationDrawer.vue Co-authored-by: Moriz Wahl <[email protected]> add snapshots remove unused file add locale, change tsconfig coverage to 96% fix lint add snapshots, ??render config??? resolve conclict from - git rebase origin/master fix lint, fix test clear imports Add Snapshots clear imports Add Snapshot, fix lint Add SearchField Component fix clear imports change files and folders for atomic design add ListWithNavigationDrawer Component, change files and folders for atomic design fix test add snapshot fix lint NavigationDrawer Component fix test and lint Add ListElement Component Co-authored-by: Maximilian Harz <[email protected]>
dreammall-earth · Jul 10, 2024 · ce3cd41 · ce3cd41
1 parent 812efa7
commit ce3cd41
Show file tree

Hide file tree

Showing 10 changed files with 1,585 additions and 3,942 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/components/buttons/CreateButtonMobile.test.ts b/frontend/src/components/buttons/CreateButtonMobile.test.ts
@@ -7,7 +7,7 @@ import CreateButtonMobile from './CreateButtonMobile.vue'
 vi.mock('vike/client/router')
 vi.mocked(navigate).mockResolvedValue()
 
-describe('CreateButton', () => {
+describe('CreateButtonMobile', () => {
   const Wrapper = () => {
     return mount(CreateButtonMobile, {
       props: {},
@@ -49,18 +49,14 @@ describe('CreateButton', () => {
   })
 
   describe('new table button', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       wrapper = Wrapper()
+      await wrapper.find('#create-button-mobile').trigger('click')
     })
-    describe('enter room', () => {
-      beforeEach(async () => {
-        await wrapper.find('#create-button-mobile').trigger('click')
-        await wrapper.find('.button-list-mobile button.new-table-button').trigger('click')
-      })
 
-      it('opens room page', () => {
-        expect(navigate).toHaveBeenCalledWith('/room/')
-      })
+    it('opens room page', async () => {
+      await wrapper.find('.button-list-mobile button.new-table-button').trigger('click')
+      expect(navigate).toHaveBeenCalledWith('/room/')
     })
   })
 })
diff --git a/frontend/src/components/buttons/__snapshots__/CreateButtonMobile.test.ts.snap b/frontend/src/components/buttons/__snapshots__/CreateButtonMobile.test.ts.snap
@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`CreateButton > renders 1`] = `
+exports[`CreateButtonMobile > renders 1`] = `
 <div
   class="create-button-container"
   data-v-1c60eb53=""

diff --git a/frontend/src/components/menu/BottomMenu.vue b/frontend/src/components/menu/BottomMenu.vue
@@ -27,13 +27,15 @@ import Circle from './CircleElement.vue'
 import UserInfo from './UserInfo.vue'
 
 const drawer = ref(false)
+const location = ref<'bottom' | 'right' | 'left' | 'end' | 'top' | 'start'>('bottom')
+
 const toggleDrawer = () => {
   drawer.value = !drawer.value
 }
+
 const updateDrawer = (value: boolean) => {
   drawer.value = value
 }
-const location = ref<'bottom' | 'right' | 'left' | 'end' | 'top' | 'start'>('bottom')
 </script>
 
 <style scoped lang="scss">

diff --git a/frontend/src/components/menu/TopMenu.stories.ts b/frontend/src/components/menu/TopMenu.stories.ts
@@ -15,6 +15,10 @@ const meta = {
 export default meta
 type Story = StoryObj<typeof meta>
 
-export const Example: Story = {
-  args: {},
+export const WithDrawer: Story = {
+  args: { drawer: true },
+}
+
+export const WithoutDrawer: Story = {
+  args: { drawer: false },
 }
diff --git a/frontend/src/components/menu/TopMenu.vue b/frontend/src/components/menu/TopMenu.vue
@@ -32,13 +32,13 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 
+import LightDarkSwitch from '#components/menu/LightDarkSwitch.vue'
+import LogoImage from '#components/menu/LogoImage.vue'
+import TabControl from '#components/menu/TabControl.vue'
+import UserInfo from '#components/menu/UserInfo.vue'
 import ListWithNavigationDrawer from '#components/vuetify/Organisms/ListWithNavigationDrawer.vue'
 
 import Circle from './CircleElement.vue'
-import LightDarkSwitch from './LightDarkSwitch.vue'
-import LogoImage from './LogoImage.vue'
-import TabControl from './TabControl.vue'
-import UserInfo from './UserInfo.vue'
 
 const drawer = ref(false)
 const toggleDrawer = () => {

diff --git a/frontend/src/components/vuetify/Atoms/ListElement.stories.ts b/frontend/src/components/vuetify/Atoms/ListElement.stories.ts
@@ -1,12 +1,10 @@
-// import { VIcon, VBtn, VAvatar, VImg } from 'vuetify/components'
-
 import { SBComp } from '#types/SBComp'
 
 import ListElement from './ListElement.vue'
 
 import type { Meta, StoryObj } from '@storybook/vue3'
 
-const meta: Meta<typeof ListElement> = {
+const meta = {
   title: 'MOLECULES/ListElement',
   component: ListElement as SBComp,
   tags: ['autodocs'],
@@ -20,11 +18,6 @@ const meta: Meta<typeof ListElement> = {
         participantCount: 4,
         attendees: [],
         joinLink: 'https://my.link',
-        // rounded: true,
-        // prepend: VIcon,
-        // prependProps: { icon: 'mdi-home' },
-        // append: VBtn,
-        // appendProps: { icon: 'mdi-menu' },
       },
       {
         meetingName: 'Beispiel Titel 2',
@@ -33,11 +26,6 @@ const meta: Meta<typeof ListElement> = {
         participantCount: 4,
         attendees: [],
         joinLink: 'https://my.link',
-        // rounded: true,
-        // prepend: VAvatar,
-        // prependProps: { src: 'https://via.placeholder.com/40' },
-        // append: VIcon,
-        // appendProps: { icon: 'mdi-menu' },
       },
     ],
   },
@@ -59,8 +47,6 @@ export const Basic: Story = {
         participantCount: 4,
         attendees: [],
         joinLink: 'https://my.link',
-        // append: VBtn,
-        // appendProps: { icon: 'mdi-menu' },
       },
       {
         meetingName: 'Beispiel Titel 2',
@@ -69,85 +55,7 @@ export const Basic: Story = {
         participantCount: 4,
         attendees: [],
         joinLink: 'https://my.link',
-        // append: VIcon,
-        // appendProps: { icon: 'mdi-menu' },
-      },
-    ],
-  },
-}
-
-/*
-export const WithIcons: Story = {
-  args: {
-    items: [
-      {
-        title: 'Home',
-        prepend: VIcon,
-        prependProps: { icon: 'mdi-home' },
-        append: VIcon,
-        appendProps: { icon: 'mdi-menu' },
-      },
-      {
-        title: 'Profile',
-        prepend: VIcon,
-        prependProps: { icon: 'mdi-account' },
-        append: VIcon,
-        appendProps: { icon: 'mdi-menu' },
-      },
-      {
-        title: 'Settings',
-        prepend: VIcon,
-        prependProps: { icon: 'mdi-settings' },
-        append: VIcon,
-        appendProps: { icon: 'mdi-menu' },
-      },
-      {
-        title: 'Logout',
-        prepend: VIcon,
-        prependProps: { icon: 'mdi-logout' },
-        append: VIcon,
-        appendProps: { icon: 'mdi-menu' },
-      },
-    ],
-  },
-}
-
-export const WithImages: Story = {
-  args: {
-    items: [
-      {
-        title: 'Item 1',
-        subtitle: 'Subtitle 1',
-        prepend: VImg,
-        prependProps: { src: 'https://via.placeholder.com/40' },
-        append: VIcon,
-        appendProps: { icon: 'mdi-menu' },
-      },
-      {
-        title: 'Item 2',
-        subtitle: 'Subtitle 2',
-        prepend: VImg,
-        prependProps: { src: 'https://via.placeholder.com/40' },
-        append: VIcon,
-        appendProps: { icon: 'mdi-menu' },
-      },
-      {
-        title: 'Item 3',
-        subtitle: 'Subtitle 3',
-        prepend: VImg,
-        prependProps: { src: 'https://via.placeholder.com/40' },
-        append: VIcon,
-        appendProps: { icon: 'mdi-menu' },
-      },
-      {
-        title: 'Item 4',
-        subtitle: 'Subtitle 4',
-        prepend: VImg,
-        prependProps: { src: 'https://via.placeholder.com/40' },
-        append: VIcon,
-        appendProps: { icon: 'mdi-menu' },
       },
     ],
   },
 }
-*/
diff --git a/frontend/src/components/vuetify/Organisms/ListWithNavigationDrawer.test.ts b/frontend/src/components/vuetify/Organisms/ListWithNavigationDrawer.test.ts
@@ -9,7 +9,7 @@ describe('ListWithNavigationDrawer', () => {
   const Wrapper = () => {
     return mount(VApp, {
       slots: {
-        default: h(ListWithNavigationDrawer as Component),
+        default: h(ListWithNavigationDrawer as Component, { drawer: true }),
       },
     })
   }

diff --git a/...tend/src/components/vuetify/Organisms/__snapshots__/ListWithNavigationDrawer.test.ts.snap b/...tend/src/components/vuetify/Organisms/__snapshots__/ListWithNavigationDrawer.test.ts.snap
@@ -10,9 +10,9 @@ exports[`ListWithNavigationDrawer > renders correctly 1`] = `
     
     
     <nav
-      class="v-navigation-drawer v-navigation-drawer--right v-navigation-drawer--temporary v-theme--light v-navigation-drawer--mobile menu-drawer-top"
+      class="v-navigation-drawer v-navigation-drawer--right v-navigation-drawer--temporary v-navigation-drawer--active v-theme--light v-navigation-drawer--mobile menu-drawer-top"
       data-v-3308ee86=""
-      style="right: 0px; z-index: 1004; transform: translateX(110%); position: fixed; transition: none !important; height: calc(100% - 0px - 0px); top: 0px; bottom: 0px;"
+      style="right: 0px; z-index: 1004; transform: translateX(0%); position: fixed; transition: none !important; height: calc(100% - 0px - 0px); top: 0px; bottom: 0px;"
     >
       <!---->
       <!---->
@@ -120,7 +120,11 @@ exports[`ListWithNavigationDrawer > renders correctly 1`] = `
       name="fade-transition"
       persisted="false"
     >
-      <!---->
+      <div
+        class="v-navigation-drawer__scrim"
+        data-v-3308ee86=""
+        style="z-index: 1003;"
+      />
     </transition-stub>
     
     

diff --git a/frontend/src/stores/activeRoomStore.ts b/frontend/src/stores/activeRoomStore.ts
@@ -9,7 +9,6 @@ export const useActiveRoomStore = defineStore(
     const getActiveRoom = computed(() => activeRoom.value)
 
     const setActiveRoom = (room: string | null) => {
-      // console.log('setActiveRoom', room)
       activeRoom.value = room
     }