rzmk/learnhouse
1
0
Fork 0
mirror of https://github.com/rzmk/learnhouse.git synced 2025-12-19 04:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: init new auth

Browse source
This commit is contained in:
swve 2024-05-25 14:56:28 +02:00
parent f838a8512c
commit 1708b36818
34 changed files with 1853 additions and 3613 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/web/components/Objects/Editor/ActiveAvatars.tsx
View file

@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react'
import UserAvatar from '../UserAvatar'
import { useSession } from '@components/Contexts/SessionContext'
import { useSession } from 'next-auth/react'
import { getUserAvatarMediaDirectory } from '@services/media/media';
import { getCollaborationServerUrl } from '@services/config/config';
import { useOrg } from '@components/Contexts/OrgContext';
@ -27,11 +27,11 @@ function ActiveAvatars(props: ActiveAvatarsProps) {
});
// Remove the current user from the list
delete users[session.user.user_uuid];
delete users[session.data.user.user_uuid];
setActiveUsers(users);
}
, [props.mouseMovements, session.user, org]);
, [props.mouseMovements, session.data.user, org]);
return (
@ -50,7 +50,7 @@ function ActiveAvatars(props: ActiveAvatarsProps) {
<div className="h-2 w-2 rounded-full" style={{ position: 'absolute', bottom: -5, right: 16, backgroundColor: props.mouseMovements[key].color }} />
</div>
))}
{session.isAuthenticated && (
{session.status && (
<div className='z-50'>
<UserAvatar
width={40}

4
apps/web/components/Objects/Editor/Editor.tsx
View file

@ -41,7 +41,7 @@ import html from 'highlight.js/lib/languages/xml'
import python from 'highlight.js/lib/languages/python'
import java from 'highlight.js/lib/languages/java'
import { CourseProvider } from '@components/Contexts/CourseContext'
import { useSession } from '@components/Contexts/SessionContext'
import { useSession } from 'next-auth/react'
import AIEditorToolkit from './AI/AIEditorToolkit'
import useGetAIFeatures from '@components/AI/Hooks/useGetAIFeatures'
import UserAvatar from '../UserAvatar'
@ -145,7 +145,7 @@ function Editor(props: Editor) {
CollaborationCursor.configure({
provider: props.hocuspocusProvider,
user: {
name: props.session.user.first_name + ' ' + props.session.user.last_name,
name: props.session.data.user.first_name + ' ' + props.session.data.user.last_name,
color: props.userRandomColor,
},
}),

8
apps/web/components/Objects/Editor/EditorWrapper.tsx
View file

@ -5,7 +5,7 @@ import { updateActivity } from '@services/courses/activities'
import { toast } from 'react-hot-toast'
import Toast from '@components/StyledElements/Toast/Toast'
import { OrgProvider } from '@components/Contexts/OrgContext'
import { useSession } from '@components/Contexts/SessionContext'
import { useSession } from 'next-auth/react'
// Collaboration
import { HocuspocusProvider } from '@hocuspocus/provider'
@ -57,7 +57,7 @@ function EditorWrapper(props: EditorWrapperProps): JSX.Element {
document.addEventListener("mousemove", (event) => {
// Share any information you like
provider?.setAwarenessField("userMouseMovement", {
user: session.user,
user: session.data.user,
mouseX: event.clientX,
mouseY: event.clientY,
color: thisPageColor,
@ -72,10 +72,10 @@ function EditorWrapper(props: EditorWrapperProps): JSX.Element {
provider?.setAwarenessField("savings_states", {
[session.user.user_uuid]: {
[session.data.user.user_uuid]: {
status: 'action_save',
timestamp: new Date().toISOString(),
user: session.user
user: session.data.user
}
});