Skip to content

Commit

Permalink
feat(changes): done with changes
Browse files Browse the repository at this point in the history
  • Loading branch information
faisalEsMagico committed Dec 12, 2023
1 parent 2dfa1b4 commit 4cd51ea
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 20 deletions.
4 changes: 2 additions & 2 deletions src/app/3cp/account-verification/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export type accountType = {
updatedAt: Date | undefined | string;
};

const AccountVefication = () => {
const AccountVerification = () => {
const [activeSection, setActiveSection] = useState<string>('PENDING');
const [currentAccountList, setCurrentAccountList] = useState<accountType[]>(
[]
Expand Down Expand Up @@ -92,4 +92,4 @@ const AccountVefication = () => {
</div>
);
};
export default AccountVefication;
export default AccountVerification;
2 changes: 1 addition & 1 deletion src/app/3cp/marketplace/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const MarketPlace = () => {

return (
<div className='w-screen bg-[#f7f9fc]'>
<ProfileNavbar heading='Marketplace' />
<ProfileNavbar heading='Marketplace/Courses' />

{loading && (
<div className='mt-[100px] text-center'>
Expand Down
2 changes: 1 addition & 1 deletion src/app/user-management/user-wallet/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ const AddToWallet = ({ params }: { params: { id: string } }) => {
<div className='rounded bg-[#FFF7DA] py-[9px] pl-[18px] pr-[76px]'>
<p className='text-base text-[#65758C]'>Wallet Balance</p>
<p className='text-2xl font-semibold text-[#385B8B]'>
Cr {data?.credits ?? '--'}
Cr. {data?.credits ?? '--'}
</p>
</div>
<div className='w-[350px]'>
Expand Down
2 changes: 1 addition & 1 deletion src/app/user-management/user-wallet/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ProfileNavbar from '@/components/wpcasOverView/ProfileNavbar';
import UserWalletContext from '@/app/context/UserWalletContext';

export default function Layout({ children }: { children: React.ReactNode }) {
const heading = 'Payments';
const heading = 'User Wallet';
const pathname = usePathname();
return (
<div className='flex'>
Expand Down
2 changes: 1 addition & 1 deletion src/components/3cp/AccountItems.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const AccountItems = ({
fetchData: () => void;
}) => {
return (
<div className='flex flex-col gap-2.5'>
<div className='mb-2 flex flex-col gap-2.5'>
{accountList?.map((account) => {
return (
<SingleAccount
Expand Down
2 changes: 1 addition & 1 deletion src/components/3cp/AccountSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const AccountSection = ({
/>
</div>
) : (
<NoCoursesAdded text='No Account Present yet!' />
<NoCoursesAdded text='No Accounts' />
)}
</div>
);
Expand Down
3 changes: 3 additions & 0 deletions src/components/3cp/CourseSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ const CourseSection = ({
const [showReset, setShowReset] = useState(false);

const handleSearch = () => {
if (!input.language && !input.competency && !input.course && !showReset) {
return;
}
const filteredCourses = courseList?.filter((course) => {
const courseTitleLower = course?.title?.toLowerCase();
const inputCourseLower = input?.course?.toLowerCase();
Expand Down
4 changes: 2 additions & 2 deletions src/components/3cp/SearchCourse.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ const SearchCourse = ({
setShowReset,
}: PropType) => {
return (
<div className='my-7 flex flex-wrap justify-between gap-3'>
<div className='my-7 flex flex-wrap gap-3'>
<SearchInput
value={value.course}
value={value?.course}
onChange={(updatedValue) => {
setShowReset(false);
onChange({ ...value, course: updatedValue });
Expand Down
2 changes: 1 addition & 1 deletion src/components/3cp/SingleAccount.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const SingleAccount = ({
: 'text-[#385B8B]'
} `}
>
{activeSection === 'REJECTED' ? 'Rejected' : 'Onboard'} On{' '}
{activeSection === 'REJECTED' ? 'Rejected' : 'Approved'} On{' '}
{account?.updatedAt ? formatDate(account?.updatedAt) : '--'}
</p>
</div>
Expand Down
1 change: 0 additions & 1 deletion src/components/3cp/SingleCourse.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ const SingleCourse = ({
className='rounded-xl'
/>
</div>
{/* centerItem */}
<div className='flex flex-grow flex-col justify-between'>
<div>
<p className='pb-2 text-[16px] font-bold text-[#272728]'>
Expand Down
1 change: 1 addition & 0 deletions src/components/navbar/MarketPlaceNavbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { usePathname } from 'next/navigation';

import { outfit } from '@/components/FontFamily';

const MarketPlaceNavbar = ({
activeSection,
setActiveSection,
Expand Down
6 changes: 1 addition & 5 deletions src/components/uiComponents/NoCoursesAdded.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ import React from 'react';

import EmptyBox from '~/svg/emptyBox.svg';

const NoCoursesAdded = ({
text = 'No courses added yet!',
}: {
text?: string;
}) => {
const NoCoursesAdded = ({ text = 'No courses' }: { text?: string }) => {
return (
<div className='mx-7 flex flex-col items-center justify-center gap-2 pt-[170px]'>
<EmptyBox width='160px' />
Expand Down
4 changes: 2 additions & 2 deletions src/components/uiComponents/SearchInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const SearchInput = ({
onChange,
}: PropsType) => {
return (
<div className='relative '>
<div className='relative'>
<div className='pointer-events-none absolute inset-y-0 left-0 top-0 flex items-center pl-3'>
<svg
className='h-4 w-4 text-gray-500 dark:text-gray-400'
Expand All @@ -36,7 +36,7 @@ const SearchInput = ({
<input
type='search'
className='block w-[320px] rounded-lg
border border-[#E3E7EF] bg-white py-2.5 pl-10 pr-[70px] text-sm text-gray-900 placeholder:font-medium placeholder:text-[#909090]
border border-[#E3E7EF] bg-white py-2.5 pl-10 text-sm text-gray-900 placeholder:text-[16px] placeholder:font-normal placeholder:text-[#787777]
focus:ring-blue-400 md:w-[450px]'
placeholder={placeholder}
required={required}
Expand Down
2 changes: 1 addition & 1 deletion src/components/userManagement/ConfirmTransaction.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const ConfirmTransaction = ({
Confirm the Transaction
</div>
<div className='mt-[20px] text-center text-base text-[#272728]'>
Are you sure want to {isAddWallet ? 'add' : 'remove'} {credit} Cr to
Are you sure want to {isAddWallet ? 'add' : 'remove'} {credit} Cr from
this wallet
</div>
<div className='my-[40px] flex justify-center gap-6'>
Expand Down
2 changes: 1 addition & 1 deletion src/components/userManagement/UserWalletTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const UserWalletTable = ({
<SearchUser
value={searchInput}
onChange={(value) => handleSearch(value)}
placeholder='Search User'
placeholder='Search User Name'
/>
<div className='relative overflow-x-auto shadow-md sm:rounded-md'>
<table className='w-full text-left text-sm text-gray-500 dark:text-gray-400'>
Expand Down
11 changes: 11 additions & 0 deletions src/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,17 @@
/* display: none; */
}

/* Hide the up and down arrows for number input */
input[type='number']::-webkit-inner-spin-button,
input[type='number']::-webkit-outer-spin-button {
-webkit-appearance: none;
margin: 0;
}

input[type='number'] {
-moz-appearance: textfield; /* Firefox */
}

@layer base {
/* inter var - latin */
@font-face {
Expand Down

0 comments on commit 4cd51ea

Please sign in to comment.