diff --git a/@types/index.d.ts b/@types/index.d.ts index de770812c..772947a98 100644 --- a/@types/index.d.ts +++ b/@types/index.d.ts @@ -931,5 +931,5 @@ export type DashboardActivity = { }; export interface ExtendedDashboardActivity extends DashboardActivity { - isPage?: boolean; + isPage?: boolean; } diff --git a/components/Modals/TempUser.tsx b/components/Modals/TempUser.tsx index 658e7b218..772e51811 100644 --- a/components/Modals/TempUser.tsx +++ b/components/Modals/TempUser.tsx @@ -31,9 +31,9 @@ const TempUser = ({ isOpen, onClose }: TempUser) => { }; const payment = userForm.get('paymentMethod') as string; const tempUser = await createTempUser(data); - + if (tempUser.data.token) { - localStorage.setItem('trans_token',tempUser.data.token); + localStorage.setItem('trans_token', tempUser.data.token); const cartItems = JSON.parse(localStorage.getItem('products') as string); const cartIds = await getCardItemsId(cartItems); diff --git a/components/Navbars/TopBar.tsx b/components/Navbars/TopBar.tsx index 17092ed99..ca92c91ec 100644 --- a/components/Navbars/TopBar.tsx +++ b/components/Navbars/TopBar.tsx @@ -532,7 +532,6 @@ function TopBar(props: { activePage: string; showDashBorad: boolean }) { )}
-

{globalAuth?.user?.firstName} {globalAuth?.user?.lastName}

diff --git a/helpers/formatCurrency.ts b/helpers/formatCurrency.ts index d576a4912..67a8a272e 100644 --- a/helpers/formatCurrency.ts +++ b/helpers/formatCurrency.ts @@ -16,6 +16,6 @@ export const formatToNigerianNaira = (num: number | string): string => { return formatter.format(parsedNum); }; -export const formatCurrency = (currency:number|string) => { - return currency.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); -} +export const formatCurrency = (currency: number | string) => { + return currency.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); +}; diff --git a/http/super-admin1.ts b/http/super-admin1.ts index 3f5b5e615..530b8ed95 100644 --- a/http/super-admin1.ts +++ b/http/super-admin1.ts @@ -187,5 +187,5 @@ export const useDeleteShop = () => { export const logout = (route: NextRouter) => { localStorage.removeItem('zpt'); - route.push('/') -} \ No newline at end of file + route.push('/'); +}; diff --git a/modules/assessment/component/Badges/BadgeComponent.tsx b/modules/assessment/component/Badges/BadgeComponent.tsx index 26d26b6f0..a48ab20bf 100644 --- a/modules/assessment/component/Badges/BadgeComponent.tsx +++ b/modules/assessment/component/Badges/BadgeComponent.tsx @@ -29,7 +29,7 @@ const BadgeComponent: React.FC = ({ href={href} as={as} passHref - className="badgecomponent w-[330px] h-[330px] sm:w-[236px] sm:h-[236px] lg:min-w-[300px] lg:min-h-[300px] xl:min-w-[330px] xl:min-h-[330px] p-[16px] flex flex-col items-center border border-neutral-200 rounded-[8px] gap-[12px] relative overflow-hidden" + className="badgecomponent w-[330px] h-[330px] sm:w-[236px] sm:h-[236px] lg:min-w-[300px] lg:min-h-[300px] xl:min-w-[330px] xl:min-h-[330px] p-[16px] flex flex-col items-center border border-neutral-200 rounded-[8px] gap-[12px] relative overflow-hidden transition-transform duration-300 hover:scale-105" >
{imageAlt} diff --git a/modules/assessment/component/Badges/BadgesComponentHeader.tsx b/modules/assessment/component/Badges/BadgesComponentHeader.tsx index 533496487..58a3766f0 100644 --- a/modules/assessment/component/Badges/BadgesComponentHeader.tsx +++ b/modules/assessment/component/Badges/BadgesComponentHeader.tsx @@ -4,12 +4,12 @@ import Image from 'next/image'; const BadgesComponentHeader = () => { return ( <> -
-
-

- Keep tabs on all yours badges +
+
+

+ Keep tabs on all your badges

-

+

Start your journey and earn a badge today!

@@ -47,7 +47,7 @@ const BadgesComponentHeader = () => { src="/assets/images/badges/bannerintermediatebadge.svg" width={290} height={30} - alt="expert badge image" + alt="intermediate badge image" />
@@ -55,7 +55,7 @@ const BadgesComponentHeader = () => { src="/assets/images/badges/bannerbeginnerbadge.png" width={160} height={128} - alt="expert badge image" + alt="beginner badge image" />
@@ -63,7 +63,7 @@ const BadgesComponentHeader = () => { src="/assets/images/badges/bannerintermediatebadge.svg" width={290} height={30} - alt="expert badge image" + alt="intermediate badge image" />
@@ -71,7 +71,7 @@ const BadgesComponentHeader = () => { src="/assets/images/badges/bannerbeginnerbadge.png" width={160} height={128} - alt="expert badge image" + alt="beginner badge image" />
@@ -79,7 +79,7 @@ const BadgesComponentHeader = () => { src="/assets/images/badges/bannerintermediatesmallbadge.svg" width={100} height={30} - alt="expert badge image" + alt="intermediate badge image" priority={true} />
@@ -88,7 +88,7 @@ const BadgesComponentHeader = () => { src="/assets/images/badges/bannerbeginnerbadge.png" width={160} height={128} - alt="expert badge image" + alt="beginner badge image" />

@@ -96,7 +96,7 @@ const BadgesComponentHeader = () => { src="/assets/images/badges/bannerintermediatesmallbadge.svg" width={100} height={30} - alt="expert badge image" + alt="intermediate badge image" priority={true} />
diff --git a/modules/assessment/component/Badges/errordata.tsx b/modules/assessment/component/Badges/errordata.tsx index b044badde..3411977b6 100644 --- a/modules/assessment/component/Badges/errordata.tsx +++ b/modules/assessment/component/Badges/errordata.tsx @@ -2,10 +2,10 @@ import React from 'react'; const errordata = () => { return ( -
-
+
+

Oops!

-

Error fetching data.

+

Error fetching data

{ // status code for user whose email is not verified if (e.status === 403) { notify({ - message: "Account not verified, redirecting to verification page.", + message: 'Account not verified, redirecting to verification page.', type: 'error', theme: 'light', }); diff --git a/modules/auth/component/guestsignupform.tsx b/modules/auth/component/guestsignupform.tsx index 7ffe9701d..93ec4e3e9 100644 --- a/modules/auth/component/guestsignupform.tsx +++ b/modules/auth/component/guestsignupform.tsx @@ -45,7 +45,7 @@ const Guestsignupform: React.FC = () => { notify({ message: res.message, type: 'error', - theme: 'light' + theme: 'light', }); }, }); diff --git a/modules/auth/component/logout/Logout.tsx b/modules/auth/component/logout/Logout.tsx index 336bad5df..e33038954 100644 --- a/modules/auth/component/logout/Logout.tsx +++ b/modules/auth/component/logout/Logout.tsx @@ -40,7 +40,6 @@ export const MobileLogout = () => {

Sign Out

-
); }; diff --git a/modules/auth/verificationComplete.tsx b/modules/auth/verificationComplete.tsx index 0790ac347..449fb5ba9 100644 --- a/modules/auth/verificationComplete.tsx +++ b/modules/auth/verificationComplete.tsx @@ -71,7 +71,7 @@ function VerificationComplete() { notify({ message: timeoutErrorMessage, type: 'error', - theme: 'light' + theme: 'light', }); setIsError(true); return; @@ -86,7 +86,7 @@ function VerificationComplete() { notify({ message: error.message, type: 'error', - theme: 'light' + theme: 'light', }); setIsError(true); }, diff --git a/modules/portfolio/component/modals/CountryCityDropdown.tsx b/modules/portfolio/component/modals/CountryCityDropdown.tsx index a9c0831fa..a8b93539f 100644 --- a/modules/portfolio/component/modals/CountryCityDropdown.tsx +++ b/modules/portfolio/component/modals/CountryCityDropdown.tsx @@ -69,7 +69,7 @@ const CountryCityDropdown: React.FC = ({ @@ -95,7 +95,7 @@ const CountryCityDropdown: React.FC = ({ diff --git a/modules/portfolio/component/modals/edit-profile.tsx b/modules/portfolio/component/modals/edit-profile.tsx index 94df666a6..ff468b21a 100644 --- a/modules/portfolio/component/modals/edit-profile.tsx +++ b/modules/portfolio/component/modals/edit-profile.tsx @@ -14,7 +14,6 @@ import { useAuth } from '../../../../context/AuthContext'; const inputStyle = `placeholder-gray-300 placeholder-opacity-40 font-semibold text-gray-500 h-[50px] border-2 border-[#bcbcbc] rounded-[10px] px-4 ring-0 outline-brand-green-primary transition-all duration-300 ease-in-out select-none focus-within:border-brand-green-primary`; const EditProfile = () => { - const { userData, setUserData, showProfileUpdate, setShowProfileUpdate } = useContext(Portfolio); const [picture, setPicture] = useState(); const [firstNamee, setFirstnamee] = useState(''); @@ -61,7 +60,6 @@ const EditProfile = () => { const response = await fetch(`https://hng6-r5y3.onrender.com/api/v1/users/${userId}`); const userData = await response.json(); - // Set default values as placeholders if data is not present setPicture(userData.data.user.profilePic || ''); setFirstnamee(userData.data.user.firstName || ''); // Access 'user' inside 'data' @@ -69,7 +67,7 @@ const EditProfile = () => { setCity(userData.data.portfolio.city || ''); // Access 'portfolio' inside 'data' setCountry(userData.data.portfolio.country || ''); // Access 'portfolio' inside 'data' setSelectedTrack(userData.data.userTracks.track || ''); // Access 'userTracks' inside 'data' - + setAvailableTracks(await getTracks()); setIsLoading(false); } catch (error: any) { @@ -85,15 +83,12 @@ const EditProfile = () => { const response = await fetch('https://hng6-r5y3.onrender.com/api/v1/tracks'); const data = await response.json(); return data.data; - } catch (error: any) { - - } + } catch (error: any) {} }; - const handleSubmit = async (e: any) => { e.preventDefault(); - + let matchingTrack: any; matchingTrack = availableTracks.find((track: any) => track.track === selectedTrack); if (!isLoading) { diff --git a/modules/portfolio/component/skillModal/SkillsModal.tsx b/modules/portfolio/component/skillModal/SkillsModal.tsx index a503a5a90..8c1ec4097 100644 --- a/modules/portfolio/component/skillModal/SkillsModal.tsx +++ b/modules/portfolio/component/skillModal/SkillsModal.tsx @@ -8,7 +8,6 @@ import { notify } from '@ui/Toast'; import Loader from '@ui/Loader'; import Portfolio from '../../../../context/PortfolioLandingContext'; - type skillModalProps = { onCloseModal: () => void; onSaveModal: () => void; @@ -43,7 +42,7 @@ const SkillModal = ({ onCloseModal, onSaveModal, isOpen, userId }: skillModalPro ]); const [arrayTwo, setArrayTwo] = useState>([]); const [values, setValues] = useState>([]); - const slug = useContext(Portfolio); + const slug = useContext(Portfolio); const fetchSkillData = useCallback(async () => { try { diff --git a/modules/shop/component/cart/checkout/Summary.tsx b/modules/shop/component/cart/checkout/Summary.tsx index 3fcb24a69..d58772b07 100644 --- a/modules/shop/component/cart/checkout/Summary.tsx +++ b/modules/shop/component/cart/checkout/Summary.tsx @@ -71,7 +71,9 @@ const Summary = ({ prices, summary, token }: SummaryProps & { token: string; sum

Subtotal

- ₦ {summary.subtotal ? formatCurrency(summary.subtotal.toFixed(2)) : ''} + + ₦ {summary.subtotal ? formatCurrency(summary.subtotal.toFixed(2)) : ''} +
@@ -107,7 +109,11 @@ const Summary = ({ prices, summary, token }: SummaryProps & { token: string; sum
{token.length > 0 && modalOpen ? ( - + ) : ( )} diff --git a/modules/super-admin/components/navigations/SuperAdminSidebar.tsx b/modules/super-admin/components/navigations/SuperAdminSidebar.tsx index 9a8c5d35e..20c249a78 100644 --- a/modules/super-admin/components/navigations/SuperAdminSidebar.tsx +++ b/modules/super-admin/components/navigations/SuperAdminSidebar.tsx @@ -38,7 +38,10 @@ const SuperAdminSidebar = () => { ))}
- diff --git a/pages/assessments/dashboard/[badges]/index.tsx b/pages/assessments/dashboard/[badges]/index.tsx index f2530bd2e..a42801fad 100644 --- a/pages/assessments/dashboard/[badges]/index.tsx +++ b/pages/assessments/dashboard/[badges]/index.tsx @@ -6,7 +6,9 @@ import MainLayout from '../../../../components/Layout/MainLayout'; import BadgeComponent from '@modules/assessment/component/Badges/BadgeComponent'; import ErrorData from '@modules/assessment/component/Badges/errordata'; import BadgesComponentHeader from '@modules/assessment/component/Badges/BadgesComponentHeader'; +import { MdArrowBackIosNew } from 'react-icons/md'; import { withUserAuth } from '../../../../helpers/withAuth'; +import Head from 'next/head'; interface Skill { id: number; @@ -104,15 +106,13 @@ const Earnedbadges: React.FC = () => { useEffect(() => { const bearerToken = localStorage.getItem('zpt'); - console.log(bearerToken); const fetchData = async () => { try { const badgelabel = router.query?.badges; - console.log(badgelabel); + if (badgelabel) { const apiUrl = `https://staging.zuri.team/api/badges/user/badges?badges=${badgelabel}`; - console.log(apiUrl); const response = await fetch(apiUrl, { method: 'GET', @@ -141,27 +141,49 @@ const Earnedbadges: React.FC = () => { fetchData(); }, [router.query]); + const handleBack = () => { + router.back(); + }; + return ( -
+ + Badges + + + + + + +
{isLoading ? ( -
+
) : errorMessage ? ( ) : ( -
-

- {router.query?.badges} Badges -

+
+
+
+
+ +
+

+ go back +

+
+

+ {router.query?.badges} Badges +

+
{badges.length <= 0 ? ( - <> +

Oops You Have Not Earned A {router.query?.badges} Badge Yet

- +
) : (
{badges.map((badge, index) => ( @@ -171,7 +193,7 @@ const Earnedbadges: React.FC = () => { imageAlt={`${badge.Badge.name} Page`} title={`${badge.Badge.name}`} description={`Badge earned in the ${badge.Badge.Skill.category_name} category.`} - earnedDate={`Earned on: ${formatDate(badge.Badge.Skill.created_at)}`} + earnedDate={`Earned on: ${formatDate(badge.Badge.Skill.updated_at)}`} badgelabel={'nfj'} href="/assessments/dashboard/badge/[id]" as={`/assessments/dashboard/badge/${badge.id}`} diff --git a/pages/assessments/dashboard/index.tsx b/pages/assessments/dashboard/index.tsx index 8a8a114c7..18e534d05 100644 --- a/pages/assessments/dashboard/index.tsx +++ b/pages/assessments/dashboard/index.tsx @@ -47,6 +47,9 @@ const Dashboard = () => { Assessment dashboard + + + {isLoading ? ( @@ -93,7 +96,7 @@ const Dashboard = () => { href={`/assessments/dashboard/[badges]`} as={`/assessments/dashboard/${item.level}`} key={index} - className="flex md:mx-2 xl:mx-4 items-center gap-[.5rem] my-[1rem] md:my-0 md:gap-[.7rem] lg:gap-[1rem] p-[.7rem] lg:p-[1rem] border-[.58px] border-white-400 md:w-[14.4rem] lg:w-[35%] xl:w-[35%] 2xl:w-[35%] rounded-md h-[6rem] md:h-[7rem] lg:h-[9rem]" + className="flex md:mx-2 xl:mx-4 items-center gap-[.5rem] my-[1rem] md:my-0 md:gap-[.7rem] lg:gap-[1rem] p-[.7rem] lg:p-[1rem] border-[.58px] border-white-400 md:w-[14.4rem] lg:w-[35%] xl:w-[35%] 2xl:w-[35%] rounded-md h-[6rem] md:h-[7rem] lg:h-[9rem] transition-transform duration-300 hover:scale-105" >
diff --git a/pages/auth/google-redirect.tsx b/pages/auth/google-redirect.tsx index b537f6a1a..b299790c5 100644 --- a/pages/auth/google-redirect.tsx +++ b/pages/auth/google-redirect.tsx @@ -12,7 +12,7 @@ function GoogleRedirect() { const { handleAuth, userCameFrom, userCameFromForOAuth } = useAuth(); const { mutate: signUserWithGoogle } = useAuthMutation(signUpWithOAuth, { onSuccess: (data) => { - console.log("Goog;le data", data) + console.log('Goog;le data', data); // Checking if user enabled 2fa if (data?.status === 202) { // Setting to localStorage because 2fa page needs them diff --git a/pages/marketplace/success.tsx b/pages/marketplace/success.tsx index 5fb0d79cf..b397db467 100644 --- a/pages/marketplace/success.tsx +++ b/pages/marketplace/success.tsx @@ -4,7 +4,6 @@ import Loader from '../../components/Loader/loader2'; import { confirmTransaction } from '../../http/checkout'; import Head from 'next/head'; - export default function Successful() { const [success, setSuccess] = useState(true); const [isLoading, setIsLoading] = useState(true); @@ -19,10 +18,9 @@ export default function Successful() { const confirmResponse = await confirmTransaction({ token, txn_ref, payment_gateway }); setSuccess(confirmResponse); setIsLoading(false); - localStorage.setItem('trans_token',"") + localStorage.setItem('trans_token', ''); } confirmTransactionStatus(); - }); return ( <> @@ -50,12 +48,15 @@ export default function Successful() { - {!isLoading ? - (success ? ( + {!isLoading ? ( + success ? ( ) : ( - )) : } + ) + ) : ( + + )} ); }