Merge branch 'development'

.env.example

@@ -2,7 +2,9 @@ VITE_BASHAWAY_BE_URL=https://api.staging.bashaway.sliitfoss.org
 VITE_FIREBASE_CONFIG=
 VITE_AZURE_UPLOAD_SAS_TOKEN=
 VITE_AZURE_DOWNLOAD_SAS_TOKEN=
+VITE_AZURE_GENERIC_UPLOAD_SAS_TOKEN=
 VITE_AZURE_STORAGE_ACCOUNT=
+VITE_AZURE_GENERIC_STORAGE_ACCOUNT=
 VITE_AZURE_STORAGE_CONTAINER=
 VITE_APP_ENV=local
 VITE_SENTRY_DSN=

.github/workflows/preview-build.yml

@@ -28,7 +28,9 @@ jobs:
           VITE_FIREBASE_CONFIG: ${{ secrets.STAGING_FIREBASE_CONFIG }}
           VITE_AZURE_UPLOAD_SAS_TOKEN: ${{ secrets.STAGING_AZURE_UPLOAD_SAS_TOKEN }}
           VITE_AZURE_DOWNLOAD_SAS_TOKEN: ${{ secrets.STAGING_AZURE_DOWNLOAD_SAS_TOKEN }}
+          VITE_AZURE_GENERIC_UPLOAD_SAS_TOKEN: ${{ secrets.STAGING_AZURE_GENERIC_UPLOAD_SAS_TOKEN }}
           VITE_AZURE_STORAGE_ACCOUNT: ${{ secrets.STAGING_AZURE_STORAGE_ACCOUNT }}
+          VITE_AZURE_GENERIC_STORAGE_ACCOUNT: ${{ secrets.STAGING_AZURE_GENERIC_STORAGE_ACCOUNT }}
           VITE_AZURE_STORAGE_CONTAINER: ${{ secrets.STAGING_AZURE_STORAGE_CONTAINER }}
           VITE_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
           VITE_APP_ENV: staging

.github/workflows/staging-deploy.yml

@@ -19,7 +19,9 @@ jobs:
           VITE_FIREBASE_CONFIG: ${{ secrets.STAGING_FIREBASE_CONFIG }}
           VITE_AZURE_UPLOAD_SAS_TOKEN: ${{ secrets.STAGING_AZURE_UPLOAD_SAS_TOKEN }}
           VITE_AZURE_DOWNLOAD_SAS_TOKEN: ${{ secrets.STAGING_AZURE_DOWNLOAD_SAS_TOKEN }}
+          VITE_AZURE_GENERIC_UPLOAD_SAS_TOKEN: ${{ secrets.STAGING_AZURE_GENERIC_UPLOAD_SAS_TOKEN }}
           VITE_AZURE_STORAGE_ACCOUNT: ${{ secrets.STAGING_AZURE_STORAGE_ACCOUNT }}
+          VITE_AZURE_GENERIC_STORAGE_ACCOUNT: ${{ secrets.STAGING_AZURE_GENERIC_STORAGE_ACCOUNT }}
           VITE_AZURE_STORAGE_CONTAINER: ${{ secrets.STAGING_AZURE_STORAGE_CONTAINER }}
           VITE_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
           VITE_APP_ENV: staging

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bashaway-event-portal",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "scripts": {
     "dev": "vite",
     "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 vite build",
@@ -13,7 +13,7 @@
     "@azure/storage-blob": "12.15.0",
     "@reduxjs/toolkit": "1.9.5",
     "@sentry/react": "7.69.0",
-    "@sliit-foss/bashaway-ui": "0.5.4",
+    "@sliit-foss/bashaway-ui": "0.10.3",
     "async-mutex": "^0.4.0",
     "firebase": "10.2.0",
     "framer-motion": "10.14.0",
@@ -22,7 +22,6 @@
     "lucide-react": "0.263.1",
     "moment-timezone": "0.5.43",
     "react": "18.0.0",
-    "react-countdown": "2.3.5",
     "react-dom": "18.0.0",
     "react-icons": "4.10.1",
     "react-loader-spinner": "5.3.4",

src/app.jsx

@@ -1,3 +1,4 @@
+import { Suspense, lazy } from "react";
 import { Provider } from "react-redux";
 import { useLocation } from "react-router-dom";
 import { motion } from "framer-motion";
@@ -7,6 +8,8 @@ import { default as AnimatedRoutes } from "@/routes";
 import { store } from "@/store";
 import { ErrorBoundary, Loader, Toaster, TooltipProvider } from "@sliit-foss/bashaway-ui/components";
 
+const IdentificationForm = lazy(() => import("@/components/identification-form"));
+
 const App = () => {
   const location = useLocation();
   const completed = useAuth();
@@ -17,7 +20,7 @@ const App = () => {
           <Header />
           <motion.main
             key={location.pathname}
-            className="w-full max-w-body mx-auto px-8 lg:px-24 flex flex-col items-center relative z-[5] font-inter break-words  overflow-x-hidden pt-[calc(70px+64px)] xs:pt-[calc(90px+64px)] pb-[64px]"
+            className="w-full max-w-body mx-auto px-8 lg:px-24 flex flex-col items-center relative z-[5] font-inter break-words  overflow-x-hidden pt-[calc(70px+64px)] xs:pt-[calc(86px+64px)] pb-[64px]"
             initial={{ opacity: 0 }}
             animate={{ opacity: 1 }}
             exit={{ opacity: 0, transition: { duration: 0.3 } }}
@@ -28,6 +31,9 @@ const App = () => {
           <Footer />
           <Loader />
           <Toaster />
+          <Suspense>
+            <IdentificationForm />
+          </Suspense>
           <div
             className={`fixed inset-0 h-screen w-full bg-white z-50 transition-all duration-long ${
               completed ? "opacity-0 pointer-events-none" : "opacity-100"

src/components/home/index.jsx

@@ -1,2 +1 @@
-export { default as Timer } from "./timer";
 export * from "./question";

src/components/home/question/index.jsx

@@ -2,7 +2,7 @@ import { useMemo } from "react";
 import { CheckCircle2, XCircle } from "lucide-react";
 import { default as ReactMarkdown } from "react-markdown";
 import { Link } from "react-router-dom";
-import { startCase } from "lodash";
+import { default as startCase } from "lodash/startCase";
 import { twMerge } from "tailwind-merge";
 import { challengeColor } from "@/utils";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@sliit-foss/bashaway-ui/components";