DHBW-WE/MeetUp
5
0
Fork 0
Code Issues 7 Pull requests 5 Projects 1 Releases 5 Packages 1 Wiki Activity Actions

fix: fix conflicts and changes after rebasing

Browse source
This commit is contained in:
micha 2025-06-17 18:38:50 +02:00
parent a6694c4f7e
commit f5450d9b4f
2 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/app/api-doc/react-swagger.tsx
View file

@ -4,19 +4,11 @@ import SwaggerUI from 'swagger-ui-react';
import 'swagger-ui-react/swagger-ui.css'; import 'swagger-ui-react/swagger-ui.css';
type Props = { type Props = {
<<<<<<< HEAD
spec: object; spec: object;
=======
spec: object,
>>>>>>> 57e420f (feat(api): add swagger docs, /api/user/me GET and PUT endpoints)
}; };
function ReactSwagger({ spec }: Props) { function ReactSwagger({ spec }: Props) {
return <SwaggerUI spec={spec} />; return <SwaggerUI spec={spec} />;
} }
<<<<<<< HEAD
export default ReactSwagger; export default ReactSwagger;
=======
export default ReactSwagger;
>>>>>>> 57e420f (feat(api): add swagger docs, /api/user/me GET and PUT endpoints)

2
src/app/home/page.tsx
View file

@ -2,7 +2,7 @@
import { RedirectButton } from '@/components/buttons/redirect-button'; import { RedirectButton } from '@/components/buttons/redirect-button';
import { ThemePicker } from '@/components/misc/theme-picker'; import { ThemePicker } from '@/components/misc/theme-picker';
import { useGetApiUserMe } from '@/generated/api/user/user'; import { useGetApiUserMe } from '@/generated/api/default/default';
export default function Home() { export default function Home() {
const { data, isLoading } = useGetApiUserMe(); const { data, isLoading } = useGetApiUserMe();