Skip to content

Commit

Permalink
Merge master
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Bettelstab committed Jul 10, 2024
1 parent f29f294 commit bf9400a
Show file tree
Hide file tree
Showing 18 changed files with 1,806 additions and 3,953 deletions.
11 changes: 9 additions & 2 deletions backend/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
// eslint-disable-next-line import/no-unassigned-import
import 'reflect-metadata'
// import { handleOpenRooms } from '#graphql/resolvers/dal/handleOpenRooms'

import logger from './logger'
import { prisma } from './prisma'
import { listen } from './server/server'
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const checkForOpenRooms = (): void => {
// void handleOpenRooms()
setTimeout(checkForOpenRooms, 60 * 1000)
}

export const main = async (): Promise<void> => {
await listen(4000)
logger.info(`🚀 Server is ready at http://localhost:4000/`)
const url = await listen(4000)
// @typescript-eslint/restrict-template-expressions
logger.info(`🚀 Server is ready at ${url}`)
}

void main()
Expand Down
12 changes: 12 additions & 0 deletions frontend/.storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,20 @@ const config: StorybookConfig = {
autodocs: 'tag',
},
core: {
builder: '@storybook/builder-vite',
disableTelemetry: true, // 👈 Disables telemetry
},
async viteFinal(config) {
// Merge custom configuration into the default config
const { mergeConfig } = await import('vite');

return mergeConfig(config, {
// Add dependencies to pre-optimization
optimizeDeps: {
include: ['storybook-dark-mode'],
},
});
},
}

export default config
168 changes: 168 additions & 0 deletions frontend/commit-log.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
Merge master

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

Loading

0 comments on commit bf9400a

Please sign in to comment.