feat: refactor the entire learnhouse project

apps/web/.eslintrc

@@ -0,0 +1,8 @@
+{
+  "extends": "next",
+  "rules": {
+    "react/no-unescaped-entities": "off",
+    "@next/next/no-page-custom-font": "off",
+    "@next/next/no-img-element": "off"
+  }
+}

apps/web/.gitignore

@@ -0,0 +1,42 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
+# Sentry
+.sentryclirc
+
+# Sentry
+next.config.original.js

apps/web/Dockerfile

@@ -0,0 +1,17 @@
+# 
+FROM node:16-alpine
+
+# 
+WORKDIR /usr/learnhouse/front
+
+# 
+COPY package.json /usr/learnhouse/front/package.json
+
+# 
+RUN npm install
+
+# 
+COPY ./ /usr/learnhouse
+
+# 
+CMD ["npm", "run", "dev"]

apps/web/app/api/revalidate/route.ts

@@ -0,0 +1,19 @@
+import { NextRequest, NextResponse } from "next/server";
+import { revalidateTag } from "next/cache";
+
+export async function GET(request: NextRequest) {
+  const tag: any = request.nextUrl.searchParams.get("tag");
+  revalidateTag(tag);
+
+  return NextResponse.json(
+    { revalidated: true, now: Date.now(), tag },
+    {
+      status: 200,
+      headers: {
+        "Access-Control-Allow-Origin": "*",
+        "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
+        "Access-Control-Allow-Headers": "Content-Type, Authorization",
+      },
+    }
+  );
+}

apps/web/app/editor/course/[courseid]/activity/[activityid]/edit/loading.tsx

@@ -0,0 +1,9 @@
+import PageLoading from "@components/Objects/Loaders/PageLoading";
+
+export default function Loading() {
+    // Or a custom loading skeleton component
+    return (
+        <PageLoading></PageLoading>
+    )
+
+}

apps/web/app/editor/course/[courseid]/activity/[activityid]/edit/page.tsx

@@ -0,0 +1,49 @@
+import { default as React, } from "react";
+import AuthProvider from "@components/Security/AuthProvider";
+import EditorWrapper from "@components/Objects/Editor/EditorWrapper";
+import { getCourseMetadataWithAuthHeader } from "@services/courses/courses";
+import { cookies } from "next/headers";
+import { Metadata } from "next";
+import { getActivityWithAuthHeader } from "@services/courses/activities";
+import { getAccessTokenFromRefreshTokenCookie, getNewAccessTokenUsingRefreshTokenServer } from "@services/auth/auth";
+
+type MetadataProps = {
+  params: { orgslug: string, courseid: string, activityid: string };
+  searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+  { params }: MetadataProps,
+): Promise<Metadata> {
+  const cookieStore = cookies();
+  const access_token = await getAccessTokenFromRefreshTokenCookie(cookieStore)
+  // Get Org context information 
+  const course_meta = await getCourseMetadataWithAuthHeader(params.courseid, { revalidate: 0, tags: ['courses'] }, access_token ? access_token : null)
+
+  return {
+    title: `Edit - ${course_meta.course.name} Activity`,
+    description: course_meta.course.mini_description,
+  };
+}
+
+const EditActivity = async (params: any) => {
+  const cookieStore = cookies();
+  const access_token = await getAccessTokenFromRefreshTokenCookie(cookieStore)
+  const activityid = params.params.activityid;
+  const courseid = params.params.courseid;
+  const orgslug = params.params.orgslug;
+
+  const courseInfo = await getCourseMetadataWithAuthHeader(courseid, { revalidate: 0, tags: ['courses'] }, access_token ? access_token : null)
+  const activity = await getActivityWithAuthHeader(activityid, { revalidate: 0, tags: ['activities'] }, access_token ? access_token : null)
+
+
+  return (
+    <div>
+      <AuthProvider>
+        <EditorWrapper orgslug={orgslug} course={courseInfo} activity={activity} content={activity.content}></EditorWrapper>
+      </AuthProvider>
+    </div>
+  );
+}
+
+export default EditActivity;

apps/web/app/editor/main.ts

@@ -0,0 +1 @@
+export const EDITOR = "main";

apps/web/app/install/install.tsx

@@ -0,0 +1,80 @@
+'use client'
+import React, { use, useEffect } from 'react'
+import { INSTALL_STEPS } from './steps/steps'
+import GeneralWrapperStyled from '@components/StyledElements/Wrappers/GeneralWrapper'
+import { useRouter, useSearchParams } from 'next/navigation'
+
+
+
+
+function InstallClient() {
+    const searchParams = useSearchParams()
+    const router = useRouter()
+    const step: any = parseInt(searchParams.get('step') || '0');
+    const [stepNumber, setStepNumber] = React.useState(step)
+    const [stepsState, setStepsState] = React.useState(INSTALL_STEPS)
+
+    function handleStepChange(stepNumber: number) {
+        setStepNumber(stepNumber)
+        router.push(`/install?step=${stepNumber}`)
+    }
+
+    useEffect(() => {
+        setStepNumber(step)
+    }, [step])
+
+    return (
+        <GeneralWrapperStyled>
+            <div className='flex justify-center '>
+                <div className='grow'>
+                    <LearnHouseLogo />
+                </div>
+                <div className="steps flex space-x-2 justify-center text-sm p-3 bg-slate-50 rounded-full w-fit m-auto px-10">
+                    <div className="flex space-x-8">
+                        {stepsState.map((step, index) => (
+                            <div
+                                key={index}
+                                className={`flex items-center cursor-pointer space-x-2`}
+                                onClick={() => handleStepChange(index)}
+                            >
+                                <div className={`flex w-7 h-7 rounded-full text-slate-700 bg-slate-200 justify-center items-center m-auto align-middle hover:bg-slate-300 transition-all ${index === stepNumber ? 'bg-slate-300' : ''}`}>
+                                    {index}
+                                </div>
+                                <div>{step.name}</div>
+
+                            </div>
+                        ))}
+                    </div>
+                </div>
+            </div>
+
+            <div className="flex pt-8 flex-col" >
+                <h1 className='font-bold text-3xl'>{stepsState[stepNumber].name}</h1>
+                <div className="pt-8">
+                    {stepsState[stepNumber].component}
+                </div>
+            </div>
+        </GeneralWrapperStyled>
+    )
+}
+
+const LearnHouseLogo = () => {
+    return (
+        <svg width="133" height="80" viewBox="0 0 433 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <rect width="80" height="80" rx="24" fill="black" />
+            <rect width="80" height="80" rx="24" fill="url(#paint0_angular_1555_220)" />
+            <rect x="0.5" y="0.5" width="79" height="79" rx="23.5" stroke="white" strokeOpacity="0.12" />
+            <path d="M37.546 55.926V35.04L33.534 30.497L37.546 29.258V27.016L33.534 22.473L44.626 19.11V55.926L48.992 61H33.18L37.546 55.926Z" fill="white" />
+            <path d="M113.98 54.98V30.2L109.22 24.81L113.98 23.34V20.68L109.22 15.29L122.38 11.3V54.98L127.56 61H108.8L113.98 54.98ZM157.704 41.19V41.26H135.234C136.004 50.29 140.834 54.07 146.294 54.07C151.054 54.07 155.254 51.69 156.304 48.75L157.354 49.17C154.834 55.54 149.864 61.98 141.534 61.98C132.364 61.98 127.184 53.79 127.184 45.39C127.184 36.36 132.784 26 144.194 26C152.524 26 157.634 31.6 157.704 41.05L157.774 41.19H157.704ZM148.674 39.16V38.53C148.674 31.04 145.664 28.1 142.584 28.1C137.264 28.1 135.094 34.47 135.094 38.67V39.16H148.674ZM178.717 61V55.12C176.057 57.71 171.157 61.7 166.537 61.7C161.707 61.7 158.137 59.32 158.137 53.65C158.137 46.51 166.607 42.87 178.717 38.6C178.717 33 178.577 28.66 172.837 28.66C167.237 28.66 163.877 32.58 160.307 37.9H159.817V26.7H188.657L187.117 32.72V56.45H187.187L192.367 61H178.717ZM178.717 53.23V40.56C167.727 44.97 167.377 47.98 167.377 51.34C167.377 54.7 169.687 56.17 172.627 56.17C174.797 56.17 176.967 55.05 178.717 53.23ZM221.429 39.09H220.869C217.789 31.74 213.659 29.29 210.439 29.29C205.609 29.29 205.609 32.79 205.609 39.93V54.98L212.119 61H192.029L197.209 54.98V32.09L192.449 26.7H221.429V39.09ZM261.467 61H242.707L247.747 54.98V39.44C247.747 34.05 246.977 30.62 241.587 30.62C238.997 30.62 236.337 31.74 234.097 34.75V54.98L239.137 61H220.377L225.697 54.98V36.08L220.937 30.69L234.097 26V32.37C236.897 28.03 241.447 25.86 245.647 25.86C252.787 25.86 256.147 30.48 256.147 37.06V54.98L261.467 61ZM274.343 11.3V32.23C277.143 27.89 281.693 25.72 285.893 25.72C293.033 25.72 296.393 30.34 296.393 36.92V54.98H296.463L301.643 61H282.883L287.993 55.05V39.3C287.993 33.91 287.223 30.48 281.833 30.48C279.243 30.48 276.583 31.6 274.343 34.61V54.98L279.523 61H260.763L265.943 54.98V21.38L261.183 15.99L274.343 11.3ZM335.945 42.31C335.945 51.34 329.855 61.84 316.835 61.84C306.895 61.84 301.645 53.79 301.645 45.39C301.645 36.36 307.735 25.86 320.755 25.86C330.695 25.86 335.945 33.91 335.945 42.31ZM316.975 28.52C311.165 28.52 310.535 34.82 310.535 39.02C310.535 49.94 314.525 59.18 320.685 59.18C325.865 59.18 327.195 52.32 327.195 48.68C327.195 37.76 323.135 28.52 316.975 28.52ZM349.01 26.63V48.12C349.01 53.51 349.78 56.94 355.17 56.94C357.55 56.94 360 55.75 361.82 53.65V32.72L356.64 26.63H370.22V55.26L374.98 61L361.82 61.42V55.82C359.3 59.32 356.08 61.7 351.11 61.7C343.97 61.7 340.61 57.08 340.61 50.5V32.72L335.36 26.63H349.01ZM374.617 47.77H375.177C376.997 53.79 382.527 59.04 388.267 59.04C391.137 59.04 393.517 57.64 393.517 54.49C393.517 46.23 374.967 50.29 374.967 36.43C374.967 31.25 379.517 26.7 386.657 26.7H394.357L396.947 25.23V36.85L396.527 36.78C394.007 32.23 389.807 28.87 385.327 28.94C382.387 29.01 380.707 30.83 380.707 33.56C380.707 40.77 399.887 37.62 399.887 50.43C399.887 58.55 391.697 61.7 386.167 61.7C382.667 61.7 377.907 61.21 375.247 60.09L374.617 47.77ZM430.416 41.19V41.26H407.946C408.716 50.29 413.546 54.07 419.006 54.07C423.766 54.07 427.966 51.69 429.016 48.75L430.066 49.17C427.546 55.54 422.576 61.98 414.246 61.98C405.076 61.98 399.896 53.79 399.896 45.39C399.896 36.36 405.496 26 416.906 26C425.236 26 430.346 31.6 430.416 41.05L430.486 41.19H430.416ZM421.386 39.16V38.53C421.386 31.04 418.376 28.1 415.296 28.1C409.976 28.1 407.806 34.47 407.806 38.67V39.16H421.386Z" fill="#121212" />
+            <defs>
+                <radialGradient id="paint0_angular_1555_220" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(40 40) rotate(90) scale(40)">
+                    <stop stopColor="#FBFBFB" stopOpacity="0.15" />
+                    <stop offset="0.442708" stopOpacity="0.1" />
+                </radialGradient>
+            </defs>
+        </svg>
+    )
+
+}
+
+export default InstallClient

apps/web/app/install/page.tsx

@@ -0,0 +1,18 @@
+import React from 'react'
+import InstallClient from './install'
+
+
+export const metadata = {
+    title: "Install LearnHouse",
+    description: "Install Learnhouse on your server",
+}
+
+function InstallPage() {
+    return (
+        <div className='bg-white h-screen'>
+            <InstallClient />
+        </div>
+    )
+}
+
+export default InstallPage

apps/web/app/install/steps/account_creation.tsx

@@ -0,0 +1,133 @@
+"use client";
+import FormLayout, { ButtonBlack, FormField, FormLabel, FormLabelAndMessage, FormMessage, Input } from '@components/StyledElements/Form/Form'
+import * as Form from '@radix-ui/react-form';
+import { getAPIUrl } from '@services/config/config';
+import { createNewUserInstall, updateInstall } from '@services/install/install';
+import { swrFetcher } from '@services/utils/ts/requests';
+import { useFormik } from 'formik';
+import { useRouter } from 'next/navigation';
+import React from 'react'
+import { BarLoader } from 'react-spinners';
+import useSWR, { mutate } from "swr";
+
+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.confirmPassword) {
+        errors.confirmPassword = 'Required';
+    }
+    else if (values.confirmPassword !== values.password) {
+        errors.confirmPassword = 'Passwords must match';
+    }
+
+    if (!values.username) {
+        errors.username = 'Required';
+    }
+    else if (values.username.length < 3) {
+        errors.username = 'Username must be at least 3 characters';
+    }
+
+    return errors;
+};
+
+function AccountCreation() {
+    const [isSubmitting, setIsSubmitting] = React.useState(false);
+    const { data: install, error: error, isLoading } = useSWR(`${getAPIUrl()}install/latest`, swrFetcher);
+    const router = useRouter(
+
+    )
+    const formik = useFormik({
+        initialValues: {
+            org_slug: '',
+            email: '',
+            password: '',
+            confirmPassword: '',
+            username: '',
+        },
+        validate,
+        onSubmit: values => {
+            
+            let finalvalues = { ...values, org_slug: install.data[1].slug }
+            let finalvalueswithoutpasswords = { ...values, password: '', confirmPassword: '', org_slug: install.data[1].slug }
+            let install_data = { ...install.data, 3: finalvalues }
+            let install_data_without_passwords = { ...install.data, 3: finalvalueswithoutpasswords }
+            updateInstall({ ...install_data_without_passwords }, 4)
+            createNewUserInstall(finalvalues)
+
+            // await 2 seconds
+            setTimeout(() => {
+                setIsSubmitting(false)
+            }, 2000)
+
+            router.push('/install?step=4')
+
+        },
+    });
+
+    return (
+        <div>
+            <FormLayout onSubmit={formik.handleSubmit}>
+                <FormField name="email">
+                    <FormLabelAndMessage label='Email' message={formik.errors.email} />
+                    <Form.Control asChild>
+                        <Input onChange={formik.handleChange} value={formik.values.email} type="email" required />
+                    </Form.Control>
+                </FormField>
+                {/* for password  */}
+                <FormField name="password">
+                    <FormLabelAndMessage label='Password' message={formik.errors.password} />
+
+                    <Form.Control asChild>
+                        <Input onChange={formik.handleChange} value={formik.values.password} type="password" required />
+                    </Form.Control>
+                </FormField>
+                {/* for confirm password  */}
+                <FormField name="confirmPassword">
+
+                    <FormLabelAndMessage label='Confirm Password' message={formik.errors.confirmPassword} />
+
+                    <Form.Control asChild>
+                        <Input onChange={formik.handleChange} value={formik.values.confirmPassword} type="password" required />
+                    </Form.Control>
+                </FormField>
+                {/* for username  */}
+                <FormField name="username">
+
+                    <FormLabelAndMessage label='Username' message={formik.errors.username} />
+
+                    <Form.Control asChild>
+                        <Input onChange={formik.handleChange} value={formik.values.username} type="text" required />
+                    </Form.Control>
+                </FormField>
+
+                <div className="flex flex-row-reverse py-4">
+                    <Form.Submit asChild>
+                        <ButtonBlack type="submit" css={{ marginTop: 10 }}>
+                            {isSubmitting ? <BarLoader cssOverride={{ borderRadius: 60, }} width={60} color="#ffffff" />
+                                : "Create Admin Account"}
+                        </ButtonBlack>
+                    </Form.Submit>
+                </div>
+
+            </FormLayout>
+        </div>
+    )
+}
+
+export default AccountCreation

apps/web/app/install/steps/default_elements.tsx

@@ -0,0 +1,45 @@
+import { getAPIUrl } from '@services/config/config';
+import { createDefaultElements, updateInstall } from '@services/install/install';
+import { swrFetcher } from '@services/utils/ts/requests';
+import { useRouter } from 'next/navigation';
+import React from 'react'
+import useSWR from "swr";
+
+function DefaultElements() {
+    const { data: install, error: error, isLoading } = useSWR(`${getAPIUrl()}install/latest`, swrFetcher);
+    const [isSubmitting, setIsSubmitting] = React.useState(false);
+    const [isSubmitted, setIsSubmitted] = React.useState(false);
+    const router = useRouter()
+
+    function createDefElementsAndUpdateInstall() {
+        try {
+            createDefaultElements()
+            // add an {} to the install.data object
+
+            let install_data = { ...install.data, 2: { status: 'OK' } }
+        
+            updateInstall(install_data, 3)
+            // await 2 seconds
+            setTimeout(() => {
+                setIsSubmitting(false)
+            }, 2000)
+
+            router.push('/install?step=3')
+            setIsSubmitted(true)
+        }
+        catch (e) {
+            
+        }
+    }
+
+    return (
+        <div className='flex py-10 justify-center items-center space-x-3'>
+            <h1>Install Default Elements </h1>
+            <div onClick={createDefElementsAndUpdateInstall} className='p-3  font-bold bg-gray-200 text-gray-900 rounded-lg hover:cursor-pointer' >
+                Install
+            </div>
+        </div>
+    )
+}
+
+export default DefaultElements

apps/web/app/install/steps/disable_install_mode.tsx

@@ -0,0 +1,19 @@
+import { Check, Link } from 'lucide-react'
+import React from 'react'
+
+function DisableInstallMode() {
+    return (
+        <div className='p-4 bg-green-300 text-green-950 rounded-md flex space-x-4 items-center'>
+            <div>
+                <Check size={32} />
+            </div>
+            <div><p className='font-bold text-lg'>You have reached the end of the Installation process, <b><i>please don't forget to disable installation mode.</i></b> </p>
+                <div className='flex space-x-2 items-center'>
+                    <Link size={20} />
+                    <a rel='noreferrer' target='_blank' className="text-blue-950 font-medium" href="http://docs.learnhouse.app">LearnHouse Docs</a>
+                </div></div>
+        </div>
+    )
+}
+
+export default DisableInstallMode

apps/web/app/install/steps/finish.tsx

@@ -0,0 +1,39 @@
+import { getAPIUrl } from '@services/config/config';
+import { updateInstall } from '@services/install/install';
+import { swrFetcher } from '@services/utils/ts/requests';
+import { Check } from 'lucide-react'
+import { useRouter } from 'next/navigation';
+import React from 'react'
+import useSWR from "swr";
+
+const Finish = () => {
+  const { data: install, error: error, isLoading } = useSWR(`${getAPIUrl()}install/latest`, swrFetcher);
+  const router = useRouter()
+
+  async function finishInstall() {
+    
+    let install_data = { ...install.data, 5: { status: 'OK' } }
+
+    let data = await updateInstall(install_data, 6)
+    if (data) {
+      router.push('/install?step=6')
+    }
+    else {
+      
+    }
+  }
+
+  return (
+    <div className='flex py-10 justify-center items-center space-x-3'>
+      <h1>Installation Complete</h1>
+      <br />
+      <Check size={32} />
+      <div onClick={finishInstall} className='p-3  font-bold bg-gray-200 text-gray-900 rounded-lg hover:cursor-pointer' >
+        Next Step
+      </div>
+    </div>
+
+  )
+}
+
+export default Finish

apps/web/app/install/steps/get_started.tsx

@@ -0,0 +1,69 @@
+import PageLoading from '@components/Objects/Loaders/PageLoading';
+import { getAPIUrl } from '@services/config/config';
+import { swrFetcher } from '@services/utils/ts/requests';
+import { useRouter } from 'next/navigation';
+import React, { use, useEffect } from 'react'
+import useSWR, { mutate } from "swr";
+
+function GetStarted() {
+    const { data: install, error: error, isLoading } = useSWR(`${getAPIUrl()}install/latest`, swrFetcher);
+    const router = useRouter()
+
+    async function startInstallation() {
+        let res = await fetch(`${getAPIUrl()}install/start`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({})
+        })
+
+        if (res.status == 200) {
+            mutate(`${getAPIUrl()}install/latest`)
+            router.refresh();
+            router.push(`/install?step=1`)
+        }
+
+
+    }
+
+    function redirectToStep() {
+        const step = install.step
+        router.push(`/install?step=${step}`)
+    }
+
+    
+
+    useEffect(() => {
+        if (install) {
+            redirectToStep()
+        }
+    }, [install])
+
+
+    if (error) return <div className='flex py-10 justify-center items-center space-x-3'>
+        <h1>Start a new installation</h1>
+        <div onClick={startInstallation} className='p-3  font-bold bg-green-200 text-green-900 rounded-lg hover:cursor-pointer' >
+            Start
+        </div>
+    </div>
+
+    if (isLoading) return <PageLoading />
+    if (install) {
+        return (
+            <div>
+                <div className='flex py-10 justify-center items-center space-x-3'>
+                    <h1>You already started an installation</h1>
+                    <div onClick={redirectToStep} className='p-3  font-bold bg-orange-200 text-orange-900 rounded-lg hover:cursor-pointer' >
+                        Continue
+                    </div>
+                    <div onClick={startInstallation} className='p-3  font-bold bg-green-200 text-green-900 rounded-lg hover:cursor-pointer' >
+                        Start
+                    </div>
+                </div>
+            </div>
+        )
+    }
+}
+
+export default GetStarted

apps/web/app/install/steps/org_creation.tsx

@@ -0,0 +1,138 @@
+
+import FormLayout, { ButtonBlack, FormField, FormLabel, FormLabelAndMessage, FormMessage, Input } from '@components/StyledElements/Form/Form'
+import * as Form from '@radix-ui/react-form';
+import { useFormik } from 'formik';
+import { BarLoader } from 'react-spinners';
+import React from 'react'
+import { createNewOrganization } from '@services/organizations/orgs';
+import { swrFetcher } from '@services/utils/ts/requests';
+import { getAPIUrl } from '@services/config/config';
+import useSWR, { mutate } from "swr";
+import { createNewOrgInstall, updateInstall } from '@services/install/install';
+import { useRouter } from 'next/navigation';
+import { Check } from 'lucide-react';
+
+const validate = (values: any) => {
+    const errors: any = {};
+
+    if (!values.name) {
+        errors.name = 'Required';
+    }
+
+    if (!values.description) {
+        errors.description = 'Required';
+    }
+
+    if (!values.slug) {
+        errors.slug = 'Required';
+    }
+
+    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';
+    }
+
+
+
+    return errors;
+};
+
+function OrgCreation() {
+    const { data: install, error: error, isLoading } = useSWR(`${getAPIUrl()}install/latest`, swrFetcher);
+    const [isSubmitting, setIsSubmitting] = React.useState(false);
+    const [isSubmitted, setIsSubmitted] = React.useState(false);
+    const router = useRouter()
+
+
+    function createOrgAndUpdateInstall(values: any) {
+        try {
+            createNewOrgInstall(values)
+            install.data = {
+                1: values
+            }
+            let install_data = { ...install.data, 1: values }
+            updateInstall(install_data, 2)
+            // await 2 seconds
+            setTimeout(() => {
+                setIsSubmitting(false)
+            }, 2000)
+
+            router.push('/install?step=2')
+            setIsSubmitted(true)
+        }
+        catch (e) {
+            
+        }
+
+    }
+
+    const formik = useFormik({
+        initialValues: {
+            name: '',
+            description: '',
+            slug: '',
+            email: '',
+        },
+        validate,
+        onSubmit: values => {
+            createOrgAndUpdateInstall(values)
+        },
+    });
+    return (
+        <div>
+            <FormLayout onSubmit={formik.handleSubmit}>
+                <FormField name="name">
+                    <FormLabelAndMessage label='Name' message={formik.errors.name} />
+                    <Form.Control asChild>
+                        <Input onChange={formik.handleChange} value={formik.values.name} type="text" required />
+                    </Form.Control>
+                </FormField>
+
+                <FormField name="description">
+                    <FormLabelAndMessage label='Description' message={formik.errors.description} />
+
+                    <Form.Control asChild>
+                        <Input onChange={formik.handleChange} value={formik.values.description} type="text" required />
+                    </Form.Control>
+                </FormField>
+
+                <FormField name="slug">
+
+                    <FormLabelAndMessage label='Slug' message={formik.errors.slug} />
+
+                    <Form.Control asChild>
+                        <Input onChange={formik.handleChange} value={formik.values.slug} type="text" required />
+                    </Form.Control>
+                </FormField>
+                {/* for username  */}
+                <FormField name="email">
+
+                    <FormLabelAndMessage label='Email' message={formik.errors.email} />
+
+                    <Form.Control asChild>
+                        <Input onChange={formik.handleChange} value={formik.values.email} type="email" required />
+                    </Form.Control>
+                </FormField>
+
+                <div className="flex flex-row-reverse py-4">
+                    <Form.Submit asChild>
+                        <ButtonBlack type="submit" css={{ marginTop: 10 }}>
+                            {isSubmitting ? <BarLoader cssOverride={{ borderRadius: 60, }} width={60} color="#ffffff" />
+                                : "Create Organization"}
+                        </ButtonBlack>
+                    </Form.Submit>
+                </div>
+
+                {isSubmitted && <div className='flex space-x-3'> <Check /> Organization Created Successfully</div>}
+
+
+            </FormLayout>
+        </div>
+    )
+}
+
+export default OrgCreation

apps/web/app/install/steps/sample_data.tsx

@@ -0,0 +1,43 @@
+import { getAPIUrl } from '@services/config/config';
+import { createSampleDataInstall, updateInstall } from '@services/install/install';
+import { swrFetcher } from '@services/utils/ts/requests';
+import { useRouter } from 'next/navigation';
+import React from 'react'
+import useSWR, { mutate } from "swr";
+
+function SampleData() {
+  const { data: install, error: error, isLoading } = useSWR(`${getAPIUrl()}install/latest`, swrFetcher);
+  const router = useRouter()
+
+  function createSampleData() {
+
+    try {
+      let username = install.data[3].username
+      let slug = install.data[1].slug
+      
+      createSampleDataInstall(username, slug)
+
+      let install_data = { ...install.data, 4: { status: 'OK' } }
+      updateInstall(install_data, 5)
+
+      router.push('/install?step=5')
+
+    }
+    catch (e) {
+      
+    }
+  }
+
+
+
+  return (
+    <div className='flex py-10 justify-center items-center space-x-3'>
+      <h1>Install Sample data on your organization </h1>
+      <div onClick={createSampleData} className='p-3  font-bold bg-purple-200 text-pruple-900 rounded-lg hover:cursor-pointer' >
+        Start
+      </div>
+    </div>
+  )
+}
+
+export default SampleData

apps/web/app/install/steps/steps.tsx

@@ -0,0 +1,53 @@
+import AccountCreation from "./account_creation";
+import DefaultElements from "./default_elements";
+import DisableInstallMode from "./disable_install_mode";
+import Finish from "./finish";
+import GetStarted from "./get_started";
+import OrgCreation from "./org_creation";
+import SampleData from "./sample_data";
+
+export const INSTALL_STEPS = [
+  {
+    id: "INSTALL_STATUS",
+    name: "Get started",
+    component: <GetStarted />,
+    completed: false,
+  },
+  {
+    id: "ORGANIZATION_CREATION",
+    name: "Organization Creation",
+    component: <OrgCreation />,
+    completed: false,
+  },
+  {
+    id: "DEFAULT_ELEMENTS",
+    name: "Default Elements",
+    component: <DefaultElements />,
+    completed: false,
+  },
+  {
+    id: "ACCOUNT_CREATION",
+    name: "Account Creation",
+    component: <AccountCreation />,
+    completed: false,
+  },
+  {
+    id: "SAMPLE_DATA",
+    name: "Sample Data",
+    component: <SampleData />,
+    completed: false,
+  },
+  {
+    id: "FINISH",
+    name: "Finish",
+    component: <Finish />,
+    completed: false,
+
+  },
+  {
+    id: "DISABLING_INSTALLATION_MODE",
+    name: "Disabling Installation Mode",
+    component: <DisableInstallMode />,
+    completed: false,
+  },
+];

apps/web/app/layout.tsx

@@ -0,0 +1,31 @@
+"use client";
+import "../styles/globals.css";
+import StyledComponentsRegistry from "../components/Utils/libs/styled-registry";
+import { motion } from "framer-motion";
+
+export default function RootLayout({ children }: { children: React.ReactNode }) {
+  const variants = {
+    hidden: { opacity: 0, x: 0, y: 0 },
+    enter: { opacity: 1, x: 0, y: 0 },
+    exit: { opacity: 0, x: 0, y: 0 },
+  };
+  return (
+    <html className="" lang="en">
+      <head />
+      <body>
+        <StyledComponentsRegistry>
+          <motion.main
+            variants={variants} // Pass the variant object into Framer Motion
+            initial="hidden" // Set the initial state to variants.hidden
+            animate="enter" // Animated state to variants.enter
+            exit="exit" // Exit state (used later) to variants.exit
+            transition={{ type: "linear" }} // Set the transition to linear
+            className=""
+          >
+            {children}
+          </motion.main>
+        </StyledComponentsRegistry>
+      </body>
+    </html>
+  );
+}

apps/web/app/organizations/new/page.tsx

@@ -0,0 +1,51 @@
+"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;

apps/web/app/organizations/page.tsx

@@ -0,0 +1,56 @@
+"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";
+import AuthProvider from "@components/Security/AuthProvider";
+
+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 (
+    <>
+      <AuthProvider />
+      <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;

apps/web/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/error.tsx

@@ -0,0 +1,23 @@
+'use client'; // Error components must be Client Components
+
+import ErrorUI from '@components/StyledElements/Error/Error';
+import { useEffect } from 'react';
+ 
+export default function Error({
+  error,
+  reset,
+}: {
+  error: Error;
+  reset: () => void;
+}) {
+  useEffect(() => {
+    // Log the error to an error reporting service
+    console.error(error);
+  }, [error]);
+ 
+  return (
+    <div>
+      <ErrorUI></ErrorUI>
+    </div>
+  );
+}

apps/web/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/loading.tsx

@@ -0,0 +1,8 @@
+import PageLoading from "@components/Objects/Loaders/PageLoading";
+
+export default function Loading() {
+    return (
+        <PageLoading></PageLoading>
+    )
+
+}

apps/web/app/orgs/[orgslug]/(withmenu)/collection/[collectionid]/page.tsx

@@ -0,0 +1,80 @@
+import GeneralWrapperStyled from "@components/StyledElements/Wrappers/GeneralWrapper";
+import { getAccessTokenFromRefreshTokenCookie, getNewAccessTokenUsingRefreshTokenServer } from "@services/auth/auth";
+import { getBackendUrl, getUriWithOrg } from "@services/config/config";
+import { getCollectionByIdWithAuthHeader } from "@services/courses/collections";
+import { getCourseThumbnailMediaDirectory } from "@services/media/media";
+import { getOrganizationContextInfo } from "@services/organizations/orgs";
+import { Metadata } from "next";
+import { cookies } from "next/headers";
+import Link from "next/link";
+
+type MetadataProps = {
+  params: { orgslug: string, courseid: string, collectionid: string };
+  searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+  { params }: MetadataProps,
+): Promise<Metadata> {
+  const cookieStore = cookies();
+  const access_token = await getAccessTokenFromRefreshTokenCookie(cookieStore)
+
+  // Get Org context information 
+  const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
+  const col = await getCollectionByIdWithAuthHeader(params.collectionid, access_token ? access_token : null, { revalidate: 0, tags: ['collections'] });
+
+  // SEO
+  return {
+    title: `Collection : ${col.name}  — ${org.name}`,
+    description: `${col.description} `,
+    robots: {
+      index: true,
+      follow: true,
+      nocache: true,
+      googleBot: {
+        index: true,
+        follow: true,
+        "max-image-preview": "large",
+      }
+    },
+    openGraph: {
+      title: `Collection : ${col.name}  — ${org.name}`,
+      description: `${col.description} `,
+      type: 'website',
+    },
+  };
+}
+
+const CollectionPage = async (params: any) => {
+  const cookieStore = cookies();
+  const access_token = await getAccessTokenFromRefreshTokenCookie(cookieStore)
+  const orgslug = params.params.orgslug;
+  const col = await getCollectionByIdWithAuthHeader(params.params.collectionid, access_token ? access_token : null, { revalidate: 0, tags: ['collections'] });
+
+  const removeCoursePrefix = (courseid: string) => {
+    return courseid.replace("course_", "")
+  }
+
+
+  return <GeneralWrapperStyled>
+    <h2 className="text-sm font-bold text-gray-400">Collection</h2>
+    <h1 className="text-3xl font-bold">{col.name}</h1>
+    <br />
+    <div className="home_courses flex flex-wrap">
+      {col.courses.map((course: any) => (
+        <div className="pr-8" key={course.course_id}>
+          <Link href={getUriWithOrg(orgslug, "/course/" + removeCoursePrefix(course.course_id))}>
+            <div className="inset-0 ring-1 ring-inset ring-black/10 rounded-lg shadow-xl relative w-[249px] h-[131px] bg-cover" style={{ backgroundImage: `url(${getCourseThumbnailMediaDirectory(course.org_id, course.course_id, course.thumbnail)})` }}>
+            </div>
+          </Link>
+          <h2 className="font-bold text-lg w-[250px] py-2">{course.name}</h2>
+        </div>
+      ))}
+    </div>
+
+
+
+  </GeneralWrapperStyled>;
+};
+
+export default CollectionPage;

apps/web/app/orgs/[orgslug]/(withmenu)/collections/loading.tsx

@@ -0,0 +1,9 @@
+import PageLoading from "@components/Objects/Loaders/PageLoading";
+
+export default function Loading() {
+    // Or a custom loading skeleton component
+    return (
+        <PageLoading></PageLoading>
+    )
+
+}

apps/web/app/orgs/[orgslug]/(withmenu)/collections/new/page.tsx

@@ -0,0 +1,118 @@
+"use client";
+import { useRouter } from "next/navigation";
+import React from "react";
+import { createCollection } from "@services/courses/collections";
+import useSWR from "swr";
+import { getAPIUrl, getUriWithOrg } from "@services/config/config";
+import { revalidateTags, swrFetcher } from "@services/utils/ts/requests";
+import { getOrganizationContextInfo } from "@services/organizations/orgs";
+
+function NewCollection(params: any) {
+  const orgslug = params.params.orgslug;
+  const [name, setName] = React.useState("");
+  const [org, setOrg] = React.useState({}) as any;
+  const [description, setDescription] = React.useState("");
+  const [selectedCourses, setSelectedCourses] = React.useState([]) as any;
+  const router = useRouter();
+
+  const { data: courses, error: error } = useSWR(`${getAPIUrl()}courses/org_slug/${orgslug}/page/1/limit/10`, swrFetcher);
+
+  React.useEffect(() => {
+    async function getOrg() {
+      const org = await getOrganizationContextInfo(orgslug, { revalidate: 1800 });
+      setOrg(org);
+    }
+    getOrg();
+  }, []);
+
+  const handleNameChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setName(event.target.value);
+  };
+
+  const handleDescriptionChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setDescription(event.target.value);
+  };
+
+  const handleSubmit = async (e: any) => {
+    e.preventDefault();
+    
+    const collection = {
+      name: name,
+      description: description,
+      courses: selectedCourses,
+      public: true,
+      org_id: org.org_id,
+    };
+    await createCollection(collection);
+    await revalidateTags(["collections"], orgslug);
+    router.refresh();
+    router.prefetch(getUriWithOrg(orgslug, "/collections"));
+    router.push(getUriWithOrg(orgslug, "/collections"));
+  };
+
+
+  return (
+    <>
+      <div className="w-64 m-auto py-20">
+      <div className="font-bold text-lg mb-4">Add new</div>
+
+<input
+  type="text"
+  placeholder="Name"
+  value={name}
+  onChange={handleNameChange}
+  className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+/>
+
+{!courses ? (
+  <p className="text-gray-500">Loading...</p>
+) : (
+  <div>
+    {courses.map((course: any) => (
+      <div key={course.course_id} className="flex items-center mb-2">
+        <input
+          type="checkbox"
+          id={course.course_id}
+          name={course.course_id}
+          value={course.course_id}
+          checked={selectedCourses.includes(course.course_id)}
+          onChange={(e) => {
+            const courseId = e.target.value;
+            setSelectedCourses((prevSelectedCourses: string[]) => {
+              if (e.target.checked) {
+                return [...prevSelectedCourses, courseId];
+              } else {
+                return prevSelectedCourses.filter((selectedCourse) => selectedCourse !== courseId);
+              }
+            });
+          }}
+          className="mr-2 focus:outline-none focus:ring-2 focus:ring-blue-500"
+        />
+        <label htmlFor={course.course_id} className="text-sm">{course.name}</label>
+      </div>
+    ))}
+
+  </div>
+)}
+
+<input
+  type="text"
+  placeholder="Description"
+  value={description}
+  onChange={handleDescriptionChange}
+  className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+/>
+
+<button
+  onClick={handleSubmit}
+  className="px-6 py-3 text-white bg-black rounded-lg shadow-md hover:bg-black focus:outline-none focus:ring-2 focus:ring-blue-500"
+>
+  Submit
+</button>
+      </div>
+
+    </>
+  );
+}
+
+export default NewCollection;

apps/web/app/orgs/[orgslug]/(withmenu)/collections/page.tsx

@@ -0,0 +1,97 @@
+import AuthenticatedClientElement from "@components/Security/AuthenticatedClientElement";
+import TypeOfContentTitle from "@components/StyledElements/Titles/TypeOfContentTitle";
+import GeneralWrapperStyled from "@components/StyledElements/Wrappers/GeneralWrapper";
+import { getUriWithOrg } from "@services/config/config";
+import { getOrgCollectionsWithAuthHeader } from "@services/courses/collections";
+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/Other/CollectionThumbnail";
+import NewCollectionButton from "@components/StyledElements/Buttons/NewCollectionButton";
+
+type MetadataProps = {
+    params: { orgslug: string, courseid: string };
+    searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+    { params }: MetadataProps,
+): Promise<Metadata> {
+    // Get Org context information 
+    const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
+
+    // SEO 
+    return {
+        title: `Collections — ${org.name}`,
+        description: `Collections of courses from ${org.name}`,
+        robots: {
+            index: true,
+            follow: true,
+            nocache: true,
+            googleBot: {
+                index: true,
+                follow: true,
+                "max-image-preview": "large",
+            }
+        },
+        openGraph: {
+            title: `Collections — ${org.name}`,
+            description: `Collections of courses from ${org.name}`,
+            type: 'website',
+        },
+    };
+}
+
+const CollectionsPage = async (params: any) => {
+    const cookieStore = cookies();
+    const access_token = await getAccessTokenFromRefreshTokenCookie(cookieStore)
+    const orgslug = params.params.orgslug;
+    const org = await getOrganizationContextInfo(orgslug, { revalidate: 1800, tags: ['organizations'] });
+    const org_id = org.org_id;
+    const collections = await getOrgCollectionsWithAuthHeader(org_id, access_token ? access_token : null, { revalidate: 0, tags: ['collections'] });
+
+    return (
+        <GeneralWrapperStyled>
+            <div className="flex justify-between" >
+                <TypeOfContentTitle title="Collections" type="col" />
+                <AuthenticatedClientElement checkMethod='roles' orgId={org_id}>
+                    <Link className="flex justify-center" href={getUriWithOrg(orgslug, "/collections/new")}>
+                        <NewCollectionButton />
+                    </Link>
+                </AuthenticatedClientElement>
+            </div>
+            <div className="home_collections flex flex-wrap">
+                {collections.map((collection: any) => (
+                    <div className="flex flex-col py-1 px-3" key={collection.collection_id}>
+                        <CollectionThumbnail collection={collection} orgslug={orgslug} org_id={org_id} />
+                    </div>
+                ))}
+                {collections.length == 0 &&
+                    <div className="flex mx-auto h-[400px]">
+                        <div className="flex flex-col justify-center text-center items-center space-y-5">
+                            <div className='mx-auto'>
+                                <svg width="120" height="120" viewBox="0 0 295 295" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                    <rect opacity="0.51" x="10" y="10" width="275" height="275" rx="75" stroke="#4B5564" strokeOpacity="0.15" strokeWidth="20" />
+                                    <path d="M135.8 200.8V130L122.2 114.6L135.8 110.4V102.8L122.2 87.4L159.8 76V200.8L174.6 218H121L135.8 200.8Z" fill="#4B5564" fillOpacity="0.08" />
+                                </svg>
+                            </div>
+                            <div className="space-y-0">
+                                <h1 className="text-3xl font-bold text-gray-600">No collections yet</h1>
+                                <p className="text-lg text-gray-400">Create a collection to group courses together</p>
+                            </div>
+                            <AuthenticatedClientElement checkMethod='roles' orgId={org_id}>
+                                <Link href={getUriWithOrg(orgslug, "/collections/new")}>
+                                    <NewCollectionButton />
+                                </Link>
+                            </AuthenticatedClientElement>
+                        </div>
+                    </div>
+                }
+            </div>
+        </GeneralWrapperStyled>
+    );
+}
+
+export default CollectionsPage

apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/activity.tsx

@@ -0,0 +1,129 @@
+"use client";
+import Link from "next/link";
+import { getUriWithOrg } from "@services/config/config";
+import Canva from "@components/Objects/Activities/DynamicCanva/DynamicCanva";
+import VideoActivity from "@components/Objects/Activities/Video/Video";
+import { Check } from "lucide-react";
+import { markActivityAsComplete } from "@services/courses/activity";
+import DocumentPdfActivity from "@components/Objects/Activities/DocumentPdf/DocumentPdf";
+import ActivityIndicators from "@components/Pages/Courses/ActivityIndicators";
+import GeneralWrapperStyled from "@components/StyledElements/Wrappers/GeneralWrapper";
+import { useRouter } from "next/navigation";
+import AuthenticatedClientElement from "@components/Security/AuthenticatedClientElement";
+import { getCourseThumbnailMediaDirectory } from "@services/media/media";
+
+interface ActivityClientProps {
+  activityid: string;
+  courseid: string;
+  orgslug: string;
+  activity: any;
+  course: any;
+}
+
+
+function ActivityClient(props: ActivityClientProps) {
+  const activityid = props.activityid;
+  const courseid = props.courseid;
+  const orgslug = props.orgslug;
+  const activity = props.activity;
+  const course = props.course;
+
+  function getChapterName(chapterId: string) {
+    let chapterName = "";
+    course.chapters.forEach((chapter: any) => {
+      if (chapter.id === chapterId) {
+        chapterName = chapter.name;
+      } 
+    });
+    return chapterName;
+  }
+
+
+
+  return (
+    <>
+      <GeneralWrapperStyled>
+        <div className="space-y-4 pt-4">
+          <div className="flex space-x-6">
+            <div className="flex">
+              <Link href={getUriWithOrg(orgslug, "") + `/course/${courseid}`}>
+                <img className="w-[100px] h-[57px] rounded-md drop-shadow-md" src={`${getCourseThumbnailMediaDirectory(course.course.org_id, course.course.course_id, course.course.thumbnail)}`} alt="" />
+              </Link>
+            </div>
+            <div className="flex flex-col -space-y-1">
+              <p className="font-bold text-gray-700 text-md">Course </p>
+              <h1 className="font-bold text-gray-950 text-2xl first-letter:uppercase" >{course.course.name}</h1>
+            </div>
+          </div>
+          <ActivityIndicators course_id={courseid} current_activity={activityid} orgslug={orgslug} course={course} />
+
+          <div className="flex justify-between items-center">
+            <div className="flex flex-col -space-y-1">
+              <p className="font-bold text-gray-700 text-md">Chapter : {getChapterName(activity.coursechapter_id)}</p>
+              <h1 className="font-bold text-gray-950 text-2xl first-letter:uppercase" >{activity.name}</h1>
+            </div>
+            <div className="flex space-x-2">
+              <AuthenticatedClientElement checkMethod="authentication">
+                <MarkStatus activityid={activityid} course={course} orgslug={orgslug} courseid={courseid} />
+
+              </AuthenticatedClientElement>
+            </div>
+          </div>
+
+          {activity ? (
+            <div className={`p-7 pt-4 drop-shadow-sm rounded-lg ${activity.type == 'dynamic' ? 'bg-white' : 'bg-zinc-950'}`}>
+              <div>
+                {activity.type == "dynamic" && <Canva content={activity.content} activity={activity} />}
+                {/* todo : use apis & streams instead of this */}
+                {activity.type == "video" && <VideoActivity course={course} activity={activity} />}
+                {activity.type == "documentpdf" && <DocumentPdfActivity course={course} activity={activity} />}
+              </div>
+            </div>
+          ) : (<div></div>)}
+          {<div style={{ height: "100px" }}></div>}
+        </div>
+      </GeneralWrapperStyled>
+    </>
+  );
+}
+
+
+
+export function MarkStatus(props: { activityid: string, course: any, orgslug: string, courseid: string }) {
+  const router = useRouter();
+
+
+  async function markActivityAsCompleteFront() {
+    const trail = await markActivityAsComplete(props.orgslug, props.courseid, props.activityid);
+    router.refresh();
+
+    // refresh page (FIX for Next.js BUG)
+    //window.location.reload();
+
+  }
+
+  return (
+    <>{props.course.trail.activities_marked_complete &&
+      props.course.trail.activities_marked_complete.includes("activity_" + props.activityid) &&
+      props.course.trail.status == "ongoing" ? (
+      <div className="bg-teal-600 rounded-md drop-shadow-md flex flex-col p-3 text-sm text-white hover:cursor-pointer transition delay-150 duration-300 ease-in-out" >
+        <i>
+          <Check size={15}></Check>
+        </i>{" "}
+        Already completed
+      </div>
+    ) : (
+      <div className="bg-zinc-600 rounded-md drop-shadow-md flex flex-col p-3 text-sm text-white hover:cursor-pointer transition delay-150 duration-300 ease-in-out" onClick={markActivityAsCompleteFront}>
+        {" "}
+        <i>
+          <Check size={15}></Check>
+        </i>{" "}
+        Mark as complete
+      </div>
+    )}</>
+  )
+}
+
+
+
+export default ActivityClient;

apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/error.tsx

@@ -0,0 +1,23 @@
+'use client'; // Error components must be Client Components
+
+import ErrorUI from '@components/StyledElements/Error/Error';
+import { useEffect } from 'react';
+ 
+export default function Error({
+  error,
+  reset,
+}: {
+  error: Error;
+  reset: () => void;
+}) {
+  useEffect(() => {
+    // Log the error to an error reporting service
+    console.error(error);
+  }, [error]);
+ 
+  return (
+    <div>
+      <ErrorUI></ErrorUI>
+    </div>
+  );
+}

apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/loading.tsx

@@ -0,0 +1,9 @@
+import PageLoading from "@components/Objects/Loaders/PageLoading";
+
+export default function Loading() {
+    // Or a custom loading skeleton component
+    return (
+        <PageLoading></PageLoading>
+    )
+
+}

apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseid]/activity/[activityid]/page.tsx

@@ -0,0 +1,72 @@
+import { getActivityWithAuthHeader } from "@services/courses/activities";
+import { getCourseMetadataWithAuthHeader } 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, getNewAccessTokenUsingRefreshTokenServer } from "@services/auth/auth";
+
+
+type MetadataProps = {
+    params: { orgslug: string, courseid: string, activityid: string };
+    searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+    { params }: MetadataProps,
+): Promise<Metadata> {
+    const cookieStore = cookies();
+    const access_token = await getAccessTokenFromRefreshTokenCookie(cookieStore)
+
+    // Get Org context information 
+    const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
+    const course_meta = await getCourseMetadataWithAuthHeader(params.courseid, { revalidate: 0, tags: ['courses'] }, access_token ? access_token : null)
+    const activity = await getActivityWithAuthHeader(params.activityid, { revalidate: 0, tags: ['activities'] }, access_token ? access_token : null)
+
+    // SEO
+    return {
+        title: activity.name + ` — ${course_meta.course.name} Course`,
+        description: course_meta.course.mini_description,
+        keywords: course_meta.course.learnings,
+        robots: {
+            index: true,
+            follow: true,
+            nocache: true,
+            googleBot: {
+                index: true,
+                follow: true,
+                "max-image-preview": "large",
+            }
+        },
+        openGraph: {
+            title: activity.name + ` — ${course_meta.course.name} Course`,
+            description: course_meta.course.mini_description,
+            type: activity.type === 'video' ? 'video.other' : 'article',
+            publishedTime: course_meta.course.creationDate,
+            tags: course_meta.course.learnings,
+        },
+    };
+}
+
+const ActivityPage = async (params: any) => {
+    const cookieStore = cookies();
+    const access_token = await getAccessTokenFromRefreshTokenCookie(cookieStore)
+    const activityid = params.params.activityid;
+    const courseid = params.params.courseid;
+    const orgslug = params.params.orgslug;
+
+    const course_meta = await getCourseMetadataWithAuthHeader(courseid, { revalidate: 0, tags: ['courses'] }, access_token ? access_token : null)
+    const activity = await getActivityWithAuthHeader(activityid, { revalidate: 0, tags: ['activities'] }, access_token ? access_token : null)
+    return (
+        <>
+            <ActivityClient
+                activityid={activityid}
+                courseid={courseid}
+                orgslug={orgslug}
+                activity={activity}
+                course={course_meta}
+            /></>
+    )
+}
+
+export default ActivityPage

apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseid]/course.tsx

@@ -0,0 +1,217 @@
+"use client";
+import { removeCourse, startCourse } from "@services/courses/activity";
+import Link from "next/link";
+import React, { use, useEffect, useState } from "react";
+import { getUriWithOrg } from "@services/config/config";
+import PageLoading from "@components/Objects/Loaders/PageLoading";
+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 { ArrowRight, Check, File, Sparkles, Star, Video } from "lucide-react";
+import Avvvatars from "avvvatars-react";
+import { getUser } from "@services/users/users";
+
+const CourseClient = (props: any) => {
+  const [user, setUser] = useState<any>({});
+  const courseid = props.courseid;
+  const orgslug = props.orgslug;
+  const course = props.course;
+  const router = useRouter();
+
+
+
+  async function getUserUI() {
+    let user_id = course.course.authors[0];
+    const user = await getUser(user_id);
+    setUser(user);
+    console.log(user);
+  }
+
+  async function startCourseUI() {
+    // Create activity
+    await startCourse("course_" + courseid, orgslug);
+    await revalidateTags(['courses'], orgslug);
+    router.refresh();
+
+    // refresh page (FIX for Next.js BUG)
+    // window.location.reload();
+  }
+
+  async function quitCourse() {
+    // Close activity
+    let activity = await removeCourse("course_" + courseid, orgslug);
+    // Mutate course
+    await revalidateTags(['courses'], orgslug);
+    router.refresh();
+  }
+
+    useEffect(() => {
+      getUserUI();
+    }
+    , []);
+
+  return (
+    <>
+      {!course ? (
+        <PageLoading></PageLoading>
+      ) : (
+        <GeneralWrapperStyled>
+          <div className="pb-3">
+            <p className="text-md font-bold text-gray-400 pb-2">Course</p>
+            <h1 className="text-3xl -mt-3 font-bold">
+              {course.course.name}
+            </h1>
+          </div>
+
+
+          <div className="inset-0 ring-1 ring-inset ring-black/10 rounded-lg shadow-xl relative w-auto h-[300px] bg-cover bg-center mb-4" style={{ backgroundImage: `url(${getCourseThumbnailMediaDirectory(course.course.org_id, course.course.course_id, course.course.thumbnail)})` }}>
+          </div>
+
+          <ActivityIndicators course_id={props.course.course.course_id} orgslug={orgslug} course={course} />
+
+          <div className="flex flex-row pt-10">
+            <div className="course_metadata_left grow space-y-2">
+              <h2 className="py-3 text-2xl font-bold">Description</h2>
+              <div className="bg-white shadow-md shadow-gray-300/25 outline outline-1 outline-neutral-200/40 rounded-lg overflow-hidden">
+                <p className="py-5 px-5">{course.course.description}</p>
+              </div>
+
+              <h2 className="py-3 text-2xl font-bold">What you will learn</h2>
+              <div className="bg-white shadow-md shadow-gray-300/25 outline outline-1 outline-neutral-200/40 rounded-lg overflow-hidden px-5 py-5 space-y-2">
+                {course.course.learnings.map((learning: any) => {
+                  return (
+                    <div key={learning}
+                      className="flex space-x-2 items-center font-semibold text-gray-500 capitalize">
+                      <div className="px-2 py-2 rounded-full">
+                        <Check className="text-gray-400" size={15} />
+                      </div>
+                      <p>{learning}</p>
+                    </div>
+                  );
+                }
+                )}
+              </div>
+
+              <h2 className="py-3 text-2xl font-bold">Course Lessons</h2>
+              <div className="bg-white shadow-md shadow-gray-300/25 outline outline-1 outline-neutral-200/40 rounded-lg overflow-hidden">
+                {course.chapters.map((chapter: any) => {
+                  return (
+                    <div
+                      key={chapter}
+                      className=""
+                    >
+                      <div className="flex text-lg py-4 px-4 outline outline-1 outline-neutral-200/40 font-bold bg-neutral-50 text-neutral-600 items-center">
+                        <h3 className="grow">{chapter.name}</h3>
+                        <p className="text-sm font-normal text-neutral-400 px-3 py-[2px] outline-1 outline outline-neutral-200 rounded-full ">
+                          {chapter.activities.length} Activities
+                        </p>
+                      </div>
+                      <div
+                        className="py-3"
+                      >{chapter.activities.map((activity: any) => {
+                        return (
+                          <>
+                            <p className="flex text-md">
+
+                            </p>
+                            <div className="flex space-x-1 py-2 px-4 items-center">
+                              <div className="courseicon items-center flex space-x-2 text-neutral-400">
+                                {activity.type === "dynamic" &&
+                                  <div className="bg-gray-100 px-2 py-2 rounded-full">
+                                    <Sparkles className="text-gray-400" size={13} />
+                                  </div>
+                                }
+                                {activity.type === "video" &&
+                                  <div className="bg-gray-100 px-2 py-2 rounded-full">
+                                    <Video className="text-gray-400" size={13} />
+                                  </div>
+                                }
+                                {activity.type === "documentpdf" &&
+                                  <div className="bg-gray-100 px-2 py-2 rounded-full">
+                                    <File className="text-gray-400" size={13} />
+                                  </div>
+                                }
+
+                              </div>
+                              <Link className="flex font-semibold grow pl-2 text-neutral-500" href={getUriWithOrg(orgslug, "") + `/course/${courseid}/activity/${activity.id.replace("activity_", "")}`} rel="noopener noreferrer">
+                                <p>{activity.name}</p>
+                              </Link>
+                              <div className="flex ">
+                                {activity.type === "dynamic" &&
+                                  <>
+                                    <Link className="flex grow pl-2 text-gray-500" href={getUriWithOrg(orgslug, "") + `/course/${courseid}/activity/${activity.id.replace("activity_", "")}`} rel="noopener noreferrer">
+                                      <div className="text-xs bg-gray-100 text-gray-400 font-bold px-2 py-1 rounded-full flex space-x-1 items-center">
+                                        <p>Page</p>
+                                        <ArrowRight size={13} /></div>
+                                    </Link>
+                                  </>
+                                }
+                                {activity.type === "video" &&
+                                  <>
+                                    <Link className="flex grow pl-2 text-gray-500" href={getUriWithOrg(orgslug, "") + `/course/${courseid}/activity/${activity.id.replace("activity_", "")}`} rel="noopener noreferrer">
+                                      <div className="text-xs bg-gray-100 text-gray-400 font-bold px-2 py-1 rounded-full flex space-x-1 items-center">
+                                        <p>Video</p>
+                                        <ArrowRight size={13} /></div>
+                                    </Link>
+                                  </>
+                                }
+                                {activity.type === "documentpdf" &&
+                                  <>
+                                    <Link className="flex grow pl-2 text-gray-500" href={getUriWithOrg(orgslug, "") + `/course/${courseid}/activity/${activity.id.replace("activity_", "")}`} rel="noopener noreferrer">
+                                      <div className="text-xs bg-gray-100 text-gray-400 font-bold px-2 py-1 rounded-full flex space-x-1 items-center">
+                                        <p>Document</p>
+                                        <ArrowRight size={13} /></div>
+                                    </Link>
+                                  </>
+                                }
+                              </div>
+                            </div>
+                          </>
+                        );
+                      })}</div>
+                    </div>
+                  );
+                })}
+              </div>
+
+            </div>
+            <div className="course_metadata_right space-y-3 w-64 antialiased flex flex-col ml-10 h-fit p-3 py-5 bg-white shadow-md shadow-gray-300/25 outline outline-1 outline-neutral-200/40 rounded-lg overflow-hidden">
+              { user &&
+                <div className="flex mx-auto space-x-3 px-2 py-2 items-center">
+                <div className="">
+                  <Avvvatars border borderSize={5} borderColor="white" size={50} shadow value={course.course.authors[0]} style='shape' />
+                </div>
+                <div className="-space-y-2 ">
+                  <div className="text-[12px] text-neutral-400 font-semibold">Author</div>
+                  <div className="text-xl font-bold text-neutral-800">{user.full_name}</div>
+                </div>
+              </div>
+              }
+
+              {course.trail.status == "ongoing" ? (
+                <button className="py-2 px-5 mx-auto rounded-xl text-white font-bold h-12 w-[200px] drop-shadow-md bg-red-600 hover:bg-red-700 hover:cursor-pointer" onClick={quitCourse}>
+                  Quit Course
+                </button>
+              ) : (
+                <button className="py-2 px-5 mx-auto rounded-xl text-white font-bold h-12 w-[200px] drop-shadow-md bg-black hover:bg-gray-900 hover:cursor-pointer" onClick={startCourseUI}>Start Course</button>
+              )}
+            </div>
+          </div>
+        </GeneralWrapperStyled>
+      )}
+    </>
+  );
+};
+
+
+const StyledBox = (props: any) => (
+  <div className="p-3 pl-10 bg-white w-[100%] h-auto ring-1 ring-inset ring-gray-400/10 rounded-lg shadow-sm">
+    {props.children}
+  </div>
+
+);
+
+
+export default CourseClient;

apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseid]/edit/[[...subpage]]/edit.tsx

@@ -0,0 +1,152 @@
+"use client";
+import React, { FC, use, useEffect, useReducer } from 'react'
+import { revalidateTags, swrFetcher } from "@services/utils/ts/requests";
+import { getAPIUrl, getUriWithOrg } from '@services/config/config';
+import useSWR, { mutate } from 'swr';
+import { getCourseThumbnailMediaDirectory } from '@services/media/media';
+import Link from 'next/link';
+import CourseEdition from '../subpages/CourseEdition';
+import CourseContentEdition from '../subpages/CourseContentEdition';
+import ErrorUI from '@components/StyledElements/Error/Error';
+import { updateChaptersMetadata } from '@services/courses/chapters';
+import { Check, SaveAllIcon, Timer } from 'lucide-react';
+import Loading from '../../loading';
+import { updateCourse } from '@services/courses/courses';
+import { useRouter } from 'next/navigation';
+
+function CourseEditClient({ courseid, subpage, params }: { courseid: string, subpage: string, params: any }) {
+    const { data: chapters_meta, error: chapters_meta_error, isLoading: chapters_meta_isloading } = useSWR(`${getAPIUrl()}chapters/meta/course_${courseid}`, swrFetcher);
+    const { data: course, error: course_error, isLoading: course_isloading } = useSWR(`${getAPIUrl()}courses/course_${courseid}`, swrFetcher);
+    const [courseChaptersMetadata, dispatchCourseChaptersMetadata] = useReducer(courseChaptersReducer, {});
+    const [courseState, dispatchCourseMetadata] = useReducer(courseReducer, {});
+    const [savedContent, dispatchSavedContent] = useReducer(savedContentReducer, true);
+    const router = useRouter();
+
+
+
+    function courseChaptersReducer(state: any, action: any) {
+        switch (action.type) {
+            case 'updated_chapter':
+                // action will contain the entire state, just update the entire state 
+                return action.payload;
+            default:
+                throw new Error();
+        }
+    }
+
+    function courseReducer(state: any, action: any) {
+        switch (action.type) {
+            case 'updated_course':
+                // action will contain the entire state, just update the entire state 
+                return action.payload;
+            default:
+                throw new Error();
+        }
+    }
+
+    function savedContentReducer(state: any, action: any) {
+        switch (action.type) {
+            case 'saved_content':
+                return true;
+            case 'unsaved_content':
+                return false;
+            default:
+                throw new Error();
+        }
+    }
+
+    async function saveCourse() {
+        if (subpage.toString() === 'content') {
+            await updateChaptersMetadata(courseid, courseChaptersMetadata)
+            dispatchSavedContent({ type: 'saved_content' })
+            await mutate(`${getAPIUrl()}chapters/meta/course_${courseid}`)
+            await revalidateTags(['courses'], params.params.orgslug)
+            router.refresh()
+        }
+        else if (subpage.toString() === 'general') {
+            await updateCourse(courseid, courseState)
+            dispatchSavedContent({ type: 'saved_content' })
+            await mutate(`${getAPIUrl()}courses/course_${courseid}`)
+            await revalidateTags(['courses'], params.params.orgslug)
+            router.refresh()
+        }
+    }
+
+    useEffect(() => {
+        if (chapters_meta) {
+            dispatchCourseChaptersMetadata({ type: 'updated_chapter', payload: chapters_meta })
+            dispatchSavedContent({ type: 'saved_content' })
+        }
+        if (course) {
+            dispatchCourseMetadata({ type: 'updated_course', payload: course })
+            dispatchSavedContent({ type: 'saved_content' })
+        }
+    }, [chapters_meta, course])
+
+    return (
+        <>
+            <div className='bg-white shadow-[0px_4px_16px_rgba(0,0,0,0.02)]'>
+                <div className='max-w-screen-2xl mx-auto px-16 pt-5 tracking-tight'>
+                    {course_isloading && <div className='text-sm text-gray-500'>Loading...</div>}
+                    {course && <>
+                        <div className='flex items-center'><div className='info flex space-x-5 items-center grow'>
+                            <div className='flex'>
+                                <Link href={getUriWithOrg(params.params.orgslug, "") + `/course/${courseid}`}>
+                                    <img className="w-[100px] h-[57px] rounded-md drop-shadow-md" src={`${getCourseThumbnailMediaDirectory(course.org_id, "course_" + courseid, course.thumbnail)}`} alt="" />
+                                </Link>
+                            </div>
+                            <div className="flex flex-col ">
+                                <div className='text-sm text-gray-500'>Edit Course</div>
+                                <div className='text-2xl font-bold first-letter:uppercase'>{course.name}</div>
+                            </div>
+                        </div>
+                            <div className='flex space-x-5 items-center'>
+                                {savedContent ? <></> : <div className='text-gray-600 flex space-x-2 items-center antialiased'>
+                                    <Timer size={15} />
+                                    <div>
+                                        Unsaved changes
+                                    </div>
+
+                                </div>}
+                                <div className={`' px-4 py-2 rounded-lg drop-shadow-md cursor-pointer flex space-x-2 items-center font-bold antialiased transition-all ease-linear ` + (savedContent ? 'bg-gray-600 text-white' : 'bg-black text-white border hover:bg-gray-900 ')
+                                } onClick={saveCourse}>
+
+                                    {savedContent ? <Check size={20} /> : <SaveAllIcon size={20} />}
+                                    {savedContent ? <div className=''>Saved</div> : <div className=''>Save</div>}
+                                </div>
+                            </div>
+                        </div>
+                    </>}
+                    <div className='flex space-x-5 pt-3 font-black text-sm'>
+                        <Link href={getUriWithOrg(params.params.orgslug, "") + `/course/${courseid}/edit/general`}>
+                            <div className={`py-2 w-16 text-center border-black transition-all ease-linear ${subpage.toString() === 'general' ? 'border-b-4' : 'opacity-50'} cursor-pointer`}>General</div>
+                        </Link>
+                        <Link href={getUriWithOrg(params.params.orgslug, "") + `/course/${courseid}/edit/content`}>
+                            <div className={`py-2 w-16 text-center border-black transition-all ease-linear ${subpage.toString() === 'content' ? 'border-b-4' : 'opacity-50'} cursor-pointer`}>Content</div>
+                        </Link>
+                    </div>
+                </div>
+            </div>
+            <CoursePageViewer dispatchSavedContent={dispatchSavedContent} courseState={courseState} courseChaptersMetadata={courseChaptersMetadata} dispatchCourseMetadata={dispatchCourseMetadata} dispatchCourseChaptersMetadata={dispatchCourseChaptersMetadata} subpage={subpage} courseid={courseid} orgslug={params.params.orgslug} />
+        </>
+
+    )
+}
+
+const CoursePageViewer = ({ subpage, courseid, orgslug, dispatchCourseMetadata, dispatchCourseChaptersMetadata, courseChaptersMetadata, dispatchSavedContent, courseState }: { subpage: string, courseid: string, orgslug: string, dispatchCourseChaptersMetadata: React.Dispatch<any>, dispatchCourseMetadata: React.Dispatch<any>, dispatchSavedContent: React.Dispatch<any>, courseChaptersMetadata: any, courseState: any }) => {
+    if (subpage.toString() === 'general' && Object.keys(courseState).length !== 0) {
+        return <CourseEdition data={courseState} dispatchCourseMetadata={dispatchCourseMetadata} dispatchSavedContent={dispatchSavedContent} />
+    }
+    else if (subpage.toString() === 'content' && Object.keys(courseChaptersMetadata).length !== 0) {
+        return <CourseContentEdition data={courseChaptersMetadata} dispatchSavedContent={dispatchSavedContent} dispatchCourseChaptersMetadata={dispatchCourseChaptersMetadata} courseid={courseid} orgslug={orgslug} />
+    }
+    else if (subpage.toString() === 'content' || subpage.toString() === 'general') {
+        return <Loading />
+    }
+    else {
+        return <ErrorUI />
+    }
+
+}
+
+export default CourseEditClient

apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseid]/edit/[[...subpage]]/page.tsx

@@ -0,0 +1,41 @@
+import { getOrganizationContextInfo } from "@services/organizations/orgs";
+import CourseEditClient from "./edit";
+import { getCourseMetadataWithAuthHeader } from "@services/courses/courses";
+import { cookies } from "next/headers";
+import { Metadata } from 'next';
+import { getAccessTokenFromRefreshTokenCookie, getNewAccessTokenUsingRefreshTokenServer } from "@services/auth/auth";
+
+type MetadataProps = {
+  params: { orgslug: string, courseid: string };
+  searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+  { params }: MetadataProps,
+): Promise<Metadata> {
+  const cookieStore = cookies();
+  const access_token = await getAccessTokenFromRefreshTokenCookie(cookieStore)
+
+
+  // Get Org context information 
+  const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
+  const course_meta = await getCourseMetadataWithAuthHeader(params.courseid, { revalidate: 0, tags: ['courses'] }, access_token ? access_token : null)
+
+  return {
+    title: `Edit Course - ` + course_meta.course.name,
+    description: course_meta.course.mini_description,
+  };
+}
+
+
+function CourseEdit(params: any) {
+  let subpage = params.params.subpage ? params.params.subpage : 'general';
+  return (
+    <>
+      <CourseEditClient params={params} subpage={subpage} courseid={params.params.courseid} />
+    </>
+  );
+}
+
+
+export default CourseEdit;

apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseid]/edit/subpages/CourseContentEdition.tsx

@@ -0,0 +1,320 @@
+"use client";
+import React from "react";
+import { useState, useEffect } from "react";
+import { DragDropContext, Droppable } from "react-beautiful-dnd";
+import Chapter from "@components/Pages/CourseEdit/Draggables/Chapter";
+import { createChapter, deleteChapter, getCourseChaptersMetadata, updateChaptersMetadata } from "@services/courses/chapters";
+import { useRouter } from "next/navigation";
+import NewChapterModal from "@components/Objects/Modals/Chapters/NewChapter";
+import NewActivityModal from "@components/Objects/Modals/Activities/Create/NewActivity";
+import { createActivity, createFileActivity, createExternalVideoActivity } from "@services/courses/activities";
+import { getOrganizationContextInfo, getOrganizationContextInfoWithoutCredentials } from "@services/organizations/orgs";
+import Modal from "@components/StyledElements/Modal/Modal";
+import { denyAccessToUser } from "@services/utils/react/middlewares/views";
+import { Folders, Hexagon, SaveIcon } from "lucide-react";
+import GeneralWrapperStyled from "@components/StyledElements/Wrappers/GeneralWrapper";
+import { revalidateTags, swrFetcher } from "@services/utils/ts/requests";
+import { mutate } from "swr";
+import { getAPIUrl } from "@services/config/config";
+
+function CourseContentEdition(props: any) {
+    const router = useRouter();
+    // Initial Course State
+    const data = props.data;
+
+    // New Chapter Modal State
+    const [newChapterModal, setNewChapterModal] = useState(false) as any;
+    // New Activity Modal State
+    const [newActivityModal, setNewActivityModal] = useState(false) as any;
+    const [newActivityModalData, setNewActivityModalData] = useState("") as any;
+
+    // Check window availability
+    const [winReady, setwinReady] = useState(false);
+    const courseid = props.courseid;
+    const orgslug = props.orgslug;
+
+
+
+    useEffect(() => {
+        setwinReady(true);
+    }, [courseid, orgslug]);
+
+    // get a list of chapters order by chapter order
+    const getChapters = () => {
+        const chapterOrder = data.chapterOrder ? data.chapterOrder : [];
+        return chapterOrder.map((chapterId: any) => {
+            const chapter = data.chapters[chapterId];
+            let activities = [];
+            if (data.activities) {
+                activities = chapter.activityIds.map((activityId: any) => data.activities[activityId])
+                    ? chapter.activityIds.map((activityId: any) => data.activities[activityId])
+                    : [];
+            }
+            return {
+                list: {
+                    chapter: chapter,
+                    activities: activities,
+                },
+            };
+        });
+    };
+
+    // Submit new chapter
+    const submitChapter = async (chapter: any) => {
+        await createChapter(chapter, courseid);
+        mutate(`${getAPIUrl()}chapters/meta/course_${courseid}`);
+        // await getCourseChapters();
+        await revalidateTags(['courses'], orgslug);
+        router.refresh();
+        setNewChapterModal(false);
+    };
+
+    // Submit new activity
+    const submitActivity = async (activity: any) => {
+        let org = await getOrganizationContextInfoWithoutCredentials(orgslug, { revalidate: 1800 });
+        await updateChaptersMetadata(courseid, data);
+        await createActivity(activity, activity.chapterId, org.org_id);
+        mutate(`${getAPIUrl()}chapters/meta/course_${courseid}`);
+        // await getCourseChapters();
+        setNewActivityModal(false);
+        await revalidateTags(['courses'], orgslug);
+        router.refresh();
+    };
+
+    
+
+    // Submit File Upload
+    const submitFileActivity = async (file: any, type: any, activity: any, chapterId: string) => {
+        await updateChaptersMetadata(courseid, data);
+        await createFileActivity(file, type, activity, chapterId);
+        mutate(`${getAPIUrl()}chapters/meta/course_${courseid}`);
+        // await getCourseChapters();
+        setNewActivityModal(false);
+        await revalidateTags(['courses'], orgslug);
+        router.refresh();
+    };
+
+    // Submit YouTube Video Upload
+    const submitExternalVideo = async (external_video_data: any, activity: any, chapterId: string) => {
+        await updateChaptersMetadata(courseid, data);
+        await createExternalVideoActivity(external_video_data, activity, chapterId);
+        mutate(`${getAPIUrl()}chapters/meta/course_${courseid}`);
+        // await getCourseChapters();
+        setNewActivityModal(false);
+        await revalidateTags(['courses'], orgslug);
+        router.refresh();
+    };
+
+    const deleteChapterUI = async (chapterId: any) => {
+
+        await deleteChapter(chapterId);
+        mutate(`${getAPIUrl()}chapters/meta/course_${courseid}`);
+        // await getCourseChapters();
+        await revalidateTags(['courses'], orgslug);
+        router.refresh();
+    };
+
+    const updateChapters = () => {
+        updateChaptersMetadata(courseid, data);
+        revalidateTags(['courses'], orgslug);
+        router.refresh();
+    };
+
+    /* 
+    Modals
+    */
+
+    const openNewActivityModal = async (chapterId: any) => {
+        setNewActivityModal(true);
+        setNewActivityModalData(chapterId);
+    };
+
+    // Close new chapter modal
+    const closeNewChapterModal = () => {
+        setNewChapterModal(false);
+    };
+
+    const closeNewActivityModal = () => {
+        setNewActivityModal(false);
+    };
+
+    /* 
+    Drag and drop functions
+  
+    */
+    const onDragEnd = async (result: any) => {
+        const { destination, source, draggableId, type } = result;
+
+
+        // check if the activity is dropped outside the droppable area
+        if (!destination) {
+            return;
+        }
+
+        // check if the activity is dropped in the same place
+        if (destination.droppableId === source.droppableId && destination.index === source.index) {
+            return;
+        }
+        //////////////////////////// CHAPTERS ////////////////////////////
+        if (type === "chapter") {
+            const newChapterOrder = Array.from(data.chapterOrder);
+            newChapterOrder.splice(source.index, 1);
+            newChapterOrder.splice(destination.index, 0, draggableId);
+
+            const newState = {
+                ...data,
+                chapterOrder: newChapterOrder,
+            };
+
+            props.dispatchCourseChaptersMetadata({ type: 'updated_chapter', payload: newState })
+            props.dispatchSavedContent({ type: 'unsaved_content' })
+            //setData(newState);
+            return;
+        }
+
+        //////////////////////// ACTIVITIES IN SAME CHAPTERS ////////////////////////////
+        // check if the activity is dropped in the same chapter
+        const start = data.chapters[source.droppableId];
+        const finish = data.chapters[destination.droppableId];
+
+        // check if the activity is dropped in the same chapter
+        if (start === finish) {
+            // create new arrays for chapters and activities
+            const chapter = data.chapters[source.droppableId];
+            const newActivityIds = Array.from(chapter.activityIds);
+
+            // remove the activity from the old position
+            newActivityIds.splice(source.index, 1);
+
+            // add the activity to the new position
+            newActivityIds.splice(destination.index, 0, draggableId);
+
+            const newChapter = {
+                ...chapter,
+                activityIds: newActivityIds,
+            };
+
+            const newState = {
+                ...data,
+                chapters: {
+                    ...data.chapters,
+                    [newChapter.id]: newChapter,
+                },
+            };
+            props.dispatchCourseChaptersMetadata({ type: 'updated_chapter', payload: newState })
+            props.dispatchSavedContent({ type: 'unsaved_content' })
+            //setData(newState);
+            return;
+        }
+
+        //////////////////////// ACTIVITIES IN DIFF CHAPTERS ////////////////////////////
+        // check if the activity is dropped in a different chapter
+        if (start !== finish) {
+            // create new arrays for chapters and activities
+            const startChapterActivityIds = Array.from(start.activityIds);
+
+            // remove the activity from the old position
+            startChapterActivityIds.splice(source.index, 1);
+            const newStart = {
+                ...start,
+                activityIds: startChapterActivityIds,
+            };
+
+            // add the activity to the new position within the chapter
+            const finishChapterActivityIds = Array.from(finish.activityIds);
+            finishChapterActivityIds.splice(destination.index, 0, draggableId);
+            const newFinish = {
+                ...finish,
+                activityIds: finishChapterActivityIds,
+            };
+
+            const newState = {
+                ...data,
+                chapters: {
+                    ...data.chapters,
+                    [newStart.id]: newStart,
+                    [newFinish.id]: newFinish,
+                },
+            };
+
+            props.dispatchCourseChaptersMetadata({ type: 'updated_chapter', payload: newState })
+            props.dispatchSavedContent({ type: 'unsaved_content' })
+            //setData(newState);
+            return;
+        }
+    };
+
+    return (
+        <>
+            <div className=""
+            >
+                <GeneralWrapperStyled>
+                    <Modal
+                        isDialogOpen={newActivityModal}
+                        onOpenChange={setNewActivityModal}
+                        minHeight="no-min"
+                        addDefCloseButton={false}
+                        dialogContent={<NewActivityModal
+                            closeModal={closeNewActivityModal}
+                            submitFileActivity={submitFileActivity}
+                            submitExternalVideo={submitExternalVideo}
+                            submitActivity={submitActivity}
+                            chapterId={newActivityModalData}
+                        ></NewActivityModal>}
+                        dialogTitle="Create Activity"
+                        dialogDescription="Choose between types of activities to add to the course"
+
+                    />
+                    {winReady && (
+                        <div className="flex flex-col">
+                            <DragDropContext onDragEnd={onDragEnd}>
+                                <Droppable key="chapters" droppableId="chapters" type="chapter">
+                                    {(provided) => (
+                                        <>
+                                            <div key={"chapters"} {...provided.droppableProps} ref={provided.innerRef}>
+                                                {getChapters().map((info: any, index: any) => (
+                                                    <>
+                                                        <Chapter
+                                                            orgslug={orgslug}
+                                                            courseid={courseid}
+                                                            openNewActivityModal={openNewActivityModal}
+                                                            deleteChapter={deleteChapterUI}
+                                                            key={index}
+                                                            info={info}
+                                                            index={index}
+                                                        ></Chapter>
+                                                    </>
+                                                ))}
+                                                {provided.placeholder}
+                                            </div>
+                                        </>
+                                    )}
+                                </Droppable>
+                            </DragDropContext>
+                            <Modal
+                                isDialogOpen={newChapterModal}
+                                onOpenChange={setNewChapterModal}
+                                minHeight="sm"
+                                dialogContent={<NewChapterModal
+                                    closeModal={closeNewChapterModal}
+                                    submitChapter={submitChapter}
+                                ></NewChapterModal>}
+                                dialogTitle="Create chapter"
+                                dialogDescription="Add a new chapter to the course"
+                                dialogTrigger={
+                                    <div className="flex max-w-7xl bg-black text-sm shadow rounded-md items-center text-white justify-center mx-auto space-x-2 p-3 w-72 hover:bg-gray-900 hover:cursor-pointer">
+                                        <Hexagon size={16} />
+                                        <div>Add chapter +</div>
+                                    </div>
+                                }
+                            />
+                        </div>
+                    )}
+                </GeneralWrapperStyled >
+            </div>
+        </>
+    );
+}
+
+
+export default CourseContentEdition;

apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseid]/edit/subpages/CourseEdition.tsx

@@ -0,0 +1,116 @@
+"use client";
+import FormLayout, { ButtonBlack, FormField, FormLabel, FormLabelAndMessage, FormMessage, Input, Textarea } from '@components/StyledElements/Form/Form'
+import * as Form from '@radix-ui/react-form';
+import { useFormik } from 'formik';
+import { AlertTriangle } from "lucide-react";
+import React from "react";
+
+const validate = (values: any) => {
+  const errors: any = {};
+
+  if (!values.name) {
+    errors.name = 'Required';
+  }
+
+  if (values.name.length > 100) {
+    errors.name = 'Must be 80 characters or less';
+  }
+
+  if (!values.mini_description) {
+    errors.mini_description = 'Required';
+  }
+
+  if (values.mini_description.length > 200) {
+    errors.mini_description = 'Must be 200 characters or less';
+  }
+
+  if (!values.description) {
+    errors.description = 'Required';
+
+  }
+
+  if (values.description.length > 1000) {
+    errors.description = 'Must be 1000 characters or less';
+  }
+
+
+  if (!values.learnings) {
+    errors.learnings = 'Required';
+  }
+
+  return errors;
+};
+
+function CourseEdition(props: any) {
+  const [error, setError] = React.useState('');
+  const formik = useFormik({
+    initialValues: {
+      name: String(props.data.name),
+      mini_description: String(props.data.mini_description),
+      description: String(props.data.description),
+      learnings: String(props.data.learnings),
+    },
+    validate,
+    onSubmit: async values => {
+    },
+  });
+
+
+  React.useEffect(() => {
+    // This code will run whenever form values are updated
+    if (formik.values !== formik.initialValues) {
+      props.dispatchSavedContent({ type: 'unsaved_content' });
+      const updatedCourse = {
+        ...props.data,
+        name: formik.values.name,
+        mini_description: formik.values.mini_description,
+        description: formik.values.description,
+        learnings: formik.values.learnings.split(", "),
+      };
+      props.dispatchCourseMetadata({ type: 'updated_course', payload: updatedCourse });
+    }
+  }, [formik.values, formik.initialValues]);
+
+
+  return (
+    <div className='max-w-screen-2xl mx-auto px-16 pt-5 tracking-tight'>
+      <div className="login-form">
+        {error && (
+          <div className="flex justify-center bg-red-200 rounded-md text-red-950 space-x-2 items-center p-4 transition-all shadow-sm">
+            <AlertTriangle size={18} />
+            <div className="font-bold text-sm">{error}</div>
+          </div>
+        )}
+        <FormLayout onSubmit={formik.handleSubmit}>
+          <FormField name="name">
+            <FormLabelAndMessage label='Name' message={formik.errors.name} />
+            <Form.Control asChild>
+              <Input style={{ backgroundColor: "white" }} onChange={formik.handleChange} value={formik.values.name} type="text" required />
+            </Form.Control>
+          </FormField>
+          <FormField name="mini_description">
+            <FormLabelAndMessage label='Mini description' message={formik.errors.mini_description} />
+            <Form.Control asChild>
+              <Input style={{ backgroundColor: "white" }} onChange={formik.handleChange} value={formik.values.mini_description} type="text" required />
+            </Form.Control>
+          </FormField>
+          <FormField name="description">
+            <FormLabelAndMessage label='Description' message={formik.errors.description} />
+            <Form.Control asChild>
+              <Textarea style={{ backgroundColor: "white" }} onChange={formik.handleChange} value={formik.values.description} required />
+            </Form.Control>
+          </FormField>
+          <FormField name="learnings">
+            <FormLabelAndMessage label='Learnings (Separated by , )' message={formik.errors.learnings} />
+            <Form.Control asChild>
+              <Textarea placeholder='Science, Design, Architecture' style={{ backgroundColor: "white" }} onChange={formik.handleChange} value={formik.values.learnings} required />
+            </Form.Control>
+          </FormField>
+        </FormLayout>
+      </div>
+
+    </div>
+  )
+}
+
+export default CourseEdition

apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseid]/error.tsx

@@ -0,0 +1,23 @@
+'use client'; // Error components must be Client Components
+
+import ErrorUI from '@components/StyledElements/Error/Error';
+import { useEffect } from 'react';
+ 
+export default function Error({
+  error,
+  reset,
+}: {
+  error: Error;
+  reset: () => void;
+}) {
+  useEffect(() => {
+    // Log the error to an error reporting service
+    console.error(error);
+  }, [error]);
+ 
+  return (
+    <div>
+      <ErrorUI></ErrorUI>
+    </div>
+  );
+}

apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseid]/loading.tsx

@@ -0,0 +1,9 @@
+import PageLoading from "@components/Objects/Loaders/PageLoading";
+
+export default function Loading() {
+    // Or a custom loading skeleton component
+    return (
+        <PageLoading></PageLoading>
+    )
+
+}

apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseid]/page.tsx

@@ -0,0 +1,65 @@
+import React from 'react'
+import CourseClient from './course'
+import { cookies } from 'next/headers';
+import { getCourseMetadataWithAuthHeader } from '@services/courses/courses';
+import { getOrganizationContextInfo } from '@services/organizations/orgs';
+import { Metadata } from 'next';
+import { getAccessTokenFromRefreshTokenCookie, getNewAccessTokenUsingRefreshTokenServer } from '@services/auth/auth';
+
+type MetadataProps = {
+    params: { orgslug: string, courseid: string };
+    searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+    { params }: MetadataProps,
+): Promise<Metadata> {
+    const cookieStore = cookies();
+    const access_token = await getAccessTokenFromRefreshTokenCookie(cookieStore)
+
+    // Get Org context information 
+    const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
+    const course_meta = await getCourseMetadataWithAuthHeader(params.courseid, { revalidate: 0, tags: ['courses'] }, access_token ? access_token : null)
+    
+
+    // SEO
+    return {
+        title: course_meta.course.name + ` — ${org.name}`,
+        description: course_meta.course.mini_description,
+        keywords: course_meta.course.learnings,
+        robots: {
+            index: true,
+            follow: true,
+            nocache: true,
+            googleBot: {
+                index: true,
+                follow: true,
+                "max-image-preview": "large",
+            }
+        },
+        openGraph: {
+            title: course_meta.course.name + ` — ${org.name}`,
+            description: course_meta.course.mini_description,
+            type: 'article',
+            publishedTime: course_meta.course.creationDate,
+            tags: course_meta.course.learnings,
+        },
+    };
+}
+
+
+const CoursePage = async (params: any) => {
+    const cookieStore = cookies();
+    const courseid = params.params.courseid
+    const orgslug = params.params.orgslug;
+    const access_token = await getAccessTokenFromRefreshTokenCookie(cookieStore)
+    const course_meta = await getCourseMetadataWithAuthHeader(courseid, { revalidate: 0, tags: ['courses'] }, access_token ? access_token : null)
+
+    return (
+        <div>
+            <CourseClient courseid={courseid} orgslug={orgslug} course={course_meta} />
+        </div>
+    )
+}
+
+export default CoursePage

apps/web/app/orgs/[orgslug]/(withmenu)/courses/courses.tsx

@@ -0,0 +1,107 @@
+'use client';
+import CreateCourseModal from '@components/Objects/Modals/Course/Create/CreateCourse';
+import Modal from '@components/StyledElements/Modal/Modal';
+import React from 'react'
+import { useSearchParams } from 'next/navigation';
+import GeneralWrapperStyled from '@components/StyledElements/Wrappers/GeneralWrapper';
+import TypeOfContentTitle from '@components/StyledElements/Titles/TypeOfContentTitle';
+import AuthenticatedClientElement from '@components/Security/AuthenticatedClientElement';
+import CourseThumbnail from '@components/Objects/Other/CourseThumbnail';
+import NewCourseButton from '@components/StyledElements/Buttons/NewCourseButton';
+
+interface CourseProps {
+    orgslug: string;
+    courses: any;
+    org_id: string;
+}
+
+function Courses(props: CourseProps) {
+    const orgslug = props.orgslug;
+    const courses = props.courses;
+    const searchParams = useSearchParams();
+    const isCreatingCourse = searchParams.get('new') ? true : false;
+    const [newCourseModal, setNewCourseModal] = React.useState(isCreatingCourse);
+
+    async function closeNewCourseModal() {
+        setNewCourseModal(false);
+    }
+
+    return (
+        <div>
+            <GeneralWrapperStyled>
+
+                <div className='flex flex-wrap justify-between'>
+                    <TypeOfContentTitle title="Courses" type="cou" />
+                    <AuthenticatedClientElement checkMethod='roles' orgId={props.org_id}>
+                        <Modal
+                            isDialogOpen={newCourseModal}
+                            onOpenChange={setNewCourseModal}
+                            minHeight="md"
+                            dialogContent={<CreateCourseModal
+                                closeModal={closeNewCourseModal}
+                                orgslug={orgslug}
+                            ></CreateCourseModal>}
+                            dialogTitle="Create Course"
+                            dialogDescription="Create a new course"
+                            dialogTrigger={
+
+                                <button>
+                                    <NewCourseButton />
+                                </button>}
+                        />
+                    </AuthenticatedClientElement>
+                </div>
+
+
+
+                <div className="flex flex-wrap">
+                    {courses.map((course: any) => (
+                        <div className="px-3" key={course.course_id}>
+                            <CourseThumbnail course={course} orgslug={orgslug} />
+                        </div>
+                    ))}
+                    {courses.length == 0 &&
+                        <div className="flex mx-auto h-[400px]">
+                            <div className="flex flex-col justify-center text-center items-center space-y-5">
+                                <div className='mx-auto'>
+                                    <svg width="120" height="120" viewBox="0 0 295 295" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                        <rect opacity="0.51" x="10" y="10" width="275" height="275" rx="75" stroke="#4B5564" strokeOpacity="0.15" strokeWidth="20" />
+                                        <path d="M135.8 200.8V130L122.2 114.6L135.8 110.4V102.8L122.2 87.4L159.8 76V200.8L174.6 218H121L135.8 200.8Z" fill="#4B5564" fillOpacity="0.08" />
+                                    </svg>
+                                </div>
+                                <div className="space-y-0">
+                                    <h1 className="text-3xl font-bold text-gray-600">No courses yet</h1>
+                                    <p className="text-lg text-gray-400">Create a course to add content</p>
+                                </div>
+                                <AuthenticatedClientElement checkMethod='roles' orgId={props.org_id}>
+                                    <Modal
+                                        isDialogOpen={newCourseModal}
+                                        onOpenChange={setNewCourseModal}
+                                        minHeight="md"
+                                        dialogContent={<CreateCourseModal
+                                            closeModal={closeNewCourseModal}
+                                            orgslug={orgslug}
+                                        ></CreateCourseModal>}
+                                        dialogTitle="Create Course"
+                                        dialogDescription="Create a new course"
+                                        dialogTrigger={
+                                            <button>
+                                                <NewCourseButton />
+                                            </button>}
+                                    />
+                                </AuthenticatedClientElement>
+                            </div>
+                        </div>
+                    }
+                </div>
+
+
+            </GeneralWrapperStyled>
+        </div>
+    )
+}
+
+
+
+
+export default Courses

apps/web/app/orgs/[orgslug]/(withmenu)/courses/error.tsx

@@ -0,0 +1,23 @@
+'use client'; // Error components must be Client Components
+
+import ErrorUI from '@components/StyledElements/Error/Error';
+import { useEffect } from 'react';
+ 
+export default function Error({
+  error,
+  reset,
+}: {
+  error: Error;
+  reset: () => void;
+}) {
+  useEffect(() => {
+    // Log the error to an error reporting service
+    console.error(error);
+  }, [error]);
+ 
+  return (
+    <div>
+      <ErrorUI></ErrorUI>
+    </div>
+  );
+}

apps/web/app/orgs/[orgslug]/(withmenu)/courses/loading.tsx

@@ -0,0 +1,9 @@
+import PageLoading from "@components/Objects/Loaders/PageLoading";
+
+export default function Loading() {
+    // Or a custom loading skeleton component
+    return (
+        <PageLoading></PageLoading>
+    )
+
+}

apps/web/app/orgs/[orgslug]/(withmenu)/courses/page.tsx

@@ -0,0 +1,60 @@
+
+import React from "react";
+import Courses from "./courses";
+import { getOrgCoursesWithAuthHeader } from "@services/courses/courses";
+import { Metadata } from "next";
+import { getOrganizationContextInfo } from "@services/organizations/orgs";
+import { cookies } from "next/headers";
+import { getAccessTokenFromRefreshTokenCookie, getNewAccessTokenUsingRefreshTokenServer } from "@services/auth/auth";
+
+type MetadataProps = {
+  params: { orgslug: string };
+  searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+  { params }: MetadataProps,
+): Promise<Metadata> {
+
+  // Get Org context information 
+  const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
+
+  // SEO
+  return {
+    title: "Courses — " + org.name,
+    description: org.description,
+    keywords: `${org.name}, ${org.description}, courses, learning, education, online learning, edu, online courses, ${org.name} courses`,
+    robots: {
+      index: true,
+      follow: true,
+      nocache: true,
+      googleBot: {
+        index: true,
+        follow: true,
+        "max-image-preview": "large",
+      }
+    },
+    openGraph: {
+      title: "Courses — " + org.name,
+      description: org.description,
+      type: 'website',
+    },
+  };
+}
+
+const CoursesPage = async (params: any) => {
+  const orgslug = params.params.orgslug;
+  const org = await getOrganizationContextInfo(orgslug, { revalidate: 1800, tags: ['organizations'] });
+  const cookieStore = cookies();
+  const access_token = await getAccessTokenFromRefreshTokenCookie(cookieStore)
+  const courses = await getOrgCoursesWithAuthHeader(orgslug, { revalidate: 0, tags: ['courses'] }, access_token ? access_token : null);
+
+  return (
+    <div>
+      <Courses org_id={org.org_id} orgslug={orgslug} courses={courses} />
+    </div>
+  );
+};
+
+export default CoursesPage;
+

apps/web/app/orgs/[orgslug]/(withmenu)/error.tsx

@@ -0,0 +1,23 @@
+'use client'; // Error components must be Client Components
+
+import ErrorUI from '@components/StyledElements/Error/Error';
+import { useEffect } from 'react';
+ 
+export default function Error({
+  error,
+  reset,
+}: {
+  error: Error;
+  reset: () => void;
+}) {
+  useEffect(() => {
+    // Log the error to an error reporting service
+    console.error(error);
+  }, [error]);
+ 
+  return (
+    <div>
+      <ErrorUI></ErrorUI>
+    </div>
+  );
+}

apps/web/app/orgs/[orgslug]/(withmenu)/layout.tsx

@@ -0,0 +1,14 @@
+import "@styles/globals.css";
+import { Menu } from "@components/Objects/Menu/Menu";
+import AuthProvider from "@components/Security/AuthProvider";
+
+export default function RootLayout({ children, params }: { children: React.ReactNode , params :any}) {
+  return (
+    <>
+      <AuthProvider>
+        <Menu orgslug={params?.orgslug}></Menu>
+        {children}
+      </AuthProvider>
+    </>
+  );
+}

apps/web/app/orgs/[orgslug]/(withmenu)/loading.tsx

@@ -0,0 +1,8 @@
+import PageLoading from "@components/Objects/Loaders/PageLoading";
+
+export default function Loading() {
+    return (
+        <PageLoading></PageLoading>
+    )
+
+}

apps/web/app/orgs/[orgslug]/(withmenu)/page.tsx

@@ -0,0 +1,146 @@
+export const dynamic = 'force-dynamic';
+import { Metadata } from 'next';
+import { getUriWithOrg } from "@services/config/config";
+import { getOrgCoursesWithAuthHeader } from "@services/courses/courses";
+import Link from "next/link";
+import { getOrgCollectionsWithAuthHeader } from "@services/courses/collections";
+import { getOrganizationContextInfo } from '@services/organizations/orgs';
+import { cookies } from 'next/headers';
+import GeneralWrapperStyled from '@components/StyledElements/Wrappers/GeneralWrapper';
+import TypeOfContentTitle from '@components/StyledElements/Titles/TypeOfContentTitle';
+import { getAccessTokenFromRefreshTokenCookie } from '@services/auth/auth';
+import CourseThumbnail from '@components/Objects/Other/CourseThumbnail';
+import CollectionThumbnail from '@components/Objects/Other/CollectionThumbnail';
+import AuthenticatedClientElement from '@components/Security/AuthenticatedClientElement';
+import { Plus, PlusCircle } from 'lucide-react';
+import NewCourseButton from '@components/StyledElements/Buttons/NewCourseButton';
+import NewCollectionButton from '@components/StyledElements/Buttons/NewCollectionButton';
+
+type MetadataProps = {
+  params: { orgslug: string };
+  searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+  { params }: MetadataProps,
+): Promise<Metadata> {
+  // Get Org context information 
+  const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
+
+  // SEO
+  return {
+    title: `Home — ${org.name}`,
+    description: org.description,
+    robots: {
+      index: true,
+      follow: true,
+      nocache: true,
+      googleBot: {
+        index: true,
+        follow: true,
+        "max-image-preview": "large",
+      }
+    },
+    openGraph: {
+      title: `Home — ${org.name}`,
+      description: org.description,
+      type: 'website',
+    },
+  };
+}
+
+const OrgHomePage = async (params: any) => {
+  const orgslug = params.params.orgslug;
+  const cookieStore = cookies();
+
+  const access_token = await getAccessTokenFromRefreshTokenCookie(cookieStore)
+  const courses = await getOrgCoursesWithAuthHeader(orgslug, { revalidate: 0, tags: ['courses'] }, access_token ? access_token : null);
+  const org = await getOrganizationContextInfo(orgslug, { revalidate: 1800, tags: ['organizations'] });
+  const org_id = org.org_id;
+  const collections = await getOrgCollectionsWithAuthHeader(org.org_id, access_token ? access_token : null, { revalidate: 0, tags: ['courses'] });
+
+  return (
+    <div>
+      <GeneralWrapperStyled>
+        {/* Collections */}
+        <div className='flex items-center '>
+          <div className='flex grow'>
+            <TypeOfContentTitle title="Collections" type="col" />
+          </div>
+          <AuthenticatedClientElement checkMethod='roles' orgId={org_id}>
+            <Link href={getUriWithOrg(orgslug, "/collections/new")}>
+              <NewCollectionButton />
+            </Link>
+          </AuthenticatedClientElement>
+        </div>
+        <div className="home_collections flex flex-wrap">
+          {collections.map((collection: any) => (
+            <div className="flex flex-col py-3 px-3" key={collection.collection_id}>
+              <CollectionThumbnail collection={collection} orgslug={orgslug} org_id={org.org_id} />
+            </div>
+          ))}
+          {collections.length == 0 &&
+            <div className="flex mx-auto h-[100px]">
+              <div className="flex flex-col justify-center text-center items-center space-y-3">
+                <div className="flex flex-col space-y-3">
+                  <div className='mx-auto'>
+                    <svg width="50" height="50" viewBox="0 0 295 295" fill="none" xmlns="http://www.w3.org/2000/svg">
+                      <rect opacity="0.51" x="10" y="10" width="275" height="275" rx="75" stroke="#4B5564" strokeOpacity="0.15" strokeWidth="20" />
+                      <path d="M135.8 200.8V130L122.2 114.6L135.8 110.4V102.8L122.2 87.4L159.8 76V200.8L174.6 218H121L135.8 200.8Z" fill="#4B5564" fillOpacity="0.08" />
+                    </svg>
+                  </div>
+                  <div className="space-y-0">
+                    <h1 className="text-xl font-bold text-gray-600">No collections yet</h1>
+                    <p className="text-md text-gray-400">Create a collection to group courses together</p>
+                  </div>
+                </div>
+              </div>
+            </div>
+          }
+        </div>
+
+        {/* Courses */}
+        <div className='h-5'></div>
+        <div className='flex items-center '>
+          <div className='flex grow'>
+            <TypeOfContentTitle title="Courses" type="cou" />
+          </div>
+          <AuthenticatedClientElement checkMethod='roles' orgId={org_id}>
+            <Link href={getUriWithOrg(orgslug, "/courses?new=true")}>
+              <NewCourseButton />
+            </Link>
+          </AuthenticatedClientElement>
+        </div>
+        <div className="home_courses flex flex-wrap">
+          {courses.map((course: any) => (
+            <div className="py-3 px-3" key={course.course_id}>
+              <CourseThumbnail course={course} orgslug={orgslug} />
+            </div>
+          ))}
+          {courses.length == 0 &&
+            <div className="flex mx-auto h-[300px]">
+              <div className="flex flex-col justify-center text-center items-center space-y-3">
+                <div className="flex flex-col space-y-3">
+                  <div className='mx-auto'>
+                    <svg width="50" height="50" viewBox="0 0 295 295" fill="none" xmlns="http://www.w3.org/2000/svg">
+                      <rect opacity="0.51" x="10" y="10" width="275" height="275" rx="75" stroke="#4B5564" strokeOpacity="0.15" strokeWidth="20" />
+                      <path d="M135.8 200.8V130L122.2 114.6L135.8 110.4V102.8L122.2 87.4L159.8 76V200.8L174.6 218H121L135.8 200.8Z" fill="#4B5564" fillOpacity="0.08" />
+                    </svg>
+                  </div>
+                  <div className="space-y-0">
+                    <h1 className="text-xl font-bold text-gray-600">No courses yet</h1>
+                    <p className="text-md text-gray-400">Create a course to add content</p>
+                  </div>
+                </div>
+              </div>
+            </div>
+          }
+        </div>
+      </GeneralWrapperStyled>
+    </div>
+
+  );
+};
+
+
+export default OrgHomePage;

apps/web/app/orgs/[orgslug]/(withmenu)/trail/page.tsx

@@ -0,0 +1,33 @@
+import React from "react";
+import { Metadata } from "next";
+import { getOrganizationContextInfo } from "@services/organizations/orgs";
+import Trail from "./trail";
+
+type MetadataProps = {
+    params: { orgslug: string };
+    searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+    { params }: MetadataProps,
+): Promise<Metadata> {
+
+    // Get Org context information 
+    const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
+    return {
+        title: "Trail — " + org.name,
+        description: 'Check your progress using trail and easily navigate through your courses.',
+    };
+}
+
+const TrailPage = async (params: any) => {
+    let orgslug = params.params.orgslug;
+
+    return (
+        <div>
+            <Trail orgslug={orgslug} />
+        </div>
+    );
+};
+
+export default TrailPage;

apps/web/app/orgs/[orgslug]/(withmenu)/trail/trail.tsx

@@ -0,0 +1,43 @@
+"use client";
+import PageLoading from "@components/Objects/Loaders/PageLoading";
+import TrailCourseElement from "@components/Pages/Trail/TrailCourseElement";
+import TypeOfContentTitle from "@components/StyledElements/Titles/TypeOfContentTitle";
+import GeneralWrapperStyled from "@components/StyledElements/Wrappers/GeneralWrapper";
+import { getAPIUrl } from "@services/config/config";
+import { removeCourse } from "@services/courses/activity";
+import { revalidateTags, swrFetcher } from "@services/utils/ts/requests";
+import React from "react";
+import useSWR, { mutate } from "swr";
+
+function Trail(params: any) {
+  let orgslug = params.orgslug;
+  const { data: trail, error: error } = useSWR(`${getAPIUrl()}trail/org_slug/${orgslug}/trail`, swrFetcher);
+
+
+  return (
+    <GeneralWrapperStyled>
+      <TypeOfContentTitle title="Trail" type="tra" />
+      {!trail ? (
+        <PageLoading></PageLoading>
+      ) : (
+        <div className="space-y-6">
+          {trail.courses.map((course: any) => (
+            !course.masked ? (
+              <TrailCourseElement key={trail.trail_id} orgslug={orgslug} course={course} />
+            ) : (
+              <></>
+            )
+
+          ))}
+
+        </div>
+      )}
+    </GeneralWrapperStyled>
+  );
+}
+
+export default Trail;
+
+
+
+

apps/web/app/orgs/[orgslug]/layout.tsx

@@ -0,0 +1,11 @@
+
+import "@styles/globals.css";
+
+export default function RootLayout({ children, params }: { children: React.ReactNode , params:any}) {
+  
+  return (
+    <>
+        {children}
+    </>
+  );
+}

apps/web/app/orgs/[orgslug]/login/login.tsx

@@ -0,0 +1,139 @@
+"use client";
+import learnhouseIcon from "public/learnhouse_bigicon_1.png";
+import FormLayout, { ButtonBlack, FormField, FormLabel, FormLabelAndMessage, FormMessage, 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";
+import { useRouter } from "next/navigation";
+import Link from "next/link";
+import { getUriWithOrg } from "@services/config/config";
+
+interface LoginClientProps {
+    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';
+    }
+
+    return errors;
+};
+
+const LoginClient = (props: LoginClientProps) => {
+    const [isSubmitting, setIsSubmitting] = React.useState(false);
+    const router = useRouter();
+    const [error, setError] = React.useState('');
+    const formik = useFormik({
+        initialValues: {
+            email: '',
+            password: '',
+        },
+        validate,
+        onSubmit: async values => {
+            setIsSubmitting(true);
+            let res = await loginAndGetToken(values.email, values.password);
+            let message = await res.json();
+            if (res.status == 200) {
+                router.push(`/`);
+                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);
+            }
+
+        },
+    });
+    return (
+        <div className='grid grid-flow-col justify-stretch h-screen'>
+            <div className="right-login-part" style={{ background: "linear-gradient(041.61deg, #202020 7.15%, #000000 90.96%)" }} >
+                <div className='login-topbar m-10'>
+                    <Link prefetch href={getUriWithOrg(props.org.slug, "/")}>
+                        <Image quality={100} width={30} height={30} src={learnhouseIcon} alt="" />
+                    </Link></div>
+                <div className="ml-10 h-4/6 flex flex-row text-white">
+                    <div className="m-auto flex space-x-4 items-center flex-wrap">
+                        <div>Login to </div>
+                        <div className="shadow-[0px_4px_16px_rgba(0,0,0,0.02)]" >
+                            {props.org?.logo ? (
+                                <img
+                                    src={`${getOrgLogoMediaDirectory(props.org.org_id, props.org?.logo)}`}
+                                    alt="Learnhouse"
+                                    style={{ width: "auto", height: 70 }}
+                                    className="rounded-md shadow-xl inset-0 ring-1 ring-inset ring-black/10 bg-white"
+                                />
+                            ) : (
+                                <Image quality={100} width={70} height={70} src={learnhouseIcon} alt="" />
+                            )}
+                        </div>
+                        <div className="font-bold text-xl">{props.org?.name}</div>
+                    </div>
+                </div>
+            </div>
+            <div className="left-login-part bg-white flex flex-row">
+                <div className="login-form m-auto w-72">
+                    {error && (
+                        <div className="flex justify-center bg-red-200 rounded-md text-red-950 space-x-2 items-center p-4 transition-all shadow-sm">
+                            <AlertTriangle size={18} />
+                            <div className="font-bold text-sm">{error}</div>
+                        </div>
+                    )}
+                    <FormLayout onSubmit={formik.handleSubmit}>
+                        <FormField name="email">
+                            <FormLabelAndMessage label='Email' message={formik.errors.email} />
+                            <Form.Control asChild>
+                                <Input onChange={formik.handleChange} value={formik.values.email} type="email" required />
+                            </Form.Control>
+                        </FormField>
+                        {/* for password  */}
+                        <FormField name="password">
+                            <FormLabelAndMessage label='Password' message={formik.errors.password} />
+
+                            <Form.Control asChild>
+                                <Input onChange={formik.handleChange} value={formik.values.password} type="password" required />
+                            </Form.Control>
+                        </FormField>
+
+
+                        <div className="flex  py-4">
+                            <Form.Submit asChild>
+                                <button className="w-full bg-black text-white font-bold text-center p-2 rounded-md shadow-md hover:cursor-pointer" >
+                                    {isSubmitting ? "Loading..."
+                                        : "Login"}
+                                </button>
+                            </Form.Submit>
+                        </div>
+
+                    </FormLayout>
+                </div>
+            </div>
+        </div>
+    );
+};
+
+export default LoginClient
+

apps/web/app/orgs/[orgslug]/login/page.tsx

@@ -0,0 +1,35 @@
+import { getOrganizationContextInfo } from "@services/organizations/orgs";
+import LoginClient from "./login";
+import { Metadata } from 'next';
+
+type MetadataProps = {
+  params: { orgslug: string, courseid: string };
+  searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+  { params }: MetadataProps,
+): Promise<Metadata> {
+  const orgslug = params.orgslug;
+  // Get Org context information 
+  const org = await getOrganizationContextInfo(orgslug, { revalidate: 1800, tags: ['organizations'] });
+
+  return {
+    title: 'Login' + ` — ${org.name}`,
+  };
+}
+
+const Login = async (params: any) => {
+  const orgslug = params.params.orgslug;
+  const org = await getOrganizationContextInfo(orgslug, { revalidate: 1800, tags: ['organizations'] });
+
+  return (
+    <div>
+      <LoginClient org={org}></LoginClient>
+    </div>
+  );
+};
+
+
+
+export default Login;

apps/web/app/orgs/[orgslug]/settings/account/passwords/page.tsx

@@ -0,0 +1,30 @@
+import { getOrganizationContextInfo } from "@services/organizations/orgs";
+import { Metadata } from "next";
+import PasswordsClient from "./passwords";
+
+type MetadataProps = {
+  params: { orgslug: string };
+  searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+  { params }: MetadataProps,
+): Promise<Metadata> {
+
+  // Get Org context information 
+  const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
+  return {
+    title: `Settings: Passwords — ${org.name}`,
+    description: org.description,
+  };
+}
+
+function SettingsProfilePasswordsPage() {
+  return (
+    <>
+      <PasswordsClient></PasswordsClient>
+    </>
+  )
+}
+
+export default SettingsProfilePasswordsPage

apps/web/app/orgs/[orgslug]/settings/account/passwords/passwords.tsx

@@ -0,0 +1,77 @@
+"use client";
+import { AuthContext } from '@components/Security/AuthProvider';
+import React, { useEffect } from 'react'
+import { Formik, Form, Field, ErrorMessage } from 'formik';
+import { updatePassword } from '@services/settings/password';
+
+
+function PasswordsClient() {
+    const auth: any = React.useContext(AuthContext);
+
+    
+
+    const updatePasswordUI = async (values: any) => {
+        let user_id = auth.userInfo.user_object.user_id;
+        await updatePassword(user_id, values)
+    }
+
+
+    return (
+        <div>
+
+            {auth.isAuthenticated && (
+                <div>
+                    <h1 className='text-3xl font-bold'>Account Password</h1>
+                    <br /><br />
+
+                    <Formik
+                        initialValues={{ old_password: '', new_password: '' }}
+                        onSubmit={(values, { setSubmitting }) => {
+                            setTimeout(() => {
+                                alert(JSON.stringify(values, null, 2));
+                                setSubmitting(false);
+                                updatePasswordUI(values)
+                            }, 400);
+                        }}
+                    >
+                        {({ isSubmitting }) => (
+                            <Form className="max-w-md">
+                                <label className="block mb-2 font-bold" htmlFor="old_password">
+                                    Old Password
+                                </label>
+                                <Field
+                                    className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+                                    type="password"
+                                    name="old_password"
+                                />
+
+                                <label className="block mb-2 font-bold" htmlFor="new_password">
+                                    New Password
+                                </label>
+                                <Field
+                                    className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+                                    type="password"
+                                    name="new_password"
+                                />
+
+                                <button
+                                    type="submit"
+                                    disabled={isSubmitting}
+                                    className="px-6 py-3 text-white bg-black rounded-lg shadow-md hover:bg-black focus:outline-none focus:ring-2 focus:ring-blue-500"
+                                >
+                                    Submit
+                                </button>
+                            </Form>
+
+                        )}
+                    </Formik>
+                </div>
+            )}
+
+
+        </div>
+
+    )
+}
+
+export default PasswordsClient

apps/web/app/orgs/[orgslug]/settings/account/profile/page.tsx

@@ -0,0 +1,26 @@
+import { getOrganizationContextInfo } from "@services/organizations/orgs";
+import { Metadata } from "next";
+import ProfileClient from "./profile";
+
+type MetadataProps = {
+    params: { orgslug: string };
+    searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+    { params }: MetadataProps,
+): Promise<Metadata> {
+
+    // Get Org context information 
+    const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
+    return {
+        title: `Settings: Profile — ${org.name}`,
+        description: org.description,
+    };
+}
+
+function SettingsProfilePage() {
+    return <ProfileClient></ProfileClient>
+}
+
+export default SettingsProfilePage

apps/web/app/orgs/[orgslug]/settings/account/profile/profile.tsx

@@ -0,0 +1,79 @@
+"use client";
+import { AuthContext } from '@components/Security/AuthProvider';
+import React, { useEffect } from 'react'
+import { Formik, Form, Field, ErrorMessage } from 'formik';
+import { updateProfile } from '@services/settings/profile';
+
+function ProfileClient() {
+    const auth: any = React.useContext(AuthContext);
+
+    return (
+        <div>
+
+            {auth.isAuthenticated && (
+                <div>
+                    <h1 className='text-3xl font-bold'>Profile Settings</h1>
+                    <br /><br />
+
+                    <Formik
+                        initialValues={auth.userInfo.user_object}
+
+                        onSubmit={(values, { setSubmitting }) => {
+                            setTimeout(() => {
+                                alert(JSON.stringify(values, null, 2));
+                                setSubmitting(false);
+                                updateProfile(values)
+                            }, 400);
+                        }}
+                    >
+                        {({ isSubmitting }) => (
+                            <Form className="max-w-md">
+                                <label className="block mb-2 font-bold" htmlFor="full_name">
+                                    Full Name
+                                </label>
+                                <Field
+                                    className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+                                    type="textarea"
+                                    name="full_name"
+                                />
+
+                                <label className="block mb-2 font-bold" htmlFor="email">
+                                    Email
+                                </label>
+                                <Field
+                                    className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+                                    type="email"
+                                    name="email"
+                                />
+
+                                <label className="block mb-2 font-bold" htmlFor="bio">
+                                    Bio
+                                </label>
+                                <Field
+                                    as="textarea"
+                                    className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+                                    type="textarea"
+                                    name="bio"
+                                />
+
+                                <button
+                                    type="submit"
+                                    disabled={isSubmitting}
+                                    className="px-6 py-3 text-white bg-black rounded-lg shadow-md hover:bg-black focus:outline-none focus:ring-2 focus:ring-blue-500"
+                                >
+                                    Submit
+                                </button>
+                            </Form>
+
+                        )}
+                    </Formik>
+                </div>
+            )}
+
+
+        </div>
+
+    )
+}
+
+export default ProfileClient

apps/web/app/orgs/[orgslug]/settings/head.tsx

@@ -0,0 +1,15 @@
+import { createStitches } from '@stitches/react';
+
+export const { getCssText } = createStitches();
+
+export default function Head() {
+    return (
+      <>
+        <title>Settings</title>
+        <meta content="width=device-width, initial-scale=1" name="viewport" />
+        <link rel="icon" href="/favicon.ico" />
+        <style id="stitches" dangerouslySetInnerHTML={{ __html: getCssText() }} />
+      </>
+    )
+  }
+  

apps/web/app/orgs/[orgslug]/settings/layout.tsx

@@ -0,0 +1,122 @@
+"use client";
+import React, { createContext, useState } from 'react'
+import { styled } from '@stitches/react';
+import Link from 'next/link';
+import LearnHouseWhiteLogo from '@public/learnhouse_text_white.png';
+import AuthProvider, { AuthContext } from '@components/Security/AuthProvider';
+import Avvvatars from 'avvvatars-react';
+import Image from 'next/image';
+import AuthenticatedClientElement from '@components/Security/AuthenticatedClientElement';
+import { getOrganizationContextInfo } from '@services/organizations/orgs';
+
+async function SettingsLayout({ children, params }: { children: React.ReactNode, params: any }) {
+    const auth: any = React.useContext(AuthContext);
+    const orgslug = params.orgslug;
+
+    let org = await getOrganizationContextInfo(orgslug, {});
+
+    return (
+        <>
+            <AuthProvider>
+                <Main>
+                    <LeftWrapper>
+                        <LeftTopArea>
+
+                            <Link href={"/"}><Image alt="Learnhouse logo" width={128} src={LearnHouseWhiteLogo} /></Link>
+                            {auth.isAuthenticated && (
+                                <Avvvatars value={auth.userInfo.user_object.user_id} style="shape" />
+                            )}
+                        </LeftTopArea>
+                        <LeftMenuWrapper>
+                            <MenuTitle>Account</MenuTitle>
+                            <ul>
+                                <li><Link href="/settings/account/profile">Profile</Link></li>
+                                <li><Link href="/settings/account/passwords">Passwords</Link></li>
+                            </ul>
+                            <AuthenticatedClientElement checkMethod='roles' orgId={org.org_id}  >
+                                <MenuTitle>Organization</MenuTitle>
+                                <ul>
+                                    <li><Link href="/settings/organization/general">General</Link></li>
+                                </ul>
+                            </AuthenticatedClientElement>
+                        </LeftMenuWrapper>
+                    </LeftWrapper>
+                    <RightWrapper>
+                        {children}
+                    </RightWrapper>
+                </Main></AuthProvider>
+        </>
+    )
+}
+
+export default SettingsLayout
+
+
+const Main = styled('div', {
+    display: 'flex',
+})
+
+const LeftWrapper = styled('div', {
+    width: '270px',
+    background: "linear-gradient(348.55deg, #010101 -8.61%, #343434 105.52%);",
+    height: '100vh',
+    padding: '20px',
+})
+
+const LeftTopArea = styled('div', {
+    display: 'flex',
+    marginLeft: '20px',
+
+    alignItems: 'center',
+
+    img: {
+        marginRight: '20px',
+    },
+
+    a: {
+        display: 'flex',
+        placeItems: 'center',
+        placeContent: 'center',
+
+    }
+
+})
+
+const LeftMenuWrapper = styled('div', {
+    display: 'flex',
+    flexDirection: 'column',
+    padding: '20px',
+
+    ul: {
+        listStyle: 'none',
+        padding: 0,
+        margin: 0,
+        li: {
+            marginBottom: '10px',
+            a: {
+                color: '#ffffff8c',
+                textDecoration: 'none',
+                fontSize: '14px',
+                fontWeight: 'bold',
+                '&:hover': {
+                    textDecoration: 'underline',
+                }
+            }
+        }
+    }
+
+})
+
+const MenuTitle = styled('h3', {
+    color: 'white',
+    fontSize: '18px',
+    fontWeight: 'bold',
+    marginBottom: '20px',
+})
+
+const RightWrapper = styled('div', {
+    flex: 1,
+    padding: '20px',
+    boxSizing: 'border-box',
+    margin: '40px',
+})

apps/web/app/orgs/[orgslug]/settings/organization/general/organization.tsx

@@ -0,0 +1,156 @@
+"use client";
+import React, { useState } from 'react'
+import { Field, Form, Formik } from 'formik';
+import { updateOrganization, uploadOrganizationLogo } from '@services/settings/org';
+import { UploadCloud } from 'lucide-react';
+import { revalidateTags } from '@services/utils/ts/requests';
+import { useRouter } from 'next/navigation';
+
+
+interface OrganizationValues {
+    name: string;
+    description: string;
+    slug: string;
+    logo: string;
+    email: string;
+}
+
+
+function OrganizationClient(props: any) {
+    const [selectedFile, setSelectedFile] = useState<File | null>(null);
+    const router = useRouter();
+    // ...
+
+    const handleFileChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        if (event.target.files && event.target.files.length > 0) {
+            const file = event.target.files[0];
+            setSelectedFile(file);
+        }
+    };
+
+    const uploadLogo = async () => {
+        if (selectedFile) {
+            let org_id = org.org_id;
+            await uploadOrganizationLogo(org_id, selectedFile);
+            setSelectedFile(null); // Reset the selected file
+            await revalidateTags(['organizations'], org.slug);
+            router.refresh();
+
+        }
+    };
+
+
+    const org = props.org;
+    let orgValues: OrganizationValues = {
+        name: org.name,
+        description: org.description,
+        slug: org.slug,
+        logo: org.logo,
+        email: org.email
+    }
+
+    const updateOrg = async (values: OrganizationValues) => {
+        let org_id = org.org_id;
+        await updateOrganization(org_id, values);
+
+        // Mutate the org
+        await revalidateTags(['organizations'], org.slug);
+        router.refresh();
+    }
+
+
+    return (
+        <div>
+            <h1 className='text-3xl font-bold'>Organization Settings</h1>
+            <br /><br />
+
+
+            <Formik
+                initialValues={orgValues}
+                onSubmit={(values, { setSubmitting }) => {
+                    setTimeout(() => {
+                        alert(JSON.stringify(values, null, 2));
+                        setSubmitting(false);
+                        updateOrg(values)
+                    }, 400);
+                }}
+            >
+                {({ isSubmitting }) => (
+                    <Form>
+                        <label className="block mb-2 font-bold" htmlFor="name">
+                            Name
+                        </label>
+                        <Field
+                            className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+                            type="text"
+                            name="name"
+                        />
+
+                        <label className="block mb-2 font-bold" htmlFor="description">
+                            Description
+                        </label>
+                        <Field
+                            className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+                            type="text"
+                            name="description"
+                        />
+
+                        <label className="block mb-2 font-bold" htmlFor="slug">
+                            Logo
+                        </label>
+
+                        <div className="flex items-center justify-center w-full ">
+                            <input
+                                className="w-full px-4 py-2 mr-1 border rounded-lg bg-gray-200 cursor-not-allowed"
+                                type="file"
+                                name="logo"
+                                onChange={handleFileChange}
+                            />
+                            <button
+                                type="button"
+                                onClick={uploadLogo}
+                                disabled={isSubmitting || selectedFile === null}
+                                className="px-6 py-3 text-white bg-gray-500 rounded-lg  hover:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-black"
+                            >
+                                <UploadCloud size={24} />
+                            </button>
+                        </div>
+
+
+                        <label className="block mb-2 font-bold" htmlFor="slug">
+                            Slug
+                        </label>
+                        <Field
+                            className="w-full px-4 py-2 mb-4 border rounded-lg bg-gray-200 cursor-not-allowed"
+                            disabled
+                            type="text"
+                            name="slug"
+                        />
+
+                        <label className="block mb-2 font-bold" htmlFor="email">
+                            Email
+                        </label>
+                        <Field
+                            className="w-full px-4 py-2 mb-4 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
+                            type="email"
+                            name="email"
+                        />
+
+                        <button
+                            type="submit"
+                            disabled={isSubmitting}
+                            className="px-6 py-3 text-white bg-black rounded-lg shadow-md hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-black"
+                        >
+                            Submit
+                        </button>
+                    </Form>
+
+                )}
+            </Formik>
+
+
+        </div>
+    )
+}
+
+export default OrganizationClient

apps/web/app/orgs/[orgslug]/settings/organization/general/page.tsx

@@ -0,0 +1,33 @@
+import { getOrganizationContextInfo } from '@services/organizations/orgs';
+import { Metadata } from 'next';
+import OrganizationClient from './organization';
+
+type MetadataProps = {
+  params: { orgslug: string };
+  searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+  { params }: MetadataProps,
+): Promise<Metadata> {
+
+  // Get Org context information 
+  const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
+  return {
+    title: `Settings: General — ${org.name}`,
+    description: org.description,
+  };
+}
+
+async function SettingsOrganizationGeneral(params: any) {
+  const orgslug = params.params.orgslug;
+  const org = await getOrganizationContextInfo(orgslug, { revalidate: 1800, tags: ['organizations'] });
+
+  return (
+    <>
+    <OrganizationClient org={org} />
+    </>
+  )
+}
+
+export default SettingsOrganizationGeneral

apps/web/app/orgs/[orgslug]/settings/organization/roles/page.tsx

@@ -0,0 +1,9 @@
+import React from 'react'
+
+function SettingsOrganizationRole() {
+  return (
+    <div>SettingsOrganizationRole</div>
+  )
+}
+
+export default SettingsOrganizationRole

apps/web/app/orgs/[orgslug]/settings/page.tsx

@@ -0,0 +1,28 @@
+import { getOrganizationContextInfo } from "@services/organizations/orgs";
+import { Metadata, ResolvingMetadata } from 'next';
+
+type MetadataProps = {
+  params: { orgslug: string };
+  searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+  { params }: MetadataProps,
+): Promise<Metadata> {
+
+
+  // Get Org context information 
+  const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
+  return {
+    title: `Settings — ${org.name}`,
+    description: org.description,
+  };
+}
+
+function Settings() {
+  return (
+    <div>Settings</div>
+  )
+}
+
+export default Settings

apps/web/app/orgs/[orgslug]/signup/page.tsx

@@ -0,0 +1,34 @@
+
+import React from "react";
+import SignUpClient from "./signup";
+import { Metadata } from "next";
+import { getOrganizationContextInfo } from "@services/organizations/orgs";
+
+type MetadataProps = {
+  params: { orgslug: string, courseid: string };
+  searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata(
+  { params }: MetadataProps,
+): Promise<Metadata> {
+  const orgslug = params.orgslug;
+  // Get Org context information 
+  const org = await getOrganizationContextInfo(orgslug, { revalidate: 1800, tags: ['organizations'] });
+
+  return {
+    title: 'Sign up' + ` — ${org.name}`,
+  };
+}
+
+const SignUp = async (params: any) => {
+  const orgslug = params.params.orgslug;
+  const org = await getOrganizationContextInfo(orgslug, { revalidate: 1800, tags: ['organizations'] });
+
+  return (
+    <div>
+      <SignUpClient org={org}></SignUpClient>
+    </div>
+  );
+};
+export default SignUp;

apps/web/app/orgs/[orgslug]/signup/signup.tsx

@@ -0,0 +1,188 @@
+"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 } from 'lucide-react';
+import Link from 'next/link';
+import { signup } from '@services/auth/auth';
+import { getUriWithOrg } from '@services/config/config';
+
+
+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.full_name) {
+        errors.full_name = 'Required';
+    }
+
+    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 formik = useFormik({
+        initialValues: {
+            org_slug: props.org?.slug,
+            email: '',
+            password: '',
+            username: '',
+            bio: '',
+            full_name: '',
+        },
+        validate,
+        onSubmit: async values => {
+            setIsSubmitting(true);
+            let res = await signup(values);
+            let message = await res.json();
+            if (res.status == 200) {
+                router.push(`/`);
+                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);
+            }
+
+        },
+    });
+
+    return (
+        <div><div className='grid grid-flow-col justify-stretch h-screen'>
+            <div className="right-login-part" style={{ background: "linear-gradient(041.61deg, #202020 7.15%, #000000 90.96%)" }} >
+                <div className='login-topbar m-10'>
+                    <Link prefetch href={getUriWithOrg(props.org.slug, "/")}>
+                        <Image quality={100} width={30} height={30} src={learnhouseIcon} alt="" />
+                    </Link>
+                </div>
+                <div className="ml-10 h-4/6 flex flex-row text-white">
+                    <div className="m-auto flex space-x-4 items-center flex-wrap">
+                        <div>Join </div>
+                        <div className="shadow-[0px_4px_16px_rgba(0,0,0,0.02)]" >
+                            {props.org?.logo ? (
+                                <img
+                                    src={`${getOrgLogoMediaDirectory(props.org.org_id, props.org?.logo)}`}
+                                    alt="Learnhouse"
+                                    style={{ width: "auto", height: 70 }}
+                                    className="rounded-md shadow-xl inset-0 ring-1 ring-inset ring-black/10 bg-white"
+                                />
+                            ) : (
+                                <Image quality={100} width={70} height={70} src={learnhouseIcon} alt="" />
+                            )}
+                        </div>
+                        <div className="font-bold text-xl">{props.org?.name}</div>
+                    </div>
+                </div>
+            </div>
+            <div className="left-login-part bg-white flex flex-row">
+                <div className="login-form m-auto w-72">
+                    {error && (
+                        <div className="flex justify-center bg-red-200 rounded-md text-red-950 space-x-2 items-center p-4 transition-all shadow-sm">
+                            <AlertTriangle size={18} />
+                            <div className="font-bold text-sm">{error}</div>
+                        </div>
+                    )}
+                    <FormLayout onSubmit={formik.handleSubmit}>
+                        <FormField name="email">
+                            <FormLabelAndMessage label='Email' message={formik.errors.email} />
+                            <Form.Control asChild>
+                                <Input onChange={formik.handleChange} value={formik.values.email} type="email" required />
+                            </Form.Control>
+                        </FormField>
+                        {/* for password  */}
+                        <FormField name="password">
+                            <FormLabelAndMessage label='Password' message={formik.errors.password} />
+
+                            <Form.Control asChild>
+                                <Input onChange={formik.handleChange} value={formik.values.password} type="password" required />
+                            </Form.Control>
+                        </FormField>
+                        {/* for username  */}
+                        <FormField name="username">
+                            <FormLabelAndMessage label='Username' message={formik.errors.username} />
+
+                            <Form.Control asChild>
+                                <Input onChange={formik.handleChange} value={formik.values.username} type="text" required />
+                            </Form.Control>
+                        </FormField>
+
+                        {/* for full name  */}
+                        <FormField name="full_name">
+                            <FormLabelAndMessage label='Full Name' message={formik.errors.full_name} />
+
+                            <Form.Control asChild>
+                                <Input onChange={formik.handleChange} value={formik.values.full_name} type="text" required />
+                            </Form.Control>
+
+                        </FormField>
+
+                        {/* for bio  */}
+                        <FormField name="bio">
+                            <FormLabelAndMessage label='Bio' message={formik.errors.bio} />
+
+                            <Form.Control asChild>
+                                <Textarea onChange={formik.handleChange} value={formik.values.bio} required />
+                            </Form.Control>
+                        </FormField>
+
+                        <div className="flex  py-4">
+                            <Form.Submit asChild>
+                                <button className="w-full bg-black text-white font-bold text-center p-2 rounded-md shadow-md hover:cursor-pointer" >
+                                    {isSubmitting ? "Loading..."
+                                        : "Create an account"}
+                                </button>
+                            </Form.Submit>
+                        </div>
+
+                    </FormLayout>
+                </div>
+            </div>
+        </div></div>
+    )
+}
+
+export default SignUpClient

apps/web/app/orgs/[orgslug]/template.tsx

@@ -0,0 +1,25 @@
+"use client";
+import { motion } from "framer-motion";
+export default function Template({ children }: { children: React.ReactNode }) {
+   
+  const variants = {
+    hidden: { opacity: 0, x: 0, y: 0 },
+    enter: { opacity: 1, x: 0, y: 0 },
+    exit: { opacity: 0, x: 0, y: 0 },
+  };
+
+  return (
+    <div>
+      <motion.main
+        variants={variants} // Pass the variant object into Framer Motion
+        initial="hidden" // Set the initial state to variants.hidden
+        animate="enter" // Animated state to variants.enter
+        exit="exit" // Exit state (used later) to variants.exit
+        transition={{ type: "linear" }} // Set the transition to linear
+        className=""
+      >
+        {children}
+      </motion.main>
+    </div>
+  );
+}

apps/web/app/page.tsx

@@ -0,0 +1,91 @@
+"use client";
+import type { NextPage } from "next";
+import { motion } from "framer-motion";
+import styled from "styled-components";
+import learnhouseBigIcon from "public/learnhouse_bigicon.png";
+import Image from "next/legacy/image";
+import Link from "next/link";
+
+export default function Home() {
+  return (
+    <HomePage>
+      <motion.div
+        initial={{ opacity: 0, y: 20 }}
+        animate={{ opacity: 1, y: 0 }}
+        transition={{
+          type: "spring",
+          stiffness: 260,
+          damping: 70,
+          delay: 0.2,
+        }}
+        exit={{ opacity: 1 }}
+      >
+        <Image alt="Learnhouse Icon" height={260} width={260} quality={100} src={learnhouseBigIcon}></Image>
+      </motion.div>
+      <br />
+      <br />
+      <br />
+      <br />
+      <motion.div
+        initial={{ opacity: 0, y: 20 }}
+        animate={{ opacity: 1, y: 0 }}
+        transition={{
+          type: "spring",
+          stiffness: 260,
+          damping: 70,
+          delay: 0.8,
+        }}
+        exit={{ opacity: 1 }}
+      >
+        <div>
+          <Link href={"/organizations"}>
+            <OrgsButton>See Organizations</OrgsButton>
+          </Link>
+          <br />
+          <br />
+          <Link href={"/login"}>
+            <OrgsButton>Login</OrgsButton>
+          </Link>
+        </div>
+      </motion.div>
+    </HomePage>
+  );
+};
+
+const OrgsButton = styled.button`
+  background: #151515;
+  border: 1px solid #e5e5e50a;
+  box-sizing: border-box;
+  border-radius: 4px;
+  padding: 10px 20px;
+  color: white;
+  font-size: 16px;
+  line-height: 24px;
+  margin: 0 10px;
+  margin: auto;
+  cursor: pointer;
+  font-family: "DM Sans";
+  font-weight: 500;
+  border-radius: 12px;
+  -webkit-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+  &:hover {
+    background: #191919;
+  }
+`;
+
+const HomePage = styled.div`
+  display: flex;
+  flex-direction: column;
+  background: linear-gradient(131.61deg, #202020 7.15%, #000000 90.96%);
+  justify-content: center;
+  align-items: center;
+  height: 100vh;
+  width: 100vw;
+  min-height: 100vh;
+  text-align: center;
+  img {
+    width: 60px;
+  }
+`;
+

apps/web/components/Objects/Activities/DocumentPdf/DocumentPdf.tsx

@@ -0,0 +1,19 @@
+import { getBackendUrl } from "@services/config/config";
+import { getActivityMediaDirectory } from "@services/media/media";
+import React from "react";
+
+function DocumentPdfActivity({ activity, course }: { activity: any; course: any }) {
+
+  return (
+    <div className="m-8 bg-zinc-900 rounded-md mt-14">
+      <iframe
+        className="rounded-lg w-full h-[900px]"
+        src={getActivityMediaDirectory(activity.org_id, activity.course_id, activity.activity_id, activity.content.documentpdf.filename, 'documentpdf')}
+      />
+    </div>
+  );
+}
+
+export default DocumentPdfActivity;
+
+

apps/web/components/Objects/Activities/DynamicCanva/DynamicCanva.tsx

@@ -0,0 +1,222 @@
+import { useEditor, EditorContent } from "@tiptap/react";
+import StarterKit from "@tiptap/starter-kit";
+import styled from "styled-components"
+import Youtube from "@tiptap/extension-youtube";
+// Custom Extensions
+import InfoCallout from "@components/Objects/Editor/Extensions/Callout/Info/InfoCallout";
+import WarningCallout from "@components/Objects/Editor/Extensions/Callout/Warning/WarningCallout";
+import ImageBlock from "@components/Objects/Editor/Extensions/Image/ImageBlock";
+import VideoBlock from "@components/Objects/Editor/Extensions/Video/VideoBlock";
+import MathEquationBlock from "@components/Objects/Editor/Extensions/MathEquation/MathEquationBlock";
+import PDFBlock from "@components/Objects/Editor/Extensions/PDF/PDFBlock";
+import { OrderedList } from "@tiptap/extension-ordered-list";
+import QuizBlock from "@components/Objects/Editor/Extensions/Quiz/QuizBlock";
+
+// Lowlight
+import { common, createLowlight } from 'lowlight'
+const lowlight = createLowlight(common)
+import CodeBlockLowlight from '@tiptap/extension-code-block-lowlight';
+import css from 'highlight.js/lib/languages/css'
+import js from 'highlight.js/lib/languages/javascript'
+import ts from 'highlight.js/lib/languages/typescript'
+import html from 'highlight.js/lib/languages/xml'
+import python from 'highlight.js/lib/languages/python'
+import java from 'highlight.js/lib/languages/java'
+
+
+interface Editor {
+  content: string;
+  activity: any;
+  //course: any;
+}
+
+function Canva(props: Editor) {
+  const isEditable = false;
+
+  // Code Block Languages for Lowlight
+  lowlight.register('html', html)
+  lowlight.register('css', css)
+  lowlight.register('js', js)
+  lowlight.register('ts', ts)
+  lowlight.register('python', python)
+  lowlight.register('java', java)
+
+
+  const editor: any = useEditor({
+    editable: isEditable,
+    extensions: [
+      StarterKit,
+      // Custom Extensions
+      InfoCallout.configure({
+        editable: isEditable,
+      }),
+      WarningCallout.configure({
+        editable: isEditable,
+      }),
+      ImageBlock.configure({
+        editable: isEditable,
+        activity: props.activity,
+      }),
+      VideoBlock.configure({
+        editable: true,
+        activity: props.activity,
+      }),
+      MathEquationBlock.configure({
+        editable: false,
+        activity: props.activity,
+      }),
+      PDFBlock.configure({
+        editable: true,
+        activity: props.activity,
+      }),
+      QuizBlock.configure({
+        editable: isEditable,
+        activity: props.activity,
+      }),
+      Youtube.configure({
+        controls: true,
+        modestBranding: true,
+      }),
+      OrderedList.configure(),
+      CodeBlockLowlight.configure({
+        lowlight,
+      }),
+
+    ],
+
+    content: props.content,
+  });
+
+  return (
+    <CanvaWrapper>
+      <EditorContent editor={editor} />
+    </CanvaWrapper>
+  );
+}
+
+const CanvaWrapper = styled.div`
+  width: 100%;
+  margin: 0 auto;
+
+  // disable chrome outline
+
+  .ProseMirror {
+
+    h1 {
+      font-size: 30px;  
+      font-weight: 600;
+      margin-bottom: 10px;
+    }
+
+    h2 {
+      font-size: 25px;
+      font-weight: 600;
+      margin-bottom: 10px;
+    }
+
+    h3 {
+      font-size: 20px;
+      font-weight: 600;
+      margin-bottom: 10px;
+    }
+
+    h4 {
+      font-size: 18px;
+      font-weight: 600;
+      margin-top: 10px;
+      margin-bottom: 10px;
+    }
+
+    h5 {
+      font-size: 16px;
+      font-weight: 600;
+      margin-top: 10px;
+      margin-bottom: 10px;
+    }
+
+    ul, ol {
+      padding: 0 1rem;
+      padding-left: 20px;
+      list-style-type: decimal;
+    }
+
+
+    &:focus {
+      outline: none !important;
+      outline-style: none !important;
+      box-shadow: none !important;
+    }
+
+    // Code Block
+    pre {
+    background: #0d0d0d;
+    border-radius: 0.5rem;
+    color: #fff;
+    font-family: "JetBrainsMono", monospace;
+    padding: 0.75rem 1rem;
+
+    code {
+      background: none;
+      color: inherit;
+      font-size: 0.8rem;
+      padding: 0;
+    }
+
+    .hljs-comment,
+    .hljs-quote {
+      color: #616161;
+    }
+
+    .hljs-variable,
+    .hljs-template-variable,
+    .hljs-attribute,
+    .hljs-tag,
+    .hljs-name,
+    .hljs-regexp,
+    .hljs-link,
+    .hljs-name,
+    .hljs-selector-id,
+    .hljs-selector-class {
+      color: #f98181;
+    }
+
+    .hljs-number,
+    .hljs-meta,
+    .hljs-built_in,
+    .hljs-builtin-name,
+    .hljs-literal,
+    .hljs-type,
+    .hljs-params {
+      color: #fbbc88;
+    }
+
+    .hljs-string,
+    .hljs-symbol,
+    .hljs-bullet {
+      color: #b9f18d;
+    }
+
+    .hljs-title,
+    .hljs-section {
+      color: #faf594;
+    }
+
+    .hljs-keyword,
+    .hljs-selector-tag {
+      color: #70cff8;
+    }
+
+    .hljs-emphasis {
+      font-style: italic;
+    }
+
+    .hljs-strong {
+      font-weight: 700;
+    }
+  }
+}
+
+
+`;
+
+export default Canva;

apps/web/components/Objects/Activities/Video/Video.tsx

@@ -0,0 +1,73 @@
+import { getBackendUrl } from "@services/config/config";
+import React from "react";
+import styled from "styled-components";
+import YouTube from 'react-youtube';
+import { getActivityMediaDirectory } from "@services/media/media";
+
+function VideoActivity({ activity, course }: { activity: any; course: any }) {
+  const [videoId, setVideoId] = React.useState('');
+  const [videoType, setVideoType] = 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.content.video) {
+      setVideoType('video');
+    }
+    if (activity.content.external_video) {
+      setVideoType('external_video');
+      setVideoId(getYouTubeEmbed(activity.content.external_video.uri).videoId);
+    }
+  }, [activity]);
+
+  return (
+    <div>
+      {videoType === 'video' && (
+        <div className="m-8 bg-zinc-900 rounded-md mt-14">
+          <video className="rounded-lg w-full h-[500px]" controls
+            src={getActivityMediaDirectory(activity.org_id, activity.course_id, activity.activity_id, activity.content.video.filename, 'video')}
+          ></video>
+
+        </div>
+      )}
+      {videoType === 'external_video' && (
+        <div>
+          <YouTube
+            className="rounded-md overflow-hidden m-8 bg-zinc-900  mt-14"
+            opts={
+              {
+                width: '1300',
+                height: '500',
+                playerVars: {
+                  autoplay: 0,
+                },
+
+              }
+            }
+            videoId={videoId} />
+        </div>
+      )}
+
+    </div>
+  );
+}
+
+
+
+
+export default VideoActivity;
+
+

apps/web/components/Objects/Editor/Editor.tsx

@@ -0,0 +1,448 @@
+'use client';
+import React from "react";
+import { useEditor, EditorContent } from "@tiptap/react";
+import StarterKit from "@tiptap/starter-kit";
+import { AuthContext } from "../../Security/AuthProvider";
+import learnhouseIcon from "public/learnhouse_icon.png";
+import { ToolbarButtons } from "./Toolbar/ToolbarButtons";
+import { motion } from "framer-motion";
+import Image from "next/image";
+import styled from "styled-components";
+import { DividerVerticalIcon, SlashIcon } from "@radix-ui/react-icons";
+import Avvvatars from "avvvatars-react";
+// extensions
+import InfoCallout from "./Extensions/Callout/Info/InfoCallout";
+import WarningCallout from "./Extensions/Callout/Warning/WarningCallout";
+import ImageBlock from "./Extensions/Image/ImageBlock";
+import Youtube from "@tiptap/extension-youtube";
+import VideoBlock from "./Extensions/Video/VideoBlock";
+import { Eye } from "lucide-react";
+import MathEquationBlock from "./Extensions/MathEquation/MathEquationBlock";
+import PDFBlock from "./Extensions/PDF/PDFBlock";
+import QuizBlock from "./Extensions/Quiz/QuizBlock";
+import ToolTip from "@components/StyledElements/Tooltip/Tooltip";
+import Link from "next/link";
+import { getCourseThumbnailMediaDirectory } from "@services/media/media";
+import { OrderedList } from "@tiptap/extension-ordered-list";
+
+
+// Lowlight
+import { common, createLowlight } from 'lowlight'
+const lowlight = createLowlight(common)
+import CodeBlockLowlight from '@tiptap/extension-code-block-lowlight';
+import css from 'highlight.js/lib/languages/css'
+import js from 'highlight.js/lib/languages/javascript'
+import ts from 'highlight.js/lib/languages/typescript'
+import html from 'highlight.js/lib/languages/xml'
+import python from 'highlight.js/lib/languages/python'
+import java from 'highlight.js/lib/languages/java'
+
+
+interface Editor {
+  content: string;
+  ydoc: any;
+  provider: any;
+  activity: any;
+  orgslug: string
+  course: any;
+  setContent: (content: string) => void;
+}
+
+function Editor(props: Editor) {
+  const auth: any = React.useContext(AuthContext);
+  // remove course_ from course_id
+  const course_id = props.course.course.course_id.substring(7);
+
+  // remove activity_ from activity_id
+  const activity_id = props.activity.activity_id.substring(9);
+
+  // Code Block Languages for Lowlight
+  lowlight.register('html', html)
+  lowlight.register('css', css)
+  lowlight.register('js', js)
+  lowlight.register('ts', ts)
+  lowlight.register('python', python)
+  lowlight.register('java', java)
+
+  const editor: any = useEditor({
+    editable: true,
+
+    extensions: [
+      StarterKit.configure({
+        // The Collaboration extension comes with its own history handling
+        // history: false,
+      }),
+      InfoCallout.configure({
+        editable: true,
+      }),
+      WarningCallout.configure({
+        editable: true,
+      }),
+      ImageBlock.configure({
+        editable: true,
+        activity: props.activity,
+      }),
+      VideoBlock.configure({
+        editable: true,
+        activity: props.activity,
+      }),
+      MathEquationBlock.configure({
+        editable: true,
+        activity: props.activity,
+      }),
+      PDFBlock.configure({
+        editable: true,
+        activity: props.activity,
+      }),
+      QuizBlock.configure({
+        editable: true,
+        activity: props.activity,
+      }),
+      Youtube.configure({
+        controls: true,
+        modestBranding: true,
+      }),
+      OrderedList.configure(),
+      CodeBlockLowlight.configure({
+        lowlight,
+      }),
+
+
+      // Register the document with Tiptap
+      // Collaboration.configure({
+      //   document: props.ydoc,
+      // }),
+      // Register the collaboration cursor extension
+      // CollaborationCursor.configure({
+      //   provider: props.provider,
+      //   user: {
+      //     name: auth.userInfo.username,
+      //     color: "#f783ac",
+      //   },
+      // }),
+    ],
+
+    content: props.content,
+  });
+
+  return (
+    <Page>
+      <motion.div
+        initial={{ opacity: 0, scale: 0.98 }}
+        animate={{ opacity: 1, scale: 1 }}
+        key="modal"
+        transition={{
+          type: "spring",
+          stiffness: 360,
+          damping: 70,
+          delay: 0.02,
+        }}
+        exit={{ opacity: 0 }}
+      >
+        <EditorTop className="fixed bg-white bg-opacity-95 backdrop-blur backdrop-brightness-125">
+          <EditorDocSection>
+            <EditorInfoWrapper>
+              <Link href="/">
+                <EditorInfoLearnHouseLogo width={25} height={25} src={learnhouseIcon} alt="" />
+              </Link>
+              <Link target="_blank" href={`/course/${course_id}/edit`}>
+                <EditorInfoThumbnail src={`${getCourseThumbnailMediaDirectory(props.course.course.org_id, props.course.course.course_id, props.course.course.thumbnail)}`} alt=""></EditorInfoThumbnail>
+              </Link>
+              <EditorInfoDocName>
+                {" "}
+                <b>{props.course.course.name}</b> <SlashIcon /> {props.activity.name}{" "}
+              </EditorInfoDocName>
+
+            </EditorInfoWrapper>
+            <EditorButtonsWrapper>
+              <ToolbarButtons editor={editor} />
+            </EditorButtonsWrapper>
+          </EditorDocSection>
+          <EditorUsersSection>
+            <EditorUserProfileWrapper>
+              {!auth.isAuthenticated && <span>Loading</span>}
+              {auth.isAuthenticated && <Avvvatars value={auth.userInfo.user_object.user_id} style="shape" />}
+            </EditorUserProfileWrapper>
+            <DividerVerticalIcon style={{ marginTop: "auto", marginBottom: "auto", color: "grey", opacity: '0.5' }} />
+            <EditorLeftOptionsSection className="space-x-2 pl-2 pr-3">
+              <div className="bg-sky-600 hover:bg-sky-700 transition-all ease-linear px-3 py-2 font-black text-sm shadow text-teal-100 rounded-lg hover:cursor-pointer" onClick={() => props.setContent(editor.getJSON())}> Save </div>
+              <ToolTip content="Preview">
+                <Link target="_blank" href={`/course/${course_id}/activity/${activity_id}`}>
+                  <div className="flex bg-neutral-600 hover:bg-neutral-700 transition-all ease-linear h-9 px-3 py-2 font-black justify-center items-center text-sm shadow text-neutral-100 rounded-lg hover:cursor-pointer">
+                    <Eye className="mx-auto items-center" size={15} />
+                  </div>
+                </Link>
+              </ToolTip>
+            </EditorLeftOptionsSection>
+          </EditorUsersSection>
+        </EditorTop>
+      </motion.div>
+      <motion.div
+        initial={{ opacity: 0, scale: 0.99 }}
+        animate={{ opacity: 1, scale: 1 }}
+        transition={{
+          type: "spring",
+          stiffness: 360,
+          damping: 70,
+          delay: 0.5,
+        }}
+        exit={{ opacity: 0 }}
+      >
+        <EditorContentWrapper>
+          <EditorContent editor={editor} />
+        </EditorContentWrapper>
+      </motion.div>
+    </Page>
+  );
+}
+
+const Page = styled.div`
+  height: 100vh;
+  width: 100%;
+  padding-top: 30px;
+
+  // dots background
+  background-image: radial-gradient(#4744446b 1px, transparent 1px), radial-gradient(#4744446b 1px, transparent 1px);
+  background-position: 0 0, 25px 25px;
+  background-size: 50px 50px;
+  background-attachment: fixed;
+  background-repeat: repeat;
+`;
+
+const EditorTop = styled.div`
+  border-radius: 15px;
+  margin: 40px;
+  margin-top: 0px;
+  margin-bottom: 20px;
+  padding: 10px;
+  display: flex;
+  justify-content: space-between;
+  box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.03);
+  position: fixed;
+  z-index: 303;
+  width: -webkit-fill-available;
+`;
+
+// Inside EditorTop
+const EditorDocSection = styled.div`
+  display: flex;
+  flex-direction: column;
+`;
+const EditorUsersSection = styled.div`
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+`;
+
+const EditorLeftOptionsSection = styled.div`
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+`;
+
+
+// Inside EditorDocSection
+const EditorInfoWrapper = styled.div`
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 5px;
+`;
+const EditorButtonsWrapper = styled.div``;
+
+// Inside EditorUsersSection
+const EditorUserProfileWrapper = styled.div`
+  padding-right: 8px;
+  svg {
+    border-radius: 7px;
+  }
+`;
+
+// Inside EditorInfoWrapper
+//..todo
+const EditorInfoLearnHouseLogo = styled(Image)`
+  border-radius: 6px;
+  margin-right: 0px;
+`;
+const EditorInfoDocName = styled.div`
+  font-size: 16px;
+  justify-content: center;
+  align-items: center;
+  display: flex;
+  margin-left: 10px;
+  color: #494949;
+
+  svg {
+    margin-left: 4px;
+    margin-right: 4px;
+    padding: 3px;
+    color: #353535;
+  }
+`;
+
+
+const EditorInfoThumbnail = styled.img`
+  height: 25px;
+  width: 56px;
+  object-fit: cover;
+  object-position: top;
+  border-radius: 7px;
+  margin-left: 5px;
+
+  &:hover {
+    cursor: pointer;
+  }
+`;
+
+export const EditorContentWrapper = styled.div`
+  margin: 40px;
+  margin-top: 90px;
+  background-color: white;
+  border-radius: 10px;
+  z-index: 300;
+  box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.03);
+
+  // disable chrome outline
+
+  .ProseMirror {
+
+    h1 {
+      font-size: 30px;  
+      font-weight: 600;
+      margin-top: 10px;
+      margin-bottom: 10px;
+    }
+
+    h2 {
+      font-size: 25px;
+      font-weight: 600;
+      margin-top: 10px;
+      margin-bottom: 10px;
+    }
+
+    h3 {
+      font-size: 20px;
+      font-weight: 600;
+      margin-top: 10px;
+      margin-bottom: 10px;
+    }
+
+    h4 {
+      font-size: 18px;
+      font-weight: 600;
+      margin-top: 10px;
+      margin-bottom: 10px;
+    }
+
+    h5 {
+      font-size: 16px;
+      font-weight: 600;
+      margin-top: 10px;
+      margin-bottom: 10px;
+    }
+
+    padding-left: 20px;
+    padding-right: 20px;
+    padding-bottom: 20px;
+    padding-top: 20px;
+
+    &:focus {
+      outline: none !important;
+      outline-style: none !important;
+      box-shadow: none !important;
+    }
+
+    // Code Block
+    pre {
+    background: #0d0d0d;
+    border-radius: 0.5rem;
+    color: #fff;
+    font-family: "JetBrainsMono", monospace;
+    padding: 0.75rem 1rem;
+
+    code {
+      background: none;
+      color: inherit;
+      font-size: 0.8rem;
+      padding: 0;
+    }
+
+    .hljs-comment,
+    .hljs-quote {
+      color: #616161;
+    }
+
+    .hljs-variable,
+    .hljs-template-variable,
+    .hljs-attribute,
+    .hljs-tag,
+    .hljs-name,
+    .hljs-regexp,
+    .hljs-link,
+    .hljs-name,
+    .hljs-selector-id,
+    .hljs-selector-class {
+      color: #f98181;
+    }
+
+    .hljs-number,
+    .hljs-meta,
+    .hljs-built_in,
+    .hljs-builtin-name,
+    .hljs-literal,
+    .hljs-type,
+    .hljs-params {
+      color: #fbbc88;
+    }
+
+    .hljs-string,
+    .hljs-symbol,
+    .hljs-bullet {
+      color: #b9f18d;
+    }
+
+    .hljs-title,
+    .hljs-section {
+      color: #faf594;
+    }
+
+    .hljs-keyword,
+    .hljs-selector-tag {
+      color: #70cff8;
+    }
+
+    .hljs-emphasis {
+      font-style: italic;
+    }
+
+    .hljs-strong {
+      font-weight: 700;
+    }
+  }
+
+  }
+
+  iframe {
+    border-radius: 6px;
+    border: none;
+    min-width: 200px;
+    width: 100%;
+    height: 440px;
+    min-height: 200px;
+    display: block;
+    outline: 0px solid transparent;
+  }
+
+  ul, ol {
+    padding: 0 1rem;
+    padding-left: 20px;
+    list-style-type: decimal;
+  }
+
+  
+  
+
+`;
+
+export default Editor;

apps/web/components/Objects/Editor/EditorWrapper.tsx

@@ -0,0 +1,58 @@
+'use client';
+import { default as React, } from "react";
+import * as Y from "yjs";
+import Editor from "./Editor";
+import { updateActivity } from "@services/courses/activities";
+import { toast } from "react-hot-toast";
+import Toast from "@components/StyledElements/Toast/Toast";
+
+interface EditorWrapperProps {
+  content: string;
+  activity: any;
+  course: any
+  orgslug: string;
+}
+
+function EditorWrapper(props: EditorWrapperProps): JSX.Element {
+  // A new Y document
+  const ydoc = new Y.Doc();
+  const [providerState, setProviderState] = React.useState<any>({});
+  const [ydocState, setYdocState] = React.useState<any>({});
+  const [isLoading, setIsLoading] = React.useState(true);
+
+  function createRTCProvider() {
+    // const provider = new WebrtcProvider(props.activity.activity_id, ydoc);
+    // setYdocState(ydoc);
+    // setProviderState(provider);
+    setIsLoading(false);
+  }
+
+
+
+  async function setContent(content: any) {
+    let activity = props.activity;
+    activity.content = content;
+
+    toast.promise(
+      updateActivity(activity, activity.activity_id),
+      {
+        loading: 'Saving...',
+        success: <b>Activity saved!</b>,
+        error: <b>Could not save.</b>,
+      }
+    );
+  }
+
+  if (isLoading) {
+    createRTCProvider();
+    return <div>Loading...</div>;
+  } else {
+    return <>
+      <Toast></Toast>
+      <Editor orgslug={props.orgslug} course={props.course} activity={props.activity} content={props.content} setContent={setContent} provider={providerState} ydoc={ydocState}></Editor>;
+
+    </>
+  }
+}
+
+export default EditorWrapper;

apps/web/components/Objects/Editor/Extensions/Callout/Info/InfoCallout.ts

@@ -0,0 +1,29 @@
+import { mergeAttributes, Node } from "@tiptap/core";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+
+import InfoCalloutComponent from "./InfoCalloutComponent";
+
+export default Node.create({
+  name: "calloutInfo",
+  group: "block",
+  draggable: true,
+  content: "text*",
+
+  // TODO : multi line support
+
+  parseHTML() {
+    return [
+      {
+        tag: "callout-info",
+      },
+    ];
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return ["callout-info", mergeAttributes(HTMLAttributes), 0];
+  },
+
+  addNodeView() {
+    return ReactNodeViewRenderer(InfoCalloutComponent);
+  },
+});

apps/web/components/Objects/Editor/Extensions/Callout/Info/InfoCalloutComponent.tsx

@@ -0,0 +1,31 @@
+import { NodeViewContent, NodeViewWrapper } from "@tiptap/react";
+import { AlertCircle } from "lucide-react";
+import React from "react";
+import styled from "styled-components";
+
+function InfoCalloutComponent(props: any) {
+  return (
+    <NodeViewWrapper>
+      <InfoCalloutWrapper className="flex space-x-2 items-center bg-blue-200 rounded-lg text-blue-900 px-3 shadow-inner" contentEditable={props.extension.options.editable}>
+        <AlertCircle /> <NodeViewContent contentEditable={props.extension.options.editable} className="content" />
+      </InfoCalloutWrapper>
+    </NodeViewWrapper>
+  );
+}
+
+const InfoCalloutWrapper = styled.div`
+  svg{
+    padding: 3px;
+  }
+
+  .content {
+    margin: 5px;
+    padding: 0.5rem;
+    border: ${(props) => (props.contentEditable ? "2px dashed #1f3a8a12" : "none")};
+    border-radius: 0.5rem;
+  }
+`;
+
+
+
+export default InfoCalloutComponent;

apps/web/components/Objects/Editor/Extensions/Callout/Warning/WarningCallout.ts

@@ -0,0 +1,31 @@
+import { mergeAttributes, Node } from "@tiptap/core";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+
+import WarningCalloutComponent from "./WarningCalloutComponent";
+
+export default Node.create({
+  name: "calloutWarning",
+  group: "block",
+  draggable: true,
+  content: "text*",
+  marks: "",
+  defining: true,
+
+  // TODO : multi line support
+
+  parseHTML() {
+    return [
+      {
+        tag: "callout-warning",
+      },
+    ];
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return ["callout-info", mergeAttributes(HTMLAttributes), 0];
+  },
+
+  addNodeView() {
+    return ReactNodeViewRenderer(WarningCalloutComponent);
+  },
+});

apps/web/components/Objects/Editor/Extensions/Callout/Warning/WarningCalloutComponent.tsx

@@ -0,0 +1,41 @@
+import { NodeViewContent, NodeViewWrapper } from "@tiptap/react";
+import { AlertTriangle } from "lucide-react";
+import React from "react";
+import styled from "styled-components";
+
+function WarningCalloutComponent(props: any) {
+  return (
+    <NodeViewWrapper>
+      <CalloutWrapper className="flex space-x-2 items-center bg-yellow-200 rounded-lg text-yellow-900 px-3 shadow-inner" contentEditable={props.extension.options.editable}>
+        <AlertTriangle /> <NodeViewContent contentEditable={props.extension.options.editable} className="content" />
+      </CalloutWrapper>
+    </NodeViewWrapper>
+  );
+}
+
+const CalloutWrapper = styled.div`
+  
+
+  svg {
+    padding: 3px;
+  }
+
+  .content {
+    margin: 5px;
+    padding: 0.5rem;
+    border: ${(props) => (props.contentEditable ? "2px dashed #713f1117" : "none")};
+    border-radius: 0.5rem;
+  }
+`;
+
+const DragHandle = styled.div`
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 1rem;
+  height: 100%;
+  cursor: move;
+  z-index: 1;
+`;
+
+export default WarningCalloutComponent;

apps/web/components/Objects/Editor/Extensions/Image/ImageBlock.ts

@@ -0,0 +1,38 @@
+import { mergeAttributes, Node } from "@tiptap/core";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+
+import ImageBlockComponent from "./ImageBlockComponent";
+
+export default Node.create({
+  name: "blockImage",
+  group: "block",
+
+  atom: true,
+
+  addAttributes() {
+    return {
+      blockObject: {
+        default: null,
+      },
+      size: {
+        width: 300,
+      },
+    };
+  },
+
+  parseHTML() {
+    return [
+      {
+        tag: "block-image",
+      },
+    ];
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return ["block-image", mergeAttributes(HTMLAttributes), 0];
+  },
+
+  addNodeView() {
+    return ReactNodeViewRenderer(ImageBlockComponent);
+  },
+});

apps/web/components/Objects/Editor/Extensions/Image/ImageBlockComponent.tsx

@@ -0,0 +1,115 @@
+import { NodeViewWrapper } from "@tiptap/react";
+import React from "react";
+import styled from "styled-components";
+import { Resizable } from 're-resizable';
+import { AlertTriangle, Image, Loader } from "lucide-react";
+import { uploadNewImageFile } from "../../../../../services/blocks/Image/images";
+import { UploadIcon } from "@radix-ui/react-icons";
+import { getActivityBlockMediaDirectory } from "@services/media/media";
+
+function ImageBlockComponent(props: any) {
+  const [image, setImage] = React.useState(null);
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [blockObject, setblockObject] = React.useState(props.node.attrs.blockObject);
+  const [imageSize, setImageSize] = React.useState({ width: props.node.attrs.size ? props.node.attrs.size.width : 300 });
+  const fileId = blockObject ? `${blockObject.block_data.file_id}.${blockObject.block_data.file_format}` : null;
+
+  const handleImageChange = (event: React.ChangeEvent<any>) => {
+    setImage(event.target.files[0]);
+  };
+
+  const handleSubmit = async (e: any) => {
+    e.preventDefault();
+    setIsLoading(true);
+    let object = await uploadNewImageFile(image, props.extension.options.activity.activity_id);
+    setIsLoading(false);
+    setblockObject(object);
+    props.updateAttributes({
+      blockObject: object,
+      size: imageSize,
+    });
+  };
+
+  return (
+    <NodeViewWrapper className="block-image">
+      {!blockObject && props.extension.options.editable && (
+        <BlockImageWrapper className="flex items-center space-x-3 py-7 bg-gray-50 rounded-xl text-gray-900 px-3 border-dashed border-gray-150 border-2" contentEditable={props.extension.options.editable}>
+          {isLoading ? (
+            <Loader className="animate-spin animate-pulse text-gray-200" size={50} />
+          ) : (
+            <>
+              <div>
+                <Image className="text-gray-200" size={50} />
+              </div>
+              <input className="p-3 rounded-lg file:mr-4 file:py-2 file:px-4 file:rounded-full file:border-0 hover:file:cursor-pointer  file:bg-gray-200 cursor-pointer file:text-gray-500" onChange={handleImageChange} type="file" name="" id="" />
+              <button className='p-2 px-3 bg-gray-200 rounded-lg text-gray-500 hover:bg-gray-300 transition space-x-2 items-center flex' onClick={handleSubmit}><UploadIcon></UploadIcon><p>Submit</p></button>
+            </>
+          )}
+        </BlockImageWrapper>
+      )}
+      {blockObject && (
+        <Resizable defaultSize={{ width: imageSize.width, height: "100%" }}
+          handleStyles={{
+            right: { position: 'unset', width: 7, height: 30, borderRadius: 20, cursor: 'col-resize', backgroundColor: 'black', opacity: '0.3', margin: 'auto', marginLeft:5 },
+
+          }}
+          style={{ margin: "auto", display: "flex", justifyContent: "center", alignItems: "center", height: "100%"  }}
+          maxWidth={1000}
+          minWidth={200}
+          onResizeStop={(e, direction, ref, d) => {
+            props.updateAttributes({
+              size: {
+                width: imageSize.width + d.width,
+              }
+            });
+            setImageSize({
+              width: imageSize.width + d.width,
+            });
+          }}
+        >
+
+            <img
+              src={`${getActivityBlockMediaDirectory(props.extension.options.activity.org_id,
+                props.extension.options.activity.course_id,
+                props.extension.options.activity.activity_id,
+                blockObject.block_id,
+                blockObject ? fileId : ' ', 'imageBlock')}`}
+              alt=""
+              className="rounded-lg shadow "
+            />
+
+
+        </Resizable>
+      )}
+      {isLoading && (
+        <div>
+          <AlertTriangle color="#e1e0e0" size={50} />
+        </div>
+      )}
+    </NodeViewWrapper>
+  );
+}
+
+export default ImageBlockComponent;
+
+const BlockImageWrapper = styled.div`
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  font-size: 14px;
+  
+`;
+
+const BlockImage = styled.div`
+  display: flex;
+  
+
+  // center
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  font-size: 14px;
+
+  
+  
+`;

apps/web/components/Objects/Editor/Extensions/MathEquation/MathEquationBlock.ts

@@ -0,0 +1,35 @@
+import { mergeAttributes, Node } from "@tiptap/core";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+
+import MathEquationBlockComponent from "./MathEquationBlockComponent";
+
+export default Node.create({
+  name: "blockMathEquation",
+  group: "block",
+
+  atom: true,
+
+  addAttributes() {
+    return {
+      math_equation: {
+        default: "",
+      },
+    };
+  },
+
+  parseHTML() {
+    return [
+      {
+        tag: "block-math-equation",
+      },
+    ];
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return ["block-math-equation", mergeAttributes(HTMLAttributes), 0];
+  },
+
+  addNodeView() {
+    return ReactNodeViewRenderer(MathEquationBlockComponent);
+  },
+});

apps/web/components/Objects/Editor/Extensions/MathEquation/MathEquationBlockComponent.tsx

@@ -0,0 +1,93 @@
+import { NodeViewWrapper } from "@tiptap/react";
+import React from "react";
+import styled from "styled-components";
+import "katex/dist/katex.min.css";
+import { InlineMath, BlockMath } from "react-katex";
+import { Edit, Save } from "lucide-react";
+import Link from "next/link";
+
+function MathEquationBlockComponent(props: any) {
+  const [equation, setEquation] = React.useState(props.node.attrs.math_equation);
+  const [isEditing, setIsEditing] = React.useState(true);
+  const isEditable = props.extension.options.editable;
+
+  const handleEquationChange = (event: React.ChangeEvent<any>) => {
+    setEquation(event.target.value);
+    props.updateAttributes({
+      math_equation: equation,
+    });
+  };
+
+  const saveEquation = () => {
+    props.updateAttributes({
+      math_equation: equation,
+    });
+    //setIsEditing(false);
+  };
+
+  return (
+    <NodeViewWrapper className="block-math-equation">
+      <MathEqWrapper className="flex flex-col space-y-2 bg-gray-50 shadow-inner rounded-lg py-7 px-5">
+        <BlockMath>{equation}</BlockMath>
+        {isEditing && isEditable && (
+          <>
+            <EditBar>
+              <input value={equation} onChange={handleEquationChange} placeholder="Insert a Math Equation (LaTeX) " type="text" />
+              <button className="opacity-1" onClick={() => saveEquation()}>
+                <Save size={15}></Save>
+              </button>
+            </EditBar>
+            <span className="pt-2 text-zinc-500 text-sm">Please refer to this <Link className="text-zinc-900 after:content-['↗']" href="https://katex.org/docs/supported.html" target="_blank"> guide</Link> for supported TeX functions </span>
+          </>
+
+        )}
+      </MathEqWrapper>
+    </NodeViewWrapper>
+  );
+}
+
+export default MathEquationBlockComponent;
+
+const MathEqWrapper = styled.div`
+`;
+
+const EditBar = styled.div`
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+  background-color: white;
+  border-radius: 10px;
+  padding: 5px;
+  color: #5252528d;
+  align-items: center;
+  justify-content: space-between;
+  height: 50px;
+  border: solid 1px #52525224;
+
+  button {
+    margin-left: 10px;
+    margin-right: 7px;
+    cursor: pointer;
+    border: none;
+    background: none;
+    font-size: 14px;
+    color: #494949;
+  }
+
+  input {
+    border: none;
+    background: none;
+    font-size: 14px;
+    color: #494949;
+    width: 100%;
+    font-family: "DM Sans", sans-serif;
+    padding-left: 10px;
+    &:focus {
+      outline: none;
+    }
+
+    &::placeholder {
+      color: #49494936;
+    }
+  }
+`;

apps/web/components/Objects/Editor/Extensions/PDF/PDFBlock.ts

@@ -0,0 +1,35 @@
+import { mergeAttributes, Node } from "@tiptap/core";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+
+import PDFBlockComponent from "./PDFBlockComponent";
+
+export default Node.create({
+  name: "blockPDF",
+  group: "block",
+
+  atom: true,
+
+  addAttributes() {
+    return {
+      blockObject: {
+        default: null,
+      },
+    };
+  },
+
+  parseHTML() {
+    return [
+      {
+        tag: "block-pdf",
+      },
+    ];
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return ["block-pdf", mergeAttributes(HTMLAttributes), 0];
+  },
+
+  addNodeView() {
+    return ReactNodeViewRenderer(PDFBlockComponent);
+  },
+});

apps/web/components/Objects/Editor/Extensions/PDF/PDFBlockComponent.tsx

@@ -0,0 +1,91 @@
+import { NodeViewWrapper } from "@tiptap/react";
+import React from "react";
+import styled from "styled-components";
+import { AlertCircle, AlertTriangle, FileText, Image, ImagePlus, Info, Loader } from "lucide-react";
+import { getPDFFile, uploadNewPDFFile } from "../../../../../services/blocks/Pdf/pdf";
+import { getBackendUrl } from "../../../../../services/config/config";
+import { UploadIcon } from "@radix-ui/react-icons";
+import { getActivityBlockMediaDirectory } from "@services/media/media";
+
+function PDFBlockComponent(props: any) {
+  const [pdf, setPDF] = React.useState(null);
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [blockObject, setblockObject] = React.useState(props.node.attrs.blockObject);
+  const fileId = blockObject ? `${blockObject.block_data.file_id}.${blockObject.block_data.file_format}` : null;
+
+  const handlePDFChange = (event: React.ChangeEvent<any>) => {
+    setPDF(event.target.files[0]);
+  };
+
+  const handleSubmit = async (e: any) => {
+    e.preventDefault();
+    setIsLoading(true);
+    let object = await uploadNewPDFFile(pdf, props.extension.options.activity.activity_id);
+    setIsLoading(false);
+    setblockObject(object);
+    props.updateAttributes({
+      blockObject: object,
+    });
+  };
+
+  return (
+    <NodeViewWrapper className="block-pdf">
+      {!blockObject && (
+        <BlockPDFWrapper className="flex items-center space-x-3 py-7 bg-gray-50 rounded-xl text-gray-900 px-3 border-dashed border-gray-150 border-2" contentEditable={props.extension.options.editable}>
+          {isLoading ? (
+            <Loader className="animate-spin animate-pulse text-gray-200" size={50} />
+          ) : (
+            <>
+              <div>
+                <FileText className="text-gray-200" size={50} />
+              </div>
+              <input className="p-3 rounded-lg file:mr-4 file:py-2 file:px-4 file:rounded-full file:border-0 hover:file:cursor-pointer  file:bg-gray-200 cursor-pointer file:text-gray-500" onChange={handlePDFChange} type="file" name="" id="" />
+              <button className='p-2 px-3 bg-gray-200 rounded-lg text-gray-500 hover:bg-gray-300 transition space-x-2 items-center flex' onClick={handleSubmit}><UploadIcon></UploadIcon><p>Submit</p></button>
+            </>
+          )}
+        </BlockPDFWrapper>
+      )}
+      {blockObject && (
+        <BlockPDF>
+          <iframe
+            className="shadow rounded-lg h-96 w-full object-scale-down bg-black"
+            src={`${getActivityBlockMediaDirectory(props.extension.options.activity.org_id,
+              props.extension.options.activity.course_id,
+              props.extension.options.activity.activity_id,
+              blockObject.block_id,
+              blockObject ? fileId : ' ', 'pdfBlock')}`}
+          />
+        </BlockPDF>
+      )}
+      {isLoading && (
+        <div>
+          <AlertTriangle color="#e1e0e0" size={50} />
+        </div>
+      )}
+    </NodeViewWrapper>
+  );
+}
+
+export default PDFBlockComponent;
+
+const BlockPDFWrapper = styled.div`
+  
+  // center
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  font-size: 14px;
+`;
+
+const BlockPDF = styled.div`
+  display: flex;
+  flex-direction: column;
+  img {
+    width: 100%;
+    border-radius: 6px;
+    height: 300px;
+    // cover
+    object-fit: cover;
+  }
+`;
+const PDFNotFound = styled.div``;

apps/web/components/Objects/Editor/Extensions/Quiz/QuizBlock.ts

@@ -0,0 +1,37 @@
+import { mergeAttributes, Node } from "@tiptap/core";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+
+import QuizBlockComponent from "./QuizBlockComponent";
+
+export default Node.create({
+  name: "blockQuiz",
+  group: "block",
+  atom: true,
+
+  addAttributes() {
+    return {
+      quizId: {
+        value: null,
+      },
+      questions: {
+        default: [],
+      },
+    };
+  },
+
+  parseHTML() {
+    return [
+      {
+        tag: "block-quiz",
+      },
+    ];
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return ["block-quiz", mergeAttributes(HTMLAttributes), 0];
+  },
+
+  addNodeView() {
+    return ReactNodeViewRenderer(QuizBlockComponent);
+  },
+});

apps/web/components/Objects/Editor/Extensions/Quiz/QuizBlockComponent.tsx

@@ -0,0 +1,323 @@
+import { NodeViewWrapper } from "@tiptap/react";
+import { v4 as uuidv4 } from "uuid";
+import { twJoin, twMerge } from 'tailwind-merge'
+import React from "react";
+import { BadgeHelp, Check, Info, Minus, MoreVertical, Plus, RefreshCcw, X } from "lucide-react";
+import ReactConfetti from "react-confetti";
+
+interface Answer {
+  answer_id: string;
+  answer: string;
+  correct: boolean;
+}
+interface Question {
+  question_id: string;
+  question: string;
+  type: "multiple_choice" | 'custom_answer'
+  answers: Answer[];
+}
+
+function QuizBlockComponent(props: any) {
+  const [questions, setQuestions] = React.useState(props.node.attrs.questions) as [Question[], any];
+  const [userAnswers, setUserAnswers] = React.useState([]) as [any[], any];
+  const [submitted, setSubmitted] = React.useState(false) as [boolean, any];
+  const [submissionMessage, setSubmissionMessage] = React.useState("") as [string, any];
+  const isEditable = props.extension.options.editable;
+
+  const handleAnswerClick = (question_id: string, answer_id: string) => {
+    // if the quiz is submitted, do nothing
+    if (submitted) {
+      return;
+    }
+
+    const userAnswer = {
+      question_id: question_id,
+      answer_id: answer_id
+    }
+    const newAnswers = [...userAnswers, userAnswer];
+
+    // only accept one answer per question
+    const filteredAnswers = newAnswers.filter((answer: any) => answer.question_id !== question_id);
+
+    setUserAnswers([...filteredAnswers, userAnswer]);
+
+  }
+
+  const refreshUserSubmission = () => {
+    setUserAnswers([]);
+    setSubmitted(false);
+  }
+
+  const handleUserSubmission = () => {
+
+    if (userAnswers.length === 0) {
+      setSubmissionMessage("Please answer at least one question!");
+      return;
+    }
+
+    setSubmitted(true);
+
+    // check if all submitted answers are correct
+    const correctAnswers = questions.map((question: Question) => {
+      const correctAnswer: any = question.answers.find((answer: Answer) => answer.correct);
+      const userAnswer = userAnswers.find((userAnswer: any) => userAnswer.question_id === question.question_id);
+      if (correctAnswer.answer_id === userAnswer.answer_id) {
+        return true;
+      } else {
+        return false;
+      }
+    });
+
+    // check if all answers are correct
+    const allCorrect = correctAnswers.every((answer: boolean) => answer === true);
+
+    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!");
+    }
+
+
+
+  }
+
+  const getAnswerID = (answerIndex: number, questionId : string) => {
+    const alphabet = Array.from({ length: 26 }, (_, i) => String.fromCharCode('A'.charCodeAt(0) + i));
+    let alphabetID =  alphabet[answerIndex];
+
+    // Get question index
+    const questionIndex = questions.findIndex((question: Question) => question.question_id === questionId);
+    let questionID = questionIndex + 1;
+
+    return `${alphabetID}`;
+  }
+
+  const saveQuestions = (questions: any) => {
+    props.updateAttributes({
+      questions: questions,
+    });
+    setQuestions(questions);
+
+  };
+  const addSampleQuestion = () => {
+    const newQuestion = {
+      question_id: uuidv4(),
+      question: "",
+      type: "multiple_choice",
+      answers: [
+        {
+          answer_id: uuidv4(),
+          answer: "",
+          correct: false
+        },
+      ]
+    }
+    setQuestions([...questions, newQuestion]);
+  }
+
+  const addAnswer = (question_id: string) => {
+    const newAnswer = {
+      answer_id: uuidv4(),
+      answer: "",
+      correct: false
+    }
+
+    // check if there is already more thqn 5 answers
+    const question: any = questions.find((question: Question) => question.question_id === question_id);
+    if (question.answers.length >= 5) {
+      return;
+    }
+
+
+
+    const newQuestions = questions.map((question: Question) => {
+      if (question.question_id === question_id) {
+        question.answers.push(newAnswer);
+      }
+      return question;
+    });
+
+    saveQuestions(newQuestions);
+  }
+
+  const changeAnswerValue = (question_id: string, answer_id: string, value: string) => {
+    const newQuestions = questions.map((question: Question) => {
+      if (question.question_id === question_id) {
+        question.answers.map((answer: Answer) => {
+          if (answer.answer_id === answer_id) {
+            answer.answer = value;
+          }
+          return answer;
+        });
+      }
+      return question;
+    });
+    saveQuestions(newQuestions);
+  }
+
+  const changeQuestionValue = (question_id: string, value: string) => {
+    const newQuestions = questions.map((question: Question) => {
+      if (question.question_id === question_id) {
+        question.question = value;
+      }
+      return question;
+    });
+    saveQuestions(newQuestions);
+  }
+
+  const deleteQuestion = (question_id: string) => {
+    const newQuestions = questions.filter((question: Question) => question.question_id !== question_id);
+    saveQuestions(newQuestions);
+  }
+
+  const deleteAnswer = (question_id: string, answer_id: string) => {
+    const newQuestions = questions.map((question: Question) => {
+      if (question.question_id === question_id) {
+        question.answers = question.answers.filter((answer: Answer) => answer.answer_id !== answer_id);
+      }
+      return question;
+    });
+    saveQuestions(newQuestions);
+  }
+
+  const markAnswerCorrect = (question_id: string, answer_id: string) => {
+    const newQuestions = questions.map((question: Question) => {
+      if (question.question_id === question_id) {
+        question.answers.map((answer: Answer) => {
+          if (answer.answer_id === answer_id) {
+            answer.correct = true;
+          } else {
+            answer.correct = false;
+          }
+
+          return answer;
+        });
+      }
+      return question;
+    });
+    saveQuestions(newQuestions);
+  }
+
+
+  return (
+    <NodeViewWrapper className="block-quiz">
+
+      <div
+        //style={{ background: "radial-gradient(152.15% 150.08% at 56.45% -6.67%, rgba(180, 255, 250, 0.10) 5.53%, rgba(202, 201, 255, 0.10) 66.76%)" }}
+        className="rounded-xl px-5 py-2 bg-slate-100 transition-all ease-linear"
+      >
+        <div className="flex space-x-2 pt-1 items-center text-sm overflow-hidden">
+          {(submitted && submissionMessage == "All answers are correct!") &&
+            <ReactConfetti
+              numberOfPieces={submitted ? 1400 : 0}
+              recycle={false}
+              className="w-full h-screen"
+            />
+          }
+          <div className="flex space-x-2 items-center text-sm">
+            <BadgeHelp className='text-slate-400' size={15} />
+            <p className="uppercase tracking-widest text-xs font-bold py-1 text-slate-400">Quiz</p>
+          </div>
+          <div className="grow flex items-center justify-center">
+
+          </div>
+          {isEditable ?
+            <div>
+              <button onClick={addSampleQuestion} className="bg-slate-200 hover:bg-slate-300 text-slate-800 font-bold py-1 px-2 rounded-lg text-xs">Add Question</button>
+            </div>
+            :
+            <div className="flex space-x-1 items-center">
+              <div onClick={() => refreshUserSubmission()} className="cursor-pointer px-2">
+                <RefreshCcw className='text-slate-400 cursor-pointer' size={15} />
+              </div>
+              <button onClick={() => handleUserSubmission()} className="bg-slate-200 hover:bg-slate-300 text-slate-800 font-bold py-1 px-2 rounded-lg text-xs">Submit</button>
+            </div>
+          }
+        </div>
+
+        {questions.map((question: Question) => (
+          <div key={question.question_id} className="pt-1 space-y-2">
+            <div className="question">
+              <div className="flex space-x-2 items-center">
+                <div className="flex-grow">
+                  {isEditable ?
+                    <input value={question.question} placeholder="Your Question" onChange={(e) => changeQuestionValue(question.question_id, e.target.value)} className="text-slate-800 bg-[#00008b00] border-2 border-gray-200 rounded-md border-dotted text-md font-bold w-full"></input>
+                    :
+                    <p className="text-slate-800 bg-[#00008b00] rounded-md text-md font-bold w-full">{question.question}</p>
+                  }
+                </div>
+                {isEditable &&
+                  <div
+                    onClick={() => deleteQuestion(question.question_id)}
+                    className="w-[20px] flex-none flex items-center h-[20px] rounded-lg bg-slate-200 hover:bg-slate-300 text-sm transition-all ease-linear cursor-pointer">
+                    <Minus
+                      className="mx-auto text-slate-400" size={12} />
+                  </div>
+                }
+              </div>
+              <div className="answers flex py-2 space-x-3">
+                {question.answers.map((answer: Answer) => (
+                  <div
+                    key={answer.answer_id}
+                    className={twMerge(
+                      'outline outline-3 pr-2 shadow w-full flex items-center space-x-2 h-[30px] bg-opacity-50 hover:bg-opacity-100 hover:shadow-md rounded-s rounded-lg bg-white text-sm hover:scale-105 active:scale-110 duration-150 cursor-pointer ease-linear',
+                      answer.correct && isEditable ? 'outline-lime-300' : 'outline-white',
+                      userAnswers.find((userAnswer: any) => (userAnswer.question_id === question.question_id && userAnswer.answer_id === answer.answer_id) && !isEditable) ? 'outline-slate-300' : '',
+                      (submitted && answer.correct) ? 'outline-lime-300 text-lime' : '',
+                      (submitted && !answer.correct) && userAnswers.find((userAnswer: any) => userAnswer.question_id === question.question_id && userAnswer.answer_id === answer.answer_id) ? 'outline-red-400' : '',
+                    )
+                    }
+                    onClick={() => handleAnswerClick(question.question_id, answer.answer_id)}
+                  >
+                    <div className={twMerge(
+                      "bg-white font-bold  text-base flex items-center h-full w-[40px] rounded-l-md text-slate-800",
+                      answer.correct && isEditable ? 'bg-lime-300 text-lime-800 outline-none' : 'bg-white',
+                      (submitted && answer.correct) ? 'bg-lime-300 text-lime-800 outline-none' : '',
+                      (submitted && !answer.correct) && userAnswers.find((userAnswer: any) => userAnswer.question_id === question.question_id && userAnswer.answer_id === answer.answer_id) ? 'bg-red-400 text-red-800 outline-none' : '',
+                      )}>
+                      <p className="mx-auto font-bold text-sm ">{getAnswerID(question.answers.indexOf(answer),question.question_id)}</p>
+                    </div>
+                    {isEditable ?
+                      <input value={answer.answer} onChange={(e) => changeAnswerValue(question.question_id, answer.answer_id, e.target.value)} placeholder="Answer" className="w-full mx-2 px-3 pr-6 text-neutral-600 bg-[#00008b00] border-2 border-gray-200 rounded-md border-dotted text-sm font-bold"></input>
+                      :
+                      <p className="w-full mx-2 px-3 pr-6 text-neutral-600 bg-[#00008b00] rounded-md ext-sm font-bold">{answer.answer}</p>
+                    }
+                    {isEditable &&
+                      <div className="flex space-x-1 items-center">
+                        <div
+                          onClick={() => markAnswerCorrect(question.question_id, answer.answer_id)}
+                          className="w-[20px] flex-none flex items-center h-[20px] rounded-lg bg-lime-300 hover:bg-lime-400 transition-all ease-linear text-sm cursor-pointer ">
+                          <Check
+                            className="mx-auto text-lime-800" size={12} />
+                        </div>
+                        <div
+                          onClick={() => deleteAnswer(question.question_id, answer.answer_id)}
+                          className="w-[20px] flex-none flex items-center h-[20px] rounded-lg bg-slate-200 hover:bg-slate-300 text-sm transition-all ease-linear cursor-pointer">
+                          <Minus
+                            className="mx-auto text-slate-400" size={12} />
+                        </div>
+                      </div>
+                    }
+
+                  </div>
+                ))}
+                {isEditable &&
+                  <div onClick={() => addAnswer(question.question_id)} className="outline outline-3 w-[30px] flex-none flex items-center h-[30px] outline-white hover:bg-opacity-100 hover:shadow-md rounded-lg bg-white text-sm hover:scale-105 active:scale-110 duration-150 cursor-pointer ease-linear">
+                    <Plus className="mx-auto text-slate-800" size={15} />
+                  </div>
+                }
+              </div>
+            </div>
+          </div>
+        ))}
+
+      </div>
+    </NodeViewWrapper>
+  );
+}
+
+
+export default QuizBlockComponent;

apps/web/components/Objects/Editor/Extensions/Video/VideoBlock.ts

@@ -0,0 +1,34 @@
+import { mergeAttributes, Node } from "@tiptap/core";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+
+import VideoBlockComponent from "./VideoBlockComponent";
+
+export default Node.create({
+  name: "blockVideo",
+  group: "block",
+  atom: true,
+  
+  addAttributes() {
+    return {
+      blockObject: {
+        default: null,
+      },
+    };
+  },
+
+  parseHTML() {
+    return [
+      {
+        tag: "block-video",
+      },
+    ];
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return ["block-video", mergeAttributes(HTMLAttributes), 0];
+  },
+
+  addNodeView() {
+    return ReactNodeViewRenderer(VideoBlockComponent);
+  },
+});

apps/web/components/Objects/Editor/Extensions/Video/VideoBlockComponent.tsx

@@ -0,0 +1,80 @@
+import { NodeViewWrapper } from "@tiptap/react";
+import { AlertTriangle, Image, Loader, Video } from "lucide-react";
+import React from "react";
+import styled from "styled-components";
+import { getBackendUrl } from "../../../../../services/config/config";
+import { uploadNewVideoFile } from "../../../../../services/blocks/Video/video";
+import { getActivityBlockMediaDirectory } from "@services/media/media";
+import { UploadIcon } from "@radix-ui/react-icons";
+
+function VideoBlockComponents(props: any) {
+  const [video, setVideo] = React.useState(null);
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [blockObject, setblockObject] = React.useState(props.node.attrs.blockObject);
+  const fileId = blockObject ? `${blockObject.block_data.file_id}.${blockObject.block_data.file_format}` : null;
+
+  const handleVideoChange = (event: React.ChangeEvent<any>) => {
+    setVideo(event.target.files[0]);
+  };
+
+  const handleSubmit = async (e: any) => {
+    e.preventDefault();
+    setIsLoading(true);
+    let object = await uploadNewVideoFile(video, props.extension.options.activity.activity_id);
+    setIsLoading(false);
+    setblockObject(object);
+    props.updateAttributes({
+      blockObject: object,
+    });
+  };
+
+  return (
+    <NodeViewWrapper className="block-video">
+      {!blockObject && (
+        <BlockVideoWrapper className="flex items-center space-x-3 py-7 bg-gray-50 rounded-xl text-gray-900 px-3 border-dashed border-gray-150 border-2" contentEditable={props.extension.options.editable}>
+          {isLoading ? (
+            <Loader className="animate-spin animate-pulse text-gray-200" size={50} />
+          ) : (
+            <>
+              <div>
+                <Video className="text-gray-200" size={50} />
+              </div>
+              <input className="p-3 rounded-lg file:mr-4 file:py-2 file:px-4 file:rounded-full file:border-0 hover:file:cursor-pointer  file:bg-gray-200 cursor-pointer file:text-gray-500" onChange={handleVideoChange} type="file" name="" id="" />
+              <button className='p-2 px-3 bg-gray-200 rounded-lg text-gray-500 hover:bg-gray-300 transition space-x-2 items-center flex' onClick={handleSubmit}><UploadIcon></UploadIcon><p>Submit</p></button>
+            </>
+          )}
+        </BlockVideoWrapper>
+      )}
+      {blockObject && (
+        <BlockVideo>
+          <video
+            controls
+            className="rounded-lg shadow h-96 w-full object-scale-down bg-black"
+            src={`${getActivityBlockMediaDirectory(props.extension.options.activity.org_id,
+              props.extension.options.activity.course_id,
+              props.extension.options.activity.activity_id,
+              blockObject.block_id,
+              blockObject ? fileId : ' ', 'videoBlock')}`}
+          ></video>
+        </BlockVideo>
+      )}
+
+    </NodeViewWrapper>
+  );
+}
+const BlockVideoWrapper = styled.div`
+  
+  //border: ${(props) => (props.contentEditable ? "2px dashed #713f1117" : "none")};
+
+  // center
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  font-size: 14px;
+`;
+
+const BlockVideo = styled.div`
+  display: flex;
+  flex-direction: column;
+`;
+export default VideoBlockComponents;

apps/web/components/Objects/Editor/Toolbar/ToolbarButtons.tsx

@@ -0,0 +1,213 @@
+import styled from "styled-components";
+import { FontBoldIcon, FontItalicIcon, StrikethroughIcon, ArrowLeftIcon, ArrowRightIcon, OpacityIcon, DividerVerticalIcon, ListBulletIcon } from "@radix-ui/react-icons";
+import { AlertCircle, AlertTriangle, BadgeHelp, Code, FileText, GraduationCap, HelpCircle, ImagePlus, Info, ListChecks, Sigma, Video, Youtube } from "lucide-react";
+import ToolTip from "@components/StyledElements/Tooltip/Tooltip";
+
+export const ToolbarButtons = ({ editor, props }: any) => {
+  if (!editor) {
+    return null;
+  }
+
+  // YouTube extension
+
+  const addYoutubeVideo = () => {
+    const url = prompt("Enter YouTube URL");
+
+    if (url) {
+      editor.commands.setYoutubeVideo({
+        src: url,
+        width: 640,
+        height: 480,
+      });
+    }
+  };
+
+  return (
+    <ToolButtonsWrapper>
+      <ToolBtn onClick={() => editor.chain().focus().undo().run()}>
+        <ArrowLeftIcon />
+      </ToolBtn>
+      <ToolBtn onClick={() => editor.chain().focus().redo().run()}>
+        <ArrowRightIcon />
+      </ToolBtn>
+      <ToolBtn onClick={() => editor.chain().focus().toggleBold().run()} className={editor.isActive("bold") ? "is-active" : ""}>
+        <FontBoldIcon />
+      </ToolBtn>
+      <ToolBtn onClick={() => editor.chain().focus().toggleItalic().run()} className={editor.isActive("italic") ? "is-active" : ""}>
+        <FontItalicIcon />
+      </ToolBtn>
+      <ToolBtn onClick={() => editor.chain().focus().toggleStrike().run()} className={editor.isActive("strike") ? "is-active" : ""}>
+        <StrikethroughIcon />
+      </ToolBtn>
+      <ToolBtn onClick={() => editor.chain().focus().toggleOrderedList().run()} className={editor.isActive('orderedList') ? 'is-active' : ''}>
+        <ListBulletIcon />
+      </ToolBtn>
+      <ToolSelect
+        onChange={(e) =>
+          editor
+            .chain()
+            .focus()
+            .toggleHeading({ level: parseInt(e.target.value) })
+            .run()
+        }
+      >
+        <option value="1">Heading 1</option>
+        <option value="2">Heading 2</option>
+        <option value="3">Heading 3</option>
+        <option value="4">Heading 4</option>
+        <option value="5">Heading 5</option>
+        <option value="6">Heading 6</option>
+      </ToolSelect>
+      {/* TODO: fix this : toggling only works one-way */}
+      <DividerVerticalIcon style={{ marginTop: "auto", marginBottom: "auto", color: "grey" }} />
+      <ToolTip content={"Info Callout"}>
+        <ToolBtn onClick={() => editor.chain().focus().toggleNode("calloutInfo").run()}>
+          <AlertCircle size={15} />
+        </ToolBtn>
+      </ToolTip>
+      <ToolTip content={"Warning Callout"}>
+        <ToolBtn onClick={() => editor.chain().focus().toggleNode("calloutWarning").run()}>
+          <AlertTriangle size={15} />
+        </ToolBtn>
+      </ToolTip>
+      <ToolTip content={"Image"}>
+        <ToolBtn
+          onClick={() =>
+            editor
+              .chain()
+              .focus()
+              .insertContent({
+                type: "blockImage",
+              })
+              .run()
+          }
+        >
+          <ImagePlus size={15} />
+        </ToolBtn>
+      </ToolTip>
+      <ToolTip
+        content={"Video"}>
+        <ToolBtn
+          onClick={() =>
+            editor
+              .chain()
+              .focus()
+              .insertContent({
+                type: "blockVideo",
+              })
+              .run()
+          }
+        >
+          <Video size={15} />
+        </ToolBtn>
+      </ToolTip>
+      <ToolTip content={"YouTube video"}>
+        <ToolBtn onClick={() => addYoutubeVideo()}>
+          <Youtube size={15} />
+        </ToolBtn>
+      </ToolTip>
+      <ToolTip content={"Math Equation (LaTeX)"}>
+        <ToolBtn
+          onClick={() =>
+            editor
+              .chain()
+              .focus()
+              .insertContent({
+                type: "blockMathEquation",
+              })
+              .run()
+          }
+        >
+          <Sigma size={15} />
+        </ToolBtn>
+      </ToolTip>
+      <ToolTip content={"PDF Document"}>
+        <ToolBtn
+          onClick={() =>
+            editor
+              .chain()
+              .focus()
+              .insertContent({
+                type: "blockPDF",
+              })
+              .run()
+          }
+        >
+          <FileText size={15} />
+        </ToolBtn>
+      </ToolTip>
+      <ToolTip content={"Interactive Quiz"}>
+        <ToolBtn
+          onClick={() =>
+            editor
+              .chain()
+              .focus()
+              .insertContent({
+                type: "blockQuiz",
+              })
+              .run()
+          }
+        >
+          <BadgeHelp size={15} />
+        </ToolBtn>
+      </ToolTip>
+      <ToolTip content={"Code Block"}>
+        <ToolBtn
+          onClick={() => editor.chain().focus().toggleCodeBlock().run()}
+          className={editor.isActive('codeBlock') ? 'is-active' : ''}
+        >
+          <Code size={15} />
+        </ToolBtn>
+      </ToolTip>
+    </ToolButtonsWrapper>
+  );
+};
+
+const ToolButtonsWrapper = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: left;
+  justify-content: left;
+`;
+
+const ToolBtn = styled.div`
+  display: flex;
+  background: rgba(217, 217, 217, 0.24);
+  border-radius: 6px;
+  width: 25px;
+  height: 25px;
+  padding: 5px;
+  margin-right: 5px;
+  transition: all 0.2s ease-in-out;
+
+  svg {
+    padding: 1px;
+  }
+
+  &.is-active {
+    background: rgba(176, 176, 176, 0.5);
+
+    &:hover {
+      background: rgba(139, 139, 139, 0.5);
+      cursor: pointer;
+    }
+  }
+
+  &:hover {
+    background: rgba(217, 217, 217, 0.48);
+    cursor: pointer;
+  }
+`;
+
+const ToolSelect = styled.select`
+  display: flex;
+  background: rgba(217, 217, 217, 0.185);
+  border-radius: 6px;
+  width: 100px;
+  border: none;
+  height: 25px;
+  padding: 5px;
+  font-size: 11px;
+  font-family: "DM Sans";
+  margin-right: 5px;
+`;

apps/web/components/Objects/Loaders/PageLoading.tsx

@@ -0,0 +1,33 @@
+'use client';
+import { motion } from "framer-motion";
+
+const variants = {
+    hidden: { opacity: 0, x: 0, y: 0 },
+    enter: { opacity: 1, x: 0, y: 0 },
+    exit: { opacity: 0, x: 0, y: 0 },
+  };
+
+function PageLoading() {
+    
+    return (
+        <motion.main
+        variants={variants} // Pass the variant object into Framer Motion
+        initial="hidden" // Set the initial state to variants.hidden
+        animate="enter" // Animated state to variants.enter
+        exit="exit" // Exit state (used later) to variants.exit
+        transition={{ type: "linear" }} // Set the transition to linear
+        className=""
+      >
+        <div className="max-w-7xl mx-auto px-4 py-20 transition-all">
+            <div className="animate-pulse mx-auto flex space-x-4">
+                <svg className="mx-auto" width="295" height="295" viewBox="0 0 295 295" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <rect opacity="0.51" x="6.5" y="6.5" width="282" height="282" rx="78.5" stroke="#454545" strokeOpacity="0.46" strokeWidth="13" strokeDasharray="11 11" />
+                    <path d="M135.8 200.8V130L122.2 114.6L135.8 110.4V102.8L122.2 87.4L159.8 76V200.8L174.6 218H121L135.8 200.8Z" fill="#454545" fillOpacity="0.13" />
+                </svg>
+            </div>
+        </div>
+        </motion.main>
+    )
+}
+
+export default PageLoading

apps/web/components/Objects/Menu/Menu.tsx

@@ -0,0 +1,102 @@
+'use client';
+import React, { use, useEffect } from "react";
+import Link from "next/link";
+import { getAPIUrl, getUriWithOrg } from "@services/config/config";
+import { getOrganizationContextInfo, getOrganizationContextInfoWithoutCredentials } from "@services/organizations/orgs";
+import ClientComponentSkeleton from "@components/Utils/ClientComp";
+import { HeaderProfileBox } from "@components/Security/HeaderProfileBox";
+import MenuLinks from "./MenuLinks";
+import { getOrgLogoMediaDirectory } from "@services/media/media";
+import { MessageSquareIcon } from "lucide-react";
+import { Tooltip } from "@radix-ui/react-tooltip";
+import ToolTip from "@components/StyledElements/Tooltip/Tooltip";
+import Modal from "@components/StyledElements/Modal/Modal";
+import FeedbackModal from "../Modals/Feedback/Feedback";
+import useSWR from "swr";
+import { swrFetcher } from "@services/utils/ts/requests";
+
+export const Menu = (props: any) => {
+    const orgslug = props.orgslug;
+    const [feedbackModal, setFeedbackModal] = React.useState(false);
+    const { data: org, error: error, isLoading } = useSWR(`${getAPIUrl()}orgs/slug/${orgslug}`, swrFetcher);
+
+    function closeFeedbackModal() {
+        setFeedbackModal(false);
+    }
+
+
+    return (
+        <>
+            <div className="backdrop-blur-lg h-[60px] blur-3xl z-10" style={{
+            }}>
+                <div className="h-[150px] blur-3xl z-0" style={{
+                    background: "radial-gradient(1397.20% 56.18% at 75.99% 53.73%, rgba(253, 182, 207, 0.08) 0%, rgba(3, 110, 146, 0.08) 100%)"
+                }}></div>
+
+            </div>
+            <div className="backdrop-blur-lg bg-white/90 fixed flex top-0 left-0 right-0 h-[60px] ring-1 ring-inset ring-gray-500/10 items-center space-x-5 shadow-[0px_4px_16px_rgba(0,0,0,0.03)] z-50">
+                <div className="flex items-center space-x-5 w-full max-w-screen-2xl mx-auto px-16">
+                    <div className="logo flex ">
+                        <Link href={getUriWithOrg(orgslug, "/")}>
+                            <div className="flex w-auto h-9 rounded-md items-center m-auto py-1 justify-center" >
+                                {org?.logo ? (
+                                    <img
+                                        src={`${getOrgLogoMediaDirectory(org.org_id, org?.logo)}`}
+                                        alt="Learnhouse"
+                                        style={{ width: "auto", height: "100%" }}
+                                        className="rounded-md"
+                                    />
+                                ) : (
+                                    <LearnHouseLogo></LearnHouseLogo>
+                                )}
+                            </div>
+                        </Link>
+                    </div>
+                    <div className="links flex grow">
+                        <MenuLinks orgslug={orgslug} />
+                    </div>
+                    <div className="profile flex items-center space-x-2">
+
+                        <Modal
+                            isDialogOpen={feedbackModal}
+                            onOpenChange={setFeedbackModal}
+                            minHeight="sm"
+                            dialogContent={<FeedbackModal></FeedbackModal>}
+                            dialogTitle="Feedback"
+                            dialogDescription="An issue? A suggestion? a bug ? Let us know!"
+                            dialogTrigger={
+                                <div className="feedback cursor-pointer block items-center h-fit p-2 rounded-2xl bg-orange-800 hover:bg-orange-900 text-orange-300 shadow">
+                                    <MessageSquareIcon size={12} />
+                                </div>
+                            }
+                        />
+                        <HeaderProfileBox />
+                    </div>
+                </div>
+            </div>
+
+        </>
+    );
+};
+
+
+
+
+const LearnHouseLogo = () => {
+    return (
+        <svg width="133" height="80" viewBox="0 0 433 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <rect width="80" height="80" rx="24" fill="black" />
+            <rect width="80" height="80" rx="24" fill="url(#paint0_angular_1555_220)" />
+            <rect x="0.5" y="0.5" width="79" height="79" rx="23.5" stroke="white" strokeOpacity="0.12" />
+            <path d="M37.546 55.926V35.04L33.534 30.497L37.546 29.258V27.016L33.534 22.473L44.626 19.11V55.926L48.992 61H33.18L37.546 55.926Z" fill="white" />
+            <path d="M113.98 54.98V30.2L109.22 24.81L113.98 23.34V20.68L109.22 15.29L122.38 11.3V54.98L127.56 61H108.8L113.98 54.98ZM157.704 41.19V41.26H135.234C136.004 50.29 140.834 54.07 146.294 54.07C151.054 54.07 155.254 51.69 156.304 48.75L157.354 49.17C154.834 55.54 149.864 61.98 141.534 61.98C132.364 61.98 127.184 53.79 127.184 45.39C127.184 36.36 132.784 26 144.194 26C152.524 26 157.634 31.6 157.704 41.05L157.774 41.19H157.704ZM148.674 39.16V38.53C148.674 31.04 145.664 28.1 142.584 28.1C137.264 28.1 135.094 34.47 135.094 38.67V39.16H148.674ZM178.717 61V55.12C176.057 57.71 171.157 61.7 166.537 61.7C161.707 61.7 158.137 59.32 158.137 53.65C158.137 46.51 166.607 42.87 178.717 38.6C178.717 33 178.577 28.66 172.837 28.66C167.237 28.66 163.877 32.58 160.307 37.9H159.817V26.7H188.657L187.117 32.72V56.45H187.187L192.367 61H178.717ZM178.717 53.23V40.56C167.727 44.97 167.377 47.98 167.377 51.34C167.377 54.7 169.687 56.17 172.627 56.17C174.797 56.17 176.967 55.05 178.717 53.23ZM221.429 39.09H220.869C217.789 31.74 213.659 29.29 210.439 29.29C205.609 29.29 205.609 32.79 205.609 39.93V54.98L212.119 61H192.029L197.209 54.98V32.09L192.449 26.7H221.429V39.09ZM261.467 61H242.707L247.747 54.98V39.44C247.747 34.05 246.977 30.62 241.587 30.62C238.997 30.62 236.337 31.74 234.097 34.75V54.98L239.137 61H220.377L225.697 54.98V36.08L220.937 30.69L234.097 26V32.37C236.897 28.03 241.447 25.86 245.647 25.86C252.787 25.86 256.147 30.48 256.147 37.06V54.98L261.467 61ZM274.343 11.3V32.23C277.143 27.89 281.693 25.72 285.893 25.72C293.033 25.72 296.393 30.34 296.393 36.92V54.98H296.463L301.643 61H282.883L287.993 55.05V39.3C287.993 33.91 287.223 30.48 281.833 30.48C279.243 30.48 276.583 31.6 274.343 34.61V54.98L279.523 61H260.763L265.943 54.98V21.38L261.183 15.99L274.343 11.3ZM335.945 42.31C335.945 51.34 329.855 61.84 316.835 61.84C306.895 61.84 301.645 53.79 301.645 45.39C301.645 36.36 307.735 25.86 320.755 25.86C330.695 25.86 335.945 33.91 335.945 42.31ZM316.975 28.52C311.165 28.52 310.535 34.82 310.535 39.02C310.535 49.94 314.525 59.18 320.685 59.18C325.865 59.18 327.195 52.32 327.195 48.68C327.195 37.76 323.135 28.52 316.975 28.52ZM349.01 26.63V48.12C349.01 53.51 349.78 56.94 355.17 56.94C357.55 56.94 360 55.75 361.82 53.65V32.72L356.64 26.63H370.22V55.26L374.98 61L361.82 61.42V55.82C359.3 59.32 356.08 61.7 351.11 61.7C343.97 61.7 340.61 57.08 340.61 50.5V32.72L335.36 26.63H349.01ZM374.617 47.77H375.177C376.997 53.79 382.527 59.04 388.267 59.04C391.137 59.04 393.517 57.64 393.517 54.49C393.517 46.23 374.967 50.29 374.967 36.43C374.967 31.25 379.517 26.7 386.657 26.7H394.357L396.947 25.23V36.85L396.527 36.78C394.007 32.23 389.807 28.87 385.327 28.94C382.387 29.01 380.707 30.83 380.707 33.56C380.707 40.77 399.887 37.62 399.887 50.43C399.887 58.55 391.697 61.7 386.167 61.7C382.667 61.7 377.907 61.21 375.247 60.09L374.617 47.77ZM430.416 41.19V41.26H407.946C408.716 50.29 413.546 54.07 419.006 54.07C423.766 54.07 427.966 51.69 429.016 48.75L430.066 49.17C427.546 55.54 422.576 61.98 414.246 61.98C405.076 61.98 399.896 53.79 399.896 45.39C399.896 36.36 405.496 26 416.906 26C425.236 26 430.346 31.6 430.416 41.05L430.486 41.19H430.416ZM421.386 39.16V38.53C421.386 31.04 418.376 28.1 415.296 28.1C409.976 28.1 407.806 34.47 407.806 38.67V39.16H421.386Z" fill="#121212" />
+            <defs>
+                <radialGradient id="paint0_angular_1555_220" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(40 40) rotate(90) scale(40)">
+                    <stop stopColor="#FBFBFB" stopOpacity="0.15" />
+                    <stop offset="0.442708" stopOpacity="0.1" />
+                </radialGradient>
+            </defs>
+        </svg>
+    )
+
+}

apps/web/components/Objects/Menu/MenuLinks.tsx

@@ -0,0 +1,52 @@
+import AuthenticatedClientElement from '@components/Security/AuthenticatedClientElement';
+import { getUriWithOrg } from '@services/config/config';
+import Link from 'next/link';
+import React from 'react'
+
+function MenuLinks(props: { orgslug: string }) {
+    return (
+        <div>
+            <ul className="flex space-x-4">
+                <LinkItem link="/courses" type="courses" orgslug={props.orgslug}></LinkItem>
+                <LinkItem link="/collections" type="collections" orgslug={props.orgslug}></LinkItem>
+                <AuthenticatedClientElement checkMethod='authentication'>
+                    <LinkItem link="/trail" type="trail" orgslug={props.orgslug}></LinkItem>
+                </AuthenticatedClientElement>
+            </ul>
+        </div>
+    )
+}
+const LinkItem = (props: any) => {
+    const link = props.link;
+    const orgslug = props.orgslug;
+    return (
+        <Link href={getUriWithOrg(orgslug, link)}>
+            <li className="flex space-x-3 items-center text-[#909192] font-medium">
+                {props.type == 'courses' &&
+                    <>
+                        <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <path d="M14.9987 1.66663H6.66536C5.78131 1.66663 4.93346 2.01782 4.30834 2.64294C3.68322 3.26806 3.33203 4.1159 3.33203 4.99996V15C3.33203 15.884 3.68322 16.7319 4.30834 17.357C4.93346 17.9821 5.78131 18.3333 6.66536 18.3333H14.9987C15.4407 18.3333 15.8646 18.1577 16.1772 17.8451C16.4898 17.5326 16.6654 17.1087 16.6654 16.6666V3.33329C16.6654 2.89127 16.4898 2.46734 16.1772 2.15478C15.8646 1.84222 15.4407 1.66663 14.9987 1.66663ZM4.9987 4.99996C4.9987 4.55793 5.17429 4.13401 5.48685 3.82145C5.79941 3.50889 6.22334 3.33329 6.66536 3.33329H14.9987V11.6666H6.66536C6.0779 11.6691 5.50203 11.8303 4.9987 12.1333V4.99996ZM6.66536 16.6666C6.22334 16.6666 5.79941 16.491 5.48685 16.1785C5.17429 15.8659 4.9987 15.442 4.9987 15C4.9987 14.5579 5.17429 14.134 5.48685 13.8214C5.79941 13.5089 6.22334 13.3333 6.66536 13.3333H14.9987V16.6666H6.66536ZM8.33203 6.66663H11.6654C11.8864 6.66663 12.0983 6.57883 12.2546 6.42255C12.4109 6.26627 12.4987 6.05431 12.4987 5.83329C12.4987 5.61228 12.4109 5.40032 12.2546 5.24404C12.0983 5.08776 11.8864 4.99996 11.6654 4.99996H8.33203C8.11102 4.99996 7.89906 5.08776 7.74278 5.24404C7.5865 5.40032 7.4987 5.61228 7.4987 5.83329C7.4987 6.05431 7.5865 6.26627 7.74278 6.42255C7.89906 6.57883 8.11102 6.66663 8.33203 6.66663V6.66663Z" fill="#898A8B" />
+                        </svg>
+                        <span>Courses</span>
+                    </>}
+
+                {props.type == 'collections' &&
+                    <>
+                        <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <path d="M17.0567 6.14171C17.0567 6.14171 17.0567 6.14171 17.0567 6.07504L17.0067 5.95004C16.9893 5.92352 16.9698 5.89844 16.9483 5.87504C16.926 5.83976 16.901 5.80632 16.8733 5.77504L16.7983 5.71671L16.665 5.65004L10.415 1.79171C10.2826 1.70893 10.1295 1.66504 9.97333 1.66504C9.81715 1.66504 9.66411 1.70893 9.53166 1.79171L3.33166 5.65004L3.25666 5.71671L3.18166 5.77504C3.15404 5.80632 3.12896 5.83976 3.10666 5.87504C3.08524 5.89844 3.06573 5.92352 3.04833 5.95004L2.99833 6.07504C2.99833 6.07504 2.99833 6.07504 2.99833 6.14171C2.99014 6.2137 2.99014 6.28639 2.99833 6.35838V13.6417C2.99805 13.7833 3.03386 13.9227 3.10239 14.0466C3.17092 14.1706 3.2699 14.275 3.39 14.35L9.64 18.2084C9.67846 18.2321 9.72076 18.2491 9.765 18.2584C9.765 18.2584 9.80666 18.2584 9.83166 18.2584C9.97265 18.3031 10.124 18.3031 10.265 18.2584C10.265 18.2584 10.3067 18.2584 10.3317 18.2584C10.3759 18.2491 10.4182 18.2321 10.4567 18.2084L16.665 14.35C16.7851 14.275 16.8841 14.1706 16.9526 14.0466C17.0211 13.9227 17.0569 13.7833 17.0567 13.6417V6.35838C17.0649 6.28639 17.0649 6.2137 17.0567 6.14171ZM9.165 16.0084L4.58166 13.175V7.85838L9.165 10.6834V16.0084ZM9.99833 9.24171L5.33166 6.35838L9.99833 3.48337L14.665 6.35838L9.99833 9.24171ZM15.415 13.175L10.8317 16.0084V10.6834L15.415 7.85838V13.175Z" fill="#898A8B" />
+                        </svg>
+                        <span>Collections</span>
+                    </>}
+
+                {props.type == 'trail' &&
+                    <>
+                        <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <path d="M16.5751 7.95841C16.5059 7.82098 16.3999 7.70541 16.269 7.62451C16.1381 7.54361 15.9874 7.50054 15.8335 7.50008H11.6668V2.50008C11.6757 2.31731 11.6243 2.13669 11.5204 1.98608C11.4164 1.83547 11.2658 1.72325 11.0918 1.66674C10.9245 1.6117 10.744 1.61108 10.5763 1.66498C10.4087 1.71888 10.2624 1.82452 10.1585 1.96674L3.4918 11.1334C3.40827 11.2541 3.35811 11.3948 3.3464 11.5411C3.3347 11.6874 3.36186 11.8343 3.42513 11.9667C3.4834 12.1182 3.58462 12.2493 3.71637 12.3441C3.84812 12.4388 4.00467 12.493 4.1668 12.5001H8.33346V17.5001C8.33359 17.6758 8.38927 17.847 8.49254 17.9892C8.59581 18.1314 8.74139 18.2373 8.90846 18.2917C8.99219 18.3177 9.07915 18.3317 9.1668 18.3334C9.29828 18.3338 9.42799 18.303 9.5453 18.2436C9.66262 18.1842 9.76422 18.0979 9.8418 17.9917L16.5085 8.82508C16.5982 8.70074 16.652 8.55404 16.6637 8.40112C16.6755 8.24821 16.6448 8.09502 16.5751 7.95841ZM10.0001 14.9334V11.6667C10.0001 11.4457 9.91233 11.2338 9.75605 11.0775C9.59977 10.9212 9.38781 10.8334 9.1668 10.8334H5.83346L10.0001 5.06674V8.33341C10.0001 8.55442 10.0879 8.76638 10.2442 8.92267C10.4005 9.07895 10.6124 9.16674 10.8335 9.16674H14.1668L10.0001 14.9334Z" fill="#909192" />
+                        </svg>
+                        <span>Trail</span>
+                    </>}
+            </li>
+        </Link>
+    )
+}
+export default MenuLinks

apps/web/components/Objects/Menu/ProfileArea.tsx

@@ -0,0 +1,160 @@
+"use client";
+import React from "react";
+import styled from "styled-components";
+import Link from "next/link";
+import Avvvatars from "avvvatars-react";
+import { GearIcon } from "@radix-ui/react-icons";
+import { getNewAccessTokenUsingRefreshToken, getUserInfo } from "@services/auth/auth";
+import { usePathname } from "next/navigation";
+import { useRouter } from "next/router";
+import path from "path";
+
+export interface Auth {
+  access_token: string;
+  isAuthenticated: boolean;
+  userInfo: any;
+  isLoading: boolean;
+}
+
+function ProfileArea() {
+
+
+  const PRIVATE_ROUTES = ["/course/*/edit", "/settings*", "/trail"];
+  const NON_AUTHENTICATED_ROUTES = ["/login", "/register"];
+
+
+  const router = useRouter();
+  const pathname = usePathname();
+  const [auth, setAuth] = React.useState<Auth>({ access_token: "", isAuthenticated: false, userInfo: {}, isLoading: true });
+
+  async function checkRefreshToken() {
+    let data = await getNewAccessTokenUsingRefreshToken();
+    if (data) {
+      return data.access_token;
+    }
+  }
+
+  React.useEffect(() => {
+    checkAuth();
+  }, [pathname]);
+
+  async function checkAuth() {
+    try {
+      let access_token = await checkRefreshToken();
+      let userInfo = {};
+      let isLoading = false;
+
+      if (access_token) {
+        userInfo = await getUserInfo(access_token);
+        setAuth({ access_token, isAuthenticated: true, userInfo, isLoading });
+
+        // Redirect to home if user is trying to access a NON_AUTHENTICATED_ROUTES route
+
+        if (NON_AUTHENTICATED_ROUTES.some((route) => new RegExp(`^${route.replace("*", ".*")}$`).test(pathname))) {
+          router.push("/");
+        }
+
+
+      } else {
+        setAuth({ access_token, isAuthenticated: false, userInfo, isLoading });
+
+        // Redirect to login if user is trying to access a private route
+        if (PRIVATE_ROUTES.some((route) => new RegExp(`^${route.replace("*", ".*")}$`).test(pathname))) {
+          router.push("/login");
+        }
+
+      }
+    } catch (error) {
+
+    }
+  }
+  return (
+    <ProfileAreaStyled>
+      {!auth.isAuthenticated && (
+        <UnidentifiedArea>
+          <ul>
+            <li>
+              <Link href="/login">
+                Login
+              </Link>
+            </li>
+            <li>
+              <Link href="/signup">
+                Sign up
+              </Link>
+            </li>
+          </ul>
+        </UnidentifiedArea>
+      )}
+      {auth.isAuthenticated && (
+        <AccountArea>
+          <div>{auth.userInfo.user_object.username}</div>
+          <div>
+            <Avvvatars value={auth.userInfo.user_object.user_id} style="shape" />
+          </div>
+          <Link href={"/settings"}><GearIcon /></Link>
+        </AccountArea>
+      )}
+    </ProfileAreaStyled>
+  )
+}
+
+const AccountArea = styled.div`
+  padding-right: 20px;
+  display: flex;
+  place-items: center;
+
+  a{
+    // center the gear icon
+    display: flex;
+    place-items: center;
+    place-content: center;
+    width: 29px;
+    height: 29px;
+    border-radius: 19px;
+    background: #F5F5F5;
+
+    // hover effect
+    &:hover{
+      background: #E5E5E5;
+
+    }
+  }
+
+  div {
+    margin-right: 10px;
+  }
+  img {
+    width: 29px;
+    border-radius: 19px;
+  }
+`;
+
+const ProfileAreaStyled = styled.div`
+  display: flex;
+  place-items: stretch;
+  place-items: center;
+`;
+
+const UnidentifiedArea = styled.div`
+  display: flex;
+  place-items: stretch;
+  flex-grow: 1;
+
+  ul {
+    display: flex;
+    place-items: center;
+    list-style: none;
+    padding-left: 20px;
+
+    li {
+      padding-right: 20px;
+      font-size: 16px;
+      font-weight: 500;
+      color: #171717;
+    }
+  }
+`;
+
+
+export default ProfileArea

apps/web/components/Objects/Modals/Activities/Create/NewActivity.tsx

@@ -0,0 +1,113 @@
+import React, { useState } from "react";
+import { ArrowLeftIcon, Cross1Icon } from "@radix-ui/react-icons";
+import DynamicPageActivityImage from "public/activities_types/dynamic-page-activity.png";
+import VideoPageActivityImage from "public//activities_types/video-page-activity.png";
+import DocumentPdfPageActivityImage from "public//activities_types/documentpdf-page-activity.png";
+import { styled, keyframes } from '@stitches/react';
+import DynamicCanvaModal from "./NewActivityModal/DynamicCanva";
+import VideoModal from "./NewActivityModal/Video";
+import Image from "next/image";
+import DocumentPdfModal from "./NewActivityModal/DocumentPdf";
+
+function NewActivityModal({ closeModal, submitActivity, submitFileActivity, submitExternalVideo, chapterId }: any) {
+  const [selectedView, setSelectedView] = useState("home");
+
+
+  return (
+    <div>
+      {selectedView === "home" && (
+        <ActivityChooserWrapper>
+          <ActivityOption onClick={() => { setSelectedView("dynamic") }}>
+            <ActivityTypeImage>
+              <Image alt="Dynamic Page" src={DynamicPageActivityImage}></Image>
+            </ActivityTypeImage>
+            <ActivityTypeTitle>Dynamic Page</ActivityTypeTitle>
+          </ActivityOption>
+          <ActivityOption onClick={() => { setSelectedView("video") }}>
+            <ActivityTypeImage>
+              <Image alt="Video Page" src={VideoPageActivityImage}></Image>
+            </ActivityTypeImage>
+            <ActivityTypeTitle>Video Page</ActivityTypeTitle>
+          </ActivityOption>
+          <ActivityOption onClick={() => { setSelectedView("documentpdf") }}>
+            <ActivityTypeImage>
+              <Image alt="Document PDF Page" src={DocumentPdfPageActivityImage}></Image>
+            </ActivityTypeImage>
+            <ActivityTypeTitle>PDF Document Page</ActivityTypeTitle>
+          </ActivityOption>
+        </ActivityChooserWrapper>
+      )}
+
+      {selectedView === "dynamic" && (
+        <DynamicCanvaModal submitActivity={submitActivity} chapterId={chapterId} />
+      )}
+
+      {selectedView === "video" && (
+        <VideoModal submitFileActivity={submitFileActivity} submitExternalVideo={submitExternalVideo}
+          chapterId={chapterId} />
+      )}
+
+      {selectedView === "documentpdf" && (
+        <DocumentPdfModal submitFileActivity={submitFileActivity} chapterId={chapterId} />
+      )}
+    </div>
+  );
+}
+
+const ActivityChooserWrapper = styled("div", {
+  display: "flex",
+  flexDirection: "row",
+  justifyContent: "start",
+  marginTop: 10,
+});
+
+const ActivityOption = styled("div", {
+  width: "180px",
+  textAlign: "center",
+  borderRadius: 10,
+  background: "#F6F6F6",
+  border: "4px solid #F5F5F5",
+  margin: "auto",
+
+  // hover 
+  "&:hover": {
+    cursor: "pointer",
+    background: "#ededed",
+    border: "4px solid #ededed",
+
+    transition: "background 0.2s ease-in-out, border 0.2s ease-in-out",
+  },
+});
+
+const ActivityTypeImage = styled("div", {
+  height: 80,
+  borderRadius: 8,
+  margin: 2,
+  display: "flex",
+  flexDirection: "column",
+  alignItems: "center",
+  justifyContent: "end",
+  textAlign: "center",
+  background: "#ffffff",
+
+  // hover 
+  "&:hover": {
+    cursor: "pointer",
+  },
+});
+
+const ActivityTypeTitle = styled("div", {
+  display: "flex",
+  fontSize: 12,
+  height: "20px",
+  fontWeight: 500,
+  color: "rgba(0, 0, 0, 0.38);",
+
+  // center text vertically
+  alignItems: "center",
+  justifyContent: "center",
+  textAlign: "center",
+
+});
+
+export default NewActivityModal;

apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/DocumentPdf.tsx

@@ -0,0 +1,58 @@
+import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, FormMessage, Input, Textarea } from "@components/StyledElements/Form/Form";
+import React, { useState } from "react";
+import * as Form from '@radix-ui/react-form';
+import BarLoader from "react-spinners/BarLoader";
+
+function DocumentPdfModal({ submitFileActivity, chapterId }: any) {
+  const [documentpdf, setDocumentPdf] = React.useState(null) as any;
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [name, setName] = React.useState("");
+
+  const handleDocumentPdfChange = (event: React.ChangeEvent<any>) => {
+    setDocumentPdf(event.target.files[0]);
+  };
+
+  const handleNameChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setName(event.target.value);
+  };
+
+  const handleSubmit = async (e: any) => {
+    e.preventDefault();
+    setIsSubmitting(true);
+    let status = await submitFileActivity(documentpdf, "documentpdf", { name, type: "documentpdf" }, chapterId);
+    setIsSubmitting(false);
+  };
+
+  return (
+      <FormLayout onSubmit={handleSubmit}>
+      <FormField name="documentpdf-activity-name">
+        <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+          <FormLabel>PDF Document name</FormLabel>
+          <FormMessage match="valueMissing">Please provide a name for your PDF Document activity</FormMessage>
+        </Flex>
+        <Form.Control asChild>
+          <Input onChange={handleNameChange} type="text" required />
+        </Form.Control>
+      </FormField>
+      <FormField name="documentpdf-activity-file">
+        <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+          <FormLabel>PDF Document file</FormLabel>
+          <FormMessage match="valueMissing">Please provide a PDF Document for your activity</FormMessage>
+        </Flex>
+        <Form.Control asChild>
+          <input type="file" onChange={handleDocumentPdfChange} required />
+        </Form.Control>
+      </FormField>
+
+      <Flex css={{ marginTop: 25, justifyContent: 'flex-end' }}>
+        <Form.Submit asChild>
+          <ButtonBlack  type="submit" css={{ marginTop: 10 }}>
+            {isSubmitting ? <BarLoader cssOverride={{borderRadius:60,}} width={60} color="#ffffff" /> : "Create activity"}
+          </ButtonBlack>
+        </Form.Submit>
+      </Flex>
+    </FormLayout>
+  );
+}
+
+export default DocumentPdfModal;

apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/DynamicCanva.tsx

@@ -0,0 +1,63 @@
+import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, FormMessage, Input, Textarea } from "@components/StyledElements/Form/Form";
+import React, { useState } from "react";
+import * as Form from '@radix-ui/react-form';
+import BarLoader from "react-spinners/BarLoader";
+
+function DynamicCanvaModal({ submitActivity, chapterId }: any) {
+  const [activityName, setActivityName] = useState("");
+  const [activityDescription, setActivityDescription] = useState("");
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const handleActivityNameChange = (e: any) => {
+    setActivityName(e.target.value);
+  };
+
+  const handleActivityDescriptionChange = (e: any) => {
+    setActivityDescription(e.target.value);
+  };
+
+  const handleSubmit = async (e: any) => {
+    e.preventDefault();
+    setIsSubmitting(true);
+    await submitActivity({
+      name: activityName,
+      chapterId: chapterId,
+      type: "dynamic",
+      org_id : "test", 
+    });
+    setIsSubmitting(false);
+  };
+  return (
+    <FormLayout onSubmit={handleSubmit}>
+      <FormField name="dynamic-activity-name">
+        <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+          <FormLabel>Activity name</FormLabel>
+          <FormMessage match="valueMissing">Please provide a name for your activity</FormMessage>
+        </Flex>
+        <Form.Control asChild>
+          <Input onChange={handleActivityNameChange} type="text" required />
+        </Form.Control>
+      </FormField>
+      <FormField name="dynamic-activity-desc">
+        <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+          <FormLabel>Activity description</FormLabel>
+          <FormMessage match="valueMissing">Please provide a description for your activity</FormMessage>
+        </Flex>
+        <Form.Control asChild>
+          <Textarea onChange={handleActivityDescriptionChange} required />
+        </Form.Control>
+      </FormField>
+
+      <Flex css={{ marginTop: 25, justifyContent: 'flex-end' }}>
+        <Form.Submit asChild>
+          <ButtonBlack  type="submit" css={{ marginTop: 10 }}>
+            {isSubmitting ? <BarLoader cssOverride={{borderRadius:60,}} width={60} color="#ffffff" />
+             : "Create activity"}
+          </ButtonBlack>
+        </Form.Submit>
+      </Flex>
+    </FormLayout>
+  );
+}
+
+export default DynamicCanvaModal;

apps/web/components/Objects/Modals/Activities/Create/NewActivityModal/Video.tsx

@@ -0,0 +1,111 @@
+import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, FormMessage, Input, Textarea } from "@components/StyledElements/Form/Form";
+import React, { useState } from "react";
+import * as Form from '@radix-ui/react-form';
+import BarLoader from "react-spinners/BarLoader";
+import { Youtube } from "lucide-react";
+
+interface ExternalVideoObject {
+  name: string,
+  type: string,
+  uri: string
+}
+
+
+function VideoModal({ submitFileActivity, submitExternalVideo, chapterId }: any) {
+  const [video, setVideo] = React.useState(null) as any;
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [name, setName] = React.useState("");
+  const [youtubeUrl, setYoutubeUrl] = React.useState("");
+  const [selectedView, setSelectedView] = React.useState("file") as any;
+
+  const handleVideoChange = (event: React.ChangeEvent<any>) => {
+    setVideo(event.target.files[0]);
+  };
+
+  const handleNameChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setName(event.target.value);
+  };
+
+  const handleYoutubeUrlChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setYoutubeUrl(event.target.value);
+  };
+
+  const handleSubmit = async (e: any) => {
+    e.preventDefault();
+    setIsSubmitting(true);
+    
+    if (selectedView === "file") {
+      let status = await submitFileActivity(video, "video", { name, type: "video" }, chapterId);
+      setIsSubmitting(false);
+    }
+    if (selectedView === "youtube") {
+      let external_video_object: ExternalVideoObject = {
+        name,
+        type: "youtube",
+        uri: youtubeUrl
+      }
+      let status = await submitExternalVideo(external_video_object, 'activity' ,chapterId);
+      setIsSubmitting(false);
+    }
+
+  };
+
+  /* TODO : implement some sort of progress bar for file uploads, it is not possible yet because i'm not using axios.
+   and the actual upload isn't happening here anyway, it's in the submitFileActivity function */
+
+  return (
+    <FormLayout onSubmit={handleSubmit}>
+      <FormField name="video-activity-name">
+        <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+          <FormLabel>Video name</FormLabel>
+          <FormMessage match="valueMissing">Please provide a name for your video activity</FormMessage>
+        </Flex>
+        <Form.Control asChild>
+          <Input onChange={handleNameChange} type="text" required />
+        </Form.Control>
+      </FormField>
+      <div className="flex flex-col rounded-md bg-gray-50 outline-dashed outline-gray-200">
+        <div className="">
+          <div className="flex m-4 justify-center space-x-2 mb-0">
+            <div onClick={() => { setSelectedView("file") }} className="rounded-full bg-slate-900 text-zinc-50 py-2 px-4 text-sm drop-shadow-md hover:cursor-pointer hover:bg-slate-700 ">Video upload</div>
+            <div onClick={() => { setSelectedView("youtube") }} className="rounded-full bg-slate-900 text-zinc-50 py-2 px-4 text-sm drop-shadow-md hover:cursor-pointer hover:bg-slate-700">YouTube Video</div>
+          </div>
+          {selectedView === "file" && (<div className="p-4 justify-center m-auto align-middle">
+            <FormField name="video-activity-file">
+              <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+                <FormLabel>Video file</FormLabel>
+                <FormMessage match="valueMissing">Please provide a video for your activity</FormMessage>
+              </Flex>
+              <Form.Control asChild>
+                <input type="file" onChange={handleVideoChange} required />
+              </Form.Control>
+            </FormField>
+          </div>)}
+          {selectedView === "youtube" && (
+            <div className="p-4 justify-center m-auto align-middle">
+              <FormField name="video-activity-file">
+                <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+                  <FormLabel className="flex justify-center align-middle"><Youtube className="m-auto pr-1" /><span className="flex">YouTube URL</span></FormLabel>
+                  <FormMessage match="valueMissing">Please provide a video for your activity</FormMessage>
+                </Flex>
+                <Form.Control asChild>
+                  <Input className="bg-white" onChange={handleYoutubeUrlChange} type="text" required />
+                </Form.Control>
+              </FormField>
+            </div>
+          )}
+        </div>
+      </div>
+
+      <Flex css={{ marginTop: 25, justifyContent: 'flex-end' }}>
+        <Form.Submit asChild>
+          <ButtonBlack className="bg-black" type="submit" css={{ marginTop: 10 }}>
+            {isSubmitting ? <BarLoader cssOverride={{ borderRadius: 60, }} width={60} color="#ffffff" /> : "Create activity"}
+          </ButtonBlack>
+        </Form.Submit>
+      </Flex>
+    </FormLayout>
+  );
+}
+
+export default VideoModal;

apps/web/components/Objects/Modals/Chapters/NewChapter.tsx

@@ -0,0 +1,61 @@
+import FormLayout, { Flex, FormField, Input, Textarea, FormLabel, ButtonBlack } from "@components/StyledElements/Form/Form";
+import { FormMessage } from "@radix-ui/react-form";
+import * as Form from '@radix-ui/react-form';
+import React, { useState } from "react";
+import BarLoader from "react-spinners/BarLoader";
+
+function NewChapterModal({ submitChapter, closeModal }: any) {
+  const [chapterName, setChapterName] = useState("");
+  const [chapterDescription, setChapterDescription] = useState("");
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const handleChapterNameChange = (e: any) => {
+    setChapterName(e.target.value);
+  };
+
+  const handleChapterDescriptionChange = (e: any) => {
+    setChapterDescription(e.target.value);
+  };
+
+  const handleSubmit = async (e: any) => {
+    e.preventDefault();
+    
+    setIsSubmitting(true);
+    await submitChapter({ name: chapterName, description: chapterDescription, activities: [] });
+    setIsSubmitting(false);
+  };
+
+  return (
+    <FormLayout onSubmit={handleSubmit}>
+      <FormField name="chapter-name">
+        <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+          <FormLabel>Chapter name</FormLabel>
+          <FormMessage match="valueMissing">Please provide a chapter name</FormMessage>
+        </Flex>
+        <Form.Control asChild>
+          <Input onChange={handleChapterNameChange} type="text" required />
+        </Form.Control>
+      </FormField>
+      <FormField name="chapter-desc">
+        <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+          <FormLabel>Chapter description</FormLabel>
+          <FormMessage match="valueMissing">Please provide a chapter description</FormMessage>
+        </Flex>
+        <Form.Control asChild>
+          <Textarea onChange={handleChapterDescriptionChange} required />
+        </Form.Control>
+      </FormField>
+
+      <Flex css={{ marginTop: 25, justifyContent: 'flex-end' }}>
+        <Form.Submit asChild>
+          <ButtonBlack type="submit" css={{ marginTop: 10 }}>
+          {isSubmitting ? <BarLoader cssOverride={{borderRadius:60,}} width={60} color="#ffffff" />
+             : "Create Chapter"}
+            </ButtonBlack>
+        </Form.Submit>
+      </Flex>
+    </FormLayout>
+  );
+}
+
+export default NewChapterModal;

apps/web/components/Objects/Modals/Course/Create/CreateCourse.tsx

@@ -0,0 +1,117 @@
+import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, Input, Textarea } from '@components/StyledElements/Form/Form'
+import * as Form from '@radix-ui/react-form'
+import { FormMessage } from "@radix-ui/react-form";
+import { createNewCourse } from '@services/courses/courses';
+import { getOrganizationContextInfoWithoutCredentials } from '@services/organizations/orgs';
+import React, { useState } from 'react'
+import { BarLoader } from 'react-spinners'
+import { revalidateTags } from '@services/utils/ts/requests';
+import { useRouter } from 'next/navigation';
+
+function CreateCourseModal({ closeModal, orgslug }: any) {
+    const [isSubmitting, setIsSubmitting] = useState(false);
+    const [name, setName] = React.useState("");
+    const [description, setDescription] = React.useState("");
+    const [isLoading, setIsLoading] = React.useState(false);
+    const [thumbnail, setThumbnail] = React.useState(null) as any;
+    const router = useRouter();
+
+    const [orgId, setOrgId] = React.useState(null) as any;
+
+
+    const getOrgMetadata = async () => {
+        const org = await getOrganizationContextInfoWithoutCredentials(orgslug, { revalidate: 360, tags: ['organizations'] });
+        setOrgId(org.org_id);
+    }
+
+
+    const handleNameChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        setName(event.target.value);
+    };
+
+    const handleDescriptionChange = (event: React.ChangeEvent<any>) => {
+        setDescription(event.target.value);
+    };
+
+    const handleThumbnailChange = (event: React.ChangeEvent<any>) => {
+        setThumbnail(event.target.files[0]);
+    };
+
+    const handleSubmit = async (e: any) => {
+        e.preventDefault();
+        setIsSubmitting(true);
+        let status = await createNewCourse(orgId, { name, description }, thumbnail);
+        await revalidateTags(['courses'], orgslug);
+        setIsSubmitting(false);
+
+        if (status.org_id == orgId) {
+            closeModal();
+            router.refresh();
+            await revalidateTags(['courses'], orgslug);
+
+            // refresh page (FIX for Next.js BUG)
+            // window.location.reload();
+        } else {
+            alert("Error creating course, please see console logs");
+        }
+
+    };
+
+    React.useEffect(() => {
+        if (orgslug) {
+            getOrgMetadata();
+        }
+    }, [isLoading, orgslug]);
+
+    return (
+        <FormLayout onSubmit={handleSubmit}>
+            <FormField name="course-name">
+                <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+                    <FormLabel>Course name</FormLabel>
+                    <FormMessage match="valueMissing">Please provide a course name</FormMessage>
+                </Flex>
+                <Form.Control asChild>
+                    <Input onChange={handleNameChange} type="text" required />
+                </Form.Control>
+            </FormField>
+            <FormField name="course-desc">
+                <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+                    <FormLabel>Course description</FormLabel>
+                    <FormMessage match="valueMissing">Please provide a course description</FormMessage>
+                </Flex>
+                <Form.Control asChild>
+                    <Textarea onChange={handleDescriptionChange} required />
+                </Form.Control>
+            </FormField>
+            <FormField name="course-thumbnail">
+                <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+                    <FormLabel>Course thumbnail</FormLabel>
+                    <FormMessage match="valueMissing">Please provide a thumbnail for your course</FormMessage>
+                </Flex>
+                <Form.Control asChild>
+                    <Input onChange={handleThumbnailChange} type="file" required />
+                </Form.Control>
+            </FormField>
+            <FormField name="course-learnings">
+                <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+                    <FormLabel>Course keywords</FormLabel>
+                    <FormMessage match="valueMissing">Please provide learning elements, separated by comma (,)</FormMessage>
+                </Flex>
+                <Form.Control asChild>
+                    <Textarea required />
+                </Form.Control>
+            </FormField>
+
+            <Flex css={{ marginTop: 25, justifyContent: 'flex-end' }}>
+                <Form.Submit asChild>
+                    <ButtonBlack type="submit" css={{ marginTop: 10 }}>
+                        {isSubmitting ? <BarLoader cssOverride={{ borderRadius: 60, }} width={60} color="#ffffff" />
+                            : "Create Course"}
+                    </ButtonBlack>
+                </Form.Submit>
+            </Flex>
+        </FormLayout>
+    )
+}
+
+export default CreateCourseModal

apps/web/components/Objects/Modals/Feedback/Feedback.tsx

@@ -0,0 +1,88 @@
+import FormLayout, { ButtonBlack, Flex, FormField, FormLabel, FormMessage, Input, Textarea } from "@components/StyledElements/Form/Form"
+import { BarLoader } from "react-spinners"
+import * as Form from '@radix-ui/react-form'
+import React, { useState } from "react";
+import * as Sentry from '@sentry/browser';
+import { CheckCircleIcon } from "lucide-react";
+import { AuthContext } from "@components/Security/AuthProvider";
+import { randomUUID } from "crypto";
+
+export const FeedbackModal = (user: any) => {
+    const auth: any = React.useContext(AuthContext);
+
+    const [isSubmitting, setIsSubmitting] = useState(false);
+    const [view, setView] = useState<"feedbackForm" | "success">("feedbackForm")
+    const [feedbackMessage, setFeedbackMessage] = useState("");
+
+
+    const handleSubmit = async (e: any) => {
+        e.preventDefault();
+        setIsSubmitting(true);
+
+        const user = auth.userInfo.user_object ? auth.userInfo.user_object : null;
+        const eventId = Sentry.captureMessage(`Feedback from ${user ? user.email : 'Anonymous'} - ${feedbackMessage}`);
+
+        const userFeedback = {
+            event_id: eventId,
+            name: user ? user.full_name : 'Anonymous',
+            email: user ? user.email : 'Anonymous',
+            comments: feedbackMessage,
+        }
+        Sentry.captureUserFeedback(userFeedback);
+        setIsSubmitting(false);
+        setView("success");
+    };
+
+    const handleFeedbackMessage = (event: React.ChangeEvent<any>) => {
+        setFeedbackMessage(event.target.value)
+    };
+
+    if (view == "feedbackForm") {
+        return (
+            <FormLayout onSubmit={handleSubmit}>
+                <FormField name="feedback-message">
+                    <Flex css={{ alignItems: 'baseline', justifyContent: 'space-between' }}>
+                        <FormLabel>Feedback message</FormLabel>
+                        <FormMessage match="valueMissing">Please provide learning elements, separated by comma (,)</FormMessage>
+                    </Flex>
+                    <Form.Control asChild>
+                        <Textarea style={{ height: 150, }} onChange={handleFeedbackMessage} required />
+                    </Form.Control>
+                </FormField>
+
+                <Flex css={{ marginTop: 25, justifyContent: 'flex-end' }}>
+                    <Form.Submit asChild>
+                        <ButtonBlack type="submit" css={{ marginTop: 10 }}>
+                            {isSubmitting ? <BarLoader cssOverride={{ borderRadius: 60, }} width={60} color="#ffffff" />
+                                : "Submit Feedback"}
+                        </ButtonBlack>
+                    </Form.Submit>
+                </Flex>
+            </FormLayout>
+        )
+    } else {
+        return (
+            <div className="flex flex-col items-center space-y-5">
+                <div className="flex flex-col items-center space-y-5 pt-10">
+                    <div className="flex items-center space-x-2">
+                        <div className="text-9xl text-green-500">
+                            <CheckCircleIcon></CheckCircleIcon>
+                        </div>
+                        <div className="text-3xl text-green-500">
+                            <div>Thank you for your feedback!</div>
+                        </div>
+                    </div>
+                    <div className="text-xl text-gray-500">
+                        <div>We will take it into account.</div>
+                    </div>
+                </div>
+                <div className="flex items-center space-x-2">
+                    <ButtonBlack onClick={() => setView("feedbackForm")}>Send another feedback</ButtonBlack>
+                </div>
+            </div>
+        )
+    }
+
+}
+
+export default FeedbackModal

apps/web/components/Objects/Other/CollectionThumbnail.tsx

@@ -0,0 +1,77 @@
+"use client";
+import AuthenticatedClientElement from '@components/Security/AuthenticatedClientElement'
+import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal'
+import { getUriWithOrg } from '@services/config/config'
+import { deleteCollection } from '@services/courses/collections'
+import { getCourseThumbnailMediaDirectory } from '@services/media/media'
+import { revalidateTags } from '@services/utils/ts/requests'
+import { X } from 'lucide-react'
+import Link from 'next/link'
+import { useRouter } from 'next/navigation'
+import React from 'react'
+
+type PropsType = {
+    collection: any,
+    orgslug: string,
+    org_id: string
+}
+
+const removeCollectionPrefix = (collectionid: string) => {
+    return collectionid.replace("collection_", "")
+}
+
+function CollectionThumbnail(props: PropsType) {
+    return (
+        <div className=''>
+            <div className="flex flex-row space-x-4 inset-0 ring-1 ring-inset my-auto ring-black/10 rounded-xl shadow-xl relative w-[300px] h-[80px] bg-cover items-center justify-center bg-indigo-600 font-bold text-zinc-50" >
+                <div className="flex -space-x-5">
+                    {props.collection.courses.slice(0, 2).map((course: any) => (
+                        <>
+                            <Link href={getUriWithOrg(props.orgslug, "/collection/" + removeCollectionPrefix(props.collection.collection_id))}>
+                                <div className="inset-0 rounded-full shadow-2xl bg-cover w-12 h-8 justify-center ring-indigo-800 ring-4" style={{ backgroundImage: `url(${getCourseThumbnailMediaDirectory(props.collection.org_id, course.course_id, course.thumbnail)})` }}>
+                                </div>
+                            </Link>
+                        </>
+                    ))}
+                </div>
+                <Link href={getUriWithOrg(props.orgslug, "/collection/" + removeCollectionPrefix(props.collection.collection_id))}>
+                    <h1 className="font-bold text-md justify-center">{props.collection.name}</h1>
+                </Link>
+                <CollectionAdminEditsArea orgslug={props.orgslug} org_id={props.org_id} collection_id={props.collection.collection_id} collection={props.collection} />
+            </div>
+        </div>
+    )
+}
+
+const CollectionAdminEditsArea = (props: any) => {
+    const router = useRouter();
+
+    const deleteCollectionUI = async (collectionId: number) => {
+        await deleteCollection(collectionId);
+        await revalidateTags(["collections"], props.orgslug);
+        // reload the page
+        router.refresh();
+    }
+
+    return (
+        <AuthenticatedClientElement orgId={props.org_id} checkMethod='roles'>
+            <div className="flex space-x-1  justify-center mx-auto z-20 ">
+                <ConfirmationModal
+                    confirmationMessage="Are you sure you want to delete this collection?"
+                    confirmationButtonText="Delete Collection"
+                    dialogTitle={"Delete " + props.collection.name + " ?"}
+                    dialogTrigger={
+                        <div
+                            className="hover:cursor-pointer p-1 px-2 bg-red-600 rounded-xl items-center justify-center flex shadow-xl"
+                            rel="noopener noreferrer">
+                            <X size={10} className="text-rose-200 font-bold" />
+                        </div>}
+                    functionToExecute={() => deleteCollectionUI(props.collection_id)}
+                    status='warning'
+                ></ConfirmationModal>
+            </div>
+        </AuthenticatedClientElement>
+    )
+}
+
+export default CollectionThumbnail

apps/web/components/Objects/Other/CourseThumbnail.tsx

@@ -0,0 +1,75 @@
+"use client";
+import AuthenticatedClientElement from '@components/Security/AuthenticatedClientElement';
+import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal';
+import { getUriWithOrg } from '@services/config/config';
+import { deleteCourseFromBackend } from '@services/courses/courses';
+import { getCourseThumbnailMediaDirectory } from '@services/media/media';
+import { revalidateTags } from '@services/utils/ts/requests';
+import { FileEdit, X } from 'lucide-react';
+import Link from 'next/link';
+import { useRouter } from 'next/navigation';
+import React from 'react'
+
+type PropsType = {
+    course: any,
+    orgslug: string
+}
+
+// function to remove "course_" from the course_id
+function removeCoursePrefix(course_id: string) {
+    return course_id.replace("course_", "");
+}
+
+function CourseThumbnail(props: PropsType) {
+    const router = useRouter();
+
+    async function deleteCourses(course_id: any) {
+        await deleteCourseFromBackend(course_id);
+        await revalidateTags(['courses'], props.orgslug);
+
+        router.refresh();
+    }
+
+    return (
+        <div className='relative'>
+            <AdminEditsArea course={props.course} orgSlug={props.orgslug} courseId={props.course.course_id} deleteCourses={deleteCourses} />
+            <Link href={getUriWithOrg(props.orgslug, "/course/" + removeCoursePrefix(props.course.course_id))}>
+                <div className="inset-0 ring-1 ring-inset ring-black/10 rounded-xl shadow-xl w-[249px] h-[131px] bg-cover" style={{ backgroundImage: `url(${getCourseThumbnailMediaDirectory(props.course.org_id, props.course.course_id, props.course.thumbnail)})` }}>
+        
+                </div>
+            </Link>
+            <h2 className="font-bold text-lg w-[250px] py-2">{props.course.name}</h2>
+        </div>
+    )
+}
+
+const AdminEditsArea = (props: { orgSlug: string, courseId: string, course: any, deleteCourses: any }) => {
+    return (
+        <AuthenticatedClientElement checkMethod='roles' orgId={props.course.org_id}>
+            <div className="flex space-x-1 absolute justify-center mx-auto z-20 bottom-14 left-1/2 transform -translate-x-1/2">
+                <Link href={getUriWithOrg(props.orgSlug, "/course/" + removeCoursePrefix(props.courseId) + "/edit")}>
+                    <div
+                        className=" hover:cursor-pointer p-1 px-4 bg-orange-600 rounded-xl items-center justify-center flex shadow-xl"
+                        rel="noopener noreferrer">
+                        <FileEdit size={14} className="text-orange-200 font-bold" />
+                    </div>
+                </Link>
+                <ConfirmationModal
+                    confirmationButtonText='Delete Course'
+                    confirmationMessage='Are you sure you want to delete this course?'
+                    dialogTitle={'Delete ' + props.course.name + ' ?'}
+                    dialogTrigger={
+                        <div
+                            className=" hover:cursor-pointer p-1 px-4 bg-red-600 rounded-xl items-center justify-center flex shadow-xl"
+                            rel="noopener noreferrer">
+                            <X size={14} className="text-rose-200 font-bold" />
+                        </div>}
+                    functionToExecute={() => props.deleteCourses(props.courseId)}
+                    status='warning'
+                ></ConfirmationModal>
+            </div>
+        </AuthenticatedClientElement>
+    )
+}
+
+export default CourseThumbnail

apps/web/components/Pages/CourseEdit/Draggables/Activity.tsx

@@ -0,0 +1,112 @@
+import React from "react";
+import Link from "next/link";
+import { Draggable } from "react-beautiful-dnd";
+import { getAPIUrl, getUriWithOrg } from "@services/config/config";
+import { FileText, Video, Sparkles, X, Pencil, MoreVertical, Eye, Save, File } from "lucide-react";
+import { mutate } from "swr";
+import { revalidateTags } from "@services/utils/ts/requests";
+import { useRouter } from "next/navigation";
+import ConfirmationModal from "@components/StyledElements/ConfirmationModal/ConfirmationModal";
+import { deleteActivity, updateActivity } from "@services/courses/activities";
+
+interface ModifiedActivityInterface {
+  activityId: string;
+  activityName: string;
+}
+
+function Activity(props: any) {
+  const router = useRouter();
+  const [modifiedActivity, setModifiedActivity] = React.useState<ModifiedActivityInterface | undefined>(undefined);
+  const [selectedActivity, setSelectedActivity] = React.useState<string | undefined>(undefined);
+
+  async function removeActivity() {
+    await deleteActivity(props.activity.id);
+    mutate(`${getAPIUrl()}chapters/meta/course_${props.courseid}`);
+    await revalidateTags(['courses'], props.orgslug);
+    router.refresh();
+  }
+
+  async function updateActivityName(activityId: string) {
+    if ((modifiedActivity?.activityId === activityId) && selectedActivity !== undefined) {
+      setSelectedActivity(undefined);
+      let modifiedActivityCopy = {
+        name: modifiedActivity.activityName,
+        description: '',
+        type: props.activity.type,
+        content: props.activity.content,
+      }
+
+      await updateActivity(modifiedActivityCopy, activityId)
+      await mutate(`${getAPIUrl()}chapters/meta/course_${props.courseid}`)
+      await revalidateTags(['courses'], props.orgslug)
+      router.refresh();
+    }
+  }
+
+  return (
+    <Draggable key={props.activity.id} draggableId={props.activity.id} index={props.index}>
+      {(provided) => (
+        <div
+          className="flex flex-row py-2 my-2 rounded-md bg-gray-50 text-gray-500 hover:bg-gray-100 hover:scale-102 hover:shadow space-x-1 w-auto items-center ring-1 ring-inset ring-gray-400/10 shadow-sm transition-all delay-100 duration-75 ease-linear" key={props.activity.id} {...provided.draggableProps} {...provided.dragHandleProps} ref={provided.innerRef}>
+          <div className="px-3 text-gray-300 space-x-1 w-28" >
+            {props.activity.type === "video" && <>
+              <div className="flex space-x-2 items-center"><Video size={16} /> <div className="text-xs bg-gray-200 text-gray-400 font-bold px-2 py-1 rounded-full mx-auto justify-center align-middle">Video</div> </div></>}
+            {props.activity.type === "documentpdf" && <><div className="flex space-x-2 items-center"><div className="w-[30px]"><File size={16} /> </div><div className="text-xs bg-gray-200 text-gray-400 font-bold px-2 py-1 rounded-full">Document</div> </div></>}
+            {props.activity.type === "dynamic" && <><div className="flex space-x-2 items-center"><Sparkles size={16} /> <div className="text-xs bg-gray-200 text-gray-400 font-bold px-2 py-1 rounded-full">Dynamic</div> </div></>}
+          </div>
+
+          <div className="grow items-center space-x-2 flex mx-auto justify-center">
+
+            {selectedActivity === props.activity.id ?
+              (<div className="chapter-modification-zone text-[7px] text-gray-600 shadow-inner bg-gray-200/60 py-1 px-4 rounded-lg space-x-3">
+                <input type="text" className="bg-transparent outline-none text-xs text-gray-500" placeholder="Activity name" value={modifiedActivity ? modifiedActivity?.activityName : props.activity.name} onChange={(e) => setModifiedActivity({ activityId: props.activity.id, activityName: e.target.value })} />
+                <button onClick={() => updateActivityName(props.activity.id)} className="bg-transparent text-neutral-700 hover:cursor-pointer hover:text-neutral-900">
+                  <Save size={11} onClick={() => updateActivityName(props.activity.id)} />
+                </button>
+              </div>) : (<p className="first-letter:uppercase"> {props.activity.name} </p>)}
+            <Pencil onClick={() => setSelectedActivity(props.activity.id)}
+              size={12} className="text-neutral-400 hover:cursor-pointer" />
+          </div>
+
+          <div className="flex flex-row space-x-2">
+            {props.activity.type === "dynamic" && <>
+              <Link
+                href={getUriWithOrg(props.orgslug, "") + `/course/${props.courseid}/activity/${props.activity.id.replace("activity_", "")}/edit`}
+                className=" hover:cursor-pointer p-1 px-3 bg-sky-700 rounded-md items-center"
+                rel="noopener noreferrer">
+                <div className="text-sky-100 font-bold text-xs" >Edit </div>
+              </Link>
+            </>}
+            <Link
+              href={getUriWithOrg(props.orgslug, "") + `/course/${props.courseid}/activity/${props.activity.id.replace("activity_", "")}`}
+              className=" hover:cursor-pointer p-1 px-3 bg-gray-200 rounded-md"
+              rel="noopener noreferrer">
+              <Eye strokeWidth={2} size={15} className="text-gray-600" />
+            </Link>
+
+
+
+          </div>
+          <div className="flex flex-row pr-3 space-x-1 items-center">
+            <MoreVertical size={15} className="text-gray-300" />
+            <ConfirmationModal
+              confirmationMessage="Are you sure you want to delete this activity ?"
+              confirmationButtonText="Delete Activity"
+              dialogTitle={"Delete " + props.activity.name + " ?"}
+              dialogTrigger={
+                <div
+                  className=" hover:cursor-pointer p-1 px-5 bg-red-600 rounded-md"
+                  rel="noopener noreferrer">
+                  <X size={15} className="text-rose-200 font-bold" />
+                </div>}
+              functionToExecute={() => removeActivity()}
+              status='warning'
+            ></ConfirmationModal></div>
+        </div>
+      )}
+    </Draggable>
+  );
+}
+
+
+export default Activity;