Skip to content
Merged

Beta #450

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,220 changes: 1,199 additions & 21 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"bcryptjs": "^2.4.3",
"blurhash": "^2.0.5",
"date-fns": "^3.6.0",
"dompurify": "^3.3.1",
"framer-motion": "^11.2.10",
"html2canvas": "^1.4.1",
"html5-qrcode": "^2.3.8",
Expand Down Expand Up @@ -54,6 +55,7 @@
"react-loader-spinner": "^6.1.6",
"react-loading-indicators": "^0.2.3",
"react-loading-skeleton": "^3.4.0",
"react-markdown": "^10.1.0",
"react-oauth": "^0.0.1",
"react-qr-barcode-scanner": "^2.1.8",
"react-quill": "^2.0.0",
Expand Down
679 changes: 679 additions & 0 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

12 changes: 10 additions & 2 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ import FullBlog from "./pages/Blog/FullBlog";
// state
import AuthContext from "./context/AuthContext";
import EventStats from "./features/Modals/Event/EventStats/EventStats";

// Chatbot
import Chatbot from "./components/Chatbot/Chatbot";

import {
EventsView,
NewForm,
Expand Down Expand Up @@ -97,8 +101,12 @@ const AuthLayout = () => (
function App() {
const authCtx = useContext(AuthContext);
console.log(authCtx.user.access);

return (
<div>
{/* Global Chatbot Component */}
<Chatbot />

<Suspense fallback={<Loading />}>
<Routes>
<Route element={<MainLayout />}>
Expand Down Expand Up @@ -138,8 +146,8 @@ function App() {

{(authCtx.user.access === "ADMIN" ||
authCtx.user.access === "SENIOR_EXECUTIVE_CREATIVE") && (
<Route path="BlogForm" element={<BlogForm />} />
)}
<Route path="BlogForm" element={<BlogForm />} />
)}
{/* Certificates Route */}

{authCtx.user.access === "ADMIN" && (
Expand Down
Loading