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

Merge branch 'learnhouse:dev' into Ordered-List

Browse source
This commit is contained in:
Sanjeev Kumar 2023-08-24 01:43:36 +05:30 • committed by GitHub
commit 6b6b3e65f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 4057 additions and 8816 deletions
Download patch file Download diff file Expand all files Collapse all files

58
front/components/Objects/Menu/Menu.tsx
View file

@ -1,12 +1,10 @@
'use client';
import React from "react";
import useSWR from "swr";
import Link from "next/link";
import { getAPIUrl, getBackendUrl, getUriWithOrg } from "@services/config/config";
import { getUriWithOrg } from "@services/config/config";
import { getOrganizationContextInfo } from "@services/organizations/orgs";
import ClientComponentSkeleton from "@components/Utils/ClientComp";
import { HeaderProfileBox } from "@components/Security/HeaderProfileBox";
import { swrFetcher } from "@services/utils/ts/requests";
import MenuLinks from "./MenuLinks";
import { getOrgLogoMediaDirectory } from "@services/media/media";
@ -23,33 +21,35 @@ export const Menu = async (props: any) => {
}}></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 px-16 space-x-5 shadow-[0px_4px_16px_rgba(0,0,0,0.03)] z-50">
<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">
<ClientComponentSkeleton>
<MenuLinks orgslug={orgslug} />
</ClientComponentSkeleton>
<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">
<ClientComponentSkeleton>
<MenuLinks orgslug={orgslug} />
</ClientComponentSkeleton>
</div>
<div className="profile flex">
<ClientComponentSkeleton>
<HeaderProfileBox />
</ClientComponentSkeleton>
</div>
<div className="profile flex">
<ClientComponentSkeleton>
<HeaderProfileBox />
</ClientComponentSkeleton>
</div>
</div>
</div>

4
front/components/Objects/Modals/Course/Create/CreateCourse.tsx
View file

@ -43,13 +43,13 @@ function CreateCourseModal({ closeModal, orgslug }: any) {
e.preventDefault();
setIsSubmitting(true);
let status = await createNewCourse(orgId, { name, description }, thumbnail);
revalidateTags(['courses'], orgslug);
await revalidateTags(['courses'], orgslug);
setIsSubmitting(false);
if (status.org_id == orgId) {
closeModal();
router.refresh();
revalidateTags(['courses'], orgslug);
await revalidateTags(['courses'], orgslug);
// refresh page (FIX for Next.js BUG)
// window.location.reload();