Merge pull request #1573 from gtech-mulearn/dev

DevServer
gtech-mulearn · Jul 5, 2024 · 08aa66e · 08aa66e
2 parents d4d9b26 + 77a6543
commit 08aa66e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/modules/Dashboard/layouts/DashboardRootLayout.tsx b/src/modules/Dashboard/layouts/DashboardRootLayout.tsx
@@ -14,7 +14,8 @@ import { fetchLocalStorage } from "@/MuLearnServices/common_functions";
 const DashboardRootLayout = (props: { component?: any }) => {
     const [connected, setConnected] = useState(false);
 
-    const Management: ManagementTypes[] = Object.values(managementTypes).slice(2);
+    const Management: ManagementTypes[] =
+        Object.values(managementTypes).slice(2);
     useEffect(() => {
         const userInfo = fetchLocalStorage<UserInfo>("userInfo");
         if (userInfo) {
@@ -105,13 +106,13 @@ const DashboardRootLayout = (props: { component?: any }) => {
                     title: "Manage Organization",
                     hasView: true,
 
-                    roles: [roles.ADMIN, roles.FELLOW, roles.ASSOCIATE],
+                    roles: [roles.ADMIN, roles.FELLOW],
                     children: [
                         {
                             url: "/dashboard/affiliation",
                             title: "Affiliation",
                             hasView: true,
-                            roles: [roles.ADMIN, roles.FELLOW, roles.ASSOCIATE]
+                            roles: [roles.ADMIN, roles.FELLOW]
                         },
                         {
                             url: "/dashboard/organization-transfer",
@@ -233,7 +234,7 @@ const DashboardRootLayout = (props: { component?: any }) => {
                     url: "/dashboard/channels",
                     title: "Channels",
                     hasView: true,
-                    roles: [roles.ADMIN, roles.FELLOW, roles.ASSOCIATE]
+                    roles: [roles.ADMIN, roles.FELLOW]
                 },
 
                 {

diff --git a/src/modules/Public/Donation/assets/receipt/logo.png b/src/modules/Public/Donation/assets/receipt/logo.png
diff --git a/src/modules/Public/Donation/pages/DonationSuccess.tsx b/src/modules/Public/Donation/pages/DonationSuccess.tsx
@@ -75,12 +75,6 @@ const DonationSuccess = () => {
 
     return pdfData ? (
         <>
-            <div ref={pdfElement} style={{
-                // position: "absolute",
-                // top: "-1000px",
-            }}>
-                <Receipt />
-            </div>
             <div className={styles.LClandingPage}>
                 <Navbar />
 
@@ -126,7 +120,12 @@ const DonationSuccess = () => {
                         </div>
                     </div>
                 </div>
-
+                <div ref={pdfElement} style={{
+                position: "absolute",
+                top: "-1000%",
+            }}>
+                <Receipt />
+            </div>
                 <Footer />
             </div>
         </>

diff --git a/src/modules/Public/Donation/pages/receipt/Receipt.tsx b/src/modules/Public/Donation/pages/receipt/Receipt.tsx
@@ -1,6 +1,6 @@
 import { useState,useEffect } from 'react'
 import logo from '../../assets/receipt/logo.svg'
-import mulearn from '../../assets/receipt/learn.svg'
+import mulearn from '../../assets/receipt/logo.png'
 import vector from '../../assets/receipt/vector.svg'
 import bigLogo from '../../assets/receipt/group-75.svg'
 import styles from './Receipt.module.css';