feat: use session access_tokens

This commit is contained in:
swve 2024-06-01 12:23:01 +01:00
parent 08cc97f557
commit 52f2235942
74 changed files with 413 additions and 440 deletions

View file

@ -4,7 +4,8 @@
"react/no-unescaped-entities": "off",
"@next/next/no-page-custom-font": "off",
"@next/next/no-img-element": "off",
"unused-imports/no-unused-imports": "warn"
"unused-imports/no-unused-imports": "warn",
"no-console": "warn"
},
"plugins": ["unused-imports"]
}

View file

@ -52,17 +52,17 @@ const EditActivity = async (params: any) => {
const org = await getOrganizationContextInfoWithId(courseInfo.org_id, {
revalidate: 180,
tags: ['organizations'],
})
}, access_token)
return (
<EditorOptionsProvider options={{ isEditable: true }}>
<AIEditorProvider>
<EditorWrapper
org={org}
course={courseInfo}
activity={activity}
content={activity.content}
></EditorWrapper>
<EditorWrapper
org={org}
course={courseInfo}
activity={activity}
content={activity.content}
></EditorWrapper>
</AIEditorProvider>
</EditorOptionsProvider>
)

View file

@ -1,58 +0,0 @@
'use client'
import React from 'react'
import { createNewOrganization } from '../../../services/organizations/orgs'
const Organizations = () => {
const [name, setName] = React.useState('')
const [description, setDescription] = React.useState('')
const [email, setEmail] = React.useState('')
const [slug, setSlug] = React.useState('')
const handleNameChange = (e: any) => {
setName(e.target.value)
}
const handleDescriptionChange = (e: any) => {
setDescription(e.target.value)
}
const handleEmailChange = (e: any) => {
setEmail(e.target.value)
}
const handleSlugChange = (e: any) => {
setSlug(e.target.value)
}
const handleSubmit = async (e: any) => {
e.preventDefault()
let logo = ''
const status = await createNewOrganization({
name,
description,
email,
logo,
slug,
default: false,
})
alert(JSON.stringify(status))
}
return (
<div>
<div className="font-bold text-lg">New Organization</div>
Name: <input onChange={handleNameChange} type="text" />
<br />
Description: <input onChange={handleDescriptionChange} type="text" />
<br />
Slug: <input onChange={handleSlugChange} type="text" />
<br />
Email Address: <input onChange={handleEmailChange} type="text" />
<br />
<button onClick={handleSubmit}>Create</button>
</div>
)
}
export default Organizations

View file

@ -1,65 +0,0 @@
'use client' //todo: use server components
import Link from 'next/link'
import React from 'react'
import { deleteOrganizationFromBackend } from '@services/organizations/orgs'
import useSWR, { mutate } from 'swr'
import { swrFetcher } from '@services/utils/ts/requests'
import { getAPIUrl, getUriWithOrg } from '@services/config/config'
const Organizations = () => {
const { data: organizations, error } = useSWR(
`${getAPIUrl()}orgs/user/page/1/limit/10`,
swrFetcher
)
async function deleteOrganization(org_id: any) {
const response = await deleteOrganizationFromBackend(org_id)
response &&
mutate(
`${getAPIUrl()}orgs/user/page/1/limit/10`,
organizations.filter((org: any) => org.org_id !== org_id)
)
}
return (
<>
<div className="font-bold text-lg">
Your Organizations{' '}
<Link href="/organizations/new">
<button className="bg-blue-500 text-white px-2 py-1 rounded-md hover:bg-blue-600 focus:outline-none">
+
</button>
</Link>
</div>
<hr />
{error && <p className="text-red-500">Failed to load</p>}
{!organizations ? (
<p className="text-gray-500">Loading...</p>
) : (
<div>
{organizations.map((org: any) => (
<div
key={org.org_id}
className="flex items-center justify-between mb-4"
>
<Link href={getUriWithOrg(org.slug, '/')}>
<h3 className="text-blue-500 cursor-pointer hover:underline">
{org.name}
</h3>
</Link>
<button
onClick={() => deleteOrganization(org.org_id)}
className="px-3 py-1 text-white bg-red-500 rounded-md hover:bg-red-600 focus:outline-none"
>
Delete
</button>
</div>
))}
</div>
)}
</>
)
}
export default Organizations

View file

@ -6,7 +6,6 @@ import { getOrganizationContextInfo } from '@services/organizations/orgs'
import { nextAuthOptions } from 'app/auth/options'
import { Metadata } from 'next'
import { getServerSession } from 'next-auth'
import { cookies } from 'next/headers'
import Link from 'next/link'
type MetadataProps = {

View file

@ -4,9 +4,7 @@ import GeneralWrapperStyled from '@components/StyledElements/Wrappers/GeneralWra
import { getUriWithOrg } from '@services/config/config'
import { getOrganizationContextInfo } from '@services/organizations/orgs'
import { Metadata } from 'next'
import { cookies } from 'next/headers'
import Link from 'next/link'
import { getAccessTokenFromRefreshTokenCookie } from '@services/auth/auth'
import CollectionThumbnail from '@components/Objects/Thumbnails/CollectionThumbnail'
import NewCollectionButton from '@components/StyledElements/Buttons/NewCollectionButton'
import ContentPlaceHolderIfUserIsNotAdmin from '@components/ContentPlaceHolder'

View file

@ -147,8 +147,7 @@ export function MarkStatus(props: {
orgslug: string
}) {
const router = useRouter()
const session = useLHSession()
console.log(props.course.trail)
const session = useLHSession() as any;
async function markActivityAsCompleteFront() {
const trail = await markActivityAsComplete(
@ -171,8 +170,6 @@ export function MarkStatus(props: {
}
}
console.log('isActivityCompleted', isActivityCompleted())
return (
<>
{isActivityCompleted() ? (

View file

@ -1,10 +1,8 @@
import { getActivityWithAuthHeader } from '@services/courses/activities'
import { getCourseMetadata } from '@services/courses/courses'
import { cookies } from 'next/headers'
import ActivityClient from './activity'
import { getOrganizationContextInfo } from '@services/organizations/orgs'
import { Metadata } from 'next'
import { getAccessTokenFromRefreshTokenCookie } from '@services/auth/auth'
import { getServerSession } from 'next-auth'
import { nextAuthOptions } from 'app/auth/options'

View file

@ -22,7 +22,7 @@ import { useLHSession } from '@components/Contexts/LHSessionContext'
const CourseClient = (props: any) => {
const [user, setUser] = useState<any>({})
const [learnings, setLearnings] = useState<any>([])
const session = useLHSession()
const session = useLHSession() as any;
const courseuuid = props.courseuuid
const orgslug = props.orgslug
const course = props.course

View file

@ -1,10 +1,8 @@
import React from 'react'
import CourseClient from './course'
import { cookies } from 'next/headers'
import { getCourseMetadata } from '@services/courses/courses'
import { getOrganizationContextInfo } from '@services/organizations/orgs'
import { Metadata } from 'next'
import { getAccessTokenFromRefreshTokenCookie } from '@services/auth/auth'
import { getCourseThumbnailMediaDirectory } from '@services/media/media'
import { nextAuthOptions } from 'app/auth/options'
import { getServerSession } from 'next-auth'

View file

@ -2,8 +2,6 @@ import React from 'react'
import Courses from './courses'
import { Metadata } from 'next'
import { getOrganizationContextInfo } from '@services/organizations/orgs'
import { cookies } from 'next/headers'
import { getAccessTokenFromRefreshTokenCookie } from '@services/auth/auth'
import { nextAuthOptions } from 'app/auth/options'
import { getServerSession } from 'next-auth'
import { getOrgCourses } from '@services/courses/courses'

View file

@ -2,6 +2,8 @@ import React from 'react'
import { Metadata } from 'next'
import { getOrganizationContextInfo } from '@services/organizations/orgs'
import Trail from './trail'
import { getServerSession } from 'next-auth'
import { nextAuthOptions } from 'app/auth/options'
type MetadataProps = {
params: { orgslug: string }
@ -11,11 +13,13 @@ type MetadataProps = {
export async function generateMetadata({
params,
}: MetadataProps): Promise<Metadata> {
const session = await getServerSession(nextAuthOptions)
const access_token = session?.tokens?.access_token
// Get Org context information
const org = await getOrganizationContextInfo(params.orgslug, {
revalidate: 1800,
tags: ['organizations'],
})
}, access_token)
return {
title: 'Trail — ' + org.name,
description:

View file

@ -1,4 +1,5 @@
'use client'
import { useLHSession } from '@components/Contexts/LHSessionContext'
import { useOrg } from '@components/Contexts/OrgContext'
import PageLoading from '@components/Objects/Loaders/PageLoading'
import TrailCourseElement from '@components/Pages/Trail/TrailCourseElement'
@ -11,14 +12,16 @@ import useSWR from 'swr'
function Trail(params: any) {
let orgslug = params.orgslug
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const org = useOrg() as any
const orgID = org?.id
const { data: trail, error: error } = useSWR(
`${getAPIUrl()}trail/org/${orgID}/trail`,
swrFetcher
(url) => swrFetcher(url, access_token)
)
useEffect(() => {}, [trail, org])
useEffect(() => { }, [trail, org])
return (
<GeneralWrapperStyled>

View file

@ -7,7 +7,7 @@ import Link from 'next/link'
import { CourseOverviewTop } from '@components/Dashboard/UI/CourseOverviewTop'
import { motion } from 'framer-motion'
import EditCourseGeneral from '@components/Dashboard/Course/EditCourseGeneral/EditCourseGeneral'
import { GalleryVerticalEnd, Info, Lock, UserRoundCog } from 'lucide-react'
import { GalleryVerticalEnd, Info, UserRoundCog } from 'lucide-react'
import EditCourseAccess from '@components/Dashboard/Course/EditCourseAccess/EditCourseAccess'
export type CourseOverviewParams = {

View file

@ -1,8 +1,4 @@
import LeftMenu from '@components/Dashboard/UI/LeftMenu'
import AdminAuthorization from '@components/Security/AdminAuthorization'
import ClientComponentSkeleton from '@components/Utils/ClientComp'
import { Metadata } from 'next'
import { SessionProvider } from 'next-auth/react'
import React from 'react'
import ClientAdminLayout from './ClientAdminLayout'

View file

@ -1,5 +1,4 @@
'use client'
import LHSessionProvider from '@components/Contexts/LHSessionContext'
import { OrgProvider } from '@components/Contexts/OrgContext'
import Toast from '@components/StyledElements/Toast/Toast'
import '@styles/globals.css'

View file

@ -13,7 +13,7 @@ import React from 'react'
import { AlertTriangle } from 'lucide-react'
import { useRouter } from 'next/navigation'
import Link from 'next/link'
import { signIn, useSession } from "next-auth/react"
import { signIn } from "next-auth/react"
import { getUriWithOrg } from '@services/config/config'
import { useLHSession } from '@components/Contexts/LHSessionContext'
@ -42,7 +42,7 @@ const validate = (values: any) => {
const LoginClient = (props: LoginClientProps) => {
const [isSubmitting, setIsSubmitting] = React.useState(false)
const router = useRouter();
const session = useLHSession();
const session = useLHSession() as any;
const [error, setError] = React.useState('')
const formik = useFormik({

View file

@ -15,7 +15,7 @@ import { getUriWithOrg } from '@services/config/config'
import { useOrg } from '@components/Contexts/OrgContext'
import { useRouter, useSearchParams } from 'next/navigation'
import { useFormik } from 'formik'
import { resetPassword, sendResetLink } from '@services/auth/auth'
import { resetPassword } from '@services/auth/auth'
const validate = (values: any) => {
const errors: any = {}

View file

@ -6,7 +6,7 @@ import Link from 'next/link'
import { getUriWithOrg } from '@services/config/config'
import { useLHSession } from '@components/Contexts/LHSessionContext'
import React, { useEffect } from 'react'
import { MailWarning, Shield, Ticket, UserPlus } from 'lucide-react'
import { MailWarning, Ticket, UserPlus } from 'lucide-react'
import { useOrg } from '@components/Contexts/OrgContext'
import UserAvatar from '@components/Objects/UserAvatar'
import OpenSignUpComponent from './OpenSignup'
@ -33,9 +33,6 @@ function SignUpClient(props: SignUpClientProps) {
setJoinMethod(
props.org?.config?.config?.GeneralConfig.users.signup_mechanism
)
console.log(
props.org?.config?.config?.GeneralConfig.users.signup_mechanism
)
}
if (inviteCodeParam) {
setInviteCode(inviteCodeParam)

View file

@ -13,17 +13,14 @@ function useGetAIFeatures(props: UseGetAIFeatures) {
const config = org?.config?.config?.AIConfig
if (!config) {
console.log('AI or Organization config is not defined.')
return false
}
if (!config.enabled) {
console.log('AI is not enabled for this Organization.')
return false
}
if (!config.features[feature]) {
console.log(`Feature ${feature} is not enabled for this Organization.`)
return false
}

View file

@ -5,7 +5,7 @@ import Modal from '@components/StyledElements/Modal/Modal'
import { getAPIUrl } from '@services/config/config'
import { unLinkResourcesToUserGroup } from '@services/usergroups/usergroups'
import { swrFetcher } from '@services/utils/ts/requests'
import { Globe, SquareUserRound, Users, UsersRound, X } from 'lucide-react'
import { Globe, SquareUserRound, Users, X } from 'lucide-react'
import { useLHSession } from '@components/Contexts/LHSessionContext'
import React from 'react'
import toast from 'react-hot-toast'
@ -122,9 +122,11 @@ function EditCourseAccess(props: EditCourseAccessProps) {
function UserGroupsSection({ usergroups }: { usergroups: any[] }) {
const course = useCourse() as any
const [userGroupModal, setUserGroupModal] = React.useState(false)
const session = useLHSession() as any;
const access_token = session?.data?.tokens?.access_token;
const removeUserGroupLink = async (usergroup_id: number) => {
const res = await unLinkResourcesToUserGroup(usergroup_id, course.courseStructure.course_uuid)
const res = await unLinkResourcesToUserGroup(usergroup_id, course.courseStructure.course_uuid,access_token)
if (res.status === 200) {
toast.success('Successfully unliked from usergroup')
mutate(`${getAPIUrl()}usergroups/resource/${course.courseStructure.course_uuid}`)

View file

@ -6,7 +6,6 @@ import FormLayout, {
} from '@components/StyledElements/Form/Form'
import { useFormik } from 'formik'
import { AlertTriangle } from 'lucide-react'
import * as Switch from '@radix-ui/react-switch'
import * as Form from '@radix-ui/react-form'
import React from 'react'
import { useCourse, useCourseDispatch } from '../../../Contexts/CourseContext'

View file

@ -10,7 +10,7 @@ import { mutate } from 'swr'
function ThumbnailUpdate() {
const course = useCourse() as any
const session = useLHSession()
const session = useLHSession() as any;
const org = useOrg() as any
const [localThumbnail, setLocalThumbnail] = React.useState(null) as any
const [isLoading, setIsLoading] = React.useState(false) as any

View file

@ -9,6 +9,7 @@ import { UploadCloud } from 'lucide-react'
import { revalidateTags } from '@services/utils/ts/requests'
import { useRouter } from 'next/navigation'
import { useOrg } from '@components/Contexts/OrgContext'
import { useLHSession } from '@components/Contexts/LHSessionContext'
interface OrganizationValues {
name: string
@ -20,7 +21,9 @@ interface OrganizationValues {
function OrgEditGeneral(props: any) {
const [selectedFile, setSelectedFile] = useState<File | null>(null)
const router = useRouter()
const router = useRouter();
const session = useLHSession() as any;
const access_token = session?.data?.tokens?.access_token;
const org = useOrg() as any
// ...
@ -34,7 +37,7 @@ function OrgEditGeneral(props: any) {
const uploadLogo = async () => {
if (selectedFile) {
let org_id = org.id
await uploadOrganizationLogo(org_id, selectedFile)
await uploadOrganizationLogo(org_id, selectedFile, access_token)
setSelectedFile(null) // Reset the selected file
await revalidateTags(['organizations'], org.slug)
router.refresh()
@ -51,14 +54,14 @@ function OrgEditGeneral(props: any) {
const updateOrg = async (values: OrganizationValues) => {
let org_id = org.id
await updateOrganization(org_id, values)
await updateOrganization(org_id, values, access_token)
// Mutate the org
await revalidateTags(['organizations'], org.slug)
router.refresh()
}
useEffect(() => {}, [org])
useEffect(() => { }, [org])
return (
<div className="ml-10 mr-10 mx-auto bg-white rounded-xl shadow-sm px-6 py-5">

View file

@ -14,7 +14,8 @@ import UserAvatar from '@components/Objects/UserAvatar'
import { updateUserAvatar } from '@services/users/users'
function UserEditGeneral() {
const session = useLHSession() as any
const session = useLHSession() as any;
const access_token = session.data.tokens.access_token;
const [localAvatar, setLocalAvatar] = React.useState(null) as any
const [isLoading, setIsLoading] = React.useState(false) as any
const [error, setError] = React.useState() as any
@ -24,7 +25,7 @@ function UserEditGeneral() {
const file = event.target.files[0]
setLocalAvatar(file)
setIsLoading(true)
const res = await updateUserAvatar(session.data.user_uuid, file)
const res = await updateUserAvatar(session.data.user_uuid, file, access_token)
// wait for 1 second to show loading animation
await new Promise((r) => setTimeout(r, 1500))
if (res.success === false) {
@ -36,7 +37,7 @@ function UserEditGeneral() {
}
}
useEffect(() => {}, [session, session.data])
useEffect(() => { }, [session, session.data])
return (
<div className="ml-10 mr-10 mx-auto bg-white rounded-xl shadow-sm px-6 py-5">
@ -53,7 +54,7 @@ function UserEditGeneral() {
onSubmit={(values, { setSubmitting }) => {
setTimeout(() => {
setSubmitting(false)
updateProfile(values, session.data.user.id)
updateProfile(values, session.data.user.id, access_token)
}, 400)
}}
>

View file

@ -5,13 +5,14 @@ import React, { useEffect } from 'react'
function UserEditPassword() {
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const updatePasswordUI = async (values: any) => {
let user_id = session.data.user.id
await updatePassword(user_id, values)
await updatePassword(user_id, values, access_token)
}
useEffect(() => {}, [session])
useEffect(() => { }, [session])
return (
<div className="ml-10 mr-10 mx-auto bg-white rounded-xl shadow-sm px-6 py-5">

View file

@ -3,27 +3,28 @@ import PageLoading from '@components/Objects/Loaders/PageLoading'
import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal'
import { getAPIUrl, getUriWithOrg } from '@services/config/config'
import { swrFetcher } from '@services/utils/ts/requests'
import { Globe, Shield, Ticket, User, UserSquare, Users, X } from 'lucide-react'
import { Globe, Ticket, UserSquare, Users, X } from 'lucide-react'
import Link from 'next/link'
import React, { useEffect } from 'react'
import useSWR, { mutate } from 'swr'
import dayjs from 'dayjs'
import {
changeSignupMechanism,
createInviteCode,
deleteInviteCode,
} from '@services/organizations/invites'
import Toast from '@components/StyledElements/Toast/Toast'
import toast from 'react-hot-toast'
import { useRouter } from 'next/navigation'
import Modal from '@components/StyledElements/Modal/Modal'
import OrgInviteCodeGenerate from '@components/Objects/Modals/Dash/OrgAccess/OrgInviteCodeGenerate'
import { useLHSession } from '@components/Contexts/LHSessionContext'
function OrgAccess() {
const org = useOrg() as any
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const { data: invites } = useSWR(
org ? `${getAPIUrl()}orgs/${org?.id}/invites` : null,
swrFetcher
(url) => swrFetcher(url, access_token)
)
const [isLoading, setIsLoading] = React.useState(false)
const [joinMethod, setJoinMethod] = React.useState('closed')
@ -40,10 +41,8 @@ function OrgAccess() {
}
}
async function deleteInvite(invite: any) {
let res = await deleteInviteCode(org.id, invite.invite_code_uuid)
let res = await deleteInviteCode(org.id, invite.invite_code_uuid, access_token)
if (res.status == 200) {
mutate(`${getAPIUrl()}orgs/${org.id}/invites`)
} else {
@ -52,7 +51,7 @@ function OrgAccess() {
}
async function changeJoinMethod(method: 'open' | 'inviteOnly') {
let res = await changeSignupMechanism(org.id, method)
let res = await changeSignupMechanism(org.id, method, access_token)
if (res.status == 200) {
router.refresh()
mutate(`${getAPIUrl()}orgs/slug/${org?.slug}`)

View file

@ -1,4 +1,5 @@
'use client'
import { useLHSession } from '@components/Contexts/LHSessionContext'
import { useOrg } from '@components/Contexts/OrgContext'
import AddUserGroup from '@components/Objects/Modals/Dash/OrgUserGroups/AddUserGroup'
import ManageUsers from '@components/Objects/Modals/Dash/OrgUserGroups/ManageUsers'
@ -14,17 +15,19 @@ import useSWR, { mutate } from 'swr'
function OrgUserGroups() {
const org = useOrg() as any
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const [userGroupManagementModal, setUserGroupManagementModal] = React.useState(false)
const [createUserGroupModal, setCreateUserGroupModal] = React.useState(false)
const [selectedUserGroup, setSelectedUserGroup] = React.useState(null) as any
const { data: usergroups } = useSWR(
org ? `${getAPIUrl()}usergroups/org/${org.id}` : null,
swrFetcher
(url) => swrFetcher(url, access_token)
)
const deleteUserGroupUI = async (usergroup_id: any) => {
const res = await deleteUserGroup(usergroup_id)
const res = await deleteUserGroup(usergroup_id, access_token)
if (res.status == 200) {
mutate(`${getAPIUrl()}usergroups/org/${org.id}`)
}

View file

@ -1,3 +1,4 @@
import { useLHSession } from '@components/Contexts/LHSessionContext'
import { useOrg } from '@components/Contexts/OrgContext'
import PageLoading from '@components/Objects/Loaders/PageLoading'
import RolesUpdate from '@components/Objects/Modals/Dash/OrgUsers/RolesUpdate'
@ -14,9 +15,11 @@ import useSWR, { mutate } from 'swr'
function OrgUsers() {
const org = useOrg() as any
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const { data: orgUsers } = useSWR(
org ? `${getAPIUrl()}orgs/${org?.id}/users` : null,
swrFetcher
(url) => swrFetcher(url, access_token)
)
const [rolesModal, setRolesModal] = React.useState(false)
const [selectedUser, setSelectedUser] = React.useState(null) as any
@ -28,7 +31,7 @@ function OrgUsers() {
}
const handleRemoveUser = async (user_id: any) => {
const res = await removeUserFromOrg(org.id, user_id)
const res = await removeUserFromOrg(org.id, user_id,access_token)
if (res.status === 200) {
await mutate(`${getAPIUrl()}orgs/${org.id}/users`)
} else {
@ -39,7 +42,6 @@ function OrgUsers() {
useEffect(() => {
if (orgUsers) {
setIsLoading(false)
console.log(orgUsers)
}
}, [org, orgUsers])

View file

@ -1,3 +1,4 @@
import { useLHSession } from '@components/Contexts/LHSessionContext'
import { useOrg } from '@components/Contexts/OrgContext'
import PageLoading from '@components/Objects/Loaders/PageLoading'
import Toast from '@components/StyledElements/Toast/Toast'
@ -5,20 +6,22 @@ import ToolTip from '@components/StyledElements/Tooltip/Tooltip'
import { getAPIUrl } from '@services/config/config'
import { inviteBatchUsers } from '@services/organizations/invites'
import { swrFetcher } from '@services/utils/ts/requests'
import { Info, Shield, UserPlus } from 'lucide-react'
import { Info, UserPlus } from 'lucide-react'
import React, { useEffect } from 'react'
import toast from 'react-hot-toast'
import useSWR, { mutate } from 'swr'
function OrgUsersAdd() {
const org = useOrg() as any
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const [isLoading, setIsLoading] = React.useState(false)
const [invitedUsers, setInvitedUsers] = React.useState('');
const [selectedInviteCode, setSelectedInviteCode] = React.useState('');
async function sendInvites() {
setIsLoading(true)
let res = await inviteBatchUsers(org.id, invitedUsers, selectedInviteCode)
let res = await inviteBatchUsers(org.id, invitedUsers, selectedInviteCode,access_token)
if (res.status == 200) {
mutate(`${getAPIUrl()}orgs/${org?.id}/invites/users`)
setIsLoading(false)
@ -31,18 +34,17 @@ function OrgUsersAdd() {
const { data: invites } = useSWR(
org ? `${getAPIUrl()}orgs/${org?.id}/invites` : null,
swrFetcher
(url) => swrFetcher(url, access_token)
)
const { data: invited_users } = useSWR(
org ? `${getAPIUrl()}orgs/${org?.id}/invites/users` : null,
swrFetcher
(url) => swrFetcher(url, access_token)
)
useEffect(() => {
if (invites) {
setSelectedInviteCode(invites?.[0]?.invite_code_uuid)
}
console.log('dev,',selectedInviteCode)
}
, [invites, invited_users])

View file

@ -75,6 +75,7 @@ type ActivityChatMessageBoxProps = {
function ActivityChatMessageBox(props: ActivityChatMessageBoxProps) {
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const aiChatBotState = useAIChatBot() as AIChatBotStateTypes
const dispatchAIChatBot = useAIChatBotDispatch() as any
@ -115,7 +116,8 @@ function ActivityChatMessageBox(props: ActivityChatMessageBoxProps) {
const response = await sendActivityAIChatMessage(
message,
aiChatBotState.aichat_uuid,
props.activity.activity_uuid
props.activity.activity_uuid,
access_token
)
if (response.success == false) {
await dispatchAIChatBot({ type: 'setIsNoLongerWaitingForResponse' })
@ -143,8 +145,9 @@ function ActivityChatMessageBox(props: ActivityChatMessageBoxProps) {
})
await dispatchAIChatBot({ type: 'setIsWaitingForResponse' })
const response = await startActivityAIChatSession(
message,
message,access_token,
props.activity.activity_uuid
)
if (response.success == false) {
await dispatchAIChatBot({ type: 'setIsNoLongerWaitingForResponse' })
@ -219,14 +222,12 @@ function ActivityChatMessageBox(props: ActivityChatMessageBoxProps) {
/>
</div>
<div
className={`flex space-x-2 items-center -ml-[100px] ${
aiChatBotState.isWaitingForResponse ? 'animate-pulse' : ''
}`}
className={`flex space-x-2 items-center -ml-[100px] ${aiChatBotState.isWaitingForResponse ? 'animate-pulse' : ''
}`}
>
<Image
className={`outline outline-1 outline-neutral-200/20 rounded-lg ${
aiChatBotState.isWaitingForResponse ? 'animate-pulse' : ''
}`}
className={`outline outline-1 outline-neutral-200/20 rounded-lg ${aiChatBotState.isWaitingForResponse ? 'animate-pulse' : ''
}`}
width={24}
src={learnhouseAI_icon}
alt=""
@ -244,12 +245,11 @@ function ActivityChatMessageBox(props: ActivityChatMessageBoxProps) {
</div>
</div>
<div
className={`w-100 h-0.5 bg-white/5 rounded-full mx-auto mb-3 ${
aiChatBotState.isWaitingForResponse ? 'animate-pulse' : ''
}`}
className={`w-100 h-0.5 bg-white/5 rounded-full mx-auto mb-3 ${aiChatBotState.isWaitingForResponse ? 'animate-pulse' : ''
}`}
></div>
{aiChatBotState.messages.length > 0 &&
!aiChatBotState.error.isError ? (
!aiChatBotState.error.isError ? (
<div className="flex-col h-[237px] w-full space-y-4 overflow-scroll scrollbar-w-2 scrollbar scrollbar-thumb-white/20 scrollbar-thumb-rounded-full scrollbar-track-rounded-full">
{aiChatBotState.messages.map(
(message: AIMessage, index: number) => {

View file

@ -12,7 +12,6 @@ function DocumentPdfActivity({
const org = useOrg() as any
React.useEffect(() => {
console.log(activity)
}, [activity, org])
return (

View file

@ -15,6 +15,7 @@ import {
startActivityAIChatSession,
} from '@services/ai/ai'
import useGetAIFeatures from '../../../../AI/Hooks/useGetAIFeatures'
import { useLHSession } from '@components/Contexts/LHSessionContext'
type AICanvaToolkitProps = {
editor: Editor
@ -92,6 +93,8 @@ function AIActionButton(props: {
label: string
activity: any
}) {
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const dispatchAIChatBot = useAIChatBotDispatch() as any
const aiChatBotState = useAIChatBot() as AIChatBotStateTypes
@ -132,7 +135,7 @@ function AIActionButton(props: {
const response = await sendActivityAIChatMessage(
message,
aiChatBotState.aichat_uuid,
props.activity.activity_uuid
props.activity.activity_uuid, access_token
)
if (response.success == false) {
await dispatchAIChatBot({ type: 'setIsNoLongerWaitingForResponse' })
@ -160,8 +163,7 @@ function AIActionButton(props: {
})
await dispatchAIChatBot({ type: 'setIsWaitingForResponse' })
const response = await startActivityAIChatSession(
message,
props.activity.activity_uuid
message, access_token
)
if (response.success == false) {
await dispatchAIChatBot({ type: 'setIsNoLongerWaitingForResponse' })
@ -193,10 +195,10 @@ function AIActionButton(props: {
props.label === 'Explain'
? 'Explain a word or a sentence with AI'
: props.label === 'Summarize'
? 'Summarize a long paragraph or text with AI'
: props.label === 'Translate'
? 'Translate to different languages with AI'
: 'Give examples to understand better with AI'
? 'Summarize a long paragraph or text with AI'
: props.label === 'Translate'
? 'Translate to different languages with AI'
: 'Give examples to understand better with AI'
return (
<div className="flex space-x-2">
<ToolTip sideOffset={10} slateBlack content={tooltipLabel}>

View file

@ -7,22 +7,6 @@ function VideoActivity({ activity, course }: { activity: any; course: any }) {
const org = useOrg() as any
const [videoId, setVideoId] = React.useState('')
function getYouTubeEmbed(url: any) {
// Extract video ID from the YouTube URL
var videoId = url.match(
/(?:\?v=|\/embed\/|\/\d\/|\/vi\/|\/v\/|https?:\/\/(?:www\.)?youtube\.com\/(?:embed\/|v\/|watch\?v=|watch\?.+&v=))([^#\&\?\/]+)/
)[1]
// Create the embed object
var embedObject = {
videoId: videoId,
width: 560,
height: 315,
}
return embedObject
}
React.useEffect(() => {
if (activity && activity.content && activity.content.uri) {
var getYouTubeID = require('get-youtube-id');

View file

@ -38,7 +38,6 @@ function CourseUpdates() {
// if user clicks outside the model, close the model
React.useLayoutEffect(() => {
function handleClickOutside(event: any) {
console.log(event.target.id)
if (event.target.closest('.bg-white') || event.target.id === 'delete-update-button') return;
setIsModelOpen(false);
}

View file

@ -24,6 +24,7 @@ import {
startActivityAIChatSession,
} from '@services/ai/ai'
import useGetAIFeatures from '@components/AI/Hooks/useGetAIFeatures'
import { useLHSession } from '@components/Contexts/LHSessionContext'
type AIEditorToolkitProps = {
editor: Editor
@ -32,11 +33,11 @@ type AIEditorToolkitProps = {
type AIPromptsLabels = {
label:
| 'Writer'
| 'ContinueWriting'
| 'MakeLonger'
| 'GenerateQuiz'
| 'Translate'
| 'Writer'
| 'ContinueWriting'
| 'MakeLonger'
| 'GenerateQuiz'
| 'Translate'
selection: string
}
@ -141,6 +142,8 @@ function AIEditorToolkit(props: AIEditorToolkitProps) {
const UserFeedbackModal = (props: AIEditorToolkitProps) => {
const dispatchAIEditor = useAIEditorDispatch() as any
const aiEditorState = useAIEditor() as AIEditorStateTypes
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
await dispatchAIEditor({
@ -159,7 +162,7 @@ const UserFeedbackModal = (props: AIEditorToolkitProps) => {
const response = await sendActivityAIChatMessage(
message,
aiEditorState.aichat_uuid,
props.activity.activity_uuid
props.activity.activity_uuid, access_token
)
if (response.success === false) {
await dispatchAIEditor({ type: 'setIsNoLongerWaitingForResponse' })
@ -191,7 +194,7 @@ const UserFeedbackModal = (props: AIEditorToolkitProps) => {
})
await dispatchAIEditor({ type: 'setIsWaitingForResponse' })
const response = await startActivityAIChatSession(
message,
message, access_token,
props.activity.activity_uuid
)
if (response.success === false) {

View file

@ -44,8 +44,6 @@ import { CourseProvider } from '@components/Contexts/CourseContext'
import { useLHSession } from '@components/Contexts/LHSessionContext'
import AIEditorToolkit from './AI/AIEditorToolkit'
import useGetAIFeatures from '@components/AI/Hooks/useGetAIFeatures'
import UserAvatar from '../UserAvatar'
import randomColor from 'randomcolor'
import Collaboration from '@tiptap/extension-collaboration'
import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
import ActiveAvatars from './ActiveAvatars'

View file

@ -25,6 +25,7 @@ interface EditorWrapperProps {
function EditorWrapper(props: EditorWrapperProps): JSX.Element {
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
// Define provider in the state
const [provider, setProvider] = React.useState<HocuspocusProvider | null>(null);
const [thisPageColor, setThisPageColor] = useState(randomColor({ luminosity: 'light' }) as string)
@ -79,7 +80,7 @@ function EditorWrapper(props: EditorWrapperProps): JSX.Element {
}
});
toast.promise(updateActivity(activity, activity.activity_uuid), {
toast.promise(updateActivity(activity, activity.activity_uuid,access_token), {
loading: 'Saving...',
success: <b>Activity saved!</b>,
error: <b>Could not save.</b>,

View file

@ -9,11 +9,14 @@ import { getActivityBlockMediaDirectory } from '@services/media/media'
import { useOrg } from '@components/Contexts/OrgContext'
import { useCourse } from '@components/Contexts/CourseContext'
import { useEditorProvider } from '@components/Contexts/Editor/EditorContext'
import { useLHSession } from '@components/Contexts/LHSessionContext'
function ImageBlockComponent(props: any) {
const org = useOrg() as any
const course = useCourse() as any
const editorState = useEditorProvider() as any
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const isEditable = editorState.isEditable
const [image, setImage] = React.useState(null)
@ -36,7 +39,7 @@ function ImageBlockComponent(props: any) {
setIsLoading(true)
let object = await uploadNewImageFile(
image,
props.extension.options.activity.activity_uuid
props.extension.options.activity.activity_uuid,access_token
)
setIsLoading(false)
setblockObject(object)

View file

@ -8,10 +8,13 @@ import { getActivityBlockMediaDirectory } from '@services/media/media'
import { useOrg } from '@components/Contexts/OrgContext'
import { useCourse } from '@components/Contexts/CourseContext'
import { useEditorProvider } from '@components/Contexts/Editor/EditorContext'
import { useLHSession } from '@components/Contexts/LHSessionContext'
function PDFBlockComponent(props: any) {
const org = useOrg() as any
const course = useCourse() as any
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const [pdf, setPDF] = React.useState(null)
const [isLoading, setIsLoading] = React.useState(false)
const [blockObject, setblockObject] = React.useState(
@ -32,7 +35,7 @@ function PDFBlockComponent(props: any) {
setIsLoading(true)
let object = await uploadNewPDFFile(
pdf,
props.extension.options.activity.activity_uuid
props.extension.options.activity.activity_uuid, access_token
)
setIsLoading(false)
setblockObject(object)
@ -41,7 +44,7 @@ function PDFBlockComponent(props: any) {
})
}
useEffect(() => {}, [course, org])
useEffect(() => { }, [course, org])
return (
<NodeViewWrapper className="block-pdf">

View file

@ -86,10 +86,8 @@ function QuizBlockComponent(props: any) {
if (allCorrect) {
setSubmissionMessage('All answers are correct!')
console.log('All answers are correct!')
} else {
setSubmissionMessage('Some answers are incorrect!')
console.log('Some answers are incorrect!')
}
}

View file

@ -8,6 +8,7 @@ import { UploadIcon } from '@radix-ui/react-icons'
import { useOrg } from '@components/Contexts/OrgContext'
import { useCourse } from '@components/Contexts/CourseContext'
import { useEditorProvider } from '@components/Contexts/Editor/EditorContext'
import { useLHSession } from '@components/Contexts/LHSessionContext'
function VideoBlockComponents(props: any) {
const org = useOrg() as any
@ -15,6 +16,8 @@ function VideoBlockComponents(props: any) {
const editorState = useEditorProvider() as any
const isEditable = editorState.isEditable
const [video, setVideo] = React.useState(null)
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const [isLoading, setIsLoading] = React.useState(false)
const [blockObject, setblockObject] = React.useState(
props.node.attrs.blockObject
@ -32,7 +35,7 @@ function VideoBlockComponents(props: any) {
setIsLoading(true)
let object = await uploadNewVideoFile(
video,
props.extension.options.activity.activity_uuid
props.extension.options.activity.activity_uuid, access_token
)
setIsLoading(false)
setblockObject(object)
@ -41,7 +44,7 @@ function VideoBlockComponents(props: any) {
})
}
useEffect(() => {}, [course, org])
useEffect(() => { }, [course, org])
return (
<NodeViewWrapper className="block-video">
@ -98,7 +101,7 @@ function VideoBlockComponents(props: any) {
)
}
const BlockVideoWrapper = styled.div`
//border: ${(props) =>
border: ${(props) =>
props.contentEditable ? '2px dashed #713f1117' : 'none'};
// center

View file

@ -1,12 +1,10 @@
'use client'
import React from 'react'
import Link from 'next/link'
import { getAPIUrl, getUriWithOrg } from '@services/config/config'
import { getUriWithOrg } from '@services/config/config'
import { HeaderProfileBox } from '@components/Security/HeaderProfileBox'
import MenuLinks from './MenuLinks'
import { getOrgLogoMediaDirectory } from '@services/media/media'
import useSWR from 'swr'
import { swrFetcher } from '@services/utils/ts/requests'
import { useLHSession } from '@components/Contexts/LHSessionContext'
import { useOrg } from '@components/Contexts/OrgContext'

View file

@ -19,7 +19,7 @@ import { useLHSession } from '@components/Contexts/LHSessionContext'
function CreateCourseModal({ closeModal, orgslug }: any) {
const [isSubmitting, setIsSubmitting] = useState(false)
const session = useLHSession()
const session = useLHSession() as any;
const [name, setName] = React.useState('')
const [description, setDescription] = React.useState('')
const [learnings, setLearnings] = React.useState('')
@ -55,7 +55,6 @@ function CreateCourseModal({ closeModal, orgslug }: any) {
const handleVisibilityChange = (event: React.ChangeEvent<any>) => {
setVisibility(event.target.value)
console.log(visibility)
}
const handleTagsChange = (event: React.ChangeEvent<any>) => {

View file

@ -1,10 +1,11 @@
'use client';
import { useCourse } from '@components/Contexts/CourseContext';
import { useLHSession } from '@components/Contexts/LHSessionContext';
import { useOrg } from '@components/Contexts/OrgContext';
import { getAPIUrl } from '@services/config/config';
import { linkResourcesToUserGroup } from '@services/usergroups/usergroups';
import { swrFetcher } from '@services/utils/ts/requests';
import { AlertTriangle, Info } from 'lucide-react';
import { Info } from 'lucide-react';
import React, { useEffect } from 'react'
import toast from 'react-hot-toast';
import useSWR, { mutate } from 'swr'
@ -17,6 +18,8 @@ type LinkToUserGroupProps = {
function LinkToUserGroup(props: LinkToUserGroupProps) {
const course = useCourse() as any
const org = useOrg() as any
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const courseStructure = course.courseStructure
const { data: usergroups } = useSWR(
@ -27,8 +30,7 @@ function LinkToUserGroup(props: LinkToUserGroupProps) {
const handleLink = async () => {
console.log('selectedUserGroup', selectedUserGroup)
const res = await linkResourcesToUserGroup(selectedUserGroup, courseStructure.course_uuid)
const res = await linkResourcesToUserGroup(selectedUserGroup, courseStructure.course_uuid, access_token)
if (res.status === 200) {
props.setUserGroupModal(false)
toast.success('Successfully linked to usergroup')
@ -37,7 +39,6 @@ function LinkToUserGroup(props: LinkToUserGroupProps) {
else {
toast.error('Error ' + res.status + ': ' + res.data.detail)
}
}
useEffect(() => {
@ -54,25 +55,25 @@ function LinkToUserGroup(props: LinkToUserGroupProps) {
<h1 className=' font-medium'>Users that are not part of the UserGroup will no longer have access to this course</h1>
</div>
<div className='p-4 flex-row flex justify-between items-center'>
<div className='py-1'>
<span className='px-3 text-gray-400 font-bold rounded-full py-1 bg-gray-100 mx-3'>UserGroup Name </span>
<select
onChange={(e) => setSelectedUserGroup(e.target.value)}
defaultValue={selectedUserGroup}
>
{usergroups && usergroups.map((group: any) => (
<option key={group.id} value={group.id}>{group.name}</option>
))}
</select>
</div>
<div className='py-3'>
<button onClick={() => { handleLink() }} className='bg-green-700 text-white font-bold px-4 py-2 rounded-md shadow'>Link</button>
<div className='py-1'>
<span className='px-3 text-gray-400 font-bold rounded-full py-1 bg-gray-100 mx-3'>UserGroup Name </span>
<select
onChange={(e) => setSelectedUserGroup(e.target.value)}
defaultValue={selectedUserGroup}
>
{usergroups && usergroups.map((group: any) => (
<option key={group.id} value={group.id}>{group.name}</option>
))}
</select>
</div>
<div className='py-3'>
<button onClick={() => { handleLink() }} className='bg-green-700 text-white font-bold px-4 py-2 rounded-md shadow'>Link</button>
</div>
</div>
</div>
</div>
)
}

View file

@ -2,7 +2,7 @@ import { useOrg } from '@components/Contexts/OrgContext'
import { getAPIUrl } from '@services/config/config'
import { createInviteCode, createInviteCodeWithUserGroup } from '@services/organizations/invites'
import { swrFetcher } from '@services/utils/ts/requests'
import { Shield, Ticket } from 'lucide-react'
import { Ticket } from 'lucide-react'
import { useLHSession } from '@components/Contexts/LHSessionContext'
import React, { useEffect } from 'react'
import toast from 'react-hot-toast'
@ -14,7 +14,8 @@ type OrgInviteCodeGenerateProps = {
function OrgInviteCodeGenerate(props: OrgInviteCodeGenerateProps) {
const org = useOrg() as any
const session = useLHSession()
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const [usergroup_id, setUsergroup_id] = React.useState(0);
const { data: usergroups } = useSWR(
org ? `${getAPIUrl()}usergroups/org/${org.id}` : null,

View file

@ -14,13 +14,16 @@ import { BarLoader } from 'react-spinners'
import { createUserGroup } from '@services/usergroups/usergroups'
import { mutate } from 'swr'
import { getAPIUrl } from '@services/config/config'
import { useLHSession } from '@components/Contexts/LHSessionContext'
type AddUserGroupProps = {
setCreateUserGroupModal: any
}
function AddUserGroup(props: AddUserGroupProps) {
const org = useOrg() as any
const org = useOrg() as any;
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const [userGroupName, setUserGroupName] = React.useState('')
const [userGroupDescription, setUserGroupDescription] = React.useState('')
const [isSubmitting, setIsSubmitting] = React.useState(false)
@ -42,7 +45,7 @@ function AddUserGroup(props: AddUserGroupProps) {
description: userGroupDescription,
org_id: org.id
}
const res = await createUserGroup(obj)
const res = await createUserGroup(obj, access_token)
if (res.status == 200) {
setIsSubmitting(false)
mutate(`${getAPIUrl()}usergroups/org/${org.id}`)

View file

@ -1,3 +1,4 @@
import { useLHSession } from '@components/Contexts/LHSessionContext'
import { useOrg } from '@components/Contexts/OrgContext'
import { getAPIUrl } from '@services/config/config'
import { linkUserToUserGroup, unLinkUserToUserGroup } from '@services/usergroups/usergroups'
@ -14,6 +15,8 @@ type ManageUsersProps = {
function ManageUsers(props: ManageUsersProps) {
const org = useOrg() as any
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const { data: OrgUsers } = useSWR(
org ? `${getAPIUrl()}orgs/${org.id}/users` : null,
swrFetcher
@ -31,7 +34,7 @@ function ManageUsers(props: ManageUsersProps) {
}
const handleLinkUser = async (user_id: any) => {
const res = await linkUserToUserGroup(props.usergroup_id, user_id)
const res = await linkUserToUserGroup(props.usergroup_id, user_id,access_token)
if (res.status === 200) {
toast.success('User linked successfully')
mutate(`${getAPIUrl()}usergroups/${props.usergroup_id}/users`)
@ -41,7 +44,7 @@ function ManageUsers(props: ManageUsersProps) {
}
const handleUnlinkUser = async (user_id: any) => {
const res = await unLinkUserToUserGroup(props.usergroup_id, user_id)
const res = await unLinkUserToUserGroup(props.usergroup_id, user_id,access_token)
if (res.status === 200) {
toast.success('User unlinked successfully')
mutate(`${getAPIUrl()}usergroups/${props.usergroup_id}/users`)

View file

@ -1,4 +1,5 @@
'use client'
import { useLHSession } from '@components/Contexts/LHSessionContext'
import { useOrg } from '@components/Contexts/OrgContext'
import FormLayout, {
ButtonBlack,
@ -22,6 +23,8 @@ interface Props {
function RolesUpdate(props: Props) {
const org = useOrg() as any
const session = useLHSession() as any
const access_token = session.data.tokens.access_token;
const [isSubmitting, setIsSubmitting] = React.useState(false)
const [assignedRole, setAssignedRole] = React.useState(
props.alreadyAssignedRole
@ -36,7 +39,7 @@ function RolesUpdate(props: Props) {
const handleSubmit = async (e: any) => {
e.preventDefault()
setIsSubmitting(true)
const res = await updateUserRole(org.id, props.user.user.id, assignedRole)
const res = await updateUserRole(org.id, props.user.user.id, assignedRole,access_token)
if (res.status === 200) {
await mutate(`${getAPIUrl()}orgs/${org.id}/users`)

View file

@ -34,7 +34,7 @@ function CollectionThumbnail(props: PropsType) {
href={getUriWithOrg(
props.orgslug,
'/collection/' +
removeCollectionPrefix(props.collection.collection_uuid)
removeCollectionPrefix(props.collection.collection_uuid)
)}
>
<div
@ -55,7 +55,7 @@ function CollectionThumbnail(props: PropsType) {
href={getUriWithOrg(
props.orgslug,
'/collection/' +
removeCollectionPrefix(props.collection.collection_uuid)
removeCollectionPrefix(props.collection.collection_uuid)
)}
>
<h1 className="font-bold text-md justify-center">
@ -75,7 +75,7 @@ function CollectionThumbnail(props: PropsType) {
const CollectionAdminEditsArea = (props: any) => {
const router = useRouter()
const session = useLHSession() ;
const session = useLHSession() as any;
const deleteCollectionUI = async (collectionId: number) => {
await deleteCollection(collectionId, session.data?.tokens?.access_token)

View file

@ -25,7 +25,7 @@ function removeCoursePrefix(course_uuid: string) {
function CourseThumbnail(props: PropsType) {
const router = useRouter()
const org = useOrg() as any
const session = useLHSession();
const session = useLHSession() as any;
async function deleteCourses(course_uuid: any) {
await deleteCourseFromBackend(course_uuid, session.data?.tokens?.access_token)

View file

@ -1,9 +1,9 @@
'use client';
import React, { useEffect, useState, useCallback, useMemo } from 'react';
import { useOrg } from '@components/Contexts/OrgContext';
import { useLHSession } from '@components/Contexts/LHSessionContext';
import useAdminStatus from '@components/Hooks/useAdminStatus';
import { usePathname, useRouter } from 'next/navigation';
import PageLoading from '@components/Objects/Loaders/PageLoading';
type AuthorizationProps = {
children: React.ReactNode;
@ -30,10 +30,19 @@ const AdminAuthorization: React.FC<AuthorizationProps> = ({ children, authorizat
const isUserAuthenticated = useMemo(() => session.status === 'authenticated', [session.status]);
const checkPathname = useCallback((pattern: string, pathname: string) => {
const regexPattern = new RegExp(`^${pattern.replace(/\//g, '\\/').replace(/\*/g, '.*')}$`);
// Ensure the inputs are strings
if (typeof pattern !== 'string' || typeof pathname !== 'string') {
return false;
}
// Convert pattern to a regex pattern
const regexPattern = new RegExp(`^${pattern.replace(/[\/.*+?^${}()|[\]\\]/g, '\\$&').replace(/\\\*/g, '.*')}$`);
// Test the pathname against the regex pattern
return regexPattern.test(pathname);
}, []);
const isAdminPath = useMemo(() => ADMIN_PATHS.some(path => checkPathname(path, pathname)), [pathname, checkPathname]);
const authorizeUser = useCallback(() => {
@ -69,7 +78,7 @@ const AdminAuthorization: React.FC<AuthorizationProps> = ({ children, authorizat
if (loading) {
return (
<div className="flex justify-center items-center h-screen">
<h1 className="text-2xl">Loading...</h1>
<PageLoading />
</div>
);
}

View file

@ -11,9 +11,7 @@ export const HeaderProfileBox = () => {
const session = useLHSession() as any
const isUserAdmin = useAdminStatus() as any
useEffect(() => {
console.log(session)
}
useEffect(() => {}
, [session])
return (

View file

@ -1,9 +1,10 @@
import { getAPIUrl } from '@services/config/config'
import { RequestBody } from '@services/utils/ts/requests'
import { RequestBodyWithAuthHeader } from '@services/utils/ts/requests'
export async function startActivityAIChatSession(
message: string,
activity_uuid: string
access_token: string,
activity_uuid?: string
) {
const data = {
message,
@ -11,7 +12,7 @@ export async function startActivityAIChatSession(
}
const result = await fetch(
`${getAPIUrl()}ai/start/activity_chat_session`,
RequestBody('POST', data, null)
RequestBodyWithAuthHeader('POST', data, null, access_token)
)
const json = await result.json()
if (result.status === 200) {
@ -34,7 +35,8 @@ export async function startActivityAIChatSession(
export async function sendActivityAIChatMessage(
message: string,
aichat_uuid: string,
activity_uuid: string
activity_uuid: string,
access_token: string
) {
const data = {
aichat_uuid,
@ -43,7 +45,7 @@ export async function sendActivityAIChatMessage(
}
const result = await fetch(
`${getAPIUrl()}ai/send/activity_chat_message`,
RequestBody('POST', data, null)
RequestBodyWithAuthHeader('POST', data, null, access_token)
)
const json = await result.json()

View file

@ -1,7 +1,16 @@
import { getAPIUrl } from '@services/config/config'
import { RequestBody, RequestBodyForm } from '@services/utils/ts/requests'
import {
RequestBody,
RequestBodyForm,
RequestBodyFormWithAuthHeader,
RequestBodyWithAuthHeader,
} from '@services/utils/ts/requests'
export async function uploadNewImageFile(file: any, activity_uuid: string) {
export async function uploadNewImageFile(
file: any,
activity_uuid: string,
access_token: string
) {
// Send file thumbnail as form data
const formData = new FormData()
formData.append('file_object', file)
@ -9,17 +18,17 @@ export async function uploadNewImageFile(file: any, activity_uuid: string) {
return fetch(
`${getAPIUrl()}blocks/image`,
RequestBodyForm('POST', formData, null)
RequestBodyFormWithAuthHeader('POST', formData, null, access_token)
)
.then((result) => result.json())
.catch((error) => console.log('error', error))
}
export async function getImageFile(file_id: string) {
export async function getImageFile(file_id: string, access_token: string) {
// todo : add course id to url
return fetch(
`${getAPIUrl()}blocks/image?file_id=${file_id}`,
RequestBody('GET', null, null)
RequestBodyWithAuthHeader('GET', null, null, access_token)
)
.then((result) => result.json())
.catch((error) => console.log('error', error))

View file

@ -1,7 +1,16 @@
import { getAPIUrl } from '@services/config/config'
import { RequestBody, RequestBodyForm } from '@services/utils/ts/requests'
import {
RequestBody,
RequestBodyForm,
RequestBodyFormWithAuthHeader,
RequestBodyWithAuthHeader,
} from '@services/utils/ts/requests'
export async function uploadNewPDFFile(file: any, activity_uuid: string) {
export async function uploadNewPDFFile(
file: any,
activity_uuid: string,
access_token: string
) {
// Send file thumbnail as form data
const formData = new FormData()
formData.append('file_object', file)
@ -9,17 +18,17 @@ export async function uploadNewPDFFile(file: any, activity_uuid: string) {
return fetch(
`${getAPIUrl()}blocks/pdf`,
RequestBodyForm('POST', formData, null)
RequestBodyFormWithAuthHeader('POST', formData, null, access_token)
)
.then((result) => result.json())
.catch((error) => console.log('error', error))
}
export async function getPDFFile(file_id: string) {
export async function getPDFFile(file_id: string, access_token: string) {
// todo : add course id to url
return fetch(
`${getAPIUrl()}blocks/pdf?file_id=${file_id}`,
RequestBody('GET', null, null)
RequestBodyWithAuthHeader('GET', null, null, access_token)
)
.then((result) => result.json())
.catch((error) => console.log('error', error))

View file

@ -1,10 +1,10 @@
import { getAPIUrl } from '@services/config/config'
import { RequestBody } from '@services/utils/ts/requests'
import { RequestBody, RequestBodyWithAuthHeader } from '@services/utils/ts/requests'
export async function submitQuizBlock(activity_id: string, data: any) {
export async function submitQuizBlock(activity_id: string, data: any,access_token:string) {
const result: any = await fetch(
`${getAPIUrl()}blocks/quiz/${activity_id}"`,
RequestBody('POST', data, null)
RequestBodyWithAuthHeader('POST', data, null,access_token)
)
.then((result) => result.json())
.catch((error) => console.log('error', error))

View file

@ -1,7 +1,16 @@
import { getAPIUrl } from '@services/config/config'
import { RequestBody, RequestBodyForm } from '@services/utils/ts/requests'
import {
RequestBody,
RequestBodyForm,
RequestBodyFormWithAuthHeader,
RequestBodyWithAuthHeader,
} from '@services/utils/ts/requests'
export async function uploadNewVideoFile(file: any, activity_uuid: string) {
export async function uploadNewVideoFile(
file: any,
activity_uuid: string,
access_token: string
) {
// Send file thumbnail as form data
const formData = new FormData()
formData.append('file_object', file)
@ -9,17 +18,17 @@ export async function uploadNewVideoFile(file: any, activity_uuid: string) {
return fetch(
`${getAPIUrl()}blocks/video`,
RequestBodyForm('POST', formData, null)
RequestBodyFormWithAuthHeader('POST', formData, null, access_token)
)
.then((result) => result.json())
.catch((error) => console.log('error', error))
.catch((error) => console.error('error', error))
}
export async function getVideoFile(file_id: string) {
export async function getVideoFile(file_id: string, access_token: string) {
return fetch(
`${getAPIUrl()}blocks/video?file_id=${file_id}`,
RequestBody('GET', null, null)
RequestBodyWithAuthHeader('GET', null, null, access_token)
)
.then((result) => result.json())
.catch((error) => console.log('error', error))
.catch((error) => console.error('error', error))
}

View file

@ -1,4 +1,4 @@
import { RequestBody, RequestBodyWithAuthHeader, errorHandling } from '@services/utils/ts/requests'
import { RequestBodyWithAuthHeader, errorHandling } from '@services/utils/ts/requests'
import { getAPIUrl } from '@services/config/config'
/*

View file

@ -23,7 +23,6 @@ export async function deleteCollection(
// Create a new collection
export async function createCollection(collection: any, access_token: any) {
console.log(collection)
const result: any = await fetch(
`${getAPIUrl()}collections/`,
RequestBodyWithAuthHeader('POST', collection, null, access_token)

View file

@ -1,7 +1,5 @@
import { getAPIUrl } from '@services/config/config'
import {
RequestBody,
RequestBodyForm,
RequestBodyFormWithAuthHeader,
RequestBodyWithAuthHeader,
errorHandling,

View file

@ -1,6 +1,5 @@
import { getAPIUrl } from '@services/config/config'
import {
RequestBody,
RequestBodyWithAuthHeader,
getResponseMetadata,
} from '@services/utils/ts/requests'

View file

@ -1,6 +1,5 @@
import { getAPIUrl } from '@services/config/config'
import {
RequestBody,
RequestBodyWithAuthHeader,
getResponseMetadata,
} from '@services/utils/ts/requests'

View file

@ -1,6 +1,6 @@
import { getAPIUrl } from '@services/config/config'
import {
RequestBody,
RequestBodyWithAuthHeader,
errorHandling,
getResponseMetadata,
} from '@services/utils/ts/requests'
@ -10,37 +10,48 @@ import {
GET requests are called from the frontend using SWR (https://swr.vercel.app/)
*/
export async function createNewOrganization(body: any) {
export async function createNewOrganization(body: any, access_token: string) {
const result = await fetch(
`${getAPIUrl()}orgs/`,
RequestBody('POST', body, null)
RequestBodyWithAuthHeader('POST', body, null,access_token)
)
const res = await errorHandling(result)
return res
}
export async function deleteOrganizationFromBackend(org_id: any) {
export async function deleteOrganizationFromBackend(
org_id: any,
access_token: string
) {
const result = await fetch(
`${getAPIUrl()}orgs/${org_id}`,
RequestBody('DELETE', null, null)
RequestBodyWithAuthHeader('DELETE', null, null, access_token)
)
const res = await errorHandling(result)
return res
}
export async function getOrganizationContextInfo(org_slug: any, next: any) {
export async function getOrganizationContextInfo(
org_slug: any,
next: any,
access_token?: string
) {
const result = await fetch(
`${getAPIUrl()}orgs/slug/${org_slug}`,
RequestBody('GET', null, next)
RequestBodyWithAuthHeader('GET', null, next, access_token)
)
const res = await errorHandling(result)
return res
}
export async function getOrganizationContextInfoWithId(org_id: any, next: any) {
export async function getOrganizationContextInfoWithId(
org_id: any,
next: any,
access_token: string
) {
const result = await fetch(
`${getAPIUrl()}orgs/${org_id}`,
RequestBody('GET', null, next)
RequestBodyWithAuthHeader('GET', null, next, access_token)
)
const res = await errorHandling(result)
return res
@ -64,10 +75,14 @@ export async function getOrganizationContextInfoWithoutCredentials(
return res
}
export function getOrganizationContextInfoNoAsync(org_slug: any, next: any) {
export function getOrganizationContextInfoNoAsync(
org_slug: any,
next: any,
access_token: string
) {
const result = fetch(
`${getAPIUrl()}orgs/slug/${org_slug}`,
RequestBody('GET', null, next)
RequestBodyWithAuthHeader('GET', null, next, access_token)
)
return result
}
@ -75,20 +90,25 @@ export function getOrganizationContextInfoNoAsync(org_slug: any, next: any) {
export async function updateUserRole(
org_id: any,
user_id: any,
role_uuid: any
role_uuid: any,
access_token: string
) {
const result = await fetch(
`${getAPIUrl()}orgs/${org_id}/users/${user_id}/role/${role_uuid}`,
RequestBody('PUT', null, null)
RequestBodyWithAuthHeader('PUT', null, null, access_token)
)
const res = await getResponseMetadata(result)
return res
}
export async function removeUserFromOrg(org_id: any, user_id: any) {
export async function removeUserFromOrg(
org_id: any,
user_id: any,
access_token: any
) {
const result = await fetch(
`${getAPIUrl()}orgs/${org_id}/users/${user_id}`,
RequestBody('DELETE', null, null)
RequestBodyWithAuthHeader('DELETE', null, null, access_token)
)
const res = await getResponseMetadata(result)
return res

View file

@ -1,8 +1,8 @@
import { getAPIUrl } from '@services/config/config'
import {
RequestBody,
errorHandling,
RequestBodyForm,
RequestBodyWithAuthHeader,
RequestBodyFormWithAuthHeader,
} from '@services/utils/ts/requests'
/*
@ -10,22 +10,30 @@ import {
GET requests are called from the frontend using SWR (https://swr.vercel.app/)
*/
export async function updateOrganization(org_id: string, data: any) {
export async function updateOrganization(
org_id: string,
data: any,
access_token: string
) {
const result: any = await fetch(
`${getAPIUrl()}orgs/` + org_id,
RequestBody('PUT', data, null)
RequestBodyWithAuthHeader('PUT', data, null, access_token)
)
const res = await errorHandling(result)
return res
}
export async function uploadOrganizationLogo(org_id: string, logo_file: any) {
export async function uploadOrganizationLogo(
org_id: string,
logo_file: any,
access_token: string
) {
// Send file thumbnail as form data
const formData = new FormData()
formData.append('logo_file', logo_file)
const result: any = await fetch(
`${getAPIUrl()}orgs/` + org_id + '/logo',
RequestBodyForm('PUT', formData, null)
RequestBodyFormWithAuthHeader('PUT', formData, null, access_token)
)
const res = await errorHandling(result)
return res

View file

@ -1,15 +1,22 @@
import { getAPIUrl } from '@services/config/config'
import { RequestBody, errorHandling } from '@services/utils/ts/requests'
import {
RequestBodyWithAuthHeader,
errorHandling,
} from '@services/utils/ts/requests'
/*
This file includes only POST, PUT, DELETE requests
GET requests are called from the frontend using SWR (https://swr.vercel.app/)
*/
export async function updatePassword(user_id: string, data: any) {
export async function updatePassword(
user_id: string,
data: any,
access_token: any
) {
const result: any = await fetch(
`${getAPIUrl()}users/change_password/` + user_id,
RequestBody('PUT', data, null)
RequestBodyWithAuthHeader('PUT', data, null, access_token)
)
const res = await errorHandling(result)
return res

View file

@ -1,15 +1,22 @@
import { getAPIUrl } from '@services/config/config'
import { RequestBody, errorHandling } from '@services/utils/ts/requests'
import {
RequestBodyWithAuthHeader,
errorHandling,
} from '@services/utils/ts/requests'
/*
This file includes only POST, PUT, DELETE requests
GET requests are called from the frontend using SWR (https://swr.vercel.app/)
*/
export async function updateProfile(data: any, user_id: number) {
export async function updateProfile(
data: any,
user_id: number,
access_token: string
) {
const result: any = await fetch(
`${getAPIUrl()}users/` + user_id,
RequestBody('PUT', data, null)
RequestBodyWithAuthHeader('PUT', data, null, access_token)
)
const res = await errorHandling(result)
return res

View file

@ -1,46 +1,60 @@
import { getAPIUrl } from '@services/config/config'
import { RequestBody, getResponseMetadata } from '@services/utils/ts/requests'
import {
RequestBodyWithAuthHeader,
getResponseMetadata,
} from '@services/utils/ts/requests'
export async function getUserGroups(org_id: any) {
export async function getUserGroups(org_id: any, access_token: string) {
const result: any = await fetch(
`${getAPIUrl()}usergroups/org/${org_id}`,
RequestBody('GET', null, null)
RequestBodyWithAuthHeader('GET', null, null, access_token)
)
const res = await getResponseMetadata(result)
return res
}
export async function createUserGroup(body: any) {
export async function createUserGroup(body: any, access_token: string) {
const result: any = await fetch(
`${getAPIUrl()}usergroups/`,
RequestBody('POST', body, null)
RequestBodyWithAuthHeader('POST', body, null, access_token)
)
const res = await getResponseMetadata(result)
return res
}
export async function linkUserToUserGroup(usergroup_id: any, user_id: any) {
export async function linkUserToUserGroup(
usergroup_id: any,
user_id: any,
access_token: string
) {
const result: any = await fetch(
`${getAPIUrl()}usergroups/${usergroup_id}/add_users?user_ids=${user_id}`,
RequestBody('POST', null, null)
RequestBodyWithAuthHeader('POST', null, null, access_token)
)
const res = await getResponseMetadata(result)
return res
}
export async function unLinkUserToUserGroup(usergroup_id: any, user_id: any) {
export async function unLinkUserToUserGroup(
usergroup_id: any,
user_id: any,
access_token: string
) {
const result: any = await fetch(
`${getAPIUrl()}usergroups/${usergroup_id}/remove_users?user_ids=${user_id}`,
RequestBody('DELETE', null, null)
RequestBodyWithAuthHeader('DELETE', null, null, access_token)
)
const res = await getResponseMetadata(result)
return res
}
export async function deleteUserGroup(usergroup_id: number) {
export async function deleteUserGroup(
usergroup_id: number,
access_token: string
) {
const result: any = await fetch(
`${getAPIUrl()}usergroups/${usergroup_id}`,
RequestBody('DELETE', null, null)
RequestBodyWithAuthHeader('DELETE', null, null, access_token)
)
const res = await getResponseMetadata(result)
return res
@ -48,11 +62,12 @@ export async function deleteUserGroup(usergroup_id: number) {
export async function linkResourcesToUserGroup(
usergroup_id: any,
resource_uuids: any
resource_uuids: any,
access_token: string
) {
const result: any = await fetch(
`${getAPIUrl()}usergroups/${usergroup_id}/add_resources?resource_uuids=${resource_uuids}`,
RequestBody('POST', null, null)
RequestBodyWithAuthHeader('POST', null, null, access_token)
)
const res = await getResponseMetadata(result)
return res
@ -60,11 +75,12 @@ export async function linkResourcesToUserGroup(
export async function unLinkResourcesToUserGroup(
usergroup_id: any,
resource_uuids: any
resource_uuids: any,
access_token: string
) {
const result: any = await fetch(
`${getAPIUrl()}usergroups/${usergroup_id}/remove_resources?resource_uuids=${resource_uuids}`,
RequestBody('DELETE', null, null)
RequestBodyWithAuthHeader('DELETE', null, null, access_token)
)
const res = await getResponseMetadata(result)
return res

View file

@ -1,7 +1,7 @@
import { getAPIUrl } from '@services/config/config'
import {
RequestBody,
RequestBodyForm,
RequestBodyFormWithAuthHeader,
errorHandling,
getResponseMetadata,
} from '@services/utils/ts/requests'
@ -15,12 +15,16 @@ export async function getUser(user_id: string) {
return res
}
export async function updateUserAvatar(user_uuid: any, avatar_file: any) {
export async function updateUserAvatar(
user_uuid: any,
avatar_file: any,
access_token: any
) {
const formData = new FormData()
formData.append('avatar_file', avatar_file)
const result: any = await fetch(
`${getAPIUrl()}users/update_avatar/${user_uuid}`,
RequestBodyForm('PUT', formData, null)
RequestBodyFormWithAuthHeader('PUT', formData, null, access_token)
)
const res = await getResponseMetadata(result)
return res

View file

@ -20,7 +20,7 @@ export const RequestBodyWithAuthHeader = (
method: string,
data: any,
next: any,
token: string
token?: string
) => {
let HeadersConfig = new Headers(
token

View file

@ -1,3 +1,4 @@
// eslint-disable-next-line unused-imports/no-unused-imports
import type { NextAuthOptions } from 'next-auth/index';
// next-auth.d.ts