-
- Add new
+ Add new
-
+
-{!courses ? (
+
+
+
+ {!courses ? (
Loading...
) : ( -
+ ({});
@@ -25,7 +26,7 @@ const CourseClient = (props: any) => {
function getLearningTags() {
// create array of learnings from a string object (comma separated)
- let learnings = course.learnings.split(",");
+ let learnings = course?.learnings ? course?.learnings.split(",") : [];
setLearnings(learnings);
}
@@ -56,13 +57,13 @@ const CourseClient = (props: any) => {
}
useEffect(() => {
-
+ getLearningTags();
}
- , [org]);
+ , [org, course]);
return (
<>
- {!course ? (
+ {!course && !org ? (
@@ -73,9 +74,13 @@ const CourseClient = (props: any) => {
-
-
+
diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/course.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/course.tsx
index bd391921..5f4f5569 100644
--- a/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/course.tsx
+++ b/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/course.tsx
@@ -8,11 +8,12 @@ import { revalidateTags } from "@services/utils/ts/requests";
import ActivityIndicators from "@components/Pages/Courses/ActivityIndicators";
import { useRouter } from "next/navigation";
import GeneralWrapperStyled from "@components/StyledElements/Wrappers/GeneralWrapper";
-import { getCourseThumbnailMediaDirectory } from "@services/media/media";
+import { getCourseThumbnailMediaDirectory, getUserAvatarMediaDirectory } from "@services/media/media";
import { ArrowRight, Check, File, Sparkles, Star, Video } from "lucide-react";
import Avvvatars from "avvvatars-react";
import { getUser } from "@services/users/users";
import { useOrg } from "@components/Contexts/OrgContext";
+import UserAvatar from "@components/Objects/UserAvatar";
const CourseClient = (props: any) => {
const [user, setUser] = useStateCourses
{courses.map((course: any) => ( -
+
)}
-
+
-
+
- {
+ if (e.target.checked) {
+ setSelectedCourses([...selectedCourses, course.id]);
+ }
+ else {
+ setSelectedCourses(selectedCourses.filter((course_uuid: any) => course_uuid !== course.course_uuid));
+ }
+ }}
+ className="text-blue-500 rounded focus:ring-2 focus:ring-blue-500"
+ />
- type="checkbox"
- id={course.id}
- name={course.name}
- value={course.id}
-// id is an integer, not a string
-
- onChange={(e) => {
- if (e.target.checked) {
- setSelectedCourses([...selectedCourses, course.id]);
- }
- else {
- setSelectedCourses(selectedCourses.filter((course_uuid: any) => course_uuid !== course.course_uuid));
- }
- }
- }
- className="mr-2"
-/>
-
-
+
))}
-
-
+ {props.course?.thumbnail_image && org ?
+
+
+ :
+
+
+ }
{course.description}
What you will learn
-
- {learnings.map((learning: any) => {
- return (
-
+ {learnings.length > 0 && learnings[0] !== "null" &&
+
-
- );
- }
- )}
-
-
- {learning}
-
+
+ }
What you will learn
+
+ {learnings.map((learning: any) => {
+ return (
+
+
+
+ );
+ }
+ )}
+
+
+ {learning}
+Course Lessons
@@ -185,15 +194,22 @@ const CourseClient = (props: any) => {
-
+
{user &&
-
-
-
+
+
}
@@ -214,12 +230,4 @@ const CourseClient = (props: any) => {
};
-const StyledBox = (props: any) => (
- Author
- {course.authors[0].first_name} {course.authors[0].last_name} {(course.authors[0].first_name && course.authors[0].last_name) ? course.authors[0].first_name + ' ' + course.authors[0].last_name : course.authors[0].username}
+
+ {course.authors[0].first_name && course.authors[0].last_name && (
+
+
)}
+ {!course.authors[0].first_name && !course.authors[0].last_name && (
+ {course.authors[0].first_name + ' ' + course.authors[0].last_name}
@{course.authors[0].username} +
+
)}
+ @{course.authors[0].username}
+
- {props.children}
-
-
-);
-
-
export default CourseClient;
diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/error.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/error.tsx
index 8bac23db..52120114 100644
--- a/apps/web/app/orgs/[orgslug]/(withmenu)/error.tsx
+++ b/apps/web/app/orgs/[orgslug]/(withmenu)/error.tsx
@@ -17,7 +17,7 @@ export default function Error({
return (
-
);
}
\ No newline at end of file
diff --git a/apps/web/app/orgs/[orgslug]/dash/courses/course/[courseuuid]/[subpage]/page.tsx b/apps/web/app/orgs/[orgslug]/dash/courses/course/[courseuuid]/[subpage]/page.tsx
index f49069dc..d64d1331 100644
--- a/apps/web/app/orgs/[orgslug]/dash/courses/course/[courseuuid]/[subpage]/page.tsx
+++ b/apps/web/app/orgs/[orgslug]/dash/courses/course/[courseuuid]/[subpage]/page.tsx
@@ -32,9 +32,9 @@ function CourseOverviewPage({ params }: { params: CourseOverviewParams }) {
}
return (
-
+
-
+
{params.subpage == 'content' ?
-
+
)
diff --git a/apps/web/app/orgs/[orgslug]/dash/page.tsx b/apps/web/app/orgs/[orgslug]/dash/page.tsx
index ae18e474..9ef5faa2 100644
--- a/apps/web/app/orgs/[orgslug]/dash/page.tsx
+++ b/apps/web/app/orgs/[orgslug]/dash/page.tsx
@@ -1,11 +1,63 @@
-import PageLoading from '@components/Objects/Loaders/PageLoading'
+import Image from 'next/image'
import React from 'react'
+import learnhousetextlogo from '../../../../public/learnhouse_logo.png'
+import learnhouseiconlogo from '../../../../public/learnhouse_bigicon.png'
+import { BookCopy, School, Settings, Users } from 'lucide-react'
+import Link from 'next/link'
+import AdminAuthorization from '@components/Security/AdminAuthorization'
function DashboardHome() {
return (
@@ -57,12 +57,12 @@ function CourseOverviewPage({ params }: { params: CourseOverviewParams }) {
-
+
- {children}
-
-
+
+
+ {children}
+
+
-
+
+
)
}
diff --git a/apps/web/app/orgs/[orgslug]/dash/user/settings/[subpage]/page.tsx b/apps/web/app/orgs/[orgslug]/dash/user-account/settings/[subpage]/page.tsx
similarity index 87%
rename from apps/web/app/orgs/[orgslug]/dash/user/settings/[subpage]/page.tsx
rename to apps/web/app/orgs/[orgslug]/dash/user-account/settings/[subpage]/page.tsx
index 575b235f..f1ef8bcf 100644
--- a/apps/web/app/orgs/[orgslug]/dash/user/settings/[subpage]/page.tsx
+++ b/apps/web/app/orgs/[orgslug]/dash/user-account/settings/[subpage]/page.tsx
@@ -1,8 +1,8 @@
'use client';
import React, { useEffect } from 'react'
import { motion } from 'framer-motion';
-import UserEditGeneral from '@components/Dashboard/User/UserEditGeneral/UserEditGeneral';
-import UserEditPassword from '@components/Dashboard/User/UserEditPassword/UserEditPassword';
+import UserEditGeneral from '@components/Dashboard/UserAccount/UserEditGeneral/UserEditGeneral';
+import UserEditPassword from '@components/Dashboard/UserAccount/UserEditPassword/UserEditPassword';
import Link from 'next/link';
import { getUriWithOrg } from '@services/config/config';
import { Info, Lock } from 'lucide-react';
@@ -24,7 +24,7 @@ function SettingsPage({ params }: { params: SettingsParams }) {
return (
This page is work in progress
+
+
+
+
+
+
+
+
+
+ Courses
+ Create and manage courses, chapters and ativities
+
+
+
+
+ Organization
+ Configure your Organization general settings
+
+
+
+
+ Users
+ Manage your Organization's users, roles
+
+
+
+
+
+
+
+
+
+
+ Learn LearnHouse
+
+
+
+
+ Account Settings
+ Configure your personal settings, passwords, email
+
-
+
@@ -32,7 +32,7 @@ function SettingsPage({ params }: { params: SettingsParams }) {
-
+
-
+
{
const orgslug = params.orgslug;
// Get Org context information
- const org = await getOrganizationContextInfo(orgslug, { revalidate: 1800, tags: ['organizations'] });
+ const org = await getOrganizationContextInfo(orgslug, { revalidate: 0, tags: ['organizations'] });
return {
title: 'Login' + ` — ${org.name}`,
@@ -21,7 +21,7 @@ export async function generateMetadata(
const Login = async (params: any) => {
const orgslug = params.params.orgslug;
- const org = await getOrganizationContextInfo(orgslug, { revalidate: 1800, tags: ['organizations'] });
+ const org = await getOrganizationContextInfo(orgslug, { revalidate: 0, tags: ['organizations'] });
return (
@@ -41,7 +41,7 @@ function SettingsPage({ params }: { params: SettingsParams }) {
+
+ {params.subpage == 'users' ?
+
+ )
+}
+
+export default UsersSettingsPage
\ No newline at end of file
diff --git a/apps/web/app/orgs/[orgslug]/login/login.tsx b/apps/web/app/orgs/[orgslug]/login/login.tsx
index d8f32cb8..b5bf3c0c 100644
--- a/apps/web/app/orgs/[orgslug]/login/login.tsx
+++ b/apps/web/app/orgs/[orgslug]/login/login.tsx
@@ -1,11 +1,10 @@
-"use client";
+"use client";;
import learnhouseIcon from "public/learnhouse_bigicon_1.png";
-import FormLayout, { ButtonBlack, FormField, FormLabel, FormLabelAndMessage, FormMessage, Input } from '@components/StyledElements/Form/Form'
+import FormLayout, { FormField, FormLabelAndMessage, Input } from '@components/StyledElements/Form/Form';
import Image from 'next/image';
import * as Form from '@radix-ui/react-form';
import { useFormik } from 'formik';
import { getOrgLogoMediaDirectory } from "@services/media/media";
-import { BarLoader } from "react-spinners";
import React from "react";
import { loginAndGetToken } from "@services/auth/auth";
import { AlertTriangle } from "lucide-react";
@@ -79,14 +78,14 @@ const LoginClient = (props: LoginClientProps) => {
+
+
+
+
+
+ {H1Label}
+ {H2Label}
+
+
+
+
+
+
+
+
+
+
+ Users
+
+
+
+
+
+
+ Invite users
+
+
+
+
+
+
+ Signup Access
+ Login to
- {props.org?.logo ? (
+ {props.org?.logo_image ? (
- ) : (
+ ) : (
diff --git a/apps/web/app/orgs/[orgslug]/login/page.tsx b/apps/web/app/orgs/[orgslug]/login/page.tsx
index 11dd3f5b..faf71cc8 100644
--- a/apps/web/app/orgs/[orgslug]/login/page.tsx
+++ b/apps/web/app/orgs/[orgslug]/login/page.tsx
@@ -12,7 +12,7 @@ export async function generateMetadata(
): Promise
diff --git a/apps/web/app/orgs/[orgslug]/signup/InviteOnlySignUp.tsx b/apps/web/app/orgs/[orgslug]/signup/InviteOnlySignUp.tsx
new file mode 100644
index 00000000..1f554fd2
--- /dev/null
+++ b/apps/web/app/orgs/[orgslug]/signup/InviteOnlySignUp.tsx
@@ -0,0 +1,166 @@
+"use client";
+import { useFormik } from 'formik';
+import { useRouter } from 'next/navigation';
+import React, { useEffect } from 'react'
+import FormLayout, { FormField, FormLabelAndMessage, Input, Textarea } from '@components/StyledElements/Form/Form';
+import * as Form from '@radix-ui/react-form';
+import { AlertTriangle, Check, User } from 'lucide-react';
+import Link from 'next/link';
+import { signUpWithInviteCode } from '@services/auth/auth';
+import { useOrg } from '@components/Contexts/OrgContext';
+
+
+
+
+const validate = (values: any) => {
+ const errors: any = {};
+
+ if (!values.email) {
+ errors.email = 'Required';
+ }
+ else if (
+ !/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i.test(values.email)
+ ) {
+ errors.email = 'Invalid email address';
+ }
+
+ if (!values.password) {
+ errors.password = 'Required';
+ }
+ else if (values.password.length < 8) {
+ errors.password = 'Password must be at least 8 characters';
+ }
+
+ if (!values.username) {
+ errors.username = 'Required';
+ }
+
+ if (!values.username || values.username.length < 4) {
+ errors.username = 'Username must be at least 4 characters';
+ }
+
+ if (!values.bio) {
+ errors.bio = 'Required';
+ }
+
+
+ return errors;
+};
+
+interface InviteOnlySignUpProps {
+ inviteCode: string;
+}
+
+function InviteOnlySignUpComponent(props : InviteOnlySignUpProps) {
+ const [isSubmitting, setIsSubmitting] = React.useState(false);
+ const org = useOrg() as any;
+ const router = useRouter();
+ const [error, setError] = React.useState('');
+ const [message, setMessage] = React.useState('');
+ const formik = useFormik({
+ initialValues: {
+ org_slug: org?.slug,
+ org_id: org?.id,
+ email: '',
+ password: '',
+ username: '',
+ bio: '',
+ first_name: '',
+ last_name: '',
+ },
+ validate,
+ onSubmit: async values => {
+ setError('')
+ setMessage('')
+ setIsSubmitting(true);
+ let res = await signUpWithInviteCode(values, props.inviteCode);
+ let message = await res.json();
+ if (res.status == 200) {
+ //router.push(`/login`);
+ setMessage('Your account was successfully created')
+ setIsSubmitting(false);
+ }
+ else if (res.status == 401 || res.status == 400 || res.status == 404 || res.status == 409) {
+ setError(message.detail);
+ setIsSubmitting(false);
+
+ }
+ else {
+ setError("Something went wrong");
+ setIsSubmitting(false);
+ }
+
+ },
+ });
+
+ useEffect(() => {
+
+ }
+ , [org]);
+
+ return (
+ {
const orgslug = params.orgslug;
// Get Org context information
- const org = await getOrganizationContextInfo(orgslug, { revalidate: 1800, tags: ['organizations'] });
+ const org = await getOrganizationContextInfo(orgslug, { revalidate: 0, tags: ['organizations'] });
return {
title: 'Sign up' + ` — ${org.name}`,
@@ -23,12 +24,14 @@ export async function generateMetadata(
const SignUp = async (params: any) => {
const orgslug = params.params.orgslug;
- const org = await getOrganizationContextInfo(orgslug, { revalidate: 1800, tags: ['organizations'] });
+ const org = await getOrganizationContextInfo(orgslug, { revalidate: 0, tags: ['organizations'] });
return (
- }>
+
+
);
};
export default SignUp;
diff --git a/apps/web/app/orgs/[orgslug]/signup/signup.tsx b/apps/web/app/orgs/[orgslug]/signup/signup.tsx
index c154b362..fec32b1a 100644
--- a/apps/web/app/orgs/[orgslug]/signup/signup.tsx
+++ b/apps/web/app/orgs/[orgslug]/signup/signup.tsx
@@ -1,117 +1,62 @@
"use client";
-import { useFormik } from 'formik';
-import { useRouter } from 'next/navigation';
import learnhouseIcon from "public/learnhouse_bigicon_1.png";
-import React from 'react'
-import FormLayout, { ButtonBlack, FormField, FormLabel, FormLabelAndMessage, FormMessage, Input, Textarea } from '@components/StyledElements/Form/Form'
import Image from 'next/image';
-import * as Form from '@radix-ui/react-form';
import { getOrgLogoMediaDirectory } from '@services/media/media';
-import { AlertTriangle, Check, User } from 'lucide-react';
import Link from 'next/link';
-import { signup } from '@services/auth/auth';
import { getUriWithOrg } from '@services/config/config';
-
+import { useSession } from "@components/Contexts/SessionContext";
+import React, { useEffect } from "react";
+import { MailWarning, Shield, UserPlus } from "lucide-react";
+import { useOrg } from "@components/Contexts/OrgContext";
+import UserAvatar from "@components/Objects/UserAvatar";
+import OpenSignUpComponent from "./OpenSignup";
+import InviteOnlySignUpComponent from "./InviteOnlySignUp";
+import { useRouter, useSearchParams } from "next/navigation";
+import { validateInviteCode } from "@services/organizations/invites";
+import PageLoading from "@components/Objects/Loaders/PageLoading";
+import Toast from "@components/StyledElements/Toast/Toast";
+import toast from "react-hot-toast";
interface SignUpClientProps {
org: any;
}
-const validate = (values: any) => {
- const errors: any = {};
-
- if (!values.email) {
- errors.email = 'Required';
- }
- else if (
- !/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i.test(values.email)
- ) {
- errors.email = 'Invalid email address';
- }
-
- if (!values.password) {
- errors.password = 'Required';
- }
- else if (values.password.length < 8) {
- errors.password = 'Password must be at least 8 characters';
- }
-
- if (!values.username) {
- errors.username = 'Required';
- }
-
- if (!values.username || values.username.length < 4) {
- errors.username = 'Username must be at least 4 characters';
- }
-
- if (!values.bio) {
- errors.bio = 'Required';
- }
-
-
- return errors;
-};
-
-
function SignUpClient(props: SignUpClientProps) {
- const [isSubmitting, setIsSubmitting] = React.useState(false);
- const router = useRouter();
- const [error, setError] = React.useState('');
- const [message, setMessage] = React.useState('');
- const formik = useFormik({
- initialValues: {
- org_slug: props.org?.slug,
- org_id: props.org?.id,
- email: '',
- password: '',
- username: '',
- bio: '',
- first_name: '',
- last_name: '',
- },
- validate,
- onSubmit: async values => {
- setError('')
- setMessage('')
- setIsSubmitting(true);
- let res = await signup(values);
- let message = await res.json();
- if (res.status == 200) {
- //router.push(`/login`);
- setMessage('Your account was successfully created')
- setIsSubmitting(false);
- }
- else if (res.status == 401 || res.status == 400 || res.status == 404 || res.status == 409) {
- setError(message.detail);
- setIsSubmitting(false);
-
- }
- else {
- setError("Something went wrong");
- setIsSubmitting(false);
- }
+ const session = useSession() as any;
+ const [joinMethod, setJoinMethod] = React.useState('open');
+ const [inviteCode, setInviteCode] = React.useState('');
+ const searchParams = useSearchParams()
+ const inviteCodeParam = searchParams.get('inviteCode')
- },
- });
+ useEffect(() => {
+ if (props.org.config) {
+ setJoinMethod(props.org?.config?.config?.GeneralConfig.users.signup_mechanism);
+ console.log(props.org?.config?.config?.GeneralConfig.users.signup_mechanism)
+ }
+ if (inviteCodeParam) {
+ setInviteCode(inviteCodeParam);
+ }
+ }
+ , [props.org, inviteCodeParam]);
return (
-
+ {error && (
+
+
+
+
+
+
+ {/* for password */}
+
+
+
+
+
+ {/* for username */}
+
+
+
+
+
+
+ {/* for bio */}
+
+
+
+
+
+
+
+
+ )
+}
+
+export default InviteOnlySignUpComponent
\ No newline at end of file
diff --git a/apps/web/app/orgs/[orgslug]/signup/OpenSignup.tsx b/apps/web/app/orgs/[orgslug]/signup/OpenSignup.tsx
new file mode 100644
index 00000000..d7719817
--- /dev/null
+++ b/apps/web/app/orgs/[orgslug]/signup/OpenSignup.tsx
@@ -0,0 +1,163 @@
+"use client";
+import { useFormik } from 'formik';
+import { useRouter } from 'next/navigation';
+import React, { useEffect } from 'react'
+import FormLayout, { FormField, FormLabelAndMessage, Input, Textarea } from '@components/StyledElements/Form/Form';
+import * as Form from '@radix-ui/react-form';
+import { AlertTriangle, Check, User } from 'lucide-react';
+import Link from 'next/link';
+import { signup } from '@services/auth/auth';
+import { useOrg } from '@components/Contexts/OrgContext';
+
+
+
+
+const validate = (values: any) => {
+ const errors: any = {};
+
+ if (!values.email) {
+ errors.email = 'Required';
+ }
+ else if (
+ !/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i.test(values.email)
+ ) {
+ errors.email = 'Invalid email address';
+ }
+
+ if (!values.password) {
+ errors.password = 'Required';
+ }
+ else if (values.password.length < 8) {
+ errors.password = 'Password must be at least 8 characters';
+ }
+
+ if (!values.username) {
+ errors.username = 'Required';
+ }
+
+ if (!values.username || values.username.length < 4) {
+ errors.username = 'Username must be at least 4 characters';
+ }
+
+ if (!values.bio) {
+ errors.bio = 'Required';
+ }
+
+
+ return errors;
+};
+
+
+function OpenSignUpComponent() {
+ const [isSubmitting, setIsSubmitting] = React.useState(false);
+ const org = useOrg() as any;
+ const router = useRouter();
+ const [error, setError] = React.useState('');
+ const [message, setMessage] = React.useState('');
+ const formik = useFormik({
+ initialValues: {
+ org_slug: org?.slug,
+ org_id: org?.id,
+ email: '',
+ password: '',
+ username: '',
+ bio: '',
+ first_name: '',
+ last_name: '',
+ },
+ validate,
+ onSubmit: async values => {
+ setError('')
+ setMessage('')
+ setIsSubmitting(true);
+ let res = await signup(values);
+ let message = await res.json();
+ if (res.status == 200) {
+ //router.push(`/login`);
+ setMessage('Your account was successfully created')
+ setIsSubmitting(false);
+ }
+ else if (res.status == 401 || res.status == 400 || res.status == 404 || res.status == 409) {
+ setError(message.detail);
+ setIsSubmitting(false);
+
+ }
+ else {
+ setError("Something went wrong");
+ setIsSubmitting(false);
+ }
+
+ },
+ });
+
+ useEffect(() => {
+
+ }
+ , [org]);
+
+ return (
+
+
+ )}
+ {message && (
+ {error}
+
+
+
+ )}
+
+
+ {message}
+ +
Login
+
+
+
+
+
+
+
+ {error && (
+
+
+
+
+
+
+ {/* for password */}
+
+
+
+
+
+ {/* for username */}
+
+
+
+
+
+
+ {/* for bio */}
+
+
+
+
+
+
+
+
+ )
+}
+
+export default OpenSignUpComponent
\ No newline at end of file
diff --git a/apps/web/app/orgs/[orgslug]/signup/page.tsx b/apps/web/app/orgs/[orgslug]/signup/page.tsx
index dd70b7f4..d5ea7431 100644
--- a/apps/web/app/orgs/[orgslug]/signup/page.tsx
+++ b/apps/web/app/orgs/[orgslug]/signup/page.tsx
@@ -1,8 +1,9 @@
-import React from "react";
-import SignUpClient from "./signup";
import { Metadata } from "next";
import { getOrganizationContextInfo } from "@services/organizations/orgs";
+import SignUpClient from "./signup";
+import { Suspense } from "react";
+import PageLoading from "@components/Objects/Loaders/PageLoading";
type MetadataProps = {
params: { orgslug: string, courseid: string };
@@ -14,7 +15,7 @@ export async function generateMetadata(
): Promise
+
+ )}
+ {message && (
+ {error}
+
+
+
+ )}
+
+
+ {message}
+ +
Login
+
+
+
+
+
+
+
-
+ <>
+
+
({ access_token: "", user: {}, roles: {}, isLoading: true, isAuthenticated: false });
- const org = useOrg() as any;
- const pathname = usePathname()
- const router = useRouter()
-
async function getNewAccessTokenUsingRefreshTokenUI() {
let data = await getNewAccessTokenUsingRefreshToken();
@@ -39,6 +31,10 @@ function SessionProvider({ children }: { children: React.ReactNode }) {
// Set session
setSession({ access_token: access_token, user: user_session.user, roles: user_session.roles, isLoading: false, isAuthenticated: true });
}
+
+ if (!access_token) {
+ setSession({ access_token: "", user: {}, roles: {}, isLoading: false, isAuthenticated: false });
+ }
}
@@ -47,8 +43,6 @@ function SessionProvider({ children }: { children: React.ReactNode }) {
// Check session
checkSession();
-
-
}, [])
return (
diff --git a/apps/web/components/Dashboard/Course/EditCourseGeneral/EditCourseGeneral.tsx b/apps/web/components/Dashboard/Course/EditCourseGeneral/EditCourseGeneral.tsx
index 636d32e9..9b6b9814 100644
--- a/apps/web/components/Dashboard/Course/EditCourseGeneral/EditCourseGeneral.tsx
+++ b/apps/web/components/Dashboard/Course/EditCourseGeneral/EditCourseGeneral.tsx
@@ -5,6 +5,7 @@ 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';
+import ThumbnailUpdate from './ThumbnailUpdate';
type EditCourseStructureProps = {
@@ -84,71 +85,80 @@ function EditCourseGeneral(props: EditCourseStructureProps) {
}, [course, formik.values, formik.initialValues]);
return (
-
+
-
+
-
Join
+ You've been invited to join
- {props.org?.logo ? (
+ {props.org?.logo_image ? (
) : (
-
- {error && (
-
-
-
-
-
-
- {/* for password */}
-
-
-
-
-
- {/* for username */}
-
-
-
-
-
-
- {/* for bio */}
-
-
-
-
-
-
-
-
+
-
- )}
- {message && (
- {error}
-
-
-
- )}
-
-
- {message}
- -
Login
-
-
-
-
-
-
-
+ {joinMethod == 'open' && (
+ session.isAuthenticated ?
-
+
+ )
+
+}
+
+const NoTokenScreen = (props: any) => {
+ const session = useSession() as any;
+ const org = useOrg() as any;
+ const router = useRouter();
+ const [isLoading, setIsLoading] = React.useState(true);
+ const [inviteCode, setInviteCode] = React.useState('');
+ const [messsage, setMessage] = React.useState('bruh');
+
+ const handleInviteCodeChange = (e: any) => {
+ setInviteCode(e.target.value);
+ }
+
+ const validateCode = async () => {
+ setIsLoading(true);
+ let res = await validateInviteCode(org?.id, inviteCode);
+ //wait for 1s
+ if (res.success) {
+ toast.success("Invite code is valid, you'll be redirected to the signup page in a few seconds");
+ setTimeout(() => {
+ router.push(`/signup?inviteCode=${inviteCode}`);
+ }, 2000);
+ }
+ else {
+ toast.error("Invite code is invalid");
+ setIsLoading(false);
+ }
+
+ }
+
+
+ useEffect(() => {
+ if (session && org) {
+ setIsLoading(false);
+ }
+
+ }
+ , [org, session]);
+
+ return (
+
+
+
+ Hi
+
+
+
)
}
diff --git a/apps/web/components/Contexts/SessionContext.tsx b/apps/web/components/Contexts/SessionContext.tsx
index 7094b94e..26078c64 100644
--- a/apps/web/components/Contexts/SessionContext.tsx
+++ b/apps/web/components/Contexts/SessionContext.tsx
@@ -1,13 +1,9 @@
'use client';
import { getNewAccessTokenUsingRefreshToken, getUserSession } from '@services/auth/auth';
-import { usePathname, useRouter, useSearchParams } from 'next/navigation'
import React, { useContext, createContext, useEffect } from 'react'
-import { useOrg } from './OrgContext';
export const SessionContext = createContext({}) as any;
-const PATHS_THAT_REQUIRE_AUTH = ['/dash'];
-
type Session = {
access_token: string;
user: any;
@@ -18,10 +14,6 @@ type Session = {
function SessionProvider({ children }: { children: React.ReactNode }) {
const [session, setSession] = React.useState
+
+
}
+
+
+
+
- {course.courseStructure && (
-
)
}
diff --git a/apps/web/components/Dashboard/Course/EditCourseGeneral/ThumbnailUpdate.tsx b/apps/web/components/Dashboard/Course/EditCourseGeneral/ThumbnailUpdate.tsx
new file mode 100644
index 00000000..ac5ca37d
--- /dev/null
+++ b/apps/web/components/Dashboard/Course/EditCourseGeneral/ThumbnailUpdate.tsx
@@ -0,0 +1,79 @@
+import { useCourse } from '@components/Contexts/CourseContext';
+import { useOrg } from '@components/Contexts/OrgContext';
+import { getAPIUrl } from '@services/config/config';
+import { updateCourseThumbnail } from '@services/courses/courses';
+import { getCourseThumbnailMediaDirectory } from '@services/media/media';
+import { ArrowBigUpDash, UploadCloud } from 'lucide-react';
+import React from 'react'
+import { mutate } from 'swr';
+
+function ThumbnailUpdate() {
+ const course = useCourse() as any;
+ const org = useOrg() as any;
+ const [localThumbnail, setLocalThumbnail] = React.useState(null) as any;
+ const [isLoading, setIsLoading] = React.useState(false) as any;
+ const [error, setError] = React.useState('') as any;
+
+
+ const handleFileChange = async (event: any) => {
+ const file = event.target.files[0];
+ setLocalThumbnail(file);
+ setIsLoading(true);
+ const res = await updateCourseThumbnail(course.courseStructure.course_uuid, file)
+ mutate(`${getAPIUrl()}courses/${course.courseStructure.course_uuid}/meta`);
+ // wait for 1 second to show loading animation
+ await new Promise(r => setTimeout(r, 1500));
+ if (res.success === false) {
+ setError(res.HTTPmessage);
+ } else {
+ setIsLoading(false);
+ setError('');
+ }
+ };
+
+ return (
+
- {error && (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )}
- {error}
-
-
- formik.setFieldValue('public', checked)}
- checked={formik.values.public === 'true'}
- >
-
+ {course.courseStructure && (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )}
+
+ {error && (
+
+
+
+
+
+
-
-
- )}
+
+
-
+ )}
+ {error}
+
+ formik.setFieldValue('public', checked)}
+ checked={formik.values.public === 'true'}
+ >
+
+
+
+
+ )
+}
+
+export default ThumbnailUpdate
\ No newline at end of file
diff --git a/apps/web/components/Dashboard/Course/EditCourseStructure/EditCourseStructure.tsx b/apps/web/components/Dashboard/Course/EditCourseStructure/EditCourseStructure.tsx
index 8b3262e2..43c26be6 100644
--- a/apps/web/components/Dashboard/Course/EditCourseStructure/EditCourseStructure.tsx
+++ b/apps/web/components/Dashboard/Course/EditCourseStructure/EditCourseStructure.tsx
@@ -92,6 +92,7 @@ const EditCourseStructure = (props: EditCourseStructureProps) => {
return (
+
+
+
+
+ {error && (
+ })
+
+ ) : (
+ 
+ )}
+
+
+ {isLoading ? (
+
+ )}
+ {localThumbnail ? (
+ {error}
+
+
+
) : (
+
+
+
+
+
+
+
+ )}
+
+
{winReady ?
@@ -129,7 +130,7 @@ const EditCourseStructure = (props: EditCourseStructureProps) => {
dialogTitle="Create chapter"
dialogDescription="Add a new chapter to the course"
dialogTrigger={
-
+
Add Chapter
{props.type == 'courses' ?
{props.last_breadcrumb ?
+ {course?.courseStructure?.thumbnail_image ?
+ :
+
Course
diff --git a/apps/web/components/Dashboard/UI/LeftMenu.tsx b/apps/web/components/Dashboard/UI/LeftMenu.tsx
index e55225f9..abbe3237 100644
--- a/apps/web/components/Dashboard/UI/LeftMenu.tsx
+++ b/apps/web/components/Dashboard/UI/LeftMenu.tsx
@@ -4,12 +4,13 @@ import { useSession } from '@components/Contexts/SessionContext';
import ToolTip from '@components/StyledElements/Tooltip/Tooltip'
import LearnHouseDashboardLogo from '@public/dashLogo.png';
import { logout } from '@services/auth/auth';
-import Avvvatars from 'avvvatars-react';
-import { ArrowLeft, Book, BookCopy, Home, LogOut, School, Settings } from 'lucide-react'
+import { ArrowLeft, Book, BookCopy, Home, LogOut, School, Settings, Users } from 'lucide-react'
import Image from 'next/image';
import Link from 'next/link'
import { useRouter } from 'next/navigation';
-import React, { use, useEffect } from 'react'
+import React, { useEffect } from 'react'
+import UserAvatar from '../../Objects/UserAvatar';
+import AdminAuthorization from '@components/Security/AdminAuthorization';
function LeftMenu() {
const org = useOrg() as any;
@@ -42,8 +43,8 @@ function LeftMenu() {
return (
+ style={{ background: "linear-gradient(0deg, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0.2) 100%), radial-gradient(271.56% 105.16% at 50% -5.16%, rgba(255, 255, 255, 0.18) 0%, rgba(0, 0, 0, 0) 100%), rgb(20 19 19)" }}
+ className='flex flex-col w-[90px] bg-black h-screen text-white shadow-xl'>
@@ -59,27 +60,32 @@ function LeftMenu() {
{/*
*/}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
diff --git a/apps/web/components/Dashboard/User/UserEditGeneral/UserEditGeneral.tsx b/apps/web/components/Dashboard/User/UserEditGeneral/UserEditGeneral.tsx
deleted file mode 100644
index 165e34d7..00000000
--- a/apps/web/components/Dashboard/User/UserEditGeneral/UserEditGeneral.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import { updateProfile } from '@services/settings/profile';
-import React, { useEffect } from 'react'
-import { Formik, Form, Field, ErrorMessage } from 'formik';
-import { useSession } from '@components/Contexts/SessionContext';
-
-function UserEditGeneral() {
- const session = useSession() as any;
-
-
- useEffect(() => {
- }
- , [session, session.user])
-
- return (
-
) :
+
- {session.user && (
- {
- setTimeout(() => {
-
- setSubmitting(false);
- updateProfile(values,session.user.id)
- }, 400);
- }}
- >
- {({ isSubmitting }) => (
-
-
- )}
-
- )}
-
- )
-}
-
-export default UserEditGeneral
\ No newline at end of file
diff --git a/apps/web/components/Dashboard/UserAccount/UserEditGeneral/UserEditGeneral.tsx b/apps/web/components/Dashboard/UserAccount/UserEditGeneral/UserEditGeneral.tsx
new file mode 100644
index 00000000..8c5726ca
--- /dev/null
+++ b/apps/web/components/Dashboard/UserAccount/UserEditGeneral/UserEditGeneral.tsx
@@ -0,0 +1,181 @@
+import { updateProfile } from '@services/settings/profile';
+import React, { useEffect } from 'react'
+import { Formik, Form, Field, ErrorMessage } from 'formik';
+import { useSession } from '@components/Contexts/SessionContext';
+import { ArrowBigUpDash, Check, FileWarning, Info, UploadCloud } from 'lucide-react';
+import UserAvatar from '@components/Objects/UserAvatar';
+import { updateUserAvatar } from '@services/users/users';
+
+function UserEditGeneral() {
+ const session = useSession() as any;
+ const [localAvatar, setLocalAvatar] = React.useState(null) as any;
+ const [isLoading, setIsLoading] = React.useState(false) as any;
+ const [error, setError] = React.useState() as any;
+ const [success, setSuccess] = React.useState('') as any;
+
+ const handleFileChange = async (event: any) => {
+ const file = event.target.files[0];
+ setLocalAvatar(file);
+ setIsLoading(true);
+ const res = await updateUserAvatar(session.user.user_uuid, file)
+ // wait for 1 second to show loading animation
+ await new Promise(r => setTimeout(r, 1500));
+ if (res.success === false) {
+ setError(res.HTTPmessage);
+ } else {
+ setIsLoading(false);
+ setError('');
+ setSuccess('Avatar Updated');
+ }
+ };
+
+ useEffect(() => {
+ }
+ , [session, session.user])
+
+ return (
+
+ {session.user && (
+ {
+ setTimeout(() => {
+
+ setSubmitting(false);
+ updateProfile(values, session.user.id)
+ }, 400);
+ }}
+ >
+ {({ isSubmitting }) => (
+
+ )}
+
+ )
+}
+
+export default UserEditGeneral
\ No newline at end of file
diff --git a/apps/web/components/Dashboard/User/UserEditPassword/UserEditPassword.tsx b/apps/web/components/Dashboard/UserAccount/UserEditPassword/UserEditPassword.tsx
similarity index 100%
rename from apps/web/components/Dashboard/User/UserEditPassword/UserEditPassword.tsx
rename to apps/web/components/Dashboard/UserAccount/UserEditPassword/UserEditPassword.tsx
diff --git a/apps/web/components/Dashboard/Users/OrgAccess/OrgAccess.tsx b/apps/web/components/Dashboard/Users/OrgAccess/OrgAccess.tsx
new file mode 100644
index 00000000..a2670677
--- /dev/null
+++ b/apps/web/components/Dashboard/Users/OrgAccess/OrgAccess.tsx
@@ -0,0 +1,175 @@
+import { useOrg } from '@components/Contexts/OrgContext'
+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, X } from 'lucide-react'
+import Link from 'next/link';
+import React, { use, 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';
+
+function OrgAccess() {
+ const org = useOrg() as any;
+ const { data: invites } = useSWR(org ? `${getAPIUrl()}orgs/${org?.id}/invites` : null, swrFetcher);
+ const [isLoading, setIsLoading] = React.useState(false)
+ const [joinMethod, setJoinMethod] = React.useState('closed')
+ const router = useRouter()
+
+ async function getOrgJoinMethod() {
+ if (org) {
+ if (org.config.config.GeneralConfig.users.signup_mechanism == 'open') {
+ setJoinMethod('open')
+ }
+ else {
+ setJoinMethod('inviteOnly')
+ }
+ }
+ }
+
+ async function createInvite() {
+ let res = await createInviteCode(org.id)
+ if (res.status == 200) {
+ mutate(`${getAPIUrl()}orgs/${org.id}/invites`)
+ }
+ else {
+ toast.error('Error ' + res.status + ': ' + res.data.detail)
+ }
+
+ }
+
+ async function deleteInvite(invite: any) {
+ let res = await deleteInviteCode(org.id, invite.invite_code_uuid)
+ if (res.status == 200) {
+ mutate(`${getAPIUrl()}orgs/${org.id}/invites`)
+ }
+ else {
+ toast.error('Error ' + res.status + ': ' + res.data.detail)
+ }
+
+ }
+
+ async function changeJoinMethod(method: 'open' | 'inviteOnly') {
+ let res = await changeSignupMechanism(org.id, method)
+ if (res.status == 200) {
+ router.refresh()
+ mutate(`${getAPIUrl()}orgs/slug/${org?.slug}`)
+ }
+ else {
+ toast.error('Error ' + res.status + ': ' + res.data.detail)
+ }
+ }
+
+ useEffect(() => {
+ if (invites && org) {
+ getOrgJoinMethod()
+ setIsLoading(false)
+ }
+ }
+ , [org, invites])
+
+ return (
+
+ <>
+
+
+
+
+
+ )}
+
+
+ {error && (
+
+
+
+
+ )}
+ {success && (
+ {error}
+
+
+ )}
+ {success}
+
+
+
+
+
+
+
+
+ {localAvatar ? (
+
+ {isLoading ? (
+
+
) : (
+
+
+
+
+
+
)}
+
+
+ Recommended size 100x100
+
+
+ {joinMethod == 'inviteOnly' ?
}
+ functionToExecute={() => { changeJoinMethod('inviteOnly') }}
+ status='info'
+ >
+
+
+
+ Join method
+Choose how users can join your organization
+
+
+ {joinMethod == 'open' ?
}
+ functionToExecute={() => { changeJoinMethod('open') }}
+ status='info'
+ >
+ Active
: null}
+
+
+ Open
+ Users can join freely from the signup page
+ Active
: null}
+
+
+ Closed
+ Users can join only by invitation
+
+
+
+
+
+
+
+
+ Invite codes
+Invite codes can be copied and used to join your organization
+| Code | +Signup link | +Expiration date | +Actions | +
|---|---|---|---|
| {invite.invite_code} | ++ + {getUriWithOrg(org?.slug, `/signup?inviteCode=${invite.invite_code}`)} + + | +{dayjs(invite.expiration_date).add(1, 'year').format('DD/MM/YYYY')} | +
+ |
+
+ {isLoading ?
+ )
+}
+
+export default OrgUsers
\ No newline at end of file
diff --git a/apps/web/components/Objects/Activities/AI/AIActivityAsk.tsx b/apps/web/components/Objects/Activities/AI/AIActivityAsk.tsx
index a1fcff3d..c4ab2440 100644
--- a/apps/web/components/Objects/Activities/AI/AIActivityAsk.tsx
+++ b/apps/web/components/Objects/Activities/AI/AIActivityAsk.tsx
@@ -1,6 +1,6 @@
import { useSession } from '@components/Contexts/SessionContext'
import { sendActivityAIChatMessage, startActivityAIChatSession } from '@services/ai/ai';
-import { AlertTriangle, BadgeInfo, NotebookTabs } from 'lucide-react';
+import { AlertTriangle, BadgeInfo, NotebookTabs, User } from 'lucide-react';
import Avvvatars from 'avvvatars-react';
import { motion, AnimatePresence } from 'framer-motion';
import { FlaskConical, Keyboard, MessageCircle, MessageSquareIcon, Sparkle, Sparkles, X } from 'lucide-react'
@@ -13,6 +13,7 @@ import { AIChatBotStateTypes, useAIChatBot, useAIChatBotDispatch } from '@compon
import FeedbackModal from '@components/Objects/Modals/Feedback/Feedback';
import Modal from '@components/StyledElements/Modal/Modal';
import useGetAIFeatures from '../../../AI/Hooks/useGetAIFeatures';
+import UserAvatar from '@components/Objects/UserAvatar';
type AIActivityAskProps = {
@@ -172,7 +173,7 @@ function ActivityChatMessageBox(props: ActivityChatMessageBoxProps) {
+
+
+
+
+
+ }
+
+
+ Active users
+Manage your organization users, assign roles and permissions
+| User | +Role | +Actions | +
|---|---|---|
| + {user.user.first_name + ' ' + user.user.last_name} + @{user.user.username} + | +{user.role.name} | +
+ |
+
-
@@ -235,7 +236,11 @@ function AIMessage(props: AIMessageProps) {
return (
-
@@ -277,7 +282,8 @@ const AIMessagePlaceHolder = (props: { activity_uuid: string, sendMessage: any }
Hello
-
diff --git a/apps/web/components/Objects/Editor/Editor.tsx b/apps/web/components/Objects/Editor/Editor.tsx
index 586f78e0..29a9566d 100644
--- a/apps/web/components/Objects/Editor/Editor.tsx
+++ b/apps/web/components/Objects/Editor/Editor.tsx
@@ -42,6 +42,7 @@ import { CourseProvider } from "@components/Contexts/CourseContext";
import { useSession } from "@components/Contexts/SessionContext";
import AIEditorToolkit from "./AI/AIEditorToolkit";
import useGetAIFeatures from "@components/AI/Hooks/useGetAIFeatures";
+import UserAvatar from "../UserAvatar";
interface Editor {
@@ -163,7 +164,7 @@ function Editor(props: Editor) {
AI Editor
+ AI Editor PRE-ALPHA
{auth.userInfo.user_object.username}
-